thread: Support hardware breakpoints and watchpoints

.github/workflows/ci.yml

@@ -186,6 +186,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
+      - uses: nttld/setup-ndk@v1
+        if: startsWith(matrix.id, 'android-')
+        id: setup-ndk
+        with:
+          ndk-version: r25
+          add-to-path: false
+      - name: Set ANDROID_NDK_ROOT
+        if: startsWith(matrix.id, 'android-')
+        run: echo "ANDROID_NDK_ROOT=${{ steps.setup-ndk.outputs.ndk-path }}" >> $GITHUB_ENV
       - name: Build
         run: |
           ./configure --host=${{ matrix.id }} ${{ env.GUM_OPTIONS }}

bindings/gumjs/gumquickprocess.c

@@ -157,12 +157,14 @@ void
 _gum_quick_process_init (GumQuickProcess * self,
                          JSValue ns,
                          GumQuickModule * module,
+                         GumQuickThread * thread,
                          GumQuickCore * core)
 {
   JSContext * ctx = core->ctx;
   JSValue obj;
 
   self->module = module;
+  self->thread = thread;
   self->core = core;
 
   self->main_module_value = JS_UNINITIALIZED;
@@ -308,31 +310,9 @@ gum_emit_thread (const GumThreadDetails * details,
                  GumQuickMatchContext * mc)
 {
   JSContext * ctx = mc->ctx;
-  GumQuickCore * core = mc->parent->core;
   JSValue thread, result;
 
-  thread = JS_NewObject (ctx);
-
-  JS_DefinePropertyValue (ctx, thread,
-      GUM_QUICK_CORE_ATOM (core, id),
-      JS_NewInt64 (ctx, details->id),
-      JS_PROP_C_W_E);
-  if (details->name != NULL)
-  {
-    JS_DefinePropertyValue (ctx, thread,
-        GUM_QUICK_CORE_ATOM (core, name),
-        JS_NewString (ctx, details->name),
-        JS_PROP_C_W_E);
-  }
-  JS_DefinePropertyValue (ctx, thread,
-      GUM_QUICK_CORE_ATOM (core, state),
-      _gum_quick_thread_state_new (ctx, details->state),
-      JS_PROP_C_W_E);
-  JS_DefinePropertyValue (ctx, thread,
-      GUM_QUICK_CORE_ATOM (core, context),
-      _gum_quick_cpu_context_new (ctx, (GumCpuContext *) &details->cpu_context,
-          GUM_CPU_CONTEXT_READONLY, core, NULL),
-      JS_PROP_C_W_E);
+  thread = _gum_quick_thread_new (ctx, details, mc->parent->thread);
 
   result = JS_Call (ctx, mc->on_match, JS_UNDEFINED, 1, &thread);
 

bindings/gumjs/gumquickprocess.h

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2020-2024 Ole André Vadla Ravnås <[email protected]>
  * Copyright (C) 2023 Francesco Tamagni <[email protected]>
+ * Copyright (C) 2024 Håvard Sørbø <[email protected]>
  *
  * Licence: wxWindows Library Licence, Version 3.1
  */
@@ -10,6 +11,7 @@
 
 #include "gumquickcore.h"
 #include "gumquickmodule.h"
+#include "gumquickthread.h"
 
 G_BEGIN_DECLS
 
@@ -19,6 +21,7 @@ typedef struct _GumQuickExceptionHandler GumQuickExceptionHandler;
 struct _GumQuickProcess
 {
   GumQuickModule * module;
+  GumQuickThread * thread;
   GumQuickCore * core;
 
   JSValue main_module_value;
@@ -30,7 +33,8 @@ struct _GumQuickProcess
 };
 
 G_GNUC_INTERNAL void _gum_quick_process_init (GumQuickProcess * self,
-    JSValue ns, GumQuickModule * module, GumQuickCore * core);
+    JSValue ns, GumQuickModule * module, GumQuickThread * thread,
+    GumQuickCore * core);
 G_GNUC_INTERNAL void _gum_quick_process_flush (GumQuickProcess * self);
 G_GNUC_INTERNAL void _gum_quick_process_dispose (GumQuickProcess * self);
 G_GNUC_INTERNAL void _gum_quick_process_finalize (GumQuickProcess * self);

bindings/gumjs/gumquickscript.c

@@ -62,8 +62,8 @@ struct _GumQuickScript
   GumQuickKernel kernel;
   GumQuickMemory memory;
   GumQuickModule module;
-  GumQuickProcess process;
   GumQuickThread thread;
+  GumQuickProcess process;
   GumQuickFile file;
   GumQuickChecksum checksum;
   GumQuickStream stream;
@@ -478,8 +478,9 @@ gum_quick_script_create_context (GumQuickScript * self,
   _gum_quick_kernel_init (&self->kernel, global_obj, core);
   _gum_quick_memory_init (&self->memory, global_obj, core);
   _gum_quick_module_init (&self->module, global_obj, core);
-  _gum_quick_process_init (&self->process, global_obj, &self->module, core);
   _gum_quick_thread_init (&self->thread, global_obj, core);
+  _gum_quick_process_init (&self->process, global_obj, &self->module,
+      &self->thread, core);
   _gum_quick_file_init (&self->file, global_obj, core);
   _gum_quick_checksum_init (&self->checksum, global_obj, core);
   _gum_quick_stream_init (&self->stream, global_obj, core);
@@ -548,8 +549,8 @@ gum_quick_script_destroy_context (GumQuickScript * self)
     _gum_quick_stream_dispose (&self->stream);
     _gum_quick_checksum_dispose (&self->checksum);
     _gum_quick_file_dispose (&self->file);
-    _gum_quick_thread_dispose (&self->thread);
     _gum_quick_process_dispose (&self->process);
+    _gum_quick_thread_dispose (&self->thread);
     _gum_quick_module_dispose (&self->module);
     _gum_quick_memory_dispose (&self->memory);
     _gum_quick_kernel_dispose (&self->kernel);
@@ -591,8 +592,8 @@ gum_quick_script_destroy_context (GumQuickScript * self)
   _gum_quick_stream_finalize (&self->stream);
   _gum_quick_checksum_finalize (&self->checksum);
   _gum_quick_file_finalize (&self->file);
-  _gum_quick_thread_finalize (&self->thread);
   _gum_quick_process_finalize (&self->process);
+  _gum_quick_thread_finalize (&self->thread);
   _gum_quick_module_finalize (&self->module);
   _gum_quick_memory_finalize (&self->memory);
   _gum_quick_kernel_finalize (&self->kernel);
@@ -1139,9 +1140,9 @@ _gum_quick_script_make_worker (GumQuickScript * self,
     _gum_quick_kernel_init (&worker->kernel, global_obj, core);
     _gum_quick_memory_init (&worker->memory, global_obj, core);
     _gum_quick_module_init (&worker->module, global_obj, core);
-    _gum_quick_process_init (&worker->process, global_obj, &worker->module,
-        core);
     _gum_quick_thread_init (&worker->thread, global_obj, core);
+    _gum_quick_process_init (&worker->process, global_obj, &worker->module,
+        &worker->thread, core);
     _gum_quick_file_init (&worker->file, global_obj, core);
     _gum_quick_checksum_init (&worker->checksum, global_obj, core);
     _gum_quick_stream_init (&worker->stream, global_obj, core);