From 795a241dd36313cde96dd6424e398d5aa6566da7 Mon Sep 17 00:00:00 2001 From: Grazfather Date: Fri, 25 Nov 2016 18:59:52 -0800 Subject: [PATCH 01/11] Add ARM bx crash regress test case --- tests/regress/arm_bx_unmapped.py | 93 ++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 tests/regress/arm_bx_unmapped.py diff --git a/tests/regress/arm_bx_unmapped.py b/tests/regress/arm_bx_unmapped.py new file mode 100644 index 00000000..e18d3459 --- /dev/null +++ b/tests/regress/arm_bx_unmapped.py @@ -0,0 +1,93 @@ +from __future__ import print_function +from unicorn import * +from unicorn.arm_const import * +import regress + +# code to be emulated +''' +ins = { + 0x00008cd4: """ + push {r11} + add r11, sp, #0 + mov r3, pc + mov r0, r3 + sub sp, r11, #0 + pop {r11} + bx lr + """, + 0x00008cf0: """ + push {r11} + add r11, sp, #0 + push {r6} + add r6, pc, $1 + bx r6 + .code 16 + mov r3, pc + add r3, $0x4 + push {r3} + pop {pc} + .code 32 + pop {r6} + mov r0, r3 + sub sp, r11, #0 + pop {r11} + bx lr + """, + 0x00008d20: """ + push {r11} + add r11, sp, #0 + mov r3, lr + mov r0, r3 + sub sp, r11, #0 + pop {r11} + bx lr + """, + 0x00008d68: "bl 0x8cd4\n" + "mov r4, r0\n" + "bl 0x8cf0\n" + "mov r3, r0\n" + "add r4, r4, r3\n" + "bl 0x8d20\n" + "mov r3, r0\n" + "add r2, r4, r3", +} +''' + +class BxTwiceTest(regress.RegressTest): + def runTest(self): + ADDRESS = 0x8000 + MAIN_ADDRESS = 0x8d68 + STACK_ADDR = ADDRESS + 0x1000 + + code = { + 0x8cf0: '\x04\xb0-\xe5\x00\xb0\x8d\xe2\x04`-\xe5\x01`\x8f\xe2\x16\xff/\xe1{F\x03\xf1\x04\x03\x08\xb4\x00\xbd\x00\x00\x04`\x9d\xe4\x03\x00\xa0\xe1\x00\xd0K\xe2\x04\xb0\x9d\xe4\x1e\xff/\xe1', + 0x8d20: '\x04\xb0-\xe5\x00\xb0\x8d\xe2\x0e0\xa0\xe1\x03\x00\xa0\xe1\x00\xd0K\xe2\x04\xb0\x9d\xe4\x1e\xff/\xe1', + 0x8cd4: '\x04\xb0-\xe5\x00\xb0\x8d\xe2\x0f0\xa0\xe1\x03\x00\xa0\xe1\x00\xd0K\xe2\x04\xb0\x9d\xe4\x1e\xff/\xe1', + 0x8d68: '\xd9\xff\xff\xeb\x00@\xa0\xe1\xde\xff\xff\xeb\x000\xa0\xe1\x03@\x84\xe0\xe7\xff\xff\xeb\x000\xa0\xe1\x03 \x84\xe0' + } + + try: + mu = Uc(UC_ARCH_ARM, UC_MODE_ARM) + # map 2MB memory for this emulation + mu.mem_map(ADDRESS, 2 * 1024 * 1024) + + # write machine code to be emulated to memory + for addr, c in code.items(): + print("Writing chunk to 0x{:x}".format(addr)) + mu.mem_write(addr, c) + + # initialize machine registers + mu.reg_write(UC_ARM_REG_SP, STACK_ADDR) + + print("Starting emulation") + + # emulate code in infinite time & unlimited instructions + mu.emu_start(MAIN_ADDRESS, MAIN_ADDRESS + len(code[MAIN_ADDRESS])) + + print("Emulation done") + + r2 = mu.reg_read(UC_ARM_REG_R2) + print(">>> r2: 0x{:08x}".format(r2)) + + except UcError as e: + self.fail("ERROR: %s" % e) From f6908e2c62b558f472694cd98683638f62773aeb Mon Sep 17 00:00:00 2001 From: ant1 Date: Sat, 17 Dec 2016 07:25:06 +0000 Subject: [PATCH 02/11] Do not prepend DESTDIR twice when installing unicorn.pc on FreeBSD --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b71de9ed..9ce4ad25 100644 --- a/Makefile +++ b/Makefile @@ -183,9 +183,9 @@ LIBDATADIR ?= $(LIBDIR) ifndef USE_GENERIC_LIBDATADIR ifeq ($(UNAME_S), FreeBSD) -LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata +LIBDATADIR = $(PREFIX)/libdata else ifeq ($(UNAME_S), DragonFly) -LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata +LIBDATADIR = $(PREFIX)/libdata endif endif From 934fa2c90f0c49ae209f697d44d681ddbcdea2d1 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 17:29:25 +0800 Subject: [PATCH 03/11] remove qemu/util/qemu-timer-common.c --- qemu/util/Makefile.objs | 2 +- qemu/util/qemu-timer-common.c | 61 ----------------------------------- 2 files changed, 1 insertion(+), 62 deletions(-) delete mode 100644 qemu/util/qemu-timer-common.c diff --git a/qemu/util/Makefile.objs b/qemu/util/Makefile.objs index 9f4021b9..0c9866f5 100644 --- a/qemu/util/Makefile.objs +++ b/qemu/util/Makefile.objs @@ -1,4 +1,4 @@ -util-obj-y = cutils.o unicode.o qemu-timer-common.o +util-obj-y = cutils.o unicode.o util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o util-obj-y += module.o diff --git a/qemu/util/qemu-timer-common.c b/qemu/util/qemu-timer-common.c deleted file mode 100644 index 95e0847c..00000000 --- a/qemu/util/qemu-timer-common.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * QEMU System Emulator - * - * Copyright (c) 2003-2008 Fabrice Bellard - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#include "qemu/timer.h" - -/***********************************************************/ -/* real time host monotonic timer */ - -#ifdef _WIN32 - -int64_t clock_freq; - -static void __attribute__((constructor)) init_get_clock(void) -{ - LARGE_INTEGER freq; - int ret; - ret = QueryPerformanceFrequency(&freq); - if (ret == 0) { - fprintf(stderr, "Could not calibrate ticks\n"); - exit(1); - } - clock_freq = freq.QuadPart; -} - -#else - -int use_rt_clock; - -static void __attribute__((constructor)) init_get_clock(void) -{ - use_rt_clock = 0; -#ifdef CLOCK_MONOTONIC - { - struct timespec ts; - if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) { - use_rt_clock = 1; - } - } -#endif -} -#endif From b680ee11f82029703d86951321db2d96d7058f3c Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 20:30:46 +0800 Subject: [PATCH 04/11] Revert "remove qemu/util/qemu-timer-common.c" This reverts commit 934fa2c90f0c49ae209f697d44d681ddbcdea2d1. --- qemu/util/Makefile.objs | 2 +- qemu/util/qemu-timer-common.c | 61 +++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 qemu/util/qemu-timer-common.c diff --git a/qemu/util/Makefile.objs b/qemu/util/Makefile.objs index 0c9866f5..9f4021b9 100644 --- a/qemu/util/Makefile.objs +++ b/qemu/util/Makefile.objs @@ -1,4 +1,4 @@ -util-obj-y = cutils.o unicode.o +util-obj-y = cutils.o unicode.o qemu-timer-common.o util-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o util-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o util-obj-y += module.o diff --git a/qemu/util/qemu-timer-common.c b/qemu/util/qemu-timer-common.c new file mode 100644 index 00000000..95e0847c --- /dev/null +++ b/qemu/util/qemu-timer-common.c @@ -0,0 +1,61 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "qemu/timer.h" + +/***********************************************************/ +/* real time host monotonic timer */ + +#ifdef _WIN32 + +int64_t clock_freq; + +static void __attribute__((constructor)) init_get_clock(void) +{ + LARGE_INTEGER freq; + int ret; + ret = QueryPerformanceFrequency(&freq); + if (ret == 0) { + fprintf(stderr, "Could not calibrate ticks\n"); + exit(1); + } + clock_freq = freq.QuadPart; +} + +#else + +int use_rt_clock; + +static void __attribute__((constructor)) init_get_clock(void) +{ + use_rt_clock = 0; +#ifdef CLOCK_MONOTONIC + { + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) { + use_rt_clock = 1; + } + } +#endif +} +#endif From 87d7c1be4bd70e031bc95484762d555a4b997647 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 22:01:50 +0800 Subject: [PATCH 05/11] docs: remove glib dependency --- docs/COMPILE-NIX.md | 28 +++++----------------------- docs/COMPILE-WINDOWS.md | 23 ++++------------------- 2 files changed, 9 insertions(+), 42 deletions(-) diff --git a/docs/COMPILE-NIX.md b/docs/COMPILE-NIX.md index 6853908d..90637744 100644 --- a/docs/COMPILE-NIX.md +++ b/docs/COMPILE-NIX.md @@ -8,24 +8,10 @@ To compile for Microsoft Windows, see [COMPILE-WINDOWS.md](COMPILE-WINDOWS.md) [0] Dependencies -Unicorn requires few dependent packages as follows. - -- For Mac OS X, "pkg-config" and "glib" are needed. - Brew users can install "pkg-config" and "glib" with: - - $ brew install pkg-config glib - - NOTE: to build Unicorn universal binaries (which support both 32-bit & - 64-bit), you need to have glib in universal format. To do that, build & - install glib with: - - $ brew install glib --universal - -- For Linux, "glib2-dev" is needed. - Ubuntu/Debian users can install this with: - - $ sudo apt-get install libglib2.0-dev +For MacOS, Unicorn requires "pkg-config" package. +Brew users can install this with: + $ brew install pkg-config [1] Tailor Unicorn to your need. @@ -75,12 +61,8 @@ To build Unicorn on *nix (such as MacOSX, Linux, *BSD, Solaris): $ UNICORN_QEMU_FLAGS="--python=/path/to/python2" ./make.sh -- To cross-compile Unicorn on 64-bit Linux to target 32-bit binary, install - libglib2.0-dev for i386. On Ubuntu, this can be done with: - - $ sudo apt-get install libglib2.0-dev:i386 - - Then cross-compile to 32-bit with: +- To cross-compile Unicorn on 64-bit Linux to target 32-bit binary, + cross-compile to 32-bit with: $ ./make.sh linux32 diff --git a/docs/COMPILE-WINDOWS.md b/docs/COMPILE-WINDOWS.md index 8bdcec15..96c65c45 100644 --- a/docs/COMPILE-WINDOWS.md +++ b/docs/COMPILE-WINDOWS.md @@ -7,9 +7,8 @@ To compile for Linux, Mac OS X and Unix-based OS, see [COMPILE-NIX.md](COMPILE-N [0] Dependencies -For Windows, cross-compile requires Mingw. Mingw-glib2 is needed. -At the moment, it is confirmed that Unicorn can be compiled either on Ubuntu -or Windows. +For Windows, cross-compile requires Mingw. At the moment, it is confirmed that +Unicorn can be compiled either on Ubuntu or Windows. - On Ubuntu 14.04 64-bit, do: @@ -17,14 +16,6 @@ or Windows. https://launchpad.net/~greg-hellings/+archive/ubuntu/mingw-libs/+build/2924251 - - To cross-compile for Windows 32-bit, install Mingw with (ignore all the warnings): - - $ sudo dpkg -i --force-depends mingw64-x86-glib2_2.31.0_all.deb - - To cross-compile for Windows 64-bit, install Mingw with: - - $ sudo dpkg -i --force-depends mingw64-x64-glib2_2.31.0_all.deb - - On Windows, install MinGW via package MSYS2 at https://msys2.github.io/ @@ -43,7 +34,6 @@ or Windows. $ pacman -S python2 $ pacman -S make $ pacman -S pkg-config - $ pacman -S mingw-w64-i686-glib2 $ pacman -S mingw-w64-i686-toolchain - To compile for Windows 64-bit, run: @@ -51,15 +41,14 @@ or Windows. $ pacman -S python2 $ pacman -S make $ pacman -S pkg-config - $ pacman -S mingw-w64-x86_64-glib2 $ pacman -S mingw-w64-x86_64-toolchain - For Cygwin, "make", "gcc-core", "pkg-config", "libpcre-devel", "zlib-devel" - and "libglib2.0-devel" are needed. + are needed. If apt-cyg is available, you can install these with: - $ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel libglib2.0-devel + $ apt-cyg install make gcc-core pkg-config libpcre-devel zlib-devel @@ -111,7 +100,6 @@ To run sample_x86.exe on Windows 32-bit, you need the following files: unicorn.dll %MSYS2%\mingw32\bin\libgcc_s_dw2-1.dll - %MSYS2%\mingw32\bin\libglib-2.0-0.dll %MSYS2%\mingw32\bin\libiconv-2.dll %MSYS2%\mingw32\bin\libintl-8.dll %MSYS2%\mingw32\bin\libpcre-1.dll @@ -121,7 +109,6 @@ To run sample_x86.exe on Windows 64-bit, you need the following files: unicorn.dll %MSYS2%\mingw64\bin\libgcc_s_seh-1.dll - %MSYS2%\mingw64\bin\libglib-2.0-0.dll %MSYS2%\mingw64\bin\libiconv-2.dll %MSYS2%\mingw64\bin\libintl-8.dll %MSYS2%\mingw64\bin\libpcre-1.dll @@ -171,14 +158,12 @@ be used on Windows machine. To run sample_x86.exe on Windows 32-bit, you need the following files: unicorn.dll - /usr/i686-w64-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll /usr/lib/gcc/i686-w64-mingw32/4.8/libgcc_s_sjlj-1.dll /usr/i686-w64-mingw32/lib/libwinpthread-1.dll To run sample_x86.exe on Windows 64-bit, you need the following files: unicorn.dll - /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libglib-2.0-0.dll /usr/lib/gcc/x86_64-w64-mingw32/4.8/libgcc_s_sjlj-1.dll /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll From c42e118832c23781b3f287887459d9829147fb9a Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 22:07:38 +0800 Subject: [PATCH 06/11] on MacOS, compile in Universal format by default --- Makefile | 3 +++ make.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index d86e4937..46300981 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,9 @@ UNICORN_CFLAGS += -fPIC # Verbose output? V ?= 0 +# on MacOS, compile in Universal format by default +MACOS_UNIVERSAL ?= yes + ifeq ($(UNICORN_DEBUG),yes) CFLAGS += -g else diff --git a/make.sh b/make.sh index ed6706ea..967c983e 100755 --- a/make.sh +++ b/make.sh @@ -102,6 +102,7 @@ case "$1" in "install" ) install;; "uninstall" ) uninstall;; "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE};; + "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};; "cross-win32" ) build_cross i686-w64-mingw32;; "cross-win64" ) build_cross x86_64-w64-mingw32;; "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};; From 04e2e7e84513df3a4556a8264582f8eb1e451585 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 22:18:33 +0800 Subject: [PATCH 07/11] glib_compat.c: code style --- qemu/glib_compat.c | 147 ++++++++++++++++++++++++++++++--------------- 1 file changed, 98 insertions(+), 49 deletions(-) diff --git a/qemu/glib_compat.c b/qemu/glib_compat.c index dc9ea04d..1e761443 100644 --- a/qemu/glib_compat.c +++ b/qemu/glib_compat.c @@ -65,7 +65,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. This may be marginally better than what glib does in their direct_hash but someone with some chops in this space should fix if it needs improving */ -uint32_t g_direct_hash(const void *v) { +uint32_t g_direct_hash(const void *v) +{ #ifdef __HAVE_64_BIT_PTRS uint64_t hash = (uint64_t)v; hash = (hash >> 4) | (hash << 60); @@ -78,7 +79,8 @@ uint32_t g_direct_hash(const void *v) { #endif } -int g_direct_equal(const void *v1, const void *v2) { +int g_direct_equal(const void *v1, const void *v2) +{ return v1 == v2; } @@ -86,7 +88,8 @@ int g_direct_equal(const void *v1, const void *v2) { djb2+ string hashing see: http://www.cse.yorku.ca/~oz/hash.html */ -uint32_t g_str_hash(const void *v) { +uint32_t g_str_hash(const void *v) +{ const char *s = (const char*)v; uint32_t hash = 5381; while (*s) { @@ -96,7 +99,8 @@ uint32_t g_str_hash(const void *v) { return hash; } -int g_str_equal(const void *v1, const void *v2) { +int g_str_equal(const void *v1, const void *v2) +{ return strcmp((const char*)v1, (const char*)v2) == 0; } @@ -104,7 +108,8 @@ int g_str_equal(const void *v1, const void *v2) { Bob Jenkins integer hash algorithm see: http://burtleburtle.net/bob/hash/integer.html */ -uint32_t g_int_hash(const void *v) { +uint32_t g_int_hash(const void *v) +{ uint32_t hash = *(const uint32_t*)v; hash = (hash + 0x7ed55d16) + (hash << 12); hash = (hash ^ 0xc761c23c) ^ (hash >> 19); @@ -115,26 +120,30 @@ uint32_t g_int_hash(const void *v) { return hash; } -int g_int_equal(const void *v1, const void *v2) { +int g_int_equal(const void *v1, const void *v2) +{ return *(const int*)v1 == *(const int*)v2; } /* Doubly-linked list */ -GList *g_list_first(GList *list) { +GList *g_list_first(GList *list) +{ if (list == NULL) return NULL; while (list->prev) list = list->prev; return list; } -void g_list_foreach(GList *list, list_func func, void* user_data) { +void g_list_foreach(GList *list, list_func func, void* user_data) +{ GList *lp; for (lp = list; lp; lp = lp->next) { (*func)(lp->data, user_data); } } -void g_list_free(GList *list) { +void g_list_free(GList *list) +{ GList *lp, *next, *prev = NULL; if (list) prev = list->prev; for (lp = list; lp; lp = next) { @@ -147,7 +156,8 @@ void g_list_free(GList *list) { } } -GList *g_list_insert_sorted(GList *list, void* data, compare_func compare) { +GList *g_list_insert_sorted(GList *list, void* data, compare_func compare) +{ GList *i; GList *n = (GList*)g_malloc(sizeof(GList)); n->data = data; @@ -170,7 +180,8 @@ GList *g_list_insert_sorted(GList *list, void* data, compare_func compare) { return list; } -GList *g_list_prepend(GList *list, void* data) { +GList *g_list_prepend(GList *list, void* data) +{ GList *n = (GList*)g_malloc(sizeof(GList)); n->next = list; n->prev = NULL; @@ -178,14 +189,16 @@ GList *g_list_prepend(GList *list, void* data) { return n; } -GList *g_list_remove_link(GList *list, GList *llink) { +GList *g_list_remove_link(GList *list, GList *llink) +{ if (llink == list) list = list->next; if (llink->prev) llink->prev->next = llink->next; if (llink->next) llink->next->prev = llink->prev; return list; } -GList *g_list_sort(GList *list, compare_func compare) { +GList *g_list_sort(GList *list, compare_func compare) +{ GList *i, *it, *j; /* base case for singletons or empty lists */ if (list == NULL || list->next == NULL) return list; @@ -235,7 +248,8 @@ GList *g_list_sort(GList *list, compare_func compare) { /* Singly-linked list */ -GSList *g_slist_append(GSList *list, void* data) { +GSList *g_slist_append(GSList *list, void* data) +{ GSList *head = list; if (list) { while (list->next) list = list->next; @@ -250,14 +264,16 @@ GSList *g_slist_append(GSList *list, void* data) { return head; } -void g_slist_foreach(GSList *list, list_func func, void* user_data) { +void g_slist_foreach(GSList *list, list_func func, void* user_data) +{ GSList *lp; for (lp = list; lp; lp = lp->next) { (*func)(lp->data, user_data); } } -void g_slist_free(GSList *list) { +void g_slist_free(GSList *list) +{ GSList *lp, *next; for (lp = list; lp; lp = next) { next = lp->next; @@ -265,7 +281,8 @@ void g_slist_free(GSList *list) { } } -void g_slist_free_full(GSList *list, GDestroyNotify free_func) { +void g_slist_free_full(GSList *list, GDestroyNotify free_func) +{ GSList *lp, *next; for (lp = list; lp; lp = next) { next = lp->next; @@ -274,14 +291,16 @@ void g_slist_free_full(GSList *list, GDestroyNotify free_func) { } } -GSList *g_slist_prepend(GSList *list, void* data) { +GSList *g_slist_prepend(GSList *list, void* data) +{ GSList *head = (GSList*)g_malloc(sizeof(GSList)); head->next = list; head->data = data; return head; } -GSList *g_slist_sort(GSList *list, compare_func compare) { +GSList *g_slist_sort(GSList *list, compare_func compare) +{ GSList *i, *it, *j; /* base case for singletons or empty lists */ if (list == NULL || list->next == NULL) return list; @@ -326,7 +345,8 @@ GSList *g_slist_sort(GSList *list, compare_func compare) { return list; } -GSList *g_slist_find_custom(GSList *list, const void *data, compare_func func) { +GSList *g_slist_find_custom(GSList *list, const void *data, compare_func func) +{ GSList *lp; for (lp = list; lp; lp = lp->next) { if ((*func)(lp->data, data) == 0) return lp; @@ -334,7 +354,8 @@ GSList *g_slist_find_custom(GSList *list, const void *data, compare_func func) { return NULL; } -GSList *g_slist_remove(GSList *list, const void *data) { +GSList *g_slist_remove(GSList *list, const void *data) +{ GSList *lp, *prev = NULL; for (lp = list; lp; lp = lp->next) { if (lp->data == data) { @@ -373,13 +394,15 @@ typedef struct _GHashTable { GSList **buckets; } GHashTable; -void g_hash_table_destroy(GHashTable *hash_table) { +void g_hash_table_destroy(GHashTable *hash_table) +{ if (hash_table == NULL) return; g_hash_table_remove_all(hash_table); g_hash_table_unref(hash_table); } -void* g_hash_table_find(GHashTable *hash_table, GHRFunc predicate, void* user_data) { +void* g_hash_table_find(GHashTable *hash_table, GHRFunc predicate, void* user_data) +{ if (hash_table == NULL) return NULL; int i; for (i = 0; i < hash_table->size; i++) { @@ -392,7 +415,8 @@ void* g_hash_table_find(GHashTable *hash_table, GHRFunc predicate, void* user_da return NULL; } -void g_hash_table_foreach(GHashTable *hash_table, GHFunc func, void* user_data) { +void g_hash_table_foreach(GHashTable *hash_table, GHFunc func, void* user_data) +{ if (hash_table == NULL) return; int i; for (i = 0; i < hash_table->size; i++) { @@ -404,7 +428,8 @@ void g_hash_table_foreach(GHashTable *hash_table, GHFunc func, void* user_data) } } -int g_hash_table_insert(GHashTable *hash_table, void* key, void* value) { +int g_hash_table_insert(GHashTable *hash_table, void* key, void* value) +{ if (hash_table == NULL) return 1; GSList *lp; uint32_t hash = (*hash_table->hash_func)(key); @@ -428,7 +453,8 @@ int g_hash_table_insert(GHashTable *hash_table, void* key, void* value) { return 1; } -void* g_hash_table_lookup(GHashTable *hash_table, const void* key) { +void* g_hash_table_lookup(GHashTable *hash_table, const void* key) +{ if (hash_table == NULL) return NULL; GSList *lp; uint32_t hash = (*hash_table->hash_func)(key); @@ -443,12 +469,14 @@ void* g_hash_table_lookup(GHashTable *hash_table, const void* key) { return NULL; } -GHashTable *g_hash_table_new(GHashFunc hash_func, GEqualFunc key_equal_func) { +GHashTable *g_hash_table_new(GHashFunc hash_func, GEqualFunc key_equal_func) +{ return g_hash_table_new_full(hash_func, key_equal_func, NULL, NULL); } GHashTable *g_hash_table_new_full(GHashFunc hash_func, GEqualFunc key_equal_func, - GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func) { + GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func) +{ GHashTable *ht = (GHashTable*)g_malloc(sizeof(GHashTable)); ht->hash_func = hash_func ? hash_func : g_direct_hash; ht->key_equal_func = key_equal_func; @@ -461,7 +489,8 @@ GHashTable *g_hash_table_new_full(GHashFunc hash_func, GEqualFunc key_equal_func return ht; } -void g_hash_table_remove_all(GHashTable *hash_table) { +void g_hash_table_remove_all(GHashTable *hash_table) +{ if (hash_table == NULL) return; int i; for (i = 0; i < hash_table->size; i++) { @@ -478,7 +507,8 @@ void g_hash_table_remove_all(GHashTable *hash_table) { hash_table->num_entries = 0; } -int g_hash_table_remove(GHashTable *hash_table, const void* key) { +int g_hash_table_remove(GHashTable *hash_table, const void* key) +{ GSList *lp, *prev = NULL; if (hash_table == NULL) return 0; uint32_t hash = (*hash_table->hash_func)(key); @@ -504,7 +534,8 @@ int g_hash_table_remove(GHashTable *hash_table, const void* key) { return 0; } -void g_hash_table_unref(GHashTable *hash_table) { +void g_hash_table_unref(GHashTable *hash_table) +{ if (hash_table == NULL) return; hash_table->refcount--; if (hash_table->refcount == 0) { @@ -513,13 +544,15 @@ void g_hash_table_unref(GHashTable *hash_table) { } } -GHashTable *g_hash_table_ref(GHashTable *hash_table) { +GHashTable *g_hash_table_ref(GHashTable *hash_table) +{ if (hash_table == NULL) return NULL; hash_table->refcount++; return hash_table; } -uint32_t g_hash_table_size(GHashTable *hash_table) { +uint32_t g_hash_table_size(GHashTable *hash_table) +{ return hash_table ? hash_table->num_entries : 0; } @@ -528,27 +561,31 @@ uint32_t g_hash_table_size(GHashTable *hash_table) { /* general g_XXX substitutes */ -void *g_malloc(size_t size) { +void *g_malloc(size_t size) +{ if (size == 0) return NULL; void *res = malloc(size); if (res == NULL) exit(1); return res; } -void *g_malloc0(size_t size) { +void *g_malloc0(size_t size) +{ if (size == 0) return NULL; void *res = calloc(size, 1); if (res == NULL) exit(1); return res; } -void *g_try_malloc0(size_t size) { +void *g_try_malloc0(size_t size) +{ if (size == 0) return NULL; void *res = calloc(size, 1); return res; } -void *g_realloc(void *ptr, size_t size) { +void *g_realloc(void *ptr, size_t size) +{ if (size == 0) { free(ptr); return NULL; @@ -558,11 +595,13 @@ void *g_realloc(void *ptr, size_t size) { return res; } -char *g_strdup(const char *str) { +char *g_strdup(const char *str) +{ return str ? strdup(str) : NULL; } -char *g_strdup_printf(const char *format, ...) { +char *g_strdup_printf(const char *format, ...) +{ va_list ap; char *res; va_start(ap, format); @@ -571,20 +610,23 @@ char *g_strdup_printf(const char *format, ...) { return res; } -char *g_strdup_vprintf(const char *format, va_list ap) { +char *g_strdup_vprintf(const char *format, va_list ap) +{ char *str_res = NULL; vasprintf(&str_res, format, ap); return str_res; } -char *g_strndup(const char *str, size_t n) { +char *g_strndup(const char *str, size_t n) +{ /* try to mimic glib's g_strndup */ char *res = calloc(n + 1, 1); strncpy(res, str, n); return res; } -void g_strfreev(char **str_array) { +void g_strfreev(char **str_array) +{ char **p = str_array; if (p) { while (*p) { @@ -594,7 +636,8 @@ void g_strfreev(char **str_array) { free(str_array); } -void *g_memdup(const void *mem, size_t byte_size) { +void *g_memdup(const void *mem, size_t byte_size) +{ if (mem) { void *res = g_malloc(byte_size); memcpy(res, mem, byte_size); @@ -603,25 +646,29 @@ void *g_memdup(const void *mem, size_t byte_size) { return NULL; } -void *g_new_(size_t sz, size_t n_structs) { +void *g_new_(size_t sz, size_t n_structs) +{ size_t need = sz * n_structs; if ((need / sz) != n_structs) return NULL; return g_malloc(need); } -void *g_new0_(size_t sz, size_t n_structs) { +void *g_new0_(size_t sz, size_t n_structs) +{ size_t need = sz * n_structs; if ((need / sz) != n_structs) return NULL; return g_malloc0(need); } -void *g_renew_(size_t sz, void *mem, size_t n_structs) { +void *g_renew_(size_t sz, void *mem, size_t n_structs) +{ size_t need = sz * n_structs; if ((need / sz) != n_structs) return NULL; return g_realloc(mem, need); } -char *g_strconcat (const char *string1, ...) { +char *g_strconcat (const char *string1, ...) +{ va_list ap; char *res; size_t sz = strlen(string1); @@ -644,7 +691,8 @@ char *g_strconcat (const char *string1, ...) { return res; } -char **g_strsplit(const char *string, const char *delimiter, int max_tokens) { +char **g_strsplit(const char *string, const char *delimiter, int max_tokens) +{ char **res; if (string == NULL || *string == 0) { res = (char**)g_malloc(sizeof(char*)); @@ -686,7 +734,8 @@ char **g_strsplit(const char *string, const char *delimiter, int max_tokens) { #include -char *g_win32_error_message(int error) { +char *g_win32_error_message(int error) +{ char *msg; char *winMsg = NULL; if (error == 0) { From 7665310daafa15836e47c9c0b7cf005698162c5d Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 23:50:21 +0800 Subject: [PATCH 08/11] samples: add -lrt for clock_gettime(), as suggested by Stephen --- samples/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/Makefile b/samples/Makefile index da49f5a4..dc212cd5 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -13,8 +13,8 @@ AR_EXT = a V ?= 0 CFLAGS += -Wall -Werror -I../include -LDFLAGS += -L$(LIBDIR) -lunicorn -lpthread -lm -LDLIBS += -lpthread -lunicorn -lm +LDFLAGS += -L$(LIBDIR) -lunicorn -lpthread -lm -lrt +LDLIBS += -lpthread -lunicorn -lm -lrt ifneq ($(CROSS),) CC = $(CROSS)gcc From 5e217a2490ef6bb49c6994d93e6684962eaf12ff Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Mon, 19 Dec 2016 23:51:59 +0800 Subject: [PATCH 09/11] fix samples/Makefile --- samples/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/Makefile b/samples/Makefile index dc212cd5..0ddc4eb8 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -13,7 +13,7 @@ AR_EXT = a V ?= 0 CFLAGS += -Wall -Werror -I../include -LDFLAGS += -L$(LIBDIR) -lunicorn -lpthread -lm -lrt +LDFLAGS += -L$(LIBDIR) -lunicorn -lpthread -lm LDLIBS += -lpthread -lunicorn -lm -lrt ifneq ($(CROSS),) From 16bbe4fb88659f646739cf754e280928f6f9b06b Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 20 Dec 2016 00:19:13 +0800 Subject: [PATCH 10/11] do not redefine GHashTable --- qemu/glib_compat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/glib_compat.c b/qemu/glib_compat.c index 1e761443..1930ce56 100644 --- a/qemu/glib_compat.c +++ b/qemu/glib_compat.c @@ -383,7 +383,7 @@ typedef struct _KeyValue { void *value; } KeyValue; -typedef struct _GHashTable { +struct _GHashTable { GHashFunc hash_func; GEqualFunc key_equal_func; GDestroyNotify key_destroy_func; @@ -392,7 +392,7 @@ typedef struct _GHashTable { uint32_t size; uint32_t num_entries; GSList **buckets; -} GHashTable; +}; void g_hash_table_destroy(GHashTable *hash_table) { From bd1632e60ce668d15184c94bbbe33cd2b640d255 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Tue, 20 Dec 2016 00:21:02 +0800 Subject: [PATCH 11/11] fix an warning 'control may reach end of non-void function' --- qemu/target-arm/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/qemu/target-arm/cpu.h b/qemu/target-arm/cpu.h index 92f05e02..aa16f7d5 100644 --- a/qemu/target-arm/cpu.h +++ b/qemu/target-arm/cpu.h @@ -1285,6 +1285,7 @@ static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx) return !(env->daif & PSTATE_I); default: g_assert_not_reached(); + return false; } }