From 72a196e565d2120c939b01774af6845f181cf2be Mon Sep 17 00:00:00 2001 From: danghvu Date: Wed, 27 Nov 2013 10:00:13 -0600 Subject: [PATCH 1/9] Add a Makefile for testing binding --- bindings/Makefile | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 bindings/Makefile diff --git a/bindings/Makefile b/bindings/Makefile new file mode 100644 index 0000000000..e1143a5cdf --- /dev/null +++ b/bindings/Makefile @@ -0,0 +1,47 @@ +TMPDIR = /tmp/capstone_test + +DIFF = diff -u -b + +TEST = $(TMPDIR)/test +TEST_ARM = $(TMPDIR)/test_arm +TEST_ARM64 = $(TMPDIR)/test_arm64 +TEST_MIPS = $(TMPDIR)/test_mips +TEST_X86 = $(TMPDIR)/test_x86 + +all: expected python_test java_test #oclma_test ruby_test + +expected: + $(MAKE) -C ../tests + mkdir -p $(TMPDIR) + ../tests/test > $(TEST)_e + ../tests/test_arm > $(TEST_ARM)_e + ../tests/test_arm64 > $(TEST_ARM64)_e + ../tests/test_mips > $(TEST_MIPS)_e + ../tests/test_x86 > $(TEST_X86)_e + +python: FORCE + python python/test.py > $(TEST)_o + python python/test_arm.py > $(TEST_ARM)_o + python python/test_arm64.py > $(TEST_ARM64)_o + python python/test_mips.py > $(TEST_MIPS)_o + python python/test_x86.py > $(TEST_X86)_o + +java: FORCE + $(MAKE) -C java + cd java; ./run.sh > $(TEST)_o + cd java; ./run.sh arm > $(TEST_ARM)_o + cd java; ./run.sh arm64 > $(TEST_ARM64)_o + cd java; ./run.sh mips > $(TEST_MIPS)_o + cd java; ./run.sh x86 > $(TEST_X86)_o + +test: + $(DIFF) $(TEST)_e $(TEST)_o + $(DIFF) $(TEST_ARM)_e $(TEST_ARM)_o + $(DIFF) $(TEST_ARM64)_e $(TEST_ARM64)_o + $(DIFF) $(TEST_MIPS)_e $(TEST_MIPS)_o + $(DIFF) $(TEST_X86)_e $(TEST_X86)_o + +python_test: python test +java_test: java test + +FORCE: From 7b088044405324c36ffae038af333b0d70b6c4fd Mon Sep 17 00:00:00 2001 From: danghvu Date: Wed, 27 Nov 2013 10:58:31 -0600 Subject: [PATCH 2/9] Fix partially inconsistent output from java binding --- bindings/Makefile | 2 +- bindings/java/Test.java | 11 +++++++---- bindings/java/TestArm.java | 15 ++++++++------- bindings/java/TestArm64.java | 10 +++++----- bindings/java/TestMips.java | 6 +++--- bindings/java/TestX86.java | 18 +++++++++--------- 6 files changed, 33 insertions(+), 29 deletions(-) diff --git a/bindings/Makefile b/bindings/Makefile index e1143a5cdf..db6d6178f1 100644 --- a/bindings/Makefile +++ b/bindings/Makefile @@ -1,6 +1,6 @@ TMPDIR = /tmp/capstone_test -DIFF = diff -u -b +DIFF = diff -u -w TEST = $(TMPDIR)/test TEST_ARM = $(TMPDIR)/test_arm diff --git a/bindings/java/Test.java b/bindings/java/Test.java index d485b29cbc..813a5b0cad 100644 --- a/bindings/java/Test.java +++ b/bindings/java/Test.java @@ -48,7 +48,7 @@ static public void main(String argv[]) { Capstone.CS_ARCH_X86, Capstone.CS_MODE_32, new byte[] { (byte)0x8d, 0x4c, 0x32, 0x08, 0x01, (byte)0xd8, (byte)0x81, (byte)0xc6, 0x34, 0x12, 0x00, 0x00 }, - "X86 32bit (Intel syntax)" + "X86 32 (Intel syntax)" ), new platform( Capstone.CS_ARCH_X86, @@ -102,18 +102,20 @@ static public void main(String argv[]) { }; for (int j = 0; j < platforms.length; j++) { - System.out.println("************"); + System.out.println("****************"); System.out.println(String.format("Platform: %s", platforms[j].comment)); System.out.println(String.format("Code: %s", stringToHex(platforms[j].code))); + System.out.println("Disasm:"); Capstone cs = new Capstone(platforms[j].arch, platforms[j].mode); Capstone.cs_insn[] all_insn = cs.disasm(platforms[j].code, 0x1000); for (int i = 0; i < all_insn.length; i++) { - System.out.println(String.format("0x%x\t%s\t%s", all_insn[i].address, + System.out.println(String.format("0x%x: \t%s\t%s", all_insn[i].address, all_insn[i].mnemonic, all_insn[i].operands)); + /* if (all_insn[i].regs_read[0] != 0) { System.out.print("\tRegister read: "); for(int k = 0; k < all_insn[i].regs_read.length; k++) { @@ -142,8 +144,9 @@ static public void main(String argv[]) { System.out.print(String.format("%d ", all_insn[i].groups[k])); } System.out.println(); - } + }*/ } + System.out.printf("0x%x:\n\n", all_insn[all_insn.length-1].address + all_insn[all_insn.length-1].size); } } } diff --git a/bindings/java/TestArm.java b/bindings/java/TestArm.java index f095038851..d3f42a4099 100644 --- a/bindings/java/TestArm.java +++ b/bindings/java/TestArm.java @@ -52,17 +52,17 @@ public static void print_ins_detail(Capstone.cs_insn ins) { if (op_info.op != null) { System.out.printf("\top_count: %d\n", op_info.op.length); - for (int c=1; c 0) System.out.printf("\t\t\tShift: type = %d, value = %d\n", i.shift.type, i.shift.value); @@ -106,6 +106,7 @@ public static void main(String argv[]) { print_ins_detail(all_ins[j]); System.out.println(); } + System.out.printf("0x%x:\n\n", (all_ins[all_ins.length-1].address + all_ins[all_ins.length-1].size)); } } diff --git a/bindings/java/TestArm64.java b/bindings/java/TestArm64.java index f044e42d24..d636baf21d 100644 --- a/bindings/java/TestArm64.java +++ b/bindings/java/TestArm64.java @@ -49,15 +49,15 @@ public static void print_ins_detail(Capstone.cs_insn ins) { if (op_info.op != null) { System.out.printf("\top_count: %d\n", op_info.op.length); - for (int c=1; c 0) System.out.printf("\t\t\tShift: type = %d, value = %d\n", i.shift.type, i.shift.value); diff --git a/bindings/java/TestMips.java b/bindings/java/TestMips.java index 9f1ecf8b9f..965cede71f 100644 --- a/bindings/java/TestMips.java +++ b/bindings/java/TestMips.java @@ -38,13 +38,13 @@ public static void print_ins_detail(Capstone.cs_insn ins) { if (op_info.op != null) { System.out.printf("\top_count: %d\n", op_info.op.length); - for (int c=1; c Date: Wed, 27 Nov 2013 14:38:53 -0600 Subject: [PATCH 3/9] Improve Java speed --- bindings/java/Arm.java | 25 ++++++++++++---- bindings/java/Arm64.java | 11 ++++++-- bindings/java/CS.java | 61 ++++++++++++++++++++-------------------- bindings/java/Mips.java | 7 ++++- bindings/java/X86.java | 7 ++++- 5 files changed, 72 insertions(+), 39 deletions(-) diff --git a/bindings/java/Arm.java b/bindings/java/Arm.java index c8276a4f4c..f35b9be13e 100644 --- a/bindings/java/Arm.java +++ b/bindings/java/Arm.java @@ -91,7 +91,7 @@ public static class Operand extends Structure { public OpValue value; public void read() { - super.read(); + readField("type"); if (type == ARM_OP_MEM) value.setType(MemType.class); if (type == ARM_OP_FP) @@ -100,7 +100,10 @@ public void read() { value.setType(Long.TYPE); if (type == ARM_OP_REG) value.setType(Integer.TYPE); + if (type == ARM_OP_INVALID) + return; readField("value"); + readField("shift"); } @Override @@ -109,7 +112,7 @@ public List getFieldOrder() { } } - public static class UnionOpInfo extends Structure { + public static class UnionOpInfo extends Capstone.UnionOpInfo { public int cc; public byte _update_flags; public byte _writeback; @@ -117,6 +120,20 @@ public static class UnionOpInfo extends Structure { public Operand [] op = new Operand[32]; + public UnionOpInfo(Pointer p){ + super(p); + read(); + } + + public void read() { + readField("cc"); + readField("_update_flags"); + readField("_writeback"); + readField("op_count"); + op = new Operand[op_count]; + readField("op"); + } + @Override public List getFieldOrder() { return Arrays.asList("cc", "_update_flags", "_writeback", "op_count", "op"); @@ -134,9 +151,7 @@ public OpInfo(UnionOpInfo op_info) { update_flags = (op_info._update_flags > 0); writeback = (op_info._writeback > 0); if (op_info.op_count == 0) return; - op = new Operand[op_info.op_count]; - for (int i=0; i Date: Wed, 27 Nov 2013 15:09:07 -0600 Subject: [PATCH 4/9] Packaging java binding --- bindings/java/Makefile | 16 +++++++++++++--- bindings/java/Test.java | 2 ++ bindings/java/TestArm.java | 4 ++++ bindings/java/TestArm64.java | 3 +++ bindings/java/TestMips.java | 3 +++ bindings/java/TestX86.java | 3 +++ bindings/java/{ => capstone}/Arm.java | 4 +++- bindings/java/{ => capstone}/Arm64.java | 4 +++- .../java/{CS.java => capstone/Capstone.java} | 15 +++++++-------- bindings/java/{ => capstone}/Mips.java | 4 +++- bindings/java/{ => capstone}/X86.java | 6 ++++-- 11 files changed, 48 insertions(+), 16 deletions(-) rename bindings/java/{ => capstone}/Arm.java (99%) rename bindings/java/{ => capstone}/Arm64.java (99%) rename bindings/java/{CS.java => capstone/Capstone.java} (96%) rename bindings/java/{ => capstone}/Mips.java (99%) rename bindings/java/{ => capstone}/X86.java (99%) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index 6aad81662d..a37932944d 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -3,8 +3,18 @@ JNA = /usr/share/java/jna/jna.jar -all: - javac -classpath $(JNA) CS.java Arm.java Arm64.java Mips.java X86.java Test.java TestArm.java TestArm64.java TestMips.java TestX86.java +CAPSTONE_JAVA = Capstone.java Arm.java Arm64.java Mips.java X86.java + +all: capstone tests + +capstone: capstone_class + jar cf capstone.jar capstone/*.class + +capstone_class: + cd capstone; javac -classpath $(JNA) $(CAPSTONE_JAVA) + +tests: + javac -classpath "$(JNA):capstone.jar" Test.java TestArm.java TestArm64.java TestMips.java TestX86.java clean: - rm -rf *.class *.log + rm -rf *.class *.log *.jar diff --git a/bindings/java/Test.java b/bindings/java/Test.java index 813a5b0cad..91a30f6a7a 100644 --- a/bindings/java/Test.java +++ b/bindings/java/Test.java @@ -5,6 +5,8 @@ import com.sun.jna.Memory; import com.sun.jna.Pointer; +import capstone.Capstone; + public class Test { public static class platform { public int arch; diff --git a/bindings/java/TestArm.java b/bindings/java/TestArm.java index d3f42a4099..6df2e0eed6 100644 --- a/bindings/java/TestArm.java +++ b/bindings/java/TestArm.java @@ -5,6 +5,10 @@ import com.sun.jna.Memory; import com.sun.jna.Pointer; +import capstone.Capstone; +import capstone.Capstone.*; +import capstone.Arm; + public class TestArm { static byte[] hexString2Byte(String s) { diff --git a/bindings/java/TestArm64.java b/bindings/java/TestArm64.java index d636baf21d..507a3ee370 100644 --- a/bindings/java/TestArm64.java +++ b/bindings/java/TestArm64.java @@ -5,6 +5,9 @@ import com.sun.jna.Memory; import com.sun.jna.Pointer; +import capstone.Capstone; +import capstone.Arm64; + public class TestArm64 { static byte[] hexString2Byte(String s) { diff --git a/bindings/java/TestMips.java b/bindings/java/TestMips.java index 965cede71f..87a9e496bd 100644 --- a/bindings/java/TestMips.java +++ b/bindings/java/TestMips.java @@ -5,6 +5,9 @@ import com.sun.jna.Memory; import com.sun.jna.Pointer; +import capstone.Capstone; +import capstone.Mips; + public class TestMips { static byte[] hexString2Byte(String s) { diff --git a/bindings/java/TestX86.java b/bindings/java/TestX86.java index e5d38fba31..4efa1c38e5 100644 --- a/bindings/java/TestX86.java +++ b/bindings/java/TestX86.java @@ -5,6 +5,9 @@ import com.sun.jna.Memory; import com.sun.jna.Pointer; +import capstone.Capstone; +import capstone.X86; + public class TestX86 { static byte[] hexString2Byte(String s) { diff --git a/bindings/java/Arm.java b/bindings/java/capstone/Arm.java similarity index 99% rename from bindings/java/Arm.java rename to bindings/java/capstone/Arm.java index f35b9be13e..81fd512f80 100644 --- a/bindings/java/Arm.java +++ b/bindings/java/capstone/Arm.java @@ -1,6 +1,8 @@ // Capstone Java binding // By Nguyen Anh Quynh & Dang Hoang Vu, 2013 +package capstone; + import com.sun.jna.Structure; import com.sun.jna.Pointer; import com.sun.jna.Union; @@ -9,7 +11,7 @@ import java.util.List; import java.util.Arrays; -class Arm { +public class Arm { // ARM operand shift type public static final int ARM_SFT_INVALID = 0; diff --git a/bindings/java/Arm64.java b/bindings/java/capstone/Arm64.java similarity index 99% rename from bindings/java/Arm64.java rename to bindings/java/capstone/Arm64.java index aabb349a51..7d6be435df 100644 --- a/bindings/java/Arm64.java +++ b/bindings/java/capstone/Arm64.java @@ -1,6 +1,8 @@ // Capstone Java binding // By Nguyen Anh Quynh & Dang Hoang Vu, 2013 +package capstone; + import com.sun.jna.Structure; import com.sun.jna.Pointer; import com.sun.jna.Union; @@ -9,7 +11,7 @@ import java.util.List; import java.util.Arrays; -class Arm64 { +public class Arm64 { // ARM64 operand shift type public static final int ARM64_SFT_INVALID = 0; diff --git a/bindings/java/CS.java b/bindings/java/capstone/Capstone.java similarity index 96% rename from bindings/java/CS.java rename to bindings/java/capstone/Capstone.java index 3945731266..f35268a5f8 100644 --- a/bindings/java/CS.java +++ b/bindings/java/capstone/Capstone.java @@ -1,6 +1,8 @@ // Capstone Java binding // By Nguyen Anh Quynh & Dang Hoang Vu, 2013 +package capstone; + import com.sun.jna.Library; import com.sun.jna.Native; import com.sun.jna.Structure; @@ -13,7 +15,7 @@ import java.util.Arrays; import java.lang.RuntimeException; -class Capstone { +public class Capstone { public int arch; public int mode; @@ -172,7 +174,7 @@ public long cs_disasm_dyn(long handle, byte[] code, long code_len, private PointerByReference insnRef; private CS cs; - Capstone(int arch, int mode) + public Capstone(int arch, int mode) { this.arch = arch; this.mode = mode; @@ -188,18 +190,15 @@ public String reg_name(int reg) { return cs.cs_reg_name(csh, reg); } - protected void finalize() - { + protected void finalize() { cs.cs_close(csh); } - cs_insn[] disasm(byte[] code, long address) - { + public cs_insn[] disasm(byte[] code, long address) { return disasm(code, address, 0); } - cs_insn[] disasm(byte[] code, long address, long count) - { + public cs_insn[] disasm(byte[] code, long address, long count) { insnRef = new PointerByReference(); long c = cs.cs_disasm_dyn(csh, code, code.length, address, count, insnRef); diff --git a/bindings/java/Mips.java b/bindings/java/capstone/Mips.java similarity index 99% rename from bindings/java/Mips.java rename to bindings/java/capstone/Mips.java index 4aaecba12e..3e00b7a903 100644 --- a/bindings/java/Mips.java +++ b/bindings/java/capstone/Mips.java @@ -1,6 +1,8 @@ // Capstone Java binding // By Nguyen Anh Quynh & Dang Hoang Vu, 2013 +package capstone; + import com.sun.jna.Structure; import com.sun.jna.Pointer; import com.sun.jna.Union; @@ -9,7 +11,7 @@ import java.util.List; import java.util.Arrays; -class Mips { +public class Mips { // Operand type public static final int MIPS_OP_INVALID = 0; // Uninitialized. diff --git a/bindings/java/X86.java b/bindings/java/capstone/X86.java similarity index 99% rename from bindings/java/X86.java rename to bindings/java/capstone/X86.java index 8ccfff3911..ea10930233 100644 --- a/bindings/java/X86.java +++ b/bindings/java/capstone/X86.java @@ -1,6 +1,8 @@ // Capstone Java binding // By Nguyen Anh Quynh & Dang Hoang Vu, 2013 +package capstone; + import com.sun.jna.Structure; import com.sun.jna.Pointer; import com.sun.jna.Union; @@ -9,7 +11,7 @@ import java.util.List; import java.util.Arrays; -class X86 { +public class X86 { // Operand type public static final int X86_OP_INVALID = 0; // Uninitialized. @@ -113,7 +115,7 @@ public static class OpInfo extends Capstone.OpInfo { public byte sib_scale; public int sib_base; - Operand[] op; + public Operand[] op; public OpInfo(UnionOpInfo e) { prefix = e.prefix; From f3ef69673a860733b640c0da84e26c185c64083e Mon Sep 17 00:00:00 2001 From: danghvu Date: Wed, 27 Nov 2013 21:41:17 -0600 Subject: [PATCH 5/9] Fix java binding test, output the same as core test --- bindings/java/Test.java | 2 +- bindings/java/TestArm.java | 24 ++++++++++-------------- bindings/java/TestArm64.java | 29 +++++++++++++++-------------- bindings/java/TestMips.java | 5 ++++- bindings/java/TestX86.java | 13 ++++++++++--- 5 files changed, 40 insertions(+), 33 deletions(-) diff --git a/bindings/java/Test.java b/bindings/java/Test.java index 91a30f6a7a..ec5a6f7202 100644 --- a/bindings/java/Test.java +++ b/bindings/java/Test.java @@ -22,7 +22,7 @@ public platform(int a, int m, byte[] c, String s) { } }; - static String stringToHex(byte[] code) { + static public String stringToHex(byte[] code) { StringBuilder buf = new StringBuilder(200); for (byte ch: code) { if (buf.length() > 0) diff --git a/bindings/java/TestArm.java b/bindings/java/TestArm.java index 6df2e0eed6..2e7d20038e 100644 --- a/bindings/java/TestArm.java +++ b/bindings/java/TestArm.java @@ -6,7 +6,6 @@ import com.sun.jna.Pointer; import capstone.Capstone; -import capstone.Capstone.*; import capstone.Arm; public class TestArm { @@ -42,18 +41,6 @@ public static void print_ins_detail(Capstone.cs_insn ins) { Arm.OpInfo op_info = (Arm.OpInfo) ins.op_info; - if (op_info.cc != Arm.ARM_CC_AL && op_info.cc != Arm.ARM_CC_INVALID){ - System.out.printf("\tCode condition: %d\n", op_info.cc); - } - - if (op_info.update_flags) { - System.out.println("\tUpdate-flags: True"); - } - - if (op_info.writeback) { - System.out.println("\tWriteback: True"); - } - if (op_info.op != null) { System.out.printf("\top_count: %d\n", op_info.op.length); for (int c=0; c 0) System.out.printf("\t\t\tShift: type = %d, value = %d\n", i.shift.type, i.shift.value); } + if (op_info.writeback) + System.out.println("\tWrite-back: True"); + + if (op_info.update_flags) + System.out.println("\tUpdate-flags: True"); + + if (op_info.cc != Arm.ARM_CC_AL && op_info.cc != Arm.ARM_CC_INVALID) + System.out.printf("\tCode condition: %d\n", op_info.cc); } } @@ -99,8 +94,9 @@ public static void main(String argv[]) { for (int i=0; i 0) { @@ -111,15 +115,16 @@ public static void main(String argv[]) { final Test.platform[] all_tests = { new Test.platform(Capstone.CS_ARCH_X86, Capstone.CS_MODE_16, hexString2Byte(X86_CODE16), "X86 16bit (Intel syntax)"), - new Test.platform(Capstone.CS_ARCH_X86, Capstone.CS_MODE_32 + Capstone.CS_MODE_SYNTAX_ATT, hexString2Byte(X86_CODE32), "X86 32bit (ATT syntax)"), + new Test.platform(Capstone.CS_ARCH_X86, Capstone.CS_MODE_32 + Capstone.CS_MODE_SYNTAX_ATT, hexString2Byte(X86_CODE32), "X86 32 (AT&T syntax)"), new Test.platform(Capstone.CS_ARCH_X86, Capstone.CS_MODE_32, hexString2Byte(X86_CODE32), "X86 32 (Intel syntax)"), new Test.platform(Capstone.CS_ARCH_X86, Capstone.CS_MODE_64, hexString2Byte(X86_CODE64), "X86 64 (Intel syntax)"), }; for (int i=0; i Date: Wed, 27 Nov 2013 22:51:11 -0600 Subject: [PATCH 6/9] Fix python test output, same as core test --- bindings/Makefile | 9 +++-- bindings/python/capstone/capstone.py | 2 +- bindings/python/capstone/x86.py | 2 +- bindings/python/test.py | 22 ++++++------ bindings/python/test_arm.py | 40 +++++++++++++-------- bindings/python/test_arm64.py | 42 +++++++++++++--------- bindings/python/test_mips.py | 26 ++++++++++---- bindings/python/test_x86.py | 54 ++++++++++++++++++---------- 8 files changed, 125 insertions(+), 72 deletions(-) diff --git a/bindings/Makefile b/bindings/Makefile index db6d6178f1..5794ac1afc 100644 --- a/bindings/Makefile +++ b/bindings/Makefile @@ -8,7 +8,7 @@ TEST_ARM64 = $(TMPDIR)/test_arm64 TEST_MIPS = $(TMPDIR)/test_mips TEST_X86 = $(TMPDIR)/test_x86 -all: expected python_test java_test #oclma_test ruby_test +all: expected python java #oclma ruby expected: $(MAKE) -C ../tests @@ -25,6 +25,7 @@ python: FORCE python python/test_arm64.py > $(TEST_ARM64)_o python python/test_mips.py > $(TEST_MIPS)_o python python/test_x86.py > $(TEST_X86)_o + $(MAKE) test java: FORCE $(MAKE) -C java @@ -33,15 +34,13 @@ java: FORCE cd java; ./run.sh arm64 > $(TEST_ARM64)_o cd java; ./run.sh mips > $(TEST_MIPS)_o cd java; ./run.sh x86 > $(TEST_X86)_o + $(MAKE) test -test: +test: FORCE $(DIFF) $(TEST)_e $(TEST)_o $(DIFF) $(TEST_ARM)_e $(TEST_ARM)_o $(DIFF) $(TEST_ARM64)_e $(TEST_ARM64)_o $(DIFF) $(TEST_MIPS)_e $(TEST_MIPS)_o $(DIFF) $(TEST_X86)_e $(TEST_X86)_o -python_test: python test -java_test: java test - FORCE: diff --git a/bindings/python/capstone/capstone.py b/bindings/python/capstone/capstone.py index e9222ffa04..0241d5238d 100644 --- a/bindings/python/capstone/capstone.py +++ b/bindings/python/capstone/capstone.py @@ -203,7 +203,7 @@ def create_list(rawlist): elif arch == CS_ARCH_X86: (self.prefix, self.segment, self.opcode, self.op_size, self.addr_size, \ self.disp_size, self.imm_size, self.modrm, self.sib, self.disp, \ - self.sib_index, self.sib_scale, self.operands) = x86.get_arch_info(all_info.arch.x86) + self.sib_index, self.sib_scale, self.sib_base, self.operands) = x86.get_arch_info(all_info.arch.x86) elif arch == CS_ARCH_MIPS: self.operands = mips.get_arch_info(all_info.arch.mips) diff --git a/bindings/python/capstone/x86.py b/bindings/python/capstone/x86.py index 6af092fcf9..85fa6d0ebd 100644 --- a/bindings/python/capstone/x86.py +++ b/bindings/python/capstone/x86.py @@ -57,7 +57,7 @@ def get_arch_info(a): if i.type == 0: break op_info.append(i) - return (a.prefix, a.segment, a.opcode, a.op_size, a.addr_size, a.disp_size, a.imm_size, a.modrm, a.sib, a.disp, a.sib_index, a.sib_scale, op_info) + return (a.prefix, a.segment, a.opcode, a.op_size, a.addr_size, a.disp_size, a.imm_size, a.modrm, a.sib, a.disp, a.sib_index, a.sib_scale, a.sib_base, op_info) # all Intel reigsters X86_REG_INVALID = 0 diff --git a/bindings/python/test.py b/bindings/python/test.py index a1dcdeed79..19a9d117f9 100755 --- a/bindings/python/test.py +++ b/bindings/python/test.py @@ -10,7 +10,7 @@ ARM_CODE = "\xED\xFF\xFF\xEB\x04\xe0\x2d\xe5\x00\x00\x00\x00\xe0\x83\x22\xe5\xf1\x02\x03\x0e\x00\x00\xa0\xe3\x02\x30\xc1\xe7\x00\x00\x53\xe3" ARM_CODE2 = "\x10\xf1\x10\xe7\x11\xf2\x31\xe7\xdc\xa1\x2e\xf3\xe8\x4e\x62\xf3" THUMB_CODE = "\x70\x47\xeb\x46\x83\xb0\xc9\x68" -THUMB_CODE2 = "\x4f\xf0\x00\x01\xbd\xe8\x00\x88" +THUMB_CODE2 = "\x4f\xf0\x00\x01\xbd\xe8\x00\x88\xd1\xe8\x00\xf0" MIPS_CODE = "\x0C\x10\x00\x97\x00\x00\x00\x00\x24\x02\x00\x0c\x8f\xa2\x00\x00\x34\x21\x34\x56" MIPS_CODE2 = "\x56\x34\x21\x34\xc2\x17\x01\x00" ARM64_CODE = "\x21\x7c\x02\x9b\x21\x7c\x00\x53\x00\x40\x21\x4b\xe1\x0b\x40\xb9" @@ -21,18 +21,17 @@ (CS_ARCH_X86, CS_MODE_32, X86_CODE32, "X86 32 (Intel syntax)"), (CS_ARCH_X86, CS_MODE_64, X86_CODE64, "X86 64 (Intel syntax)"), (CS_ARCH_ARM, CS_MODE_ARM, ARM_CODE, "ARM"), + (CS_ARCH_ARM, CS_MODE_THUMB, THUMB_CODE2, "THUMB-2"), (CS_ARCH_ARM, CS_MODE_ARM, ARM_CODE2, "ARM: Cortex-A15 + NEON"), (CS_ARCH_ARM, CS_MODE_THUMB, THUMB_CODE, "THUMB"), - (CS_ARCH_ARM, CS_MODE_THUMB, THUMB_CODE2, "THUMB-2"), - (CS_ARCH_ARM64, CS_MODE_ARM, ARM64_CODE, "ARM-64"), (CS_ARCH_MIPS, CS_MODE_32 + CS_MODE_BIG_ENDIAN, MIPS_CODE, "MIPS-32 (Big-endian)"), (CS_ARCH_MIPS, CS_MODE_64+ CS_MODE_LITTLE_ENDIAN, MIPS_CODE2, "MIPS-64-EL (Little-endian)"), + (CS_ARCH_ARM64, CS_MODE_ARM, ARM64_CODE, "ARM-64"), ) def to_hex(s): - # print " ".join("{0:x}".format(ord(c)) for c in s) # <-- Python 3 is OK - return ' '.join(x.encode('hex') for x in s) # <-- fails for Python 3 + return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK ### Test cs_disasm_quick() @@ -50,15 +49,18 @@ def test_cs_disasm_quick(): ### Test class cs def test_class(): for (arch, mode, code, comment) in all_tests: - print('*' * 40) + print('*' * 16) print("Platform: %s" %comment) - print("Disasm:"), - print to_hex(code) - + print("Code: %s" % to_hex(code)) + print("Disasm:") + try: md = cs(arch, mode) - for insn in md.disasm(code, 0x1000): + all_ins = list(md.disasm(code, 0x1000)) + for insn in all_ins: print("0x%x:\t%s\t%s" %(insn.address, insn.mnemonic, insn.op_str)) + + print("0x%x:" % (all_ins[-1].address + all_ins[-1].size)) print except: print("ERROR: Arch or mode unsupported!") diff --git a/bindings/python/test_arm.py b/bindings/python/test_arm.py index cb4b5ab28b..bf3c4d9c66 100755 --- a/bindings/python/test_arm.py +++ b/bindings/python/test_arm.py @@ -17,6 +17,15 @@ (CS_ARCH_ARM, CS_MODE_THUMB, THUMB_CODE2, "Thumb-2"), ) +def to_hex(s): + return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK + +def to_x(s): + from struct import pack + if not s: return '0' + x = pack(">q", s).encode('hex') + while x[0] == '0': x = x[1:] + return x ### Test class cs def test_class(): @@ -24,24 +33,14 @@ def print_insn_detail(insn): # print address, mnemonic and operands print("0x%x:\t%s\t%s" %(insn.address, insn.mnemonic, insn.op_str)) - if not insn.cc in [ARM_CC_AL, ARM_CC_INVALID]: - print("\tCode condition: %u" %insn.cc) - - if insn.update_flags: - print("\tUpdate-flags: True") - - if insn.writeback: - print("\tWriteback: True") - if len(insn.operands) > 0: print("\top_count: %u" %len(insn.operands)) c = 0 for i in insn.operands: - c += 1 if i.type == ARM_OP_REG: print("\t\toperands[%u].type: REG = %s" %(c, insn.reg_name(i.value.reg))) if i.type == ARM_OP_IMM: - print("\t\toperands[%u].type: IMM = %x" %(c, i.value.imm)) + print("\t\toperands[%u].type: IMM = 0x%s" %(c, to_x(i.value.imm))) if i.type == ARM_OP_PIMM: print("\t\toperands[%u].type: P-IMM = %u" %(c, i.value.imm)) if i.type == ARM_OP_CIMM: @@ -60,24 +59,35 @@ def print_insn_detail(insn): print("\t\t\toperands[%u].mem.scale: %u" \ %(c, i.value.mem.scale)) if i.value.mem.disp != 0: - print("\t\t\toperands[%u].mem.disp: %x" \ - %(c, i.value.mem.disp)) + print("\t\t\toperands[%u].mem.disp: 0x%s" \ + %(c, to_x(i.value.mem.disp))) if i.shift.type != ARM_SFT_INVALID and i.shift.value: print("\t\t\tShift: type = %u, value = %u\n" \ %(i.shift.type, i.shift.value)) + c+=1 + if insn.update_flags: + print("\tUpdate-flags: True") + if insn.writeback: + print("\tWrite-back: True") + if not insn.cc in [ARM_CC_AL, ARM_CC_INVALID]: + print("\tCode condition: %u" %insn.cc) for (arch, mode, code, comment) in all_tests: - print("*" * 30) + print("*" * 16) print("Platform: %s" %comment) + print("Code: %s" % to_hex(code)) print("Disasm:") - + try: md = cs(arch, mode) + last = None for insn in md.disasm(code, 0x1000): print_insn_detail(insn) + last = insn print + print "0x%x:\n" % (last.address + last.size) except: print("ERROR: Arch or mode unsupported!") diff --git a/bindings/python/test_arm64.py b/bindings/python/test_arm64.py index 4cb5f1e269..dada4d687f 100755 --- a/bindings/python/test_arm64.py +++ b/bindings/python/test_arm64.py @@ -11,6 +11,15 @@ (CS_ARCH_ARM64, CS_MODE_ARM, ARM64_CODE, "ARM-64"), ) +def to_hex(s): + return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK + +def to_x(s): + from struct import pack + if not s: return '0' + x = pack(">q", s).encode('hex') + while x[0] == '0': x = x[1:] + return x ### Test class cs def test_class(): @@ -18,24 +27,15 @@ def print_insn_detail(insn): # print address, mnemonic and operands print("0x%x:\t%s\t%s" %(insn.address, insn.mnemonic, insn.op_str)) - if not insn.cc in [ARM64_CC_AL, ARM64_CC_INVALID]: - print("\tCode condition: %u" %insn.cc) - - if insn.update_flags: - print("\tUpdate-flags: True") - - if insn.writeback: - print("\tWrite-back: True") - if len(insn.operands) > 0: print("\top_count: %u" %len(insn.operands)) - c = 0 + c = -1 for i in insn.operands: c += 1 if i.type == ARM64_OP_REG: print("\t\toperands[%u].type: REG = %s" %(c, insn.reg_name(i.value.reg))) if i.type == ARM64_OP_IMM: - print("\t\toperands[%u].type: IMM = %x" %(c, i.value.imm)) + print("\t\toperands[%u].type: IMM = 0x%s" %(c, to_x(i.value.imm))) if i.type == ARM64_OP_CIMM: print("\t\toperands[%u].type: C-IMM = %u" %(c, i.value.imm)) if i.type == ARM64_OP_FP: @@ -49,8 +49,8 @@ def print_insn_detail(insn): print("\t\t\toperands[%u].mem.index: REG = %s" \ %(c, insn.reg_name(i.value.mem.index))) if i.value.mem.disp != 0: - print("\t\t\toperands[%u].mem.disp: %x" \ - %(c, i.value.mem.disp)) + print("\t\t\toperands[%u].mem.disp: 0x%s" \ + %(c, to_x(i.value.mem.disp))) if i.shift.type != ARM64_SFT_INVALID and i.shift.value: print("\t\t\tShift: type = %u, value = %u" \ @@ -59,17 +59,27 @@ def print_insn_detail(insn): if i.ext != ARM64_EXT_INVALID: print("\t\t\tExt: %u" %i.ext) + if insn.writeback: + print("\tWrite-back: True") + if not insn.cc in [ARM64_CC_AL, ARM64_CC_INVALID]: + print("\tCode condition: %u" %insn.cc) + if insn.update_flags: + print("\tUpdate-flags: True") for (arch, mode, code, comment) in all_tests: - print("*" * 30) + print("*" * 16) print("Platform: %s" %comment) + print("Code: %s" % to_hex(code)) print("Disasm:") - + try: md = cs(arch, mode) - for insn in md.disasm(code, 0x1000): + last = None + for insn in md.disasm(code, 0x2c): print_insn_detail(insn) + last = insn print + print "0x%x:\n" % (last.address + last.size) except: print("ERROR: Arch or mode unsupported!") diff --git a/bindings/python/test_mips.py b/bindings/python/test_mips.py index fe279cbd98..a22ce45cc4 100755 --- a/bindings/python/test_mips.py +++ b/bindings/python/test_mips.py @@ -13,6 +13,15 @@ (CS_ARCH_MIPS, CS_MODE_64 + CS_MODE_LITTLE_ENDIAN, MIPS_CODE2, "MIPS-64-EL (Little-endian)"), ) +def to_hex(s): + return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK + +def to_x(s): + from struct import pack + if not s: return '0' + x = pack(">q", s).encode('hex') + while x[0] == '0': x = x[1:] + return x ### Test class cs def test_class(): @@ -22,33 +31,38 @@ def print_insn_detail(insn): if len(insn.operands) > 0: print("\top_count: %u" %len(insn.operands)) - c = 0 + c = -1 for i in insn.operands: c += 1 if i.type == MIPS_OP_REG: print("\t\toperands[%u].type: REG = %s" %(c, insn.reg_name(i.value.reg))) if i.type == MIPS_OP_IMM: - print("\t\toperands[%u].type: IMM = %x" %(c, i.value.imm)) + print("\t\toperands[%u].type: IMM = 0x%s" %(c, to_x(i.value.imm))) if i.type == MIPS_OP_MEM: print("\t\toperands[%u].type: MEM" %c) if i.value.mem.base != 0: print("\t\t\toperands[%u].mem.base: REG = %s" \ %(c, insn.reg_name(i.value.mem.base))) if i.value.mem.disp != 0: - print("\t\t\toperands[%u].mem.disp: %x" \ - %(c, i.value.mem.disp)) + print("\t\t\toperands[%u].mem.disp: 0x%s" \ + %(c, to_x(i.value.mem.disp))) for (arch, mode, code, comment) in all_tests: - print("*" * 30) + print("*" * 16) print("Platform: %s" %comment) + print("Code: %s" % to_hex(code)) print("Disasm:") - + try: md = cs(arch, mode) + last = None for insn in md.disasm(code, 0x1000): print_insn_detail(insn) + last = insn print + + print "0x%x:\n" %(insn.address + insn.size) except: print("ERROR: Arch or mode unsupported!") diff --git a/bindings/python/test_x86.py b/bindings/python/test_x86.py index 2fe640bfcf..a3ec0b21d5 100755 --- a/bindings/python/test_x86.py +++ b/bindings/python/test_x86.py @@ -5,18 +5,33 @@ from capstone import * from capstone.x86 import * -X86_CODE16 = "\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x05\x23\x01\x00\x00\x36\x8b\x84\x91\x23\x01\x00\x00\x41\xa1\x13\x48\x6d\x3a" -X86_CODE32 = "\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x05\x23\x01\x00\x00\x36\x8b\x84\x91\x23\x01\x00\x00\x41\xa1\x13\x48\x6d\x3a" -X86_CODE32 += "\x8d\x05\x34\x12\x00\x00" X86_CODE64 = "\x55\x48\x8b\x05\xb8\x13\x00\x00" +X86_CODE16 = "\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x05\x23\x01\x00\x00\x36\x8b\x84\x91\x23\x01\x00\x00\x41\x8d\x84\x39\x89\x67\x00\x00\x8d\x87\x89\x67\x00\x00\xb4\xc6" +X86_CODE32 = "\x8d\x4c\x32\x08\x01\xd8\x81\xc6\x34\x12\x00\x00\x05\x23\x01\x00\x00\x36\x8b\x84\x91\x23\x01\x00\x00\x41\x8d\x84\x39\x89\x67\x00\x00\x8d\x87\x89\x67\x00\x00\xb4\xc6" all_tests = ( (CS_ARCH_X86, CS_MODE_16, X86_CODE16, "X86 16bit (Intel syntax)"), - (CS_ARCH_X86, CS_MODE_32 + CS_MODE_SYNTAX_ATT, X86_CODE32, "X86 32bit (ATT syntax)"), + (CS_ARCH_X86, CS_MODE_32 + CS_MODE_SYNTAX_ATT, X86_CODE32, "X86 32 (AT&T syntax)"), (CS_ARCH_X86, CS_MODE_32, X86_CODE32, "X86 32 (Intel syntax)"), (CS_ARCH_X86, CS_MODE_64, X86_CODE64, "X86 64 (Intel syntax)"), ) +def to_hex(s): + return " ".join("0x" + "{0:x}".format(ord(c)).zfill(2) for c in s) # <-- Python 3 is OK + +def to_x(s): + from struct import pack + if not s: return '0' + x = pack(">q", s).encode('hex') + while x[0] == '0': x = x[1:] + return x + +def to_x_32(s): + from struct import pack + if not s: return '0' + x = pack(">i", s).encode('hex') + while x[0] == '0': x = x[1:] + return x ### Test class cs def test_class(): @@ -48,29 +63,31 @@ def print_insn_detail(mode, insn): print("\tmodrm: 0x%x" %(insn.modrm)) # print displacement value - print("\tdisp: 0x%x" %(insn.disp)) + print("\tdisp: 0x%s" %to_x_32(insn.disp)) # SIB is not available in 16-bit mode if (mode & CS_MODE_16 == 0): # print SIB byte print("\tsib: 0x%x" %(insn.sib)) + if (insn.sib): + print("\tsib_index: %s, sib_scale: %d, sib_base: %s" % (insn.reg_name(insn.sib_index), insn.sib_scale, insn.reg_name(insn.sib_base))) count = insn.op_count(X86_OP_IMM) if count > 0: print("\timm_count: %u" %count) for i in xrange(count): index = insn.op_index(X86_OP_IMM, i + 1) - print("\t\timms[%u] = 0x%x" %(i+1, (insn.operands[index].value.imm))) + print("\t\timms[%u]: 0x%s" %(i+1, to_x(insn.operands[index].value.imm))) if len(insn.operands) > 0: print("\top_count: %u" %len(insn.operands)) - c = 0 + c = -1 for i in insn.operands: c += 1 if i.type == X86_OP_REG: print("\t\toperands[%u].type: REG = %s" %(c, insn.reg_name(i.value.reg))) if i.type == X86_OP_IMM: - print("\t\toperands[%u].type: IMM = 0x%x" %(c, i.value.imm)) + print("\t\toperands[%u].type: IMM = 0x%s" %(c, to_x(i.value.imm))) if i.type == X86_OP_FP: print("\t\toperands[%u].type: FP = %f" %(c, i.value.fp)) if i.type == X86_OP_MEM: @@ -82,21 +99,22 @@ def print_insn_detail(mode, insn): if i.value.mem.scale != 1: print("\t\t\toperands[%u].mem.scale: %u" %(c, i.value.mem.scale)) if i.value.mem.disp != 0: - print("\t\t\toperands[%u].mem.disp: 0x%x" %(c, i.value.mem.disp)) + print("\t\t\toperands[%u].mem.disp: 0x%s" %(c, to_x(i.value.mem.disp))) for (arch, mode, code, comment) in all_tests: - print("*" * 30) + print("*" * 16) print("Platform: %s" %comment) + print("Code: %s" % to_hex(code)) print("Disasm:") - - try: - md = cs(arch, mode) - for insn in md.disasm(code, 0x1000): - print_insn_detail(mode, insn) - print - except: - print("ERROR: Arch or mode unsupported!") + + md = cs(arch, mode) + last = None + for insn in md.disasm(code, 0x1000): + print_insn_detail(mode, insn) + last = insn + print + print ("0x%x:\n" % (last.address + last.size)) test_class() From bad54f32c02422ded9dac16ce73b987eb7473ff1 Mon Sep 17 00:00:00 2001 From: danghvu Date: Thu, 28 Nov 2013 06:55:02 +0100 Subject: [PATCH 7/9] Fix java binding for 32-bit --- bindings/java/capstone/Arm.java | 14 +++++++++++-- bindings/java/capstone/Arm64.java | 13 ++++++++++-- bindings/java/capstone/Capstone.java | 31 +++++++++++++++++++++------- bindings/java/capstone/Mips.java | 13 ++++++++++-- bindings/java/capstone/X86.java | 21 +++++++++++++++---- 5 files changed, 75 insertions(+), 17 deletions(-) diff --git a/bindings/java/capstone/Arm.java b/bindings/java/capstone/Arm.java index 81fd512f80..198a1f4a7e 100644 --- a/bindings/java/capstone/Arm.java +++ b/bindings/java/capstone/Arm.java @@ -120,13 +120,23 @@ public static class UnionOpInfo extends Capstone.UnionOpInfo { public byte _writeback; public byte op_count; - public Operand [] op = new Operand[32]; + public Operand [] op; + + public UnionOpInfo(){ + op = new Operand[32]; + } public UnionOpInfo(Pointer p){ - super(p); + op = new Operand[32]; + useMemory(p); read(); } + public static int getSize() { + UnionOpInfo x = new UnionOpInfo(); + return x.size(); + } + public void read() { readField("cc"); readField("_update_flags"); diff --git a/bindings/java/capstone/Arm64.java b/bindings/java/capstone/Arm64.java index 7d6be435df..06cf9c9be3 100644 --- a/bindings/java/capstone/Arm64.java +++ b/bindings/java/capstone/Arm64.java @@ -127,13 +127,22 @@ public static class UnionOpInfo extends Capstone.UnionOpInfo { public byte _writeback; public byte op_count; - public Operand [] op = new Operand[32]; + public Operand [] op; + + public UnionOpInfo() { + op = new Operand[32]; + } public UnionOpInfo(Pointer p) { - super(p); + op = new Operand[32]; + useMemory(p); read(); } + public static int getSize() { + return (new UnionOpInfo()).size(); + } + public void read() { readField("cc"); readField("_update_flags"); diff --git a/bindings/java/capstone/Capstone.java b/bindings/java/capstone/Capstone.java index f35268a5f8..f626ba34e7 100644 --- a/bindings/java/capstone/Capstone.java +++ b/bindings/java/capstone/Capstone.java @@ -14,6 +14,7 @@ import java.util.List; import java.util.Arrays; import java.lang.RuntimeException; +import java.lang.Math; public class Capstone { @@ -30,13 +31,14 @@ public static class PrivateOpInfo extends Union { public Mips.UnionOpInfo mips; } - public static abstract class UnionOpInfo extends Structure implements Structure.ByReference { - public UnionOpInfo(Pointer p) { - super(p); - } + public static abstract class UnionOpInfo extends Structure { + } + + static int max(int a, int b, int c, int d) { + return Math.max(Math.max(Math.max(a,b),c),d); } - public static class _cs_insn extends Structure implements Structure.ByReference { + public static class _cs_insn extends Structure { public int id; public long address; public short size; @@ -46,7 +48,15 @@ public static class _cs_insn extends Structure implements Structure.ByReference public int[] regs_write = new int[32]; public int[] groups = new int[8]; - public _cs_insn(Pointer p) { super(p); read(); } + public _cs_insn(Pointer p) { + mnemonic = new byte[32]; + operands = new byte[96]; + regs_read = new int[32]; + regs_write = new int[32]; + groups = new int[8]; + useMemory(p); + read(); + } @Override public List getFieldOrder() { @@ -83,6 +93,13 @@ public cs_insn (_cs_insn struct, Pointer _ptr_origin, long _csh, CS _cs, OpInfo op_info = _op_info; csh = _csh; cs = _cs; + _size = struct.size() + max( Arm.UnionOpInfo.getSize(), Arm64.UnionOpInfo.getSize(), Mips.UnionOpInfo.getSize(), X86.UnionOpInfo.getSize() ); + } + + private int _size; + + protected int size() { + return _size; } public int op_count(int type) { @@ -129,7 +146,7 @@ private cs_insn[] fromArrayPointer(Pointer pointer, int numberResults) for (int i = 0; i < numberResults; i++) { arr[i] = fromPointer(pointer.share(offset)); - offset += 1728; // TODO: fix this constant, can have JNA calculated but will be 5x slower + offset += arr[i].size(); // TODO: fix this constant, can have JNA calculated but will be 5x slower } return arr; diff --git a/bindings/java/capstone/Mips.java b/bindings/java/capstone/Mips.java index 3e00b7a903..37f6761e58 100644 --- a/bindings/java/capstone/Mips.java +++ b/bindings/java/capstone/Mips.java @@ -64,13 +64,22 @@ public List getFieldOrder() { public static class UnionOpInfo extends Capstone.UnionOpInfo { public short op_count; - public Operand [] op = new Operand[8]; + public Operand [] op; + + public UnionOpInfo() { + op = new Operand[8]; + } public UnionOpInfo(Pointer p) { - super(p); + op = new Operand[8]; + useMemory(p); read(); } + public static int getSize() { + return (new UnionOpInfo()).size(); + } + public void read() { readField("op_count"); op = new Operand[op_count]; diff --git a/bindings/java/capstone/X86.java b/bindings/java/capstone/X86.java index ea10930233..cf70f956e5 100644 --- a/bindings/java/capstone/X86.java +++ b/bindings/java/capstone/X86.java @@ -70,9 +70,9 @@ public List getFieldOrder() { } public static class UnionOpInfo extends Capstone.UnionOpInfo { - public byte [] prefix = new byte[5]; + public byte [] prefix; public int segment; - public byte [] opcode = new byte[3]; + public byte [] opcode; public byte op_size; public byte addr_size; public byte disp_size; @@ -86,13 +86,26 @@ public static class UnionOpInfo extends Capstone.UnionOpInfo { public int op_count; - public Operand [] op = new Operand[8]; + public Operand [] op; + + public UnionOpInfo() { + op = new Operand[8]; + opcode = new byte[3]; + prefix = new byte[5]; + } public UnionOpInfo(Pointer p) { - super(p); + op = new Operand[8]; + opcode = new byte[3]; + prefix = new byte[5]; + useMemory(p); read(); } + public static int getSize() { + return (new UnionOpInfo()).size(); + } + @Override public List getFieldOrder() { return Arrays.asList("prefix", "segment", "opcode", "op_size", "addr_size", "disp_size", From 71e1c4f9faa525c11ab72405d83750845576c56a Mon Sep 17 00:00:00 2001 From: danghvu Date: Thu, 28 Nov 2013 00:36:19 -0600 Subject: [PATCH 8/9] More verbose Java binding Makefile --- bindings/java/Makefile | 10 ++++++++++ bindings/java/run.sh | 8 ++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bindings/java/Makefile b/bindings/java/Makefile index a37932944d..e87d356092 100644 --- a/bindings/java/Makefile +++ b/bindings/java/Makefile @@ -3,6 +3,16 @@ JNA = /usr/share/java/jna/jna.jar +ifneq ($(wildcard $(JNA)),) +else + ifneq ($(wildcard /usr/share/java/jna.jar),) + JNA = /usr/share/java/jna.jar + else + JNA = + $(error Unable to find jna.jar) + endif +endif + CAPSTONE_JAVA = Capstone.java Arm.java Arm64.java Mips.java X86.java all: capstone tests diff --git a/bindings/java/run.sh b/bindings/java/run.sh index 1f2f5dfaf3..3f1b3ee58e 100755 --- a/bindings/java/run.sh +++ b/bindings/java/run.sh @@ -2,8 +2,12 @@ JNA=/usr/share/java/jna.jar if [ ! -f ${JNA} ]; then - echo "JNA @ ${JNA} does not exist, edit this file with the correct path"; - exit + if [ ! -f /usr/share/java/jna/jna.jar ]; then + echo "*** Unable to find jna.jar *** "; + exit; + else + JNA=/usr/share/java/jna/jna.jar; + fi fi case "$1" in From c4325f8593d2c8cb1eeb349312f97e9b7ae0fdb0 Mon Sep 17 00:00:00 2001 From: danghvu Date: Thu, 28 Nov 2013 01:02:17 -0600 Subject: [PATCH 9/9] Add remaining untested functions --- bindings/java/capstone/Capstone.java | 61 +++++++++++++++++++--------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/bindings/java/capstone/Capstone.java b/bindings/java/capstone/Capstone.java index f626ba34e7..4e71e39f72 100644 --- a/bindings/java/capstone/Capstone.java +++ b/bindings/java/capstone/Capstone.java @@ -10,6 +10,7 @@ import com.sun.jna.ptr.LongByReference; import com.sun.jna.Pointer; import com.sun.jna.ptr.PointerByReference; +import com.sun.jna.ptr.IntByReference; import java.util.List; import java.util.Arrays; @@ -21,24 +22,14 @@ public class Capstone { public int arch; public int mode; - public static abstract class OpInfo { - } - - public static class PrivateOpInfo extends Union { - public X86.UnionOpInfo x86; - public Arm64.UnionOpInfo arm64; - public Arm.UnionOpInfo arm; - public Mips.UnionOpInfo mips; - } + protected static abstract class OpInfo {} + protected static abstract class UnionOpInfo extends Structure {} - public static abstract class UnionOpInfo extends Structure { - } - - static int max(int a, int b, int c, int d) { + protected static int max(int a, int b, int c, int d) { return Math.max(Math.max(Math.max(a,b),c),d); } - public static class _cs_insn extends Structure { + protected static class _cs_insn extends Structure { public int id; public long address; public short size; @@ -48,7 +39,7 @@ public static class _cs_insn extends Structure { public int[] regs_write = new int[32]; public int[] groups = new int[8]; - public _cs_insn(Pointer p) { + public _cs_insn(Pointer p) { mnemonic = new byte[32]; operands = new byte[96]; regs_read = new int[32]; @@ -68,7 +59,6 @@ public static class cs_insn { public OpInfo op_info; public Pointer ptr_origin; public long csh; - public CS cs; public int id; public long address; @@ -79,6 +69,9 @@ public static class cs_insn { public int[] regs_write; public int[] groups; + private CS cs; + private int _size; + public cs_insn (_cs_insn struct, Pointer _ptr_origin, long _csh, CS _cs, OpInfo _op_info) { id = struct.id; address = struct.address; @@ -96,8 +89,6 @@ public cs_insn (_cs_insn struct, Pointer _ptr_origin, long _csh, CS _cs, OpInfo _size = struct.size() + max( Arm.UnionOpInfo.getSize(), Arm64.UnionOpInfo.getSize(), Mips.UnionOpInfo.getSize(), X86.UnionOpInfo.getSize() ); } - private int _size; - protected int size() { return _size; } @@ -109,6 +100,31 @@ public int op_count(int type) { public int op_index(int type, int index) { return cs.cs_op_index(csh, ptr_origin, type, index); } + + public boolean reg_read(int reg_id) { + return cs.cs_reg_read(csh, ptr_origin, reg_id) != 0; + } + + public boolean reg_write(int reg_id) { + return cs.cs_reg_write(csh, ptr_origin, reg_id) != 0; + } + + public int errno() { + return cs.cs_errno(csh); + } + + public String reg_name(int reg_id) { + return cs.cs_reg_name(csh, reg_id); + } + + public String insn_name() { + return cs.cs_insn_name(csh, id); + } + + public boolean group(int gid) { + return cs.cs_insn_group(csh, ptr_origin, gid) != 0; + } + } private cs_insn fromPointer(Pointer pointer) @@ -146,7 +162,7 @@ private cs_insn[] fromArrayPointer(Pointer pointer, int numberResults) for (int i = 0; i < numberResults; i++) { arr[i] = fromPointer(pointer.share(offset)); - offset += arr[i].size(); // TODO: fix this constant, can have JNA calculated but will be 5x slower + offset += arr[i].size(); } return arr; @@ -161,6 +177,13 @@ public long cs_disasm_dyn(long handle, byte[] code, long code_len, public String cs_reg_name(long csh, int id); public int cs_op_count(long csh, Pointer insn, int type); public int cs_op_index(long csh, Pointer insn, int type, int index); + + public String cs_insn_name(long csh, int id); + public byte cs_insn_group(long csh, Pointer insn, int id); + public byte cs_reg_read(long csh, Pointer insn, int id); + public byte cs_reg_write(long csh, Pointer insn, int id); + public void cs_version(IntByReference major, IntByReference minor); + public int cs_errno(long csh); } public static final int CS_ARCH_ARM = 0;