diff options
| author | Alex Brainman <alex.brainman@gmail.com> | 2014-05-15 12:44:29 +1000 |
|---|---|---|
| committer | Alex Brainman <alex.brainman@gmail.com> | 2014-05-15 12:44:29 +1000 |
| commit | 6c7bef551b32c2f7f2371b21cc8d51d807737ef3 (patch) | |
| tree | 231e1dabafb2338c1469436c0230d246cb558bd5 /src/cmd/addr2line | |
| parent | 8e22903b46aadd6eda937417cba86b528cba92e2 (diff) | |
| download | go-6c7bef551b32c2f7f2371b21cc8d51d807737ef3.tar.gz go-6c7bef551b32c2f7f2371b21cc8d51d807737ef3.zip | |
cmd/addr2line, cmd/objdump: fix pe text section starting address
fixes windows build
LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://golang.org/cl/97500043
Diffstat (limited to 'src/cmd/addr2line')
| -rw-r--r-- | src/cmd/addr2line/main.go | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/cmd/addr2line/main.go b/src/cmd/addr2line/main.go index d6d14a7330..f4a7789f9b 100644 --- a/src/cmd/addr2line/main.go +++ b/src/cmd/addr2line/main.go @@ -138,8 +138,17 @@ func loadTables(f *os.File) (textStart uint64, symtab, pclntab []byte, err error } if obj, err := pe.NewFile(f); err == nil { + var imageBase uint64 + switch oh := obj.OptionalHeader.(type) { + case *pe.OptionalHeader32: + imageBase = uint64(oh.ImageBase) + case *pe.OptionalHeader64: + imageBase = oh.ImageBase + default: + return 0, nil, nil, fmt.Errorf("pe file format not recognized") + } if sect := obj.Section(".text"); sect != nil { - textStart = uint64(sect.VirtualAddress) + textStart = imageBase + uint64(sect.VirtualAddress) } if pclntab, err = loadPETable(obj, "pclntab", "epclntab"); err != nil { return 0, nil, nil, err |