From 18a87dfe406011fa989c4277eba95af14a40bd98 Mon Sep 17 00:00:00 2001
From: Alwin Berger <alwin.berger@tu-dortmund.de>
Date: Sun, 2 Jan 2022 18:44:48 +0100
Subject: [PATCH] config, renaming, no flush on load

---
 cpu.c          |  2 +-
 myconfigure.sh |  2 +-
 softmmu/main.c | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cpu.c b/cpu.c
index e1799a15bc..07bd1c1cfa 100644
--- a/cpu.c
+++ b/cpu.c
@@ -58,7 +58,7 @@ static int cpu_common_post_load(void *opaque, int version_id)
      * memory we've translated code from. So we must flush all TBs,
      * which will now be stale.
      */
-    tb_flush(cpu);
+    // tb_flush(cpu);
 
     return 0;
 }
diff --git a/myconfigure.sh b/myconfigure.sh
index 7164e75e4c..63d0df11d9 100755
--- a/myconfigure.sh
+++ b/myconfigure.sh
@@ -2,7 +2,7 @@
 cd "$(dirname "$0")"
 mkdir -p build
 cd build
-../configure --target-list=arm-linux-user,arm-softmmu,x86_64-linux-user --enable-tcg-interpreter \
+../configure --target-list=arm-linux-user,arm-softmmu,x86_64-linux-user,x86_64-softmmu \
                 --audio-drv-list= \
                 --disable-blobs \
                 --disable-bochs \
diff --git a/softmmu/main.c b/softmmu/main.c
index ac2cd838bb..693fe36ba3 100644
--- a/softmmu/main.c
+++ b/softmmu/main.c
@@ -50,12 +50,12 @@ int main(int argc, char **argv)
 #include "hw/core/cpu.h"
 #include "qapi/error.h"
 void libafl_qemu_main_loop( void );
-void libafl_qemu_init(int argc, char **argv, char **envp);
+void libafl_qemu_sys_init(int argc, char **argv, char **envp);
 void libafl_qemu_cleanup( void );
 
-void libafl_qemu_init(int argc, char **argv, char **envp) { qemu_init(argc, argv, envp); }
+void libafl_qemu_sys_init(int argc, char **argv, char **envp) { qemu_init(argc, argv, envp); }
 void libafl_qemu_cleanup( void ) { qemu_cleanup(); }
-void libafl_breakpoint_insert( vaddr );
+void libafl_qemu_set_breakpoint( vaddr );
 void libafl_snapshot_save( const char* );
 void libafl_snapshot_load( const char* );
 
@@ -65,7 +65,7 @@ void libafl_qemu_main_loop( void )
     qemu_main_loop();
 }
 
-void libafl_breakpoint_insert(vaddr pc)
+void libafl_qemu_set_breakpoint(vaddr pc)
 {
     CPUState *cpu;
     CPU_FOREACH(cpu) {
@@ -91,8 +91,8 @@ int main(int argc, char **argv, char **envp)
     // qemu_init(argc, argv, envp);
     // qemu_main_loop();
     // qemu_cleanup();
-    libafl_qemu_init(argc, argv, envp);
-    libafl_breakpoint_insert(0x00004f5c);
+    libafl_qemu_sys_init(argc, argv, envp);
+    libafl_qemu_set_breakpoint(0x00004f5c);
     libafl_snapshot_save("Start");
     do {
         libafl_qemu_main_loop();