tinygo-org/tinygo
1
0
Fork 0
mirror of https://github.com/tinygo-org/tinygo.git synced 2026-08-17 11:13:27 +00:00
Code Issues Packages Projects Releases 6 Wiki Activity

builder: fix off-by-one in size calculation

Browse Source 
> There are two hard things in computer science: cache invalidation,
> naming things, and off-by-one errors.

Because of this bug, sometimes the last object in a section might not be
attributed correctly to a source location.
This commit is contained in:
Ayke van Laethem
2021-11-18 21:02:57 +01:00
committed by Ron Evans
parent 4ef340f228
commit dee5602e56
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/sizes.go
+17 -3
View File
@@ -97,6 +97,17 @@ const (
memoryStack memoryStack
) )
func (t memoryType) String() string {
return [...]string{
0: "-",
memoryCode: "code",
memoryData: "data",
memoryROData: "rodata",
memoryBSS: "bss",
memoryStack: "stack",
}[t]
}
// Regular expressions to match particular symbol names. These are not stored as // Regular expressions to match particular symbol names. These are not stored as
// DWARF variables because they have no mapping to source code global variables. // DWARF variables because they have no mapping to source code global variables.
var ( var (
@@ -580,8 +591,11 @@ func readSection(section memorySection, addresses []addressLine, addSize func(st
// section. We start at the beginning. // section. We start at the beginning.
addr := section.Address addr := section.Address
sectionEnd := section.Address + section.Size sectionEnd := section.Address + section.Size
if sizesDebug {
fmt.Printf("%08x..%08x %5d: %s\n", addr, sectionEnd, section.Size, section.Type)
}
for _, line := range addresses { for _, line := range addresses {
if line.Address < section.Address || line.Address+line.Length >= sectionEnd { if line.Address < section.Address || line.Address+line.Length > sectionEnd {
// Check that this line is entirely within the section. // Check that this line is entirely within the section.
// Don't bother dealing with line entries that cross sections (that // Don't bother dealing with line entries that cross sections (that
// seems rather unlikely anyway). // seems rather unlikely anyway).
@@ -592,7 +606,7 @@ func readSection(section memorySection, addresses []addressLine, addSize func(st
// previous line entry. // previous line entry.
addSize("(unknown)", line.Address-addr, false) addSize("(unknown)", line.Address-addr, false)
if sizesDebug { if sizesDebug {
fmt.Printf("%08x..%08x %4d: unknown (gap)\n", addr, line.Address, line.Address-addr) fmt.Printf("%08x..%08x %5d: unknown (gap)\n", addr, line.Address, line.Address-addr)
} }
} }
if addr > line.Address+line.Length { if addr > line.Address+line.Length {
@@ -617,7 +631,7 @@ func readSection(section memorySection, addresses []addressLine, addSize func(st
// There is a gap at the end of the section. // There is a gap at the end of the section.
addSize("(unknown)", sectionEnd-addr, false) addSize("(unknown)", sectionEnd-addr, false)
if sizesDebug { if sizesDebug {
fmt.Printf("%08x..%08x %4d: unknown (end)\n", addr, sectionEnd, sectionEnd-addr) fmt.Printf("%08x..%08x %5d: unknown (end)\n", addr, sectionEnd, sectionEnd-addr)
} }
} }
} }