bnagy · BenLubar · Jul 31, 2018 · Jul 31, 2018 · Jul 31, 2018
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+*.SPEC eol=lf
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "capstone"]
+	path = capstone
+	url = ../../aquynh/capstone.git
diff --git a/.travis.yml b/.travis.yml
@@ -7,12 +7,9 @@ go:
   - tip
 sudo: false
 before_install:
-  - ./travis_install_capstone_stable.sh
-  - export LIBRARY_PATH=$HOME/capstone/lib
-  - export C_INCLUDE_PATH=$HOME/capstone/include
-  - export LD_LIBRARY_PATH=$HOME/capstone/lib
-  - ./genconst $HOME/src/capstone/bindings/python/capstone
-  - ./genspec $HOME/src/capstone/tests
+  - ./genconst capstone/bindings/python/capstone
+  - make -C capstone
+  - ./genspec capstone/tests
 notifications:
   email:
     recipients:

diff --git a/AArch64BaseInfo.c b/AArch64BaseInfo.c
@@ -0,0 +1 @@
+#include "capstone/arch/AArch64/AArch64BaseInfo.c"
diff --git a/AArch64Disassembler.c b/AArch64Disassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/AArch64/AArch64Disassembler.c"
diff --git a/AArch64InstPrinter.c b/AArch64InstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/AArch64/AArch64InstPrinter.c"
diff --git a/AArch64Mapping.c b/AArch64Mapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/AArch64/AArch64Mapping.c"
diff --git a/AArch64Module.c b/AArch64Module.c
@@ -0,0 +1 @@
+#include "capstone/arch/AArch64/AArch64Module.c"
diff --git a/ARMDisassembler.c b/ARMDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/ARM/ARMDisassembler.c"
diff --git a/ARMInstPrinter.c b/ARMInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/ARM/ARMInstPrinter.c"
diff --git a/ARMMapping.c b/ARMMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/ARM/ARMMapping.c"
diff --git a/ARMModule.c b/ARMModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/ARM/ARMModule.c"
diff --git a/MCInst.c b/MCInst.c
@@ -0,0 +1 @@
+#include "capstone/MCInst.c"
diff --git a/MCInstrDesc.c b/MCInstrDesc.c
@@ -0,0 +1 @@
+#include "capstone/MCInstrDesc.c"
diff --git a/MCRegisterInfo.c b/MCRegisterInfo.c
@@ -0,0 +1 @@
+#include "capstone/MCRegisterInfo.c"
diff --git a/MipsDisassembler.c b/MipsDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/Mips/MipsDisassembler.c"
diff --git a/MipsInstPrinter.c b/MipsInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/Mips/MipsInstPrinter.c"
diff --git a/MipsMapping.c b/MipsMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/Mips/MipsMapping.c"
diff --git a/MipsModule.c b/MipsModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/Mips/MipsModule.c"
diff --git a/PPCDisassembler.c b/PPCDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/PowerPC/PPCDisassembler.c"
diff --git a/PPCInstPrinter.c b/PPCInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/PowerPC/PPCInstPrinter.c"
diff --git a/PPCMapping.c b/PPCMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/PowerPC/PPCMapping.c"
diff --git a/PPCModule.c b/PPCModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/PowerPC/PPCModule.c"
diff --git a/README.md b/README.md
@@ -47,10 +47,7 @@ Further information is available at http://www.capstone-engine.org
 To install:
 ----
 
-First install the capstone library from either https://github.com/aquynh/capstone
-or http://www.capstone-engine.org
-
-Then, assuming you have set up your Go environment according to the docs, just:
+Assuming you have set up your Go environment according to the docs, just:
 ```bash
 go get -u github.com/bnagy/gapstone
 ```

