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

proc: fix arm64 prologue

Browse Source
This commit is contained in:
hengwu0
2019-11-14 21:00:57 +08:00
committed by Derek Parker
parent 1c9cfc035b
commit b34936f5cc
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/proc/disasm_arm64.go
View File

@ -5,8 +5,6 @@
package proc package proc
import ( import (
//"encoding/binary"
"golang.org/x/arch/arm64/arm64asm" "golang.org/x/arch/arm64/arm64asm"
) )
@ -99,16 +97,13 @@ type instrseq []arm64asm.Op
// Possible stacksplit prologues are inserted by stacksplit in // Possible stacksplit prologues are inserted by stacksplit in
// $GOROOT/src/cmd/internal/obj/arm64/obj7.go. // $GOROOT/src/cmd/internal/obj/arm64/obj7.go.
// The stacksplit prologue will always begin with loading curg in CX, this
// instruction is added by load_g_cx in the same file and is either 1 or 2
// MOVs.
var prologues []instrseq var prologues []instrseq
func init() { func init() {
var tinyStacksplit = instrseq{arm64asm.MOV, arm64asm.CMP, arm64asm.B} var tinyStacksplit = instrseq{arm64asm.MOV, arm64asm.CMP, arm64asm.B}
var smallStacksplit = instrseq{arm64asm.SUB, arm64asm.CMP, arm64asm.B} var smallStacksplit = instrseq{arm64asm.SUB, arm64asm.CMP, arm64asm.B}
var bigStacksplit = instrseq{arm64asm.CMP, arm64asm.B, arm64asm.ADD, arm64asm.SUB, arm64asm.MOV, arm64asm.CMP, arm64asm.B} var bigStacksplit = instrseq{arm64asm.CMP, arm64asm.B, arm64asm.ADD, arm64asm.SUB, arm64asm.MOV, arm64asm.CMP, arm64asm.B}
var unixGetG = instrseq{arm64asm.MOV} var unixGetG = instrseq{arm64asm.LDR}
prologues = make([]instrseq, 0, 3) prologues = make([]instrseq, 0, 3)
for _, getG := range []instrseq{unixGetG} { for _, getG := range []instrseq{unixGetG} {

3
pkg/proc/proc_test.go
View File

@ -2136,9 +2136,6 @@ func TestIssue573(t *testing.T) {
} }
func TestTestvariables2Prologue(t *testing.T) { func TestTestvariables2Prologue(t *testing.T) {
if runtime.GOARCH == "arm64" {
t.Skip("test is not valid on ARM64")
}
withTestProcess("testvariables2", t, func(p proc.Process, fixture protest.Fixture) { withTestProcess("testvariables2", t, func(p proc.Process, fixture protest.Fixture) {
addrEntry := p.BinInfo().LookupFunc["main.main"].Entry addrEntry := p.BinInfo().LookupFunc["main.main"].Entry
addrPrologue := findFunctionLocation(p, t, "main.main") addrPrologue := findFunctionLocation(p, t, "main.main")

6
service/test/integration2_test.go
View File

@ -1110,9 +1110,6 @@ func clientEvalVariable(t *testing.T, c service.Client, expr string) *api.Variab
} }
func TestSkipPrologue(t *testing.T) { func TestSkipPrologue(t *testing.T) {
if runtime.GOARCH == "arm64" {
t.Skip("test is not valid on ARM64")
}
withTestClient2("locationsprog2", t, func(c service.Client) { withTestClient2("locationsprog2", t, func(c service.Client) {
<-c.Continue() <-c.Continue()
@ -1129,9 +1126,6 @@ func TestSkipPrologue(t *testing.T) {
} }
func TestSkipPrologue2(t *testing.T) { func TestSkipPrologue2(t *testing.T) {
if runtime.GOARCH == "arm64" {
t.Skip("test is not valid on ARM64")
}
withTestClient2("callme", t, func(c service.Client) { withTestClient2("callme", t, func(c service.Client) {
callme := findLocationHelper(t, c, "main.callme", false, 1, 0)[0] callme := findLocationHelper(t, c, "main.callme", false, 1, 0)[0]
callmeZ := uint64(clientEvalVariable(t, c, "main.callme").Addr) callmeZ := uint64(clientEvalVariable(t, c, "main.callme").Addr)