Drop support for running without GObject

The footprint savings are so small it's not really worth the added complexity and reduced code readability.
frida · Jan 8, 2025 · 51f8f93 · 51f8f93
1 parent f947acd
commit 51f8f93
Show file tree

Hide file tree

Showing 84 changed files with 142 additions and 634 deletions.
diff --git a/gum/arch-arm/gumarmbacktracer.c b/gum/arch-arm/gumarmbacktracer.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumarmbacktracer.h"
 
 #include "guminterceptor.h"
@@ -211,5 +209,3 @@ gum_arm_backtracer_generate (GumBacktracer * backtracer,
 
   return_addresses->len = i;
 }
-
-#endif
diff --git a/gum/arch-arm/gumarmbacktracer.h b/gum/arch-arm/gumarmbacktracer.h
@@ -12,8 +12,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_ARM_BACKTRACER (gum_arm_backtracer_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumArmBacktracer, gum_arm_backtracer, GUM,
-                        ARM_BACKTRACER, GObject)
+G_DECLARE_FINAL_TYPE (GumArmBacktracer, gum_arm_backtracer, GUM, ARM_BACKTRACER,
+                      GObject)
 
 GUM_API GumBacktracer * gum_arm_backtracer_new (void);
 

diff --git a/gum/arch-arm64/gumarm64backtracer.c b/gum/arch-arm64/gumarm64backtracer.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumarm64backtracer.h"
 
 #include "guminterceptor.h"
@@ -221,5 +219,3 @@ gum_strip_item (gsize address)
   return address;
 #endif
 }
-
-#endif
diff --git a/gum/arch-arm64/gumarm64backtracer.h b/gum/arch-arm64/gumarm64backtracer.h
@@ -12,8 +12,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_ARM64_BACKTRACER (gum_arm64_backtracer_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumArm64Backtracer, gum_arm64_backtracer, GUM,
-                        ARM64_BACKTRACER, GObject)
+G_DECLARE_FINAL_TYPE (GumArm64Backtracer, gum_arm64_backtracer, GUM,
+                      ARM64_BACKTRACER, GObject)
 
 GUM_API GumBacktracer * gum_arm64_backtracer_new (void);
 

diff --git a/gum/arch-mips/gummipsbacktracer.h b/gum/arch-mips/gummipsbacktracer.h
@@ -12,8 +12,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_MIPS_BACKTRACER (gum_mips_backtracer_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumMipsBacktracer, gum_mips_backtracer, GUM,
-                        MIPS_BACKTRACER, GObject)
+G_DECLARE_FINAL_TYPE (GumMipsBacktracer, gum_mips_backtracer, GUM,
+                      MIPS_BACKTRACER, GObject)
 
 GUM_API GumBacktracer * gum_mips_backtracer_new (void);
 

diff --git a/gum/arch-x86/gumx86backtracer.c b/gum/arch-x86/gumx86backtracer.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumx86backtracer.h"
 
 #include "guminterceptor.h"
@@ -179,5 +177,3 @@ gum_x86_backtracer_generate (GumBacktracer * backtracer,
 
   return_addresses->len = i;
 }
-
-#endif
diff --git a/gum/arch-x86/gumx86backtracer.h b/gum/arch-x86/gumx86backtracer.h
@@ -12,8 +12,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_X86_BACKTRACER (gum_x86_backtracer_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumX86Backtracer, gum_x86_backtracer, GUM,
-                        X86_BACKTRACER, GObject)
+G_DECLARE_FINAL_TYPE (GumX86Backtracer, gum_x86_backtracer, GUM, X86_BACKTRACER,
+                      GObject)
 
 GUM_API GumBacktracer * gum_x86_backtracer_new (void);
 

diff --git a/gum/backend-arm/gumstalker-arm.c b/gum/backend-arm/gumstalker-arm.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumstalker.h"
 
 #include "gumarmreg.h"
@@ -6297,5 +6295,3 @@ gum_count_trailing_zeros (guint16 value)
   return num_zeros;
 #endif
 }
-
-#endif
diff --git a/gum/backend-arm64/gumstalker-arm64.c b/gum/backend-arm64/gumstalker-arm64.c
@@ -10,8 +10,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumstalker.h"
 
 #include "gumarm64reader.h"
@@ -5995,5 +5993,3 @@ gum_is_bl_imm (guint32 insn)
 {
   return (insn & ~GUM_INT26_MASK) == 0x94000000;
 }
-
-#endif
diff --git a/gum/backend-darwin/gumdarwinbacktracer.c b/gum/backend-darwin/gumdarwinbacktracer.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gum/gumdarwinbacktracer.h"
 
 #include "guminterceptor.h"
@@ -205,5 +203,3 @@ gum_strip_item (gpointer address)
   return address;
 #endif
 }
-
-#endif
diff --git a/gum/backend-darwin/gumdarwinmapper.c b/gum/backend-darwin/gumdarwinmapper.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gum/gumdarwinmapper.h"
 
 #include "gum/gumdarwin.h"
