PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

debugserver: fix typo in checking whether debugserver support unmask_… (#2581)

Browse Source 
* debugserver: fix typo in checking whether debugserver support unmask_signals

* gdbserver.go: fix issues in deepsource:go
This commit is contained in:
Augusto Yao 2021-07-13 23:37:26 +08:00 committed by GitHub
parent 569b772b82
commit 686989e1b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/proc/gdbserial/gdbserver.go
View File

@ -395,7 +395,7 @@ func getDebugServerAbsolutePath() string {
func canUnmaskSignals(debugServerExecutable string) bool { func canUnmaskSignals(debugServerExecutable string) bool {
checkCanUnmaskSignalsOnce.Do(func() { checkCanUnmaskSignalsOnce.Do(func() {
buf, _ := exec.Command(debugServerExecutable, "--unmask-singals").CombinedOutput() buf, _ := exec.Command(debugServerExecutable, "--unmask-signals").CombinedOutput()
canUnmaskSignalsCached = !strings.Contains(string(buf), "unrecognized option") canUnmaskSignalsCached = !strings.Contains(string(buf), "unrecognized option")
}) })
return canUnmaskSignalsCached return canUnmaskSignalsCached
@ -897,7 +897,7 @@ func (p *gdbProcess) findThreadByStrID(threadID string) *gdbThread {
// and returns true if we should stop execution in response to one of the // and returns true if we should stop execution in response to one of the
// signals and return control to the user. // signals and return control to the user.
// Adjusts trapthread to a thread that we actually want to stop at. // Adjusts trapthread to a thread that we actually want to stop at.
func (p *gdbProcess) handleThreadSignals(trapthread *gdbThread) (trapthreadOut *gdbThread, atstart bool, shouldStop bool) { func (p *gdbProcess) handleThreadSignals(trapthread *gdbThread) (trapthreadOut *gdbThread, atstart, shouldStop bool) {
var trapthreadCandidate *gdbThread var trapthreadCandidate *gdbThread
for _, th := range p.threads { for _, th := range p.threads {
@ -1575,8 +1575,7 @@ func (t *gdbThread) reloadRegisters() error {
} }
} }
switch t.p.bi.GOOS { if t.p.bi.GOOS == "linux" {
case "linux":
if reg, hasFsBase := t.regs.regs[t.p.regnames.FsBase]; hasFsBase { if reg, hasFsBase := t.regs.regs[t.p.regnames.FsBase]; hasFsBase {
t.regs.gaddr = 0 t.regs.gaddr = 0
t.regs.tls = binary.LittleEndian.Uint64(reg.value) t.regs.tls = binary.LittleEndian.Uint64(reg.value)