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

Refactor: Move Cover method to FDE

Browse Source
This commit is contained in:
Derek Parker
2014-10-11 00:52:05 -05:00
parent dfacf0770d
commit 09e352bdf7
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dwarf/frame/entries.go
View File

@ -23,16 +23,8 @@ type addrange struct {
begin, end uint64 begin, end uint64
} }
func (r *addrange) Begin() uint64 { func (fde *FrameDescriptionEntry) Cover(addr uint64) bool {
return r.begin if (addr - fde.AddressRange.begin) < fde.AddressRange.end {
}
func (r *addrange) End() uint64 {
return r.end
}
func (r *addrange) Cover(addr uint64) bool {
if (addr - r.begin) < r.end {
return true return true
} }

8
proctl/proctl_linux_amd64.go
View File

@ -249,7 +249,7 @@ func (dbp *DebuggedProcess) Next() error {
} }
loc := dbp.DebugLine.NextLocation(pc, f, l) loc := dbp.DebugLine.NextLocation(pc, f, l)
if !fde.AddressRange.Cover(loc.Address) { if !fde.Cover(loc.Address) {
// Step once to ensure we're not going to step // Step once to ensure we're not going to step
// into another function before returning. // into another function before returning.
pc, err = step() pc, err = step()
@ -257,12 +257,12 @@ func (dbp *DebuggedProcess) Next() error {
return err return err
} }
if fde.AddressRange.Cover(pc) { if fde.Cover(pc) {
// Unconditionally step out of current function // Unconditionally step out of current function
// Don't bother looking up ret addr, next line is // Don't bother looking up ret addr, next line is
// outside of current fn, should only be a few // outside of current fn, should only be a few
// instructions left to RET // instructions left to RET
for fde.AddressRange.Cover(pc) { for fde.Cover(pc) {
pc, err = step() pc, err = step()
if err != nil { if err != nil {
return err return err
@ -279,7 +279,7 @@ func (dbp *DebuggedProcess) Next() error {
return err return err
} }
if !fde.AddressRange.Cover(pc) { if !fde.Cover(pc) {
// We've stepped into a function, keep going. // We've stepped into a function, keep going.
// TODO: Use DWARF frame info to continue to return address. // TODO: Use DWARF frame info to continue to return address.
continue continue