Backport patches from r2dec and fix bug when calling pddi (#61)

Author: wargio

c/jsdec.c

@@ -199,6 +199,7 @@ jsdec_t *jsdec_new() {
 	JS_AddIntrinsicTypedArrays(ctx);
 	JS_AddIntrinsicPromise(ctx);
 	JS_AddIntrinsicBigInt(ctx);
+	JS_AddIntrinsicDate(ctx);
 
 
 	// Setup global objects.

js/libdec/arch/arm.js

@@ -917,6 +917,11 @@ var _arm = {
         cmp: _compare,
         cmn: _compare,
         fcmp: _compare,
+        ccmp: function(instr, context) {
+            context.cond.a = instr.parsed.opd[0];
+            context.cond.b = instr.parsed.opd[1];
+            return _conditional(instr, context, instr.parsed.opd[3].toUpperCase());
+        },
         cbz: function(instr, context, instructions) {
             context.cond.a = instr.parsed.opd[0];
             context.cond.b = '0';
@@ -1356,6 +1361,17 @@ var _arm = {
             }
             return Base.conditional_assign(opds[0], context.cond.a, context.cond.b, cond, '1', '0');
         },
+        cneg: function(instr, context) {
+            var opds = instr.parsed.opd;
+            var cond = 'EQ';
+            for (var i = 0; i < _conditional_list.length; i++) {
+                if (_conditional_list[i].ext == opds[1]) {
+                    cond = _conditional_list[i].type;
+                    break;
+                }
+            }
+            return Base.conditional_assign(opds[0], context.cond.a, context.cond.b, cond, '-' + opds[1], opds[0]);
+        },
         fcset: function(instr, context) {
             var opds = instr.parsed.opd;
             var cond = 'EQ';

js/libdec/rzutil.js

@@ -79,7 +79,7 @@ export default (function() {
 		var functions = rz_sanitize(rzpipe.string('aflj'), '[]');
 		var classes = rz_sanitize(rzpipe.string('icj'), '[]');
 		var data = JSONex.stringify(rizin.graph());
-		var farguments = rz_sanitize(rzpipe.string('afvj', true), '{"sp":[],"bp":[],"reg":[]}');
+		var farguments = rz_sanitize(rzpipe.string('afvlj', true), '{"stack":[],"reg":[]}');
 		var arch = rz_sanitize(rzpipe.string('e asm.arch'), '');
 		var archbits = rz_sanitize(rzpipe.string('e asm.bits'), '32');
 		var database = rz_sanitize(rzpipe.custom('afsj @@i', null, merge_arrays), '[]');
@@ -216,11 +216,13 @@ export default (function() {
 				strings: (isfast ? [] : rzpipe.json('Cslj', [])),
 				functions: (isfast ? [] : rzpipe.json('aflj', [])),
 				classes: rzpipe.json('icj', []),
-				arguments: rzpipe.json('afvj', {
+				arguments: rzpipe.json('afvlj', {
 					"stack": [],
 					"reg": []
 				})
 			};
+			this.xrefs.arguments.stack = this.xrefs.arguments.stack || [];
+			this.xrefs.arguments.reg = this.xrefs.arguments.reg || [];
 			this.graph = rizin.graph();
 			this.argdb = rzpipe.custom('afsj @@i', null, merge_arrays_json);
 		},

js/libdec/testsuite.js

@@ -52,7 +52,7 @@ function _new_data(issue) {
         // to override this is required to be converted to just an integer.
         bits = parseInt(bits.toString());
     }
-    return {
+    var testdata = {
         arch: issue.arch,
         bits: bits,
         graph: issue.agj ? _fixup_old_graph(issue.agj) : (issue.graph || []),
@@ -68,6 +68,9 @@ function _new_data(issue) {
         },
         argdb: issue.afcfj
     };
+    testdata.xrefs.arguments.stack = testdata.xrefs.arguments.stack || [];
+    testdata.xrefs.arguments.reg = testdata.xrefs.arguments.reg || [];
+    return testdata;
 }
 
 export default function(filename) {

meson.build

@@ -11,19 +11,17 @@ project('jsdec', 'c', meson_version: '>=0.56.0',
 
 cc = meson.get_compiler('c')
 
-libquickjs_proj = subproject('libquickjs', default_options: ['default_library=static'])
-libquickjs_dep = libquickjs_proj.get_variable('quickjs_dep')
-qjsc = libquickjs_proj.get_variable('qjsc')
-
 jsdec_incs = ['.', 'c']
 jsdec_c_args = []
 jsdec_src = [
     'c' / 'jsdec.c',
     'c' / 'base64.c',
 ]
-jsdec_deps = [
-  libquickjs_dep.as_link_whole(),
-]
+
+libquickjs_proj = subproject('libquickjs', default_options: ['default_library=static'])
+libquickjs_dep = libquickjs_proj.get_variable('quickjs_dep')
+
+jsdec_deps = [ libquickjs_dep ]
 
 modjs_gen = executable('modjs_gen', 'tools' / 'modjs_gen.c',
   dependencies: [],
@@ -32,8 +30,25 @@ modjs_gen = executable('modjs_gen', 'tools' / 'modjs_gen.c',
   install: false,
 )
 
+qjsc = executable('qjsc', 'tools' / 'qjsc_mod.c',
+  dependencies: libquickjs_dep,
+  c_args: ['-D_GNU_SOURCE=1'],
+  include_directories: [],
+  implicit_include_directories: false,
+  install: false,
+)
+
 subdir('js')
 
+jsdec_link_args = []
+foreach flag: [
+    '-Wl,--exclude-libs,ALL',
+  ]
+  if cc.has_link_argument(flag)
+    jsdec_link_args += flag
+  endif
+endforeach
+
 build_type = get_option('build_type')
 if build_type == 'standalone'
   jsdec_src += [
@@ -45,6 +60,8 @@ if build_type == 'standalone'
   jsdec_standalone = executable('jsdec-standalone', jsdec_src,
     c_args : jsdec_c_args,
     dependencies: jsdec_deps,
+    link_args: jsdec_link_args,
+    gnu_symbol_visibility: 'hidden',
     include_directories: include_directories(jsdec_incs),
     implicit_include_directories: false,
     install: false,
@@ -66,6 +83,8 @@ elif build_type == 'cutter'
     c_args : jsdec_c_args,
     dependencies: jsdec_deps,
     include_directories: include_directories(jsdec_incs),
+    link_args: jsdec_link_args,
+    gnu_symbol_visibility: 'hidden',
     implicit_include_directories: false,
     install: false,
   )
@@ -103,6 +122,8 @@ elif build_type == 'rizin'
     c_args : jsdec_c_args,
     dependencies: jsdec_deps,
     include_directories: include_directories(jsdec_incs),
+    link_args: jsdec_link_args,
+    gnu_symbol_visibility: 'hidden',
     implicit_include_directories: false,
     install: true,
     install_dir: rizin_plugdir

subprojects/libquickjs.wrap

@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/quickjs-ng/quickjs.git
-revision = v0.6.1
+revision = v0.8.0
 directory = libquickjs
 patch_directory = libquickjs
 depth = 1

subprojects/packagefiles/libquickjs/meson.build

@@ -1,5 +1,5 @@
 project('quickjs-ng', 'c',
-  version: 'v0.6.1',
+  version: 'v0.8.0',
   default_options: [
     'buildtype=release',
     'b_vscrt=from_buildtype',
@@ -11,13 +11,10 @@ project('quickjs-ng', 'c',
 cc = meson.get_compiler('c')
 
 threads_dep = dependency('threads')
+atomic_dep = cc.find_library('atomic', required: false)
 dl_dep = cc.find_library('dl', required: false)
 m_dep = cc.find_library('m', required: false)
 
-headers = [
-  'quickjs.h',
-]
-
 sources = [
   'cutils.c',
   'libbf.c',
@@ -28,6 +25,7 @@ sources = [
 
 compiler_flags = [
   '-fvisibility=hidden',
+  '-fvisibility-inlines-hidden',
   '-Wno-implicit-fallthrough',
   '-Wno-sign-compare',
   '-Wno-missing-field-initializers',
@@ -40,59 +38,51 @@ compiler_flags = [
 ]
 
 if cc.get_id() == 'msvc'
-  compiler_flags += '-Wno-unsafe-buffer-usage'
-  compiler_flags += '-Wno-sign-conversion'
-  compiler_flags += '-Wno-nonportable-system-include-path'
-  compiler_flags += '-Wno-implicit-int-conversion'
-  compiler_flags += '-Wno-shorten-64-to-32'
-  compiler_flags += '-Wno-reserved-macro-identifier'
-  compiler_flags += '-Wno-reserved-identifier'
-  compiler_flags += '-Wdeprecated-declarations'
-  compiler_flags += '/experimental:c11atomics'
-  compiler_flags += '/wd4018' # -Wno-sign-conversion
-  compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
-  compiler_flags += '/wd4100' # -Wno-unused-parameter
-  compiler_flags += '/wd4200' # -Wno-zero-length-array
-  compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
-  compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
-  compiler_flags += '/wd4245' # -Wno-sign-compare
-  compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
-  compiler_flags += '/wd4388' # -Wno-sign-compare
-  compiler_flags += '/wd4389' # -Wno-sign-compare
-  compiler_flags += '/wd4710' # Function not inlined
-  compiler_flags += '/wd4711' # Function was inlined
-  compiler_flags += '/wd4820' # Padding added after construct
-  compiler_flags += '/wd4996' # -Wdeprecated-declarations
-  compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
+    compiler_flags += '-Wno-unsafe-buffer-usage'
+    compiler_flags += '-Wno-sign-conversion'
+    compiler_flags += '-Wno-nonportable-system-include-path'
+    compiler_flags += '-Wno-implicit-int-conversion'
+    compiler_flags += '-Wno-shorten-64-to-32'
+    compiler_flags += '-Wno-reserved-macro-identifier'
+    compiler_flags += '-Wno-reserved-identifier'
+    compiler_flags += '-Wdeprecated-declarations'
+    compiler_flags += '/experimental:c11atomics'
+    compiler_flags += '/wd4018' # -Wno-sign-conversion
+    compiler_flags += '/wd4061' # -Wno-implicit-fallthrough
+    compiler_flags += '/wd4100' # -Wno-unused-parameter
+    compiler_flags += '/wd4200' # -Wno-zero-length-array
+    compiler_flags += '/wd4242' # -Wno-shorten-64-to-32
+    compiler_flags += '/wd4244' # -Wno-shorten-64-to-32
+    compiler_flags += '/wd4245' # -Wno-sign-compare
+    compiler_flags += '/wd4267' # -Wno-shorten-64-to-32
+    compiler_flags += '/wd4388' # -Wno-sign-compare
+    compiler_flags += '/wd4389' # -Wno-sign-compare
+    compiler_flags += '/wd4710' # Function not inlined
+    compiler_flags += '/wd4711' # Function was inlined
+    compiler_flags += '/wd4820' # Padding added after construct
+    compiler_flags += '/wd4996' # -Wdeprecated-declarations
+    compiler_flags += '/wd5045' # Compiler will insert Spectre mitigation for memory load if /Qspectre switch specified
 endif
 
 # required on linux, but ignored by windows
-add_project_arguments('-D_GNU_SOURCE=1', language: 'c')
+quickjs_c_args = ['-D_GNU_SOURCE=1']
 
 foreach flag: compiler_flags
   if cc.has_argument(flag)
-    add_project_arguments(flag, language: 'c')
+    quickjs_c_args += flag
   endif
 endforeach
 
 quickjs = static_library('quickjs', sources,
-  dependencies: [threads_dep, dl_dep, m_dep],
+  dependencies: [atomic_dep, threads_dep, dl_dep, m_dep],
+  c_args: quickjs_c_args,
+  pic: true,
+  gnu_symbol_visibility: 'hidden',
   implicit_include_directories: false,
-  install: false,
+  install: false
 )
 
 quickjs_dep = declare_dependency(
   link_with: quickjs,
   include_directories: include_directories('.'),
 )
-
-qjsc_sources = [
-  'qjsc.c',
-]
-
-qjsc = executable('qjsc', qjsc_sources,
-  dependencies: quickjs_dep,
-  include_directories: include_directories('.'),
-  implicit_include_directories: false,
-  install: false,
-)