diff --git a/SStream.c b/SStream.c
@@ -0,0 +1 @@
+#include "capstone/SStream.c"
diff --git a/SparcDisassembler.c b/SparcDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/Sparc/SparcDisassembler.c"
diff --git a/SparcInstPrinter.c b/SparcInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/Sparc/SparcInstPrinter.c"
diff --git a/SparcMapping.c b/SparcMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/Sparc/SparcMapping.c"
diff --git a/SparcModule.c b/SparcModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/Sparc/SparcModule.c"
diff --git a/SystemZDisassembler.c b/SystemZDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/SystemZ/SystemZDisassembler.c"
diff --git a/SystemZInstPrinter.c b/SystemZInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/SystemZ/SystemZInstPrinter.c"
diff --git a/SystemZMCTargetDesc.c b/SystemZMCTargetDesc.c
@@ -0,0 +1 @@
+#include "capstone/arch/SystemZ/SystemZMCTargetDesc.c"
diff --git a/SystemZMapping.c b/SystemZMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/SystemZ/SystemZMapping.c"
diff --git a/SystemZModule.c b/SystemZModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/SystemZ/SystemZModule.c"
diff --git a/X86ATTInstPrinter.c b/X86ATTInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86ATTInstPrinter.c"
diff --git a/X86Disassembler.c b/X86Disassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86Disassembler.c"
diff --git a/X86DisassemblerDecoder.c b/X86DisassemblerDecoder.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86DisassemblerDecoder.c"
diff --git a/X86IntelInstPrinter.c b/X86IntelInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86IntelInstPrinter.c"
diff --git a/X86Mapping.c b/X86Mapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86Mapping.c"
diff --git a/X86Module.c b/X86Module.c
@@ -0,0 +1 @@
+#include "capstone/arch/X86/X86Module.c"
diff --git a/XCoreDisassembler.c b/XCoreDisassembler.c
@@ -0,0 +1 @@
+#include "capstone/arch/XCore/XCoreDisassembler.c"
diff --git a/XCoreInstPrinter.c b/XCoreInstPrinter.c
@@ -0,0 +1 @@
+#include "capstone/arch/XCore/XCoreInstPrinter.c"
diff --git a/XCoreMapping.c b/XCoreMapping.c
@@ -0,0 +1 @@
+#include "capstone/arch/XCore/XCoreMapping.c"
diff --git a/XCoreModule.c b/XCoreModule.c
@@ -0,0 +1 @@
+#include "capstone/arch/XCore/XCoreModule.c"
diff --git a/arm64_constants.go b/arm64_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/arm64_decomposer.go b/arm64_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/arm_constants.go b/arm_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/arm_decomposer.go b/arm_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/capstone b/capstone
diff --git a/cs.c b/cs.c
@@ -0,0 +1 @@
+#include "capstone/cs.c"
diff --git a/engine.go b/engine.go
@@ -10,9 +10,8 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
+// #cgo CPPFLAGS: -DCAPSTONE_USE_SYS_DYN_MEM -I${SRCDIR}/include -I${SRCDIR}/include/capstone -DCAPSTONE_HAS_ARM -DCAPSTONE_HAS_ARM64 -DCAPSTONE_HAS_MIPS -DCAPSTONE_HAS_POWERPC -DCAPSTONE_HAS_X86 -DCAPSTONE_HAS_SPARC -DCAPSTONE_HAS_SYSZ -DCAPSTONE_HAS_XCORE
+// #cgo windows CPPFLAGS: -D__CRT__NO_INLINE
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 // extern size_t trampoline(uint8_t *buffer, size_t buflen, size_t offset, void *user_data);