@@ -2834,5 +2832,3 @@ gum_find_tlv_get_addr (const GumDarwinSectionDetails * details,
 
   return FALSE;
 }
-
-#endif
diff --git a/gum/backend-darwin/gumdarwinmoduleresolver.c b/gum/backend-darwin/gumdarwinmoduleresolver.c
@@ -4,8 +4,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gum/gumdarwinmoduleresolver.h"
 
 #include "gumdarwin-priv.h"
@@ -853,5 +851,3 @@ gum_darwin_module_compare_to_key (const GumAddress * key_ptr,
 
   return 0;
 }
-
-#endif
diff --git a/gum/backend-darwin/gumdarwinsymbolicator.c b/gum/backend-darwin/gumdarwinsymbolicator.c
@@ -5,8 +5,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gum/gumdarwinsymbolicator.h"
 
 #include "gum-init.h"
@@ -816,5 +814,3 @@ gum_cs_unload_library (void)
   dlclose (gum_cs);
   gum_cs = NULL;
 }
-
-#endif
diff --git a/gum/backend-darwin/gummodule-darwin.c b/gum/backend-darwin/gummodule-darwin.c
@@ -25,11 +25,7 @@ typedef struct _GumEnumerateSectionsContext GumEnumerateSectionsContext;
 
 struct _GumNativeModule
 {
-#ifndef GUM_DIET
   GObject parent;
-#else
-  GumObject parent;
-#endif
 
   gchar * name;
   gchar * path;

diff --git a/gum/backend-darwin/gummodule-darwin.h b/gum/backend-darwin/gummodule-darwin.h
@@ -13,8 +13,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_NATIVE_MODULE (gum_native_module_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumNativeModule, gum_native_module, GUM, NATIVE_MODULE,
-                        GObject)
+G_DECLARE_FINAL_TYPE (GumNativeModule, gum_native_module, GUM, NATIVE_MODULE,
+                      GObject)
 
 G_GNUC_INTERNAL GumNativeModule * _gum_native_module_make (const gchar * path,
     const GumMemoryRange * range, GumDarwinModuleResolver * resolver);

diff --git a/gum/backend-darwin/gumobjcapiresolver.c b/gum/backend-darwin/gumobjcapiresolver.c
@@ -7,8 +7,6 @@
  * Licence: wxWindows Library Licence, Version 3.1
  */
 
-#ifndef GUM_DIET
-
 #include "gumobjcapiresolver.h"
 
 #include "guminterceptor.h"
@@ -597,5 +595,3 @@ gum_objc_class_metadata_is_disposed (GumObjcClassMetadata * self)
 
   return resolver->objc_lookUpClass (self->name) != self->handle;
 }
-
-#endif
diff --git a/gum/backend-darwin/gumobjcapiresolver.h b/gum/backend-darwin/gumobjcapiresolver.h
@@ -12,8 +12,8 @@
 G_BEGIN_DECLS
 
 #define GUM_TYPE_OBJC_API_RESOLVER (gum_objc_api_resolver_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumObjcApiResolver, gum_objc_api_resolver, GUM,
-                        OBJC_API_RESOLVER, GObject)
+G_DECLARE_FINAL_TYPE (GumObjcApiResolver, gum_objc_api_resolver, GUM,
+                      OBJC_API_RESOLVER, GObject)
 
 GUM_API GumApiResolver * gum_objc_api_resolver_new (void);
 

diff --git a/gum/backend-darwin/gumobjcdisposeclasspairmonitor.h b/gum/backend-darwin/gumobjcdisposeclasspairmonitor.h
@@ -13,12 +13,10 @@ G_BEGIN_DECLS
 
 #define GUM_TYPE_OBJC_DISPOSE_CLASS_PAIR_MONITOR \
     (gum_objc_dispose_class_pair_monitor_get_type ())
-GUM_DECLARE_FINAL_TYPE (GumObjcDisposeClassPairMonitor,
-                        gum_objc_dispose_class_pair_monitor,
-                        GUM, OBJC_DISPOSE_CLASS_PAIR_MONITOR,
-                        GObject)
-
-#ifndef GUM_DIET
+G_DECLARE_FINAL_TYPE (GumObjcDisposeClassPairMonitor,
+                      gum_objc_dispose_class_pair_monitor,
+                      GUM, OBJC_DISPOSE_CLASS_PAIR_MONITOR,
+                      GObject)
 
 struct _GumObjcDisposeClassPairMonitor
 {
@@ -27,8 +25,6 @@ struct _GumObjcDisposeClassPairMonitor
   GumInterceptor * interceptor;
 };
 
-#endif
-
 G_GNUC_INTERNAL GumObjcDisposeClassPairMonitor *
     gum_objc_dispose_class_pair_monitor_obtain (void);
 

diff --git a/gum/backend-darwin/gumprocess-darwin.c b/gum/backend-darwin/gumprocess-darwin.c
@@ -153,7 +153,7 @@ gum_process_get_libc_module (void)
 static void
 gum_deinit_libc_module (void)
 {
-  gum_object_unref (gum_libc_module);
+  g_object_unref (gum_libc_module);
 }
 
 gboolean