From 23e477caa76a0fd56e61419c9c3cee84a7881438 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 11 Oct 2022 18:15:51 +0100
Subject: Updates following FRIDA API changes

---
 frida_mode/src/js/js.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'frida_mode/src/js')

diff --git a/frida_mode/src/js/js.c b/frida_mode/src/js/js.c
index 6bc31864..52b88d96 100644
--- a/frida_mode/src/js/js.c
+++ b/frida_mode/src/js/js.c
@@ -18,14 +18,10 @@ static GumScriptScheduler *scheduler;
 static GMainContext       *context;
 static GMainLoop          *main_loop;
 
-static void js_msg(GumScript *script, const gchar *message, GBytes *data,
-                   gpointer user_data) {
-
-  UNUSED_PARAMETER(script);
+static void js_msg(const gchar *message, GBytes *data, gpointer user_data) {
   UNUSED_PARAMETER(data);
   UNUSED_PARAMETER(user_data);
   FOKF("%s", message);
-
 }
 
 void js_config(void) {
@@ -124,8 +120,8 @@ void js_start(void) {
   main_loop = g_main_loop_new(context, true);
   g_main_context_push_thread_default(context);
 
-  gum_script_backend_create(backend, "example", source, cancellable, create_cb,
-                            &error);
+  gum_script_backend_create(backend, "example", source, NULL, cancellable,
+                            create_cb, &error);
 
   while (g_main_context_pending(context))
     g_main_context_iteration(context, FALSE);
-- 
cgit v1.2.3


From 7461c52278ff3a96ebc4d71d369d3a8b24fd19b1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Tue, 11 Oct 2022 18:15:51 +0100
Subject: Fixes for x64

---
 frida_mode/src/js/js.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'frida_mode/src/js')

diff --git a/frida_mode/src/js/js.c b/frida_mode/src/js/js.c
index 52b88d96..25187694 100644
--- a/frida_mode/src/js/js.c
+++ b/frida_mode/src/js/js.c
@@ -19,9 +19,11 @@ static GMainContext       *context;
 static GMainLoop          *main_loop;
 
 static void js_msg(const gchar *message, GBytes *data, gpointer user_data) {
+
   UNUSED_PARAMETER(data);
   UNUSED_PARAMETER(user_data);
   FOKF("%s", message);
+
 }
 
 void js_config(void) {
-- 
cgit v1.2.3


From 0d55feb11db1f79ee92db5f44ed04277388c933d Mon Sep 17 00:00:00 2001
From: Your <you@example.com>
Date: Tue, 31 Jan 2023 06:49:32 +0000
Subject: Add support for disabling branch suppression

---
 frida_mode/src/js/api.js   | 7 +++++++
 frida_mode/src/js/js_api.c | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'frida_mode/src/js')

diff --git a/frida_mode/src/js/api.js b/frida_mode/src/js/api.js
index fce7a5d7..f9ea1ffb 100644
--- a/frida_mode/src/js/api.js
+++ b/frida_mode/src/js/api.js
@@ -170,6 +170,12 @@ class Afl {
     static setInstrumentSeed(seed) {
         Afl.jsApiSetInstrumentSeed(seed);
     }
+    /*
+     * See `AFL_FRIDA_INST_NO_SUPPRESS`
+     */
+    static setInstrumentSuppressDisable() {
+        Afl.jsApiSetInstrumentSuppressDisable();
+    }
     /**
      * See `AFL_FRIDA_INST_TRACE_UNIQUE`.
      */
@@ -339,6 +345,7 @@ Afl.jsApiSetInstrumentLibraries = Afl.jsApiGetFunction("js_api_set_instrument_li
 Afl.jsApiSetInstrumentNoOptimize = Afl.jsApiGetFunction("js_api_set_instrument_no_optimize", "void", []);
 Afl.jsApiSetInstrumentRegsFile = Afl.jsApiGetFunction("js_api_set_instrument_regs_file", "void", ["pointer"]);
 Afl.jsApiSetInstrumentSeed = Afl.jsApiGetFunction("js_api_set_instrument_seed", "void", ["uint64"]);
+Afl.jsApiSetInstrumentSuppressDisable = Afl.jsApiGetFunction("js_api_set_instrument_suppress_disable", "void", []);
 Afl.jsApiSetInstrumentTrace = Afl.jsApiGetFunction("js_api_set_instrument_trace", "void", []);
 Afl.jsApiSetInstrumentTraceUnique = Afl.jsApiGetFunction("js_api_set_instrument_trace_unique", "void", []);
 Afl.jsApiSetInstrumentUnstableCoverageFile = Afl.jsApiGetFunction("js_api_set_instrument_unstable_coverage_file", "void", ["pointer"]);
diff --git a/frida_mode/src/js/js_api.c b/frida_mode/src/js/js_api.c
index 01bba4ff..2e996c1c 100644
--- a/frida_mode/src/js/js_api.c
+++ b/frida_mode/src/js/js_api.c
@@ -289,6 +289,13 @@ __attribute__((visibility("default"))) void js_api_set_instrument_cache_size(
 
 }
 
+__attribute__((visibility("default"))) void
+js_api_set_instrument_suppress_disable(void) {
+
+  instrument_suppress = false;
+
+}
+
 __attribute__((visibility("default"))) void js_api_set_js_main_hook(
     const js_main_hook_t hook) {
 
-- 
cgit v1.2.3