From 48f8496cc283a2b069ba022e9270605dec590a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Duquette?= <ekse.0x@gmail.com>
Date: Sat, 30 Apr 2016 00:06:55 -0400
Subject: [PATCH] Make the python sample compatible with python3.
---
bindings/python/sample.py | 46 +++++++++++++++++++--------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/bindings/python/sample.py b/bindings/python/sample.py
index 6d09ff5..7a22b2a 100755
--- a/bindings/python/sample.py
+++ b/bindings/python/sample.py
@@ -14,46 +14,46 @@ def test_ks(arch, mode, code, syntax=0):
encoding, count = ks.asm(code)
- print("%s = [ " %code, end='')
+ print("%s = [ " % code, end='')
for i in encoding:
- print("%02x " %i, end='')
+ print("%02x " % i, end='')
print("]")
if __name__ == '__main__':
# X86
- test_ks(KS_ARCH_X86, KS_MODE_16, "add eax, ecx")
- test_ks(KS_ARCH_X86, KS_MODE_32, "add eax, ecx")
- test_ks(KS_ARCH_X86, KS_MODE_64, "add rax, rcx")
- test_ks(KS_ARCH_X86, KS_MODE_32, "add %ecx, %eax", KS_OPT_SYNTAX_ATT)
- test_ks(KS_ARCH_X86, KS_MODE_64, "add %rcx, %rax", KS_OPT_SYNTAX_ATT)
+ test_ks(KS_ARCH_X86, KS_MODE_16, b"add eax, ecx")
+ test_ks(KS_ARCH_X86, KS_MODE_32, b"add eax, ecx")
+ test_ks(KS_ARCH_X86, KS_MODE_64, b"add rax, rcx")
+ test_ks(KS_ARCH_X86, KS_MODE_32, b"add %ecx, %eax", KS_OPT_SYNTAX_ATT)
+ test_ks(KS_ARCH_X86, KS_MODE_64, b"add %rcx, %rax", KS_OPT_SYNTAX_ATT)
# ARM
- test_ks(KS_ARCH_ARM, KS_MODE_ARM, "sub r1, r2, r5")
- test_ks(KS_ARCH_ARM, KS_MODE_ARM + KS_MODE_BIG_ENDIAN, "sub r1, r2, r5")
- test_ks(KS_ARCH_ARM, KS_MODE_THUMB, "movs r4, #0xf0")
- test_ks(KS_ARCH_ARM, KS_MODE_THUMB + KS_MODE_BIG_ENDIAN, "movs r4, #0xf0")
+ test_ks(KS_ARCH_ARM, KS_MODE_ARM, b"sub r1, r2, r5")
+ test_ks(KS_ARCH_ARM, KS_MODE_ARM + KS_MODE_BIG_ENDIAN, b"sub r1, r2, r5")
+ test_ks(KS_ARCH_ARM, KS_MODE_THUMB, b"movs r4, #0xf0")
+ test_ks(KS_ARCH_ARM, KS_MODE_THUMB + KS_MODE_BIG_ENDIAN, b"movs r4, #0xf0")
# ARM64
- test_ks(KS_ARCH_ARM64, KS_MODE_BIG_ENDIAN, "ldr w1, [sp, #0x8]")
+ test_ks(KS_ARCH_ARM64, KS_MODE_BIG_ENDIAN, b"ldr w1, [sp, #0x8]")
# Hexagon
- test_ks(KS_ARCH_HEXAGON, KS_MODE_BIG_ENDIAN, "v23.w=vavg(v11.w,v2.w):rnd")
+ test_ks(KS_ARCH_HEXAGON, KS_MODE_BIG_ENDIAN, b"v23.w=vavg(v11.w,v2.w):rnd")
# Mips
- test_ks(KS_ARCH_MIPS, KS_MODE_MIPS32, "and $9, $6, $7")
- test_ks(KS_ARCH_MIPS, KS_MODE_MIPS32 + KS_MODE_BIG_ENDIAN, "and $9, $6, $7")
- test_ks(KS_ARCH_MIPS, KS_MODE_MIPS64, "and $9, $6, $7")
- test_ks(KS_ARCH_MIPS, KS_MODE_MIPS64 + KS_MODE_BIG_ENDIAN, "and $9, $6, $7")
+ test_ks(KS_ARCH_MIPS, KS_MODE_MIPS32, b"and $9, $6, $7")
+ test_ks(KS_ARCH_MIPS, KS_MODE_MIPS32 + KS_MODE_BIG_ENDIAN, b"and $9, $6, $7")
+ test_ks(KS_ARCH_MIPS, KS_MODE_MIPS64, b"and $9, $6, $7")
+ test_ks(KS_ARCH_MIPS, KS_MODE_MIPS64 + KS_MODE_BIG_ENDIAN, b"and $9, $6, $7")
# PowerPC
- test_ks(KS_ARCH_PPC, KS_MODE_PPC32 + KS_MODE_BIG_ENDIAN, "add 1, 2, 3")
- test_ks(KS_ARCH_PPC, KS_MODE_PPC64, "add 1, 2, 3")
- test_ks(KS_ARCH_PPC, KS_MODE_PPC64 + KS_MODE_BIG_ENDIAN, "add 1, 2, 3")
+ test_ks(KS_ARCH_PPC, KS_MODE_PPC32 + KS_MODE_BIG_ENDIAN, b"add 1, 2, 3")
+ test_ks(KS_ARCH_PPC, KS_MODE_PPC64, b"add 1, 2, 3")
+ test_ks(KS_ARCH_PPC, KS_MODE_PPC64 + KS_MODE_BIG_ENDIAN, b"add 1, 2, 3")
# Sparc
- test_ks(KS_ARCH_SPARC, KS_MODE_SPARC32 + KS_MODE_LITTLE_ENDIAN, "add %g1, %g2, %g3")
- test_ks(KS_ARCH_SPARC, KS_MODE_SPARC32 + KS_MODE_BIG_ENDIAN, "add %g1, %g2, %g3")
+ test_ks(KS_ARCH_SPARC, KS_MODE_SPARC32 + KS_MODE_LITTLE_ENDIAN, b"add %g1, %g2, %g3")
+ test_ks(KS_ARCH_SPARC, KS_MODE_SPARC32 + KS_MODE_BIG_ENDIAN, b"add %g1, %g2, %g3")
# SystemZ
- test_ks(KS_ARCH_SYSTEMZ, KS_MODE_BIG_ENDIAN, "a %r0, 4095(%r15,%r1)")
+ test_ks(KS_ARCH_SYSTEMZ, KS_MODE_BIG_ENDIAN, b"a %r0, 4095(%r15,%r1)")
--
GitLab