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

Refactor setBreakpoint code

Browse Source
This commit is contained in:
Derek Parker
2015-08-01 21:16:58 -05:00
parent 392abbda09
commit 1f473241c7
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
proc/breakpoints.go
View File

@ -81,13 +81,20 @@ func (dbp *Process) setBreakpoint(tid int, addr uint64, temp bool) (*Breakpoint,
return nil, InvalidAddressError{address: addr}
}
var id int
newBreakpoint := &Breakpoint{
FunctionName: fn.Name,
File: f,
Line: l,
Addr: addr,
Temp: temp,
}
if temp {
dbp.tempBreakpointIDCounter++
id = dbp.tempBreakpointIDCounter
newBreakpoint.ID = dbp.tempBreakpointIDCounter
} else {
dbp.breakpointIDCounter++
id = dbp.breakpointIDCounter
newBreakpoint.ID = dbp.breakpointIDCounter
}
// Try and set a hardware breakpoint.
@ -111,17 +118,9 @@ func (dbp *Process) setBreakpoint(tid int, addr uint64, temp bool) (*Breakpoint,
}
}
dbp.arch.SetHardwareBreakpointUsage(i, true)
dbp.Breakpoints[addr] = &Breakpoint{
FunctionName: fn.Name,
File: f,
Line: l,
Addr: addr,
ID: id,
Temp: temp,
hardware: true,
reg: i,
}
newBreakpoint.reg = i
newBreakpoint.hardware = true
dbp.Breakpoints[addr] = newBreakpoint
return dbp.Breakpoints[addr], nil
}
@ -134,17 +133,10 @@ func (dbp *Process) setBreakpoint(tid int, addr uint64, temp bool) (*Breakpoint,
if err := dbp.writeSoftwareBreakpoint(thread, addr); err != nil {
return nil, err
}
dbp.Breakpoints[addr] = &Breakpoint{
FunctionName: fn.Name,
File: f,
Line: l,
Addr: addr,
OriginalData: originalData,
ID: id,
Temp: temp,
}
newBreakpoint.OriginalData = originalData
dbp.Breakpoints[addr] = newBreakpoint
return dbp.Breakpoints[addr], nil
return newBreakpoint, nil
}
func (dbp *Process) writeSoftwareBreakpoint(thread *Thread, addr uint64) error {