jump dis - seemingly working(!)

1 files changed, 27 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 7ec6e53..d97b130 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,20 @@ override CC := $(CC) $(CFLAGS)
 override CXX := $(CXX) $(CFLAGS) -fno-exceptions -fno-asynchronous-unwind-tables
 
 IMAON2 := /Users/comex/c/imaon2
-GEN_JS := node $(IMAON2)/tables/gen.js
+GEN_JS := node --harmony --harmony_arrow_functions $(IMAON2)/tables/gen.js
 
 all: \
+	generateds \
 	out/libsubstitute.dylib
 
-$(shell mkdir -p out)
-
-HEADERS := lib/*.h \
-	generated/transform-dis-arm.inc.h
+$(shell mkdir -p out generated)
 
+HEADERS := lib/*.h
+GENERATED := generated/generic-dis-arm.inc.h generated/generic-dis-thumb.inc.h generated/generic-dis-thumb2.inc.h generated/generic-dis-arm64.inc.h
 define do_prefix
-generated/transform-dis-$(1).inc.h: generated Makefile
+generated/generic-dis-$(1).inc.h: Makefile
 	$(GEN_JS) --gen-hook-disassembler $(2) --dis-pattern='P(XXX)' $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
-all: generated/transform-dis-$(1).inc.h
-#generated/jump-dis-$(1).inc.h: generated Makefile
-#	$(GEN_JS) --gen-hook-jump-disassembler $(2) -p jump_dis_$(1)_ $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
-#all: generated/jump-dis-$(1).inc.h
-HEADERS := $$(HEADERS) generated/transform-dis-$(1).inc.h
+generateds: generated/generic-dis-$(1).inc.h
 endef
 $(eval $(call do_prefix,thumb2,-n _thumb2,ARM))
 $(eval $(call do_prefix,thumb,-n _thumb,ARM))
@@ -32,35 +28,42 @@ $(eval $(call do_prefix,arm64,,AArch64))
 
 out/%.o: lib/%.c Makefile $(HEADERS)
 	$(CC) -fvisibility=hidden -std=c11 -c -o $@ $<
+out/jump-dis-arm-multi.o: generated/generic-dis-arm.inc.h generated/generic-dis-thumb.inc.h generated/generic-dis-thumb2.inc.h
 
-LIB_OBJS := out/find-syms.o out/substrate-compat.o
+LIB_OBJS := \
+	out/find-syms.o \
+	out/substrate-compat.o \
+	out/jump-dis-arm-multi.o
 out/libsubstitute.dylib: $(LIB_OBJS)
 	$(CC) -dynamiclib -fvisibility=hidden -o $@ $(LIB_OBJS)
 
 define define_test
-out/test-$(1): test/test-$(2).c* $(HEADERS) Makefile out/libsubstitute.dylib
+out/test-$(1): test/test-$(2).c* $(HEADERS) $(GENERATED) Makefile out/libsubstitute.dylib
 	$(3) -o $$@ $$< -Ilib -Isubstrate -Lout -lsubstitute
 all: out/test-$(1)
 endef
-$(eval $(call define_test,tdarm-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm.inc.h"'))
-$(eval $(call define_test,tdthumb-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb.inc.h"'))
-$(eval $(call define_test,tdthumb2-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb2.inc.h"'))
-$(eval $(call define_test,tdarm64-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm64.inc.h"'))
+$(eval $(call define_test,tdarm-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm.inc.h"' -Dxdis=dis_arm))
+$(eval $(call define_test,tdthumb-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb.inc.h"' -Dxdis=dis_thumb))
+$(eval $(call define_test,tdthumb2-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb2.inc.h"' -Dxdis=dis_thumb2))
+$(eval $(call define_test,tdarm64-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm64.inc.h"' -Dxdis=dis))
 $(eval $(call define_test,dis,dis,$(CC) -std=c11))
 $(eval $(call define_test,find-syms,find-syms,$(CC) -std=c89))
 $(eval $(call define_test,find-syms-cpp,find-syms,$(CXX) -x c++ -std=c++98))
 $(eval $(call define_test,substrate,substrate,$(CXX) -std=c++98))
+$(eval $(call define_test,jump-dis,jump-dis,$(CC) -std=c11))
 
-out/arm-insns.o: test/arm-insns.S Makefile
+out/insns-arm.o: test/insns-arm.S Makefile
 	clang -arch armv7 -c -o $@ $<
-out/thumb2-insns.o: test/arm-insns.S Makefile
+out/insns-thumb2.o: test/insns-arm.S Makefile
 	clang -arch armv7 -DTHUMB2 -c -o $@ $<
-out/%-insns.bin: out/%-insns.o Makefile
-	segedit -extract __TEXT __text $@ $<
 
-generated: Makefile
-	rm -rf generated
-	mkdir generated
+out/insns-libz-arm.o: test/insns-libz-arm.S Makefile
+	clang -arch armv7 -c -o $@ $<
+out/insns-libz-thumb2.o: test/insns-libz-arm.S Makefile
+	clang -arch armv7 -c -o $@ $< -DTHUMB2
+
+out/insns-%.bin: out/insns-%.o Makefile
+	segedit -extract __TEXT __text $@ $<
 
 clean:
 	rm -rf out