Merge branch 'next' of github.com:aquynh/capstone into next

HACK.TXT

@@ -86,6 +86,7 @@ Tests:
 - tests/test_iter.c
 - tests/test_newarch.c
 - suite/fuzz/fuzz_disasm.c: add the architecture and its modes to the list of fuzzed platforms
+- suite/capstone_get_setup.c
 
 Bindings:
 - bindings/Makefile

cs.c

@@ -209,13 +209,13 @@ static cs_err (*cs_arch_option[MAX_ARCH]) (cs_struct *, cs_opt_type, size_t valu
 #else
 	NULL,
 #endif
-#ifdef CAPSTONE_HAS_WASM
-	WASM_option,
+#ifdef CAPSTONE_HAS_MOS65XX
+	MOS65XX_option,
 #else
 	NULL,
 #endif
-#ifdef CAPSTONE_HAS_MOS65XX
-	MOS65XX_option,
+#ifdef CAPSTONE_HAS_WASM
+	WASM_option,
 #else
 	NULL,
 #endif
@@ -296,16 +296,16 @@ static cs_mode cs_arch_disallowed_mode_mask[MAX_ARCH] = {
 #else
 	0,
 #endif
-#ifdef CAPSTONE_HAS_WASM
-	0,
-#else
-    0,
-#endif
 #ifdef CAPSTONE_HAS_MOS65XX
 	~(CS_MODE_BIG_ENDIAN),
 #else
 	0,
 #endif
+#ifdef CAPSTONE_HAS_WASM
+	0,
+#else
+	0,
+#endif
 #ifdef CAPSTONE_HAS_BPF
 	~(CS_MODE_LITTLE_ENDIAN | CS_MODE_BPF_CLASSIC | CS_MODE_BPF_EXTENDED
 	  | CS_MODE_BIG_ENDIAN),
@@ -352,14 +352,14 @@ static uint32_t all_arch = 0
 #ifdef CAPSTONE_HAS_EVM
 	| (1 << CS_ARCH_EVM)
 #endif
+#ifdef CAPSTONE_HAS_MOS65XX
+	| (1 << CS_ARCH_MOS65XX)
+#endif
 #ifdef CAPSTONE_HAS_WASM
 	| (1 << CS_ARCH_WASM)
 #endif
-#ifdef CAPSTONE_HAS_MOS65XX
-    | (1 << CS_ARCH_MOS65XX)
-#endif
 #ifdef CAPSTONE_HAS_BPF
-    | (1 << CS_ARCH_BPF)
+	| (1 << CS_ARCH_BPF)
 #endif
 ;
 

suite/capstone_get_setup.c

@@ -8,7 +8,7 @@
  On default Capstone build, this code prints out the below output:
 
  $ capstone_get_setup
- x86=1 arm=1 arm64=1 mips=1 ppc=1 sparc=1 sysz=1 xcore=1 m68k=1 tms320c64x=1 m680x=1 evm=1 wasm=1
+ x86=1 arm=1 arm64=1 mips=1 ppc=1 sparc=1 sysz=1 xcore=1 m68k=1 tms320c64x=1 m680x=1 evm=1 wasm=1 mos65xx=1 bpf=1
 */
 
 #include <stdio.h>

tests/test_basic.c

@@ -329,7 +329,7 @@ static void test()
 			(unsigned char*)WASM_CODE,
 			sizeof(WASM_CODE) - 1,
 			"WASM",
-        },
+		},
 #endif
 #ifdef CAPSTONE_HAS_MOS65XX
 		{