Skip to content

Commit 4a3ca4a

Browse files
radareradare
committed
Import the zydis subproject - not yet used
1 parent 3bb1121 commit 4a3ca4a

File tree

9 files changed

+65
-1
lines changed

9 files changed

+65
-1
lines changed

‎subprojects/Makefile‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.PHONY: default all clean
22

3-
DEPS=sdb qjs
3+
DEPS=sdb qjs zydis
44

55
ifeq ($(WANT_V35),1)
66
DEPS += binaryninja
@@ -23,4 +23,20 @@ all: $(ALL)
2323
clean:
2424
rm -rf $(ALL)
2525

26+
ifeq(1,1)
2627
include *.mk
28+
else
29+
include sdb.mk
30+
ifeq ($(WANT_V35),1)
31+
include binaryninja.mk
32+
endif
33+
ifeq ($(USE_CS4),1)
34+
include capstone-v4.mk
35+
else ifeq ($(USE_CSNEXT),1)
36+
include capstone-next.mk
37+
else
38+
include capstone-v5.mk
39+
endif
40+
include qjs.mk
41+
include zydis.mk
42+
endif

‎subprojects/binaryninja.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ WRAP_wrap_git_directory:=binaryninja
66
WRAP_wrap_git_patch_directory:=binaryninja
77
WRAP_wrap_git_depth:=1
88

9+
<<<<<<< HEAD
910
.PHONY: binaryninja_clean binaryninja_all
11+
=======
12+
.PHONY: binaryninja binaryninja_clean binaryninja_all
13+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
1014

1115
binaryninja:
1216
if [ ! -d "binaryninja" -o "c40a5f04deec68d388b2072dc42b29141089f9ce" != "$(shell cd binaryninja 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "binaryninja"; ${MAKE} binaryninja_all; fi

‎subprojects/capstone-next.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-next
77
WRAP_wrap_git_diff_files:=capstone-next/capstone-patches/fix-x86-16.patch
88
WRAP_wrap_git_depth:=1
99

10+
<<<<<<< HEAD
1011
.PHONY: capstone-next_clean capstone-next_all
12+
=======
13+
.PHONY: capstone-next capstone-next_clean capstone-next_all
14+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
1115

1216
capstone-next:
1317
if [ ! -d "capstone-next" -o "ccbc41d3dadb2953deed9e050abfae146876288d" != "$(shell cd capstone-next 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-next"; ${MAKE} capstone-next_all; fi

‎subprojects/capstone-v4.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-v4
77
WRAP_wrap_git_diff_files:=capstone-v4/capstone-patches/v4/capstone-calloc.patch,capstone-v4/capstone-patches/v4/fix-x86-16.patch,capstone-v4/capstone-patches/v4/sparc-crash.patch,capstone-v4/capstone-patches/v4/sstream-null.patch
88
WRAP_wrap_git_depth:=1
99

10+
<<<<<<< HEAD
1011
.PHONY: capstone-v4_clean capstone-v4_all
12+
=======
13+
.PHONY: capstone-v4 capstone-v4_clean capstone-v4_all
14+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
1115

1216
capstone-v4:
1317
if [ ! -d "capstone-v4" -o "d7e459d026b19d6c3a7b743bfc475d919ff03f74" != "$(shell cd capstone-v4 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v4"; ${MAKE} capstone-v4_all; fi

‎subprojects/capstone-v5.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ WRAP_wrap_git_directory:=capstone-v5
77
WRAP_wrap_git_diff_files:=capstone-v5/capstone-patches/fix-x86-16.patch
88
WRAP_wrap_git_depth:=1
99

10+
<<<<<<< HEAD
1011
.PHONY: capstone-v5_clean capstone-v5_all
12+
=======
13+
.PHONY: capstone-v5 capstone-v5_clean capstone-v5_all
14+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
1115

1216
capstone-v5:
1317
if [ ! -d "capstone-v5" -o "accf4df62f1fba6f92cae692985d27063552601c" != "$(shell cd capstone-v5 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "capstone-v5"; ${MAKE} capstone-v5_all; fi

‎subprojects/qjs.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ WRAP_wrap_git_directory:=qjs
66
WRAP_wrap_git_patch_directory:=qjs
77
WRAP_wrap_git_depth:=1
88

9+
<<<<<<< HEAD
910
.PHONY: qjs_clean qjs_all
11+
=======
12+
.PHONY: qjs qjs_clean qjs_all
13+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
1014

1115
qjs:
1216
if [ ! -d "qjs" -o "7238ee64dbc2fbdea044555cda8cda78785a93ed" != "$(shell cd qjs 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "qjs"; ${MAKE} qjs_all; fi

‎subprojects/sdb.mk‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ WRAP_wrap_git_revision:=2.2.0
55
WRAP_wrap_git_directory:=sdb
66
WRAP_wrap_git_depth:=1
77

8+
<<<<<<< HEAD
89
.PHONY: sdb_clean sdb_all
10+
=======
11+
.PHONY: sdb sdb_clean sdb_all
12+
>>>>>>> bce843e5af (Import the zydis subproject - not yet used)
913

1014
sdb:
1115
if [ ! -d "sdb" -o "2.2.0" != "$(shell cd sdb 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "sdb"; ${MAKE} sdb_all; fi

‎subprojects/zydis.mk‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This file is autogenerated by acr-wrap
2+
3+
WRAP_wrap_git_url:=https://github.com/zyantific/zydis.git
4+
WRAP_wrap_git_revision:=v4.1.1
5+
WRAP_wrap_git_directory:=zydis
6+
WRAP_wrap_git_depth:=1
7+
8+
.PHONY: zydis zydis_clean zydis_all
9+
10+
zydis:
11+
if [ ! -d "zydis" -o "v4.1.1" != "$(shell cd zydis 2>/dev/null && git rev-parse HEAD)" ]; then rm -rf "zydis"; ${MAKE} zydis_all; fi
12+
13+
zydis_all:
14+
git clone --no-checkout --depth=1 https://github.com/zyantific/zydis.git zydis
15+
cd zydis && git fetch --depth=1 origin v4.1.1
16+
cd zydis && git checkout FETCH_HEAD
17+
18+
zydis_clean:
19+
rm -rf zydis

‎subprojects/zydis.wrap‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[wrap-git]
2+
url = https://github.com/zyantific/zydis.git
3+
revision = v4.1.1
4+
directory = zydis
5+
depth = 1

0 commit comments

Comments
 (0)