StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix finding next symbol when multiple symbols have the same address" am: 8d43b7cf81

Browse Source 
am: fd316aa69c

Change-Id: I017036c19ae53d12575b0951ed54dc97c7c0d891
This commit is contained in:
Colin Cross
2018-03-01 05:52:52 +00:00
committed by android-build-merger
parent 7f5686aee1 fd316aa69c
commit 1e2e55182c
2 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
cmd/symbol_inject/macho.go
View File

@@ -38,37 +38,33 @@ func findMachoSymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) {
return symbols[i].Value < symbols[j].Value
})
for i, symbol := range symbols {
if symbol.Sect == 0 {
continue
}
if symbol.Name == symbolName {
var nextSymbol *macho.Symbol
if i+1 < len(symbols) {
nextSymbol = &symbols[i+1]
for _, symbol := range symbols {
if symbol.Name == symbolName && symbol.Sect != 0 {
// Find the next symbol in the same section with a higher address
n := sort.Search(len(symbols), func(i int) bool {
return symbols[i].Sect == symbol.Sect &&
symbols[i].Value > symbol.Value
})
section := machoFile.Sections[symbol.Sect-1]
var end uint64
if n < len(symbols) {
end = symbols[n].Value
} else {
end = section.Addr + section.Size
}
return calculateMachoSymbolOffset(machoFile, symbol, nextSymbol)
if end <= symbol.Value && end > symbol.Value+4096 {
return maxUint64, maxUint64, fmt.Errorf("symbol end address does not seem valid, %x:%x", symbol.Value, end)
}
size := end - symbol.Value - 1
offset := uint64(section.Offset) + (symbol.Value - section.Addr)
return offset, size, nil
}
}
return maxUint64, maxUint64, fmt.Errorf("symbol not found")
}
func calculateMachoSymbolOffset(file *macho.File, symbol macho.Symbol, nextSymbol *macho.Symbol) (uint64, uint64, error) {
section := file.Sections[symbol.Sect-1]
var end uint64
if nextSymbol != nil && nextSymbol.Sect != symbol.Sect {
nextSymbol = nil
}
if nextSymbol != nil {
end = nextSymbol.Value
} else {
end = section.Addr + section.Size
}
size := end - symbol.Value - 1
offset := uint64(section.Offset) + (symbol.Value - section.Addr)
return offset, size, nil
}

56
cmd/symbol_inject/pe.go
View File

@@ -32,41 +32,41 @@ func findPESymbol(r io.ReaderAt, symbolName string) (uint64, uint64, error) {
symbolName = "_" + symbolName
}
sort.Slice(peFile.Symbols, func(i, j int) bool {
if peFile.Symbols[i].SectionNumber != peFile.Symbols[j].SectionNumber {
return peFile.Symbols[i].SectionNumber < peFile.Symbols[j].SectionNumber
symbols := peFile.Symbols
sort.Slice(symbols, func(i, j int) bool {
if symbols[i].SectionNumber != symbols[j].SectionNumber {
return symbols[i].SectionNumber < symbols[j].SectionNumber
}
return peFile.Symbols[i].Value < peFile.Symbols[j].Value
return symbols[i].Value < symbols[j].Value
})
for i, symbol := range peFile.Symbols {
for _, symbol := range symbols {
if symbol.Name == symbolName {
var nextSymbol *pe.Symbol
if i+1 < len(peFile.Symbols) {
nextSymbol = peFile.Symbols[i+1]
// Find the next symbol (n the same section with a higher address
n := sort.Search(len(symbols), func(i int) bool {
return symbols[i].SectionNumber == symbol.SectionNumber &&
symbols[i].Value > symbol.Value
})
section := peFile.Sections[symbol.SectionNumber-1]
var end uint32
if n < len(symbols) {
end = symbols[n].Value
} else {
end = section.Size
}
return calculatePESymbolOffset(peFile, symbol, nextSymbol)
if end <= symbol.Value && end > symbol.Value+4096 {
return maxUint64, maxUint64, fmt.Errorf("symbol end address does not seem valid, %x:%x", symbol.Value, end)
}
size := end - symbol.Value - 1
offset := section.Offset + symbol.Value
return uint64(offset), uint64(size), nil
}
}
return maxUint64, maxUint64, fmt.Errorf("symbol not found")
}
func calculatePESymbolOffset(file *pe.File, symbol *pe.Symbol, nextSymbol *pe.Symbol) (uint64, uint64, error) {
section := file.Sections[symbol.SectionNumber-1]
var end uint32
if nextSymbol != nil && nextSymbol.SectionNumber != symbol.SectionNumber {
nextSymbol = nil
}
if nextSymbol != nil {
end = nextSymbol.Value
} else {
end = section.Size
}
size := end - symbol.Value - 1
offset := section.Offset + symbol.Value
return uint64(offset), uint64(size), nil
}