Merge pull request #28 from smeng9/master

Update unicorn version to 1.0.3

README.md

@@ -48,12 +48,12 @@ To build the Unicorn.js library, clone the *master* branch of this repository on
 
 1. Initialize the original Unicorn submodule: `git submodule update --init`.
 
-2. Install the latest [Python 2.x (64-bit)](https://www.python.org/downloads/) and [Emscripten SDK 1.37.x](http://kripken.github.io/emscripten-site/docs/getting_started/downloads.html). Follow the respective instructions and make sure all environment variables are configured correctly.
-    - Note that older versions of the Emscripten SDK, specifically 1.39.15 and earlier, will not run successfully (see issue [#19](https://github.com/AlexAltea/unicorn.js/issues/19#issuecomment-731707398)). You can install a supported version with the command:
-      ```bash
-      ./emsdk install 2.0.7
-      ```
+2. Install latest [Emscripten SDK 2.0.21+](https://emscripten.org/docs/getting_started/downloads.html). Follow the respective instructions and make sure all environment variables are configured correctly.
 
-3. Install the development dependencies with: `npm install`.
+3. Install the latest [Python 3.8+](https://www.python.org/downloads/). Make sure both `python3` and `python` are callable. You can either setup alias or `apt install python-is-python3`
 
-4. Finally, build the source with: `grunt build`.
+3. Install the development dependencies with: `npm install --also=dev`.
+
+4. Install grunt with: `npm install -g grunt`
+
+5. Finally, build the source with: `grunt build`.

build.py

@@ -599,11 +599,13 @@ def compileUnicorn(targets):
     cmd += ' -Os --memory-init-file 0'
     cmd += ' unicorn/libunicorn.a'
     cmd += ' -s EXPORTED_FUNCTIONS=\"[\''+ '\', \''.join(EXPORTED_FUNCTIONS) +'\']\"'
-    cmd += ' -s EXTRA_EXPORTED_RUNTIME_METHODS=\"[\''+ '\', \''.join(methods) +'\']\"'
+    cmd += ' -s EXPORTED_RUNTIME_METHODS=\"[\''+ '\', \''.join(methods) +'\']\"'
     cmd += ' -s RESERVED_FUNCTION_POINTERS=256'
     cmd += ' -s ALLOW_MEMORY_GROWTH=1'
     cmd += ' -s MODULARIZE=1'
-    cmd += ' -s WASM=1'
+    cmd += ' -s WASM_ASYNC_COMPILATION=0'
+    cmd += ' -s WASM=0'
+    cmd += ' -s ENVIRONMENT="web"'
     cmd += ' -s EXPORT_NAME="\'MUnicorn\'"'
     if targets:
         cmd += ' -o src/libunicorn-%s.out.js' % ('-'.join(targets))

src/unicorn-wrapper.js

@@ -4,7 +4,7 @@
  */
 
 // Emscripten demodularize
-MUnicorn().then(function(instance){MUnicorn = instance});
+var MUnicorn = new MUnicorn();
 
 // Number conversion modes
 ELF_INT_NUMBER  = 1
@@ -208,7 +208,7 @@ var uc = {
                     extra_types = ['number'];
                     extra_values = [extra];
                     var callback = (function (handle, user_data) {
-                        return function (_, _) {
+                        return function (_, _2) {
                             user_callback(handle, user_data);
                         }
                     })(this, user_data);
@@ -217,7 +217,7 @@ var uc = {
                 // uc_cb_hookintr_t
                 case uc.HOOK_INTR:
                     var callback = (function (handle, user_data) {
-                        return function (_, intno, _) {
+                        return function (_, intno, _2) {
                             user_callback(handle, intno, user_data);
                         }
                     })(this, user_data);
@@ -227,7 +227,7 @@ var uc = {
                 case uc.HOOK_CODE:
                 case uc.HOOK_BLOCK:
                     var callback = (function (handle, user_data) {
-                        return function (_, addr_lo, addr_hi, size, _) {
+                        return function (_, addr_lo, addr_hi, size, _2) {
                             user_callback(handle, addr_lo, addr_hi, size, user_data);
                         }
                     })(this, user_data);
@@ -240,7 +240,7 @@ var uc = {
                         (type & uc.HOOK_MEM_FETCH) ||
                         (type & uc.HOOK_MEM_READ_AFTER)) {
                         var callback = (function (handle, user_data) {
-                            return function (_, type, addr_lo, addr_hi, size, value_lo, value_hi, _) {
+                            return function (_, type, addr_lo, addr_hi, size, value_lo, value_hi, _2) {
                                 user_callback(handle, type, addr_lo, addr_hi, size, value_lo, value_hi, user_data);
                             }
                         })(this, user_data);
@@ -254,7 +254,7 @@ var uc = {
                         (type & uc.HOOK_MEM_WRITE_PROT) ||
                         (type & uc.HOOK_MEM_FETCH_PROT)) {
                         var callback = (function (handle, user_data) {
-                            return function (_, type, addr_lo, addr_hi, size, value_lo, value_hi, _) {
+                            return function (_, type, addr_lo, addr_hi, size, value_lo, value_hi, _2) {
                                 return user_callback(handle, type, addr_lo, addr_hi, size, value_lo, value_hi, user_data);
                             }
                         })(this, user_data);