Merge branch 'release' into stable

1 files changed, 7 insertions, 28 deletions

diff --git a/frida_mode/src/entry.c b/frida_mode/src/entry.c
index a0ffd028..e71386a0 100644
--- a/frida_mode/src/entry.c
+++ b/frida_mode/src/entry.c
@@ -1,46 +1,35 @@
-#include "frida-gumjs.h"
+#include "frida-gum.h"
 
 #include "debug.h"
 
 #include "entry.h"
 #include "instrument.h"
-#include "persistent.h"
-#include "ranges.h"
 #include "stalker.h"
-#include "stats.h"
 #include "util.h"
 
 extern void __afl_manual_init();
 
-guint64  entry_point = 0;
-gboolean entry_reached = FALSE;
+guint64 entry_start = 0;
 
 static void entry_launch(void) {
 
-  OKF("Entry point reached");
   __afl_manual_init();
 
   /* Child here */
-  instrument_on_fork();
-  stats_on_fork();
-
-}
-
-void entry_config(void) {
-
-  entry_point = util_read_address("AFL_ENTRYPOINT");
+  previous_pc = 0;
 
 }
 
 void entry_init(void) {
 
-  OKF("entry_point: 0x%016" G_GINT64_MODIFIER "X", entry_point);
+  entry_start = util_read_address("AFL_ENTRYPOINT");
+  OKF("entry_point: 0x%016" G_GINT64_MODIFIER "X", entry_start);
 
 }
 
-void entry_start(void) {
+void entry_run(void) {
 
-  if (entry_point == 0) { entry_launch(); }
+  if (entry_start == 0) { entry_launch(); }
 
 }
 
@@ -55,16 +44,6 @@ static void entry_callout(GumCpuContext *cpu_context, gpointer user_data) {
 void entry_prologue(GumStalkerIterator *iterator, GumStalkerOutput *output) {
 
   UNUSED_PARAMETER(output);
-  OKF("AFL_ENTRYPOINT reached");
-
-  if (persistent_start == 0) {
-
-    entry_reached = TRUE;
-    ranges_exclude();
-    stalker_trust();
-
-  }
-
   gum_stalker_iterator_put_callout(iterator, entry_callout, NULL, NULL);
 
 }