golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-31 10:47:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Remove addrrange type

Browse Source
This commit is contained in:
Derek Parker
2014-10-11 01:05:27 -05:00
parent 09e352bdf7
commit c60f3aafde
4 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dwarf/frame/entries.go
View File

@ -19,12 +19,8 @@ type CommonInformationEntry struct {
InitialInstructions []byte InitialInstructions []byte
} }
type addrange struct {
begin, end uint64
}
func (fde *FrameDescriptionEntry) Cover(addr uint64) bool { func (fde *FrameDescriptionEntry) Cover(addr uint64) bool {
if (addr - fde.AddressRange.begin) < fde.AddressRange.end { if (addr - fde.begin) < fde.end {
return true return true
} }
@ -36,8 +32,16 @@ func (fde *FrameDescriptionEntry) Cover(addr uint64) bool {
type FrameDescriptionEntry struct { type FrameDescriptionEntry struct {
Length uint32 Length uint32
CIE *CommonInformationEntry CIE *CommonInformationEntry
AddressRange *addrange
Instructions []byte Instructions []byte
begin, end uint64
}
func (fde *FrameDescriptionEntry) Begin() uint64 {
return fde.begin
}
func (fde *FrameDescriptionEntry) End() uint64 {
return fde.begin + fde.end
} }
func (fde *FrameDescriptionEntry) EstablishFrame(pc uint64) *FrameContext { func (fde *FrameDescriptionEntry) EstablishFrame(pc uint64) *FrameContext {
@ -68,22 +72,21 @@ func (fdes *FrameDescriptionEntries) FDEForPC(pc uint64) (*FrameDescriptionEntry
} }
func (frame *FrameDescriptionEntry) Less(item rbtree.Item) bool { func (frame *FrameDescriptionEntry) Less(item rbtree.Item) bool {
return frame.AddressRange.begin < item.(*FrameDescriptionEntry).AddressRange.begin return frame.Begin() < item.(*FrameDescriptionEntry).Begin()
} }
func (frame *FrameDescriptionEntry) More(item rbtree.Item) bool { func (frame *FrameDescriptionEntry) More(item rbtree.Item) bool {
r := item.(*FrameDescriptionEntry).AddressRange f := item.(*FrameDescriptionEntry)
fnr := frame.AddressRange return frame.End() > f.End()
return fnr.begin+fnr.end > r.begin+r.end
} }
type Addr uint64 type Addr uint64
func (a Addr) Less(item rbtree.Item) bool { func (a Addr) Less(item rbtree.Item) bool {
return uint64(a) < item.(*FrameDescriptionEntry).AddressRange.begin return uint64(a) < item.(*FrameDescriptionEntry).Begin()
} }
func (a Addr) More(item rbtree.Item) bool { func (a Addr) More(item rbtree.Item) bool {
r := item.(*FrameDescriptionEntry).AddressRange f := item.(*FrameDescriptionEntry)
return uint64(a) > r.begin+r.end return uint64(a) > f.End()
} }

8
dwarf/frame/entries_test.go
View File

@ -7,10 +7,10 @@ import (
) )
func TestFDEForPC(t *testing.T) { func TestFDEForPC(t *testing.T) {
fde1 := &FrameDescriptionEntry{AddressRange: &addrange{begin: 100, end: 200}} fde1 := &FrameDescriptionEntry{begin: 100, end: 200}
fde2 := &FrameDescriptionEntry{AddressRange: &addrange{begin: 50, end: 99}} fde2 := &FrameDescriptionEntry{begin: 50, end: 99}
fde3 := &FrameDescriptionEntry{AddressRange: &addrange{begin: 0, end: 49}} fde3 := &FrameDescriptionEntry{begin: 0, end: 49}
fde4 := &FrameDescriptionEntry{AddressRange: &addrange{begin: 201, end: 245}} fde4 := &FrameDescriptionEntry{begin: 201, end: 245}
tree := NewFrameIndex() tree := NewFrameIndex()
tree.Put(fde1) tree.Put(fde1)

6
dwarf/frame/parser.go
View File

@ -50,15 +50,15 @@ func parseLength(ctx *parseContext) parsefunc {
return parseCIE return parseCIE
} }
ctx.Frame = &FrameDescriptionEntry{Length: ctx.Length, CIE: ctx.Common, AddressRange: new(addrange)} ctx.Frame = &FrameDescriptionEntry{Length: ctx.Length, CIE: ctx.Common}
return parseFDE return parseFDE
} }
func parseFDE(ctx *parseContext) parsefunc { func parseFDE(ctx *parseContext) parsefunc {
r := ctx.Buf.Next(int(ctx.Length)) r := ctx.Buf.Next(int(ctx.Length))
ctx.Frame.AddressRange.begin = binary.LittleEndian.Uint64(r[:8]) ctx.Frame.begin = binary.LittleEndian.Uint64(r[:8])
ctx.Frame.AddressRange.end = binary.LittleEndian.Uint64(r[8:16]) ctx.Frame.end = binary.LittleEndian.Uint64(r[8:16])
// Insert into the tree after setting address range begin // Insert into the tree after setting address range begin
// otherwise compares won't work. // otherwise compares won't work.

2
dwarf/frame/table.go
View File

@ -136,7 +136,7 @@ func executeCIEInstructions(cie *CommonInformationEntry) *FrameContext {
// Unwind the stack to find the return address register. // Unwind the stack to find the return address register.
func executeDwarfProgramUntilPC(fde *FrameDescriptionEntry, pc uint64) *FrameContext { func executeDwarfProgramUntilPC(fde *FrameDescriptionEntry, pc uint64) *FrameContext {
frame := executeCIEInstructions(fde.CIE) frame := executeCIEInstructions(fde.CIE)
frame.loc = fde.AddressRange.begin frame.loc = fde.Begin()
frame.address = pc frame.address = pc
frame.ExecuteUntilPC(fde.Instructions) frame.ExecuteUntilPC(fde.Instructions)