fix: merged dev

ChainSafe · Feb 10, 2025 · 289b2a2 · 289b2a2
2 parents 3c71793 + 05d41c2
commit 289b2a2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 4 deletions.
diff --git a/analyser/opcode/opcode.go b/analyser/opcode/opcode.go
@@ -7,11 +7,10 @@ import (
 	"slices"
 	"strings"
 
-	"github.com/ChainSafe/vm-compat/common"
-
 	"github.com/ChainSafe/vm-compat/analyser"
 	"github.com/ChainSafe/vm-compat/asmparser"
 	"github.com/ChainSafe/vm-compat/asmparser/mips"
+	"github.com/ChainSafe/vm-compat/common"
 	"github.com/ChainSafe/vm-compat/profile"
 )
 

diff --git a/analyser/syscall/asm_syscall.go b/analyser/syscall/asm_syscall.go
@@ -6,11 +6,10 @@ import (
 	"path/filepath"
 	"slices"
 
-	"github.com/ChainSafe/vm-compat/common"
-
 	"github.com/ChainSafe/vm-compat/analyser"
 	"github.com/ChainSafe/vm-compat/asmparser"
 	"github.com/ChainSafe/vm-compat/asmparser/mips"
+	"github.com/ChainSafe/vm-compat/common"
 	"github.com/ChainSafe/vm-compat/profile"
 )
 

diff --git a/examples/sample.go b/examples/sample.go
@@ -4,6 +4,7 @@ import (
 	"syscall"
 )
 
+<<<<<<< HEAD
 func main() {
 	lvl31(0)
 	lvl32(0)
@@ -27,4 +28,33 @@ func lvl22(v0 int) {
 
 func lvl1(v0 int) {
 	syscall.RawSyscall6(1, 0, 0, 0, 0, 0, 0)
+=======
+var ptr = syscall.SYS_OPENAT
+
+func RawSyscall(trap uintptr) {
+	syscall.RawSyscall6(trap, 0, 0, 0, 0, 0, 0)
+}
+
+func Syscall2(t uintptr) {
+	RawSyscall(t)
+}
+
+func main() {
+	var trap uintptr = syscall.SYS_READ
+	if true {
+		trap = getTrap()
+	}
+	Syscall2(trap)
+}
+
+func getTrap() uintptr {
+	if true {
+		return getTrap2()
+	} else {
+		return uintptr(ptr)
+	}
+>>>>>>> 05d41c22f14455c84c6444320b683cca7e767f69
+}
+func getTrap2() uintptr {
+	return syscall.SYS_WRITE
 }