Enable function call injection only on 1.22 and above and some cleanup

go-delve · Aug 3, 2023 · 16d5746 · 16d5746
1 parent 2102308
commit 16d5746
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/pkg/proc/ppc64le_arch.go b/pkg/proc/ppc64le_arch.go
@@ -36,13 +36,11 @@ func PPC64LEArch(goos string) *Arch {
 		PCRegNum:                         regnum.PPC64LE_PC,
 		SPRegNum:                         regnum.PPC64LE_SP,
 		ContextRegNum:                    regnum.PPC64LE_R0 + 11,
-		//ContextRegNum:                    regnum.PPC64LE_R0 + 20,
 		LRRegNum:                         regnum.PPC64LE_LR,
 		asmRegisters:                     ppc64leAsmRegisters,
 		RegisterNameToDwarf:              nameToDwarfFunc(regnum.PPC64LENameToDwarf),
 		debugCallMinStackSize:            320,
 		maxRegArgBytes:                   13*8 + 13*8,
-		//maxRegArgBytes:                   16*8 + 16*8,
 	}
 }
 
@@ -161,10 +159,8 @@ func ppc64leSwitchStack(it *stackIterator, callFrameRegs *op.DwarfRegisters) boo
 		off, _ := readIntRaw(it.mem,
 			callFrameRegs.SP()+ppc64cgocallSPOffsetSaveSlot,
 			int64(it.bi.Arch.PtrSize()))
-		//fmt.Printf("OFFSET: %x\n", off)
 		oldsp := callFrameRegs.SP()
 		newsp := uint64(int64(it.stackhi) - off)
-		//fmt.Printf("oldsp %x newsp %x\n", oldsp, newsp)
 
 		// runtime.asmcgocall can also be called from inside the system stack,
 		// in that case no stack switch actually happens

diff --git a/pkg/proc/test/support.go b/pkg/proc/test/support.go
@@ -321,8 +321,8 @@ func MustSupportFunctionCalls(t *testing.T, testBackend string) {
 	}
 
 	if runtime.GOARCH == "ppc64le" {
-		if !goversion.VersionAfterOrEqual(runtime.Version(), 1, 20)  {
-			t.Skip("On PPC64LE Building with Go lesser than 1.20 does not support function calls")
+		if !goversion.VersionAfterOrEqual(runtime.Version(), 1, 22)  {
+			t.Skip("On PPC64LE Building with Go lesser than 1.22 does not support function calls")
 		}
 	}
 }

diff --git a/pkg/proc/variables_test.go b/pkg/proc/variables_test.go
@@ -1289,7 +1289,6 @@ func TestCallFunction(t *testing.T) {
 		for _, tc := range testcases {
 			testCallFunction(t, grp, p, tc)
 		}
-
 
 		if goversion.VersionAfterOrEqual(runtime.Version(), 1, 12) {
 			for _, tc := range testcases112 {