diff --git a/engine_constants.go b/engine_constants.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/genconst b/genconst
@@ -26,9 +26,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/genspec b/genspec
@@ -11,16 +11,16 @@ end
 stub = ARGV[0].chomp('/')
 
 commands = [
-	"#{stub}/test > $GOPATH/src/github.com/bnagy/gapstone/test.SPEC",
-	"#{stub}/test_detail > $GOPATH/src/github.com/bnagy/gapstone/test_detail.SPEC",
-	"#{stub}/test_arm > $GOPATH/src/github.com/bnagy/gapstone/arm.SPEC",
-	"#{stub}/test_arm64 > $GOPATH/src/github.com/bnagy/gapstone/arm64.SPEC",
-	"#{stub}/test_x86 > $GOPATH/src/github.com/bnagy/gapstone/x86.SPEC",
-	"#{stub}/test_mips > $GOPATH/src/github.com/bnagy/gapstone/mips.SPEC",
-	"#{stub}/test_ppc > $GOPATH/src/github.com/bnagy/gapstone/ppc.SPEC",
-	"#{stub}/test_systemz > $GOPATH/src/github.com/bnagy/gapstone/sysZ.SPEC",
-	"#{stub}/test_sparc > $GOPATH/src/github.com/bnagy/gapstone/sparc.SPEC",
-	"#{stub}/test_xcore > $GOPATH/src/github.com/bnagy/gapstone/xcore.SPEC"
+	"#{stub}/test.static > $GOPATH/src/github.com/bnagy/gapstone/test.SPEC",
+	"#{stub}/test_detail.static > $GOPATH/src/github.com/bnagy/gapstone/test_detail.SPEC",
+	"#{stub}/test_arm.static > $GOPATH/src/github.com/bnagy/gapstone/arm.SPEC",
+	"#{stub}/test_arm64.static > $GOPATH/src/github.com/bnagy/gapstone/arm64.SPEC",
+	"#{stub}/test_x86.static > $GOPATH/src/github.com/bnagy/gapstone/x86.SPEC",
+	"#{stub}/test_mips.static > $GOPATH/src/github.com/bnagy/gapstone/mips.SPEC",
+	"#{stub}/test_ppc.static > $GOPATH/src/github.com/bnagy/gapstone/ppc.SPEC",
+	"#{stub}/test_systemz.static > $GOPATH/src/github.com/bnagy/gapstone/sysZ.SPEC",
+	"#{stub}/test_sparc.static > $GOPATH/src/github.com/bnagy/gapstone/sparc.SPEC",
+	"#{stub}/test_xcore.static > $GOPATH/src/github.com/bnagy/gapstone/xcore.SPEC"
 ]
 
 commands.each {|c|

diff --git a/include/capstone b/include/capstone
@@ -0,0 +1 @@
+../capstone/include
diff --git a/mips_constants.go b/mips_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/mips_decomposer.go b/mips_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/ppc_constants.go b/ppc_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/ppc_decomposer.go b/ppc_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/sparc_constants.go b/sparc_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/sparc_decomposer.go b/sparc_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/sysz_constants.go b/sysz_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/sysz_decomposer.go b/sysz_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/test_detail.SPEC b/test_detail.SPEC
@@ -54,7 +54,7 @@ Disasm:
 0x1000:	bl		#0xfbc // insn-ID: 13, insn-mnem: bl
 	Implicit registers read: pc 
 	Implicit registers modified: lr 
-	This instruction belongs to groups: arm jump 
+	This instruction belongs to groups: jump arm 
 0x1004:	str		lr, [sp, #-4]! // insn-ID: 212, insn-mnem: str
 	This instruction belongs to groups: arm 
 0x1008:	andeq		r0, r0, r0 // insn-ID: 8, insn-mnem: and

diff --git a/trampoline.go b/trampoline.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/travis_install_capstone_stable.sh b/travis_install_capstone_stable.sh
diff --git a/utils.c b/utils.c
@@ -0,0 +1 @@
+#include "capstone/utils.c"
diff --git a/x86_constants.go b/x86_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/x86_decomposer.go b/x86_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/xcore_constants.go b/xcore_constants.go
@@ -15,9 +15,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"

diff --git a/xcore_decomposer.go b/xcore_decomposer.go
@@ -10,9 +10,6 @@ try reading the *_test.go files.
 
 package gapstone
 
-// #cgo LDFLAGS: -lcapstone
-// #cgo freebsd CFLAGS: -I/usr/local/include
-// #cgo freebsd LDFLAGS: -L/usr/local/lib
 // #include <stdlib.h>
 // #include <capstone/capstone.h>
 import "C"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/AArch64/AArch64BaseInfo.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/AArch64/AArch64Disassembler.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/AArch64/AArch64InstPrinter.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/AArch64/AArch64Mapping.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/Mips/MipsDisassembler.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/Mips/MipsInstPrinter.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/PowerPC/PPCDisassembler.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/PowerPC/PPCInstPrinter.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/Sparc/SparcDisassembler.c"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#include "capstone/arch/Sparc/SparcInstPrinter.c"