Merge remote-tracking branch 'upstream/master'

COMPILE.TXT

@@ -43,11 +43,12 @@ Unicorn requires few dependent packages as followings
 
   The other way of customize Unicorn without having to edit config.mk is to
   pass the desired options on the commandline to ./make.sh. Currently,
-  Unicorn supports 3 options, as followings.
+  Unicorn supports 4 options, as followings.
 
   - UNICORN_ARCHS: specify list of architectures to compiled in.
   - UNICORN_STATIC: build static library.
   - UNICORN_SHARED: build dynamic (shared) library.
+  - UNICORN_QEMU_FLAGS: specify extra flags for qemu's configure script
 
   To avoid editing config.mk for these customization, we can pass their values to
   make.sh, as followings.

Makefile

@@ -204,11 +204,11 @@ config:
 qemu/config-host.h-timestamp:
 ifeq ($(UNICORN_DEBUG),yes)
 	cd qemu && \
-	./configure --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)"
+	./configure --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS}
 	printf "$(UNICORN_ARCHS)" > config.log
 else
 	cd qemu && \
-	./configure --disable-debug-info --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)"
+	./configure --disable-debug-info --extra-cflags="$(UNICORN_CFLAGS)" --target-list="$(UNICORN_TARGETS)" ${UNICORN_QEMU_FLAGS}
 	printf "$(UNICORN_ARCHS)" > config.log
 endif
 

regress/Makefile

@@ -1,5 +1,5 @@
 CFLAGS += -I../include
-LDFLAGS = -L.. -lunicorn
+LDFLAGS += ../libunicorn.a $(shell pkg-config --libs glib-2.0) -lpthread -lm
 
 TESTS = map_crash map_write
 TESTS += sigill sigill2
@@ -16,4 +16,7 @@ all: $(TESTS)
 clean:
 	rm -f $(TESTS)
 
+%: %.c
+	$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
+
 .PHONY: all clean

regress/block_test.c

@@ -1,5 +1,6 @@
 #include <sys/types.h>
 #include <stdint.h>
+#include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -13,7 +14,7 @@ static int count = 1;
 // @size: size of machine instruction being executed
 // @user_data: user data passed to tracing APIs.
 void cb_hookblock(ucengine *uc, uint64_t address, uint32_t size, void *user_data) {
-   fprintf(stderr, "# >>> Tracing basic block at 0x%llx, block size = 0x%x\n", address, size);
+   fprintf(stderr, "# >>> Tracing basic block at 0x%"PRIx64", block size = 0x%x\n", address, size);
    if (address != 0x1000000 && address != 0x1000200) {
       fprintf(stderr, "not ok %d - address != 0x1000000 && address != 0x1000200\n", count++);
       _exit(1);

samples/Makefile

@@ -7,7 +7,7 @@ LIBNAME = unicorn
 
 # Find GLIB
 ifndef GLIB
-GLIB = `pkg-config --libs glib-2.0`
+GLIB = $(shell pkg-config --libs glib-2.0)
 endif
 
 UNICORN_DEP_LIBS_STATIC += -lpthread -lm $(GLIB)