Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/internal/goobj: update to support go19ld

Browse source 
Updates the disassembler to support the same object file version used
by the assembler and linker.

Related #14782.

Change-Id: I4cd7560c4e4e1350cfb27ca9cbe0fde25fe693cc
Reviewed-on: https://go-review.googlesource.com/37797
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Austin Clements <austin@google.com>
This commit is contained in:
Matthew Dempsky 2017-03-06 10:14:15 -08:00
parent 7c84dc79fd
commit 6533cc1ce8
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/cmd/internal/goobj/read.go
View file

@ -198,9 +198,11 @@ type Func struct {
PCSP Data // PC → SP offset map PCSP Data // PC → SP offset map
PCFile Data // PC → file number map (index into File) PCFile Data // PC → file number map (index into File)
PCLine Data // PC → line number map PCLine Data // PC → line number map
PCInline Data // PC → inline tree index map
PCData []Data // PC → runtime support data map PCData []Data // PC → runtime support data map
FuncData []FuncData // non-PC-specific runtime support data FuncData []FuncData // non-PC-specific runtime support data
File []string // paths indexed by PCFile File []string // paths indexed by PCFile
InlTree []InlinedCall
} }
// TODO: Add PCData []byte and PCDataIter (similar to liblink). // TODO: Add PCData []byte and PCDataIter (similar to liblink).
@ -211,6 +213,15 @@ type FuncData struct {
Offset int64 // offset into symbol for funcdata pointer Offset int64 // offset into symbol for funcdata pointer
} }
// An InlinedCall is a node in an InlTree.
// See cmd/internal/obj.InlTree for details.
type InlinedCall struct {
Parent int
File string
Line int
Func SymID
}
// A Package is a parsed Go object file or archive defining a Go package. // A Package is a parsed Go object file or archive defining a Go package.
type Package struct { type Package struct {
ImportPath string // import path denoting this package ImportPath string // import path denoting this package
@ -583,7 +594,7 @@ func (r *objReader) parseObject(prefix []byte) error {
// TODO: extract OS + build ID if/when we need it // TODO: extract OS + build ID if/when we need it
r.readFull(r.tmp[:8]) r.readFull(r.tmp[:8])
if !bytes.Equal(r.tmp[:8], []byte("\x00\x00go17ld")) { if !bytes.Equal(r.tmp[:8], []byte("\x00\x00go19ld")) {
return r.error(errCorruptObject) return r.error(errCorruptObject)
} }
@ -671,6 +682,7 @@ func (r *objReader) parseObject(prefix []byte) error {
f.PCSP = r.readData() f.PCSP = r.readData()
f.PCFile = r.readData() f.PCFile = r.readData()
f.PCLine = r.readData() f.PCLine = r.readData()
f.PCInline = r.readData()
f.PCData = make([]Data, r.readInt()) f.PCData = make([]Data, r.readInt())
for i := range f.PCData { for i := range f.PCData {
f.PCData[i] = r.readData() f.PCData[i] = r.readData()
@ -686,11 +698,18 @@ func (r *objReader) parseObject(prefix []byte) error {
for i := range f.File { for i := range f.File {
f.File[i] = r.readSymID().Name f.File[i] = r.readSymID().Name
} }
f.InlTree = make([]InlinedCall, r.readInt())
for i := range f.InlTree {
f.InlTree[i].Parent = r.readInt()
f.InlTree[i].File = r.readSymID().Name
f.InlTree[i].Line = r.readInt()
f.InlTree[i].Func = r.readSymID()
}
} }
} }
r.readFull(r.tmp[:7]) r.readFull(r.tmp[:7])
if !bytes.Equal(r.tmp[:7], []byte("\xffgo17ld")) { if !bytes.Equal(r.tmp[:7], []byte("\xffgo19ld")) {
return r.error(errCorruptObject) return r.error(errCorruptObject)
} }