golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-11-02 12:59:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Small refactor, only arithmetic once

Browse Source
This commit is contained in:
Derek Parker
2014-07-11 15:32:26 -05:00
parent 07fec48272
commit e8ffa31bd7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
proctl/proctl_linux_amd64.go
View File

@ -217,12 +217,14 @@ func (dbp *DebuggedProcess) Next() error {
return err return err
} }
pc-- // account for breakpoint instruction
fde, err := dbp.FrameEntries.FDEForPC(pc) fde, err := dbp.FrameEntries.FDEForPC(pc)
if err != nil { if err != nil {
return err return err
} }
loc := dbp.DebugLine.NextLocAfterPC(pc - 1) loc := dbp.DebugLine.NextLocAfterPC(pc)
if !fde.AddressRange.Cover(loc.Address) { if !fde.AddressRange.Cover(loc.Address) {
// Next line is outside current frame, use return addr. // Next line is outside current frame, use return addr.
addr := dbp.ReturnAddressFromOffset(fde.ReturnAddressOffset(pc)) addr := dbp.ReturnAddressFromOffset(fde.ReturnAddressOffset(pc))
@ -233,7 +235,7 @@ func (dbp *DebuggedProcess) Next() error {
if loc.Delta < 0 { if loc.Delta < 0 {
// We are likely in a loop, set breakpoints at entry and exit. // We are likely in a loop, set breakpoints at entry and exit.
entry := dbp.DebugLine.LoopEntryLocation(loc.Line) entry := dbp.DebugLine.LoopEntryLocation(loc.Line)
exit := dbp.DebugLine.LoopExitLocation(pc - 1) exit := dbp.DebugLine.LoopExitLocation(pc)
addrs = append(addrs, entry.Address, exit.Address) addrs = append(addrs, entry.Address, exit.Address)
} }