This time actually fix big endian issue. (capstone-engine#2530)

Rot127 · Oct 29, 2024 · 09f3596 · 09f3596
1 parent 306d571
commit 09f3596
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/bindings/python/capstone/aarch64.py b/bindings/python/capstone/aarch64.py
@@ -52,14 +52,14 @@ class AArch64SysOpSysReg(ctypes.Union):
         ('sysreg', ctypes.c_uint),
         ('tlbi', ctypes.c_uint),
         ('ic', ctypes.c_uint),
-        ('raw_val', ctypes.c_uint64),
+        ('raw_val', ctypes.c_int),
     )
 
 class AArch64SysOpSysImm(ctypes.Union):
     _fields_ = (
         ('dbnxs', ctypes.c_uint),
         ('exactfpimm', ctypes.c_uint),
-        ('raw_val', ctypes.c_uint64),
+        ('raw_val', ctypes.c_int),
     )
 
 class AArch64SysOpSysAlias(ctypes.Union):
@@ -79,7 +79,7 @@ class AArch64SysOpSysAlias(ctypes.Union):
         ('bti', ctypes.c_uint),
         ('svepredpat', ctypes.c_uint),
         ('sveveclenspecifier', ctypes.c_uint),
-        ('raw_val', ctypes.c_uint64),
+        ('raw_val', ctypes.c_int),
     )
 class AArch64SysOp(ctypes.Structure):
     _fields_ = (

diff --git a/bindings/python/cstest_py/src/cstest_py/details.py b/bindings/python/cstest_py/src/cstest_py/details.py
@@ -755,7 +755,7 @@ def test_expected_aarch64(actual: CsInsn, expected: dict) -> bool:
                 aop.sysop.sub_type, eop.get("sub_type"), "sub_type"
             ):
                 return False
-            if not compare_uint64(
+            if not compare_int32(
                 aop.sysop.reg.raw_val, eop.get("sys_raw_val"), "sys_raw_val"
             ):
                 return False
@@ -764,7 +764,7 @@ def test_expected_aarch64(actual: CsInsn, expected: dict) -> bool:
                 aop.sysop.sub_type, eop.get("sub_type"), "sub_type"
             ):
                 return False
-            if not compare_uint64(
+            if not compare_int32(
                 aop.sysop.imm.raw_val, eop.get("sys_raw_val"), "sys_raw_val"
             ):
                 return False
@@ -778,7 +778,7 @@ def test_expected_aarch64(actual: CsInsn, expected: dict) -> bool:
                 aop.sysop.sub_type, eop.get("sub_type"), "sub_type"
             ):
                 return False
-            if not compare_uint64(
+            if not compare_int32(
                 aop.sysop.alias.raw_val, eop.get("sys_raw_val"), "sys_raw_val"
             ):
                 return False

diff --git a/include/capstone/aarch64.h b/include/capstone/aarch64.h
@@ -1972,13 +1972,13 @@ typedef union {
 	aarch64_sysreg sysreg;
 	aarch64_tlbi tlbi;
 	aarch64_ic ic;
-	uint64_t raw_val;
+	int raw_val;
 } aarch64_sysop_reg;
 
 typedef union {
 	aarch64_dbnxs dbnxs;
 	aarch64_exactfpimm exactfpimm;
-	uint64_t raw_val;
+	int raw_val;
 } aarch64_sysop_imm;
 
 typedef union {
@@ -1997,7 +1997,7 @@ typedef union {
 	aarch64_bti bti;
 	aarch64_svepredpat svepredpat;
 	aarch64_sveveclenspecifier sveveclenspecifier;
-	uint64_t raw_val;
+	int raw_val;
 } aarch64_sysop_alias;
 
 /// Operand type for instruction's operands

diff --git a/suite/cstest/include/test_detail_aarch64.h b/suite/cstest/include/test_detail_aarch64.h
@@ -58,7 +58,7 @@ typedef struct {
 	int8_t imm_range_offset;
 	double fp;
 	bool fp_set; /// Only relevant for SysOps with EXACTFPIMM
-	uint64_t sys_raw_val;
+	int sys_raw_val;
 
 	TestDetailAArch64SME *sme;
 

diff --git a/suite/cstest/src/test_detail_aarch64.c b/suite/cstest/src/test_detail_aarch64.c
@@ -180,13 +180,13 @@ bool test_expected_aarch64(csh *handle, cs_aarch64 *actual,
 		case AARCH64_OP_SYSREG:
 			compare_enum_ret(op->sysop.sub_type, eop->sub_type,
 					 false);
-			compare_uint64_ret(op->sysop.reg.raw_val,
+			compare_int_ret(op->sysop.reg.raw_val,
 					   eop->sys_raw_val, false);
 			break;
 		case AARCH64_OP_SYSIMM:
 			compare_enum_ret(op->sysop.sub_type, eop->sub_type,
 					 false);
-			compare_uint64_ret(op->sysop.imm.raw_val,
+			compare_int_ret(op->sysop.imm.raw_val,
 					   eop->sys_raw_val, false);
 			if (eop->fp_set) {
 				compare_fp_ret(op->fp, eop->fp, false);
@@ -195,7 +195,7 @@ bool test_expected_aarch64(csh *handle, cs_aarch64 *actual,
 		case AARCH64_OP_SYSALIAS:
 			compare_enum_ret(op->sysop.sub_type, eop->sub_type,
 					 false);
-			compare_uint64_ret(op->sysop.alias.raw_val,
+			compare_int_ret(op->sysop.alias.raw_val,
 					   eop->sys_raw_val, false);
 			break;
 		case AARCH64_OP_MEM: