code review 97500043: cmd/addr2line, cmd/objdump: fix pe text section startin...

cmd/addr2line, cmd/objdump: fix pe text section starting address

fixes windows build

[brainman, 2014-05-15 02:39:47]

Hello golang-codereviews@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2014-05-15 02:43:01]

LGTM
 On May 14, 2014 7:39 PM, <alex.brainman@gmail.com> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> cmd/addr2line, cmd/objdump: fix pe text section starting address
>
> fixes windows build
>
> Please review this at https://codereview.appspot.com/97500043/
>
> Affected files (+20, -2 lines):
>   M src/cmd/addr2line/main.go
>   M src/cmd/objdump/main.go
>
>
> Index: src/cmd/addr2line/main.go
> ===================================================================
> --- a/src/cmd/addr2line/main.go
> +++ b/src/cmd/addr2line/main.go
> @@ -138,8 +138,17 @@
>         }
>
>         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
> Index: src/cmd/objdump/main.go
> ===================================================================
> --- a/src/cmd/objdump/main.go
> +++ b/src/cmd/objdump/main.go
> @@ -318,8 +318,17 @@
>         }
>
>         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, nil, fmt.Errorf("pe file
> format not recognized")
> +               }
>                 if sect := obj.Section(".text"); sect != nil {
> -                       textStart = uint64(sect.VirtualAddress)
> +                       textStart = imageBase + uint64(sect.VirtualAddress)
>                         textData, _ = sect.Data()
>                 }
>                 if pclntab, err = loadPETable(obj, "pclntab", "epclntab");
> err != nil {
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[brainman, 2014-05-15 02:44:38]

*** Submitted as https://code.google.com/p/go/source/detail?r=263c466e5491 ***

cmd/addr2line, cmd/objdump: fix pe text section starting address

fixes windows build

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=golang-codereviews
https://codereview.appspot.com/97500043