Moving libafl related files in dedicating folders (#60)

* Restructuration of libafl dirs. Formatting + export of maps struct and functions. * Fix wrong header path. * Fix misc path
AFLplusplus · Apr 11, 2024 · 50b0c90 · 50b0c90
1 parent e99b9da
commit 50b0c90
Show file tree

Hide file tree

Showing 26 changed files with 113 additions and 95 deletions.
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
@@ -715,7 +715,7 @@ static inline void cpu_handle_debug_exception(CPUState *cpu)
 
 //// --- Begin LibAFL code ---
 
-#include "libafl_extras/exit.h"
+#include "libafl/exit.h"
 
 //// --- End LibAFL code ---
 

diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c
@@ -37,7 +37,7 @@
 
 //// --- Begin LibAFL code ---
 
-#include "libafl_extras/exit.h"
+#include "libafl/exit.h"
 
 #ifndef CONFIG_USER_ONLY
 

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
@@ -68,7 +68,7 @@
 
 //// --- Begin LibAFL code ---
 
-#include "libafl_extras/hook.h"
+#include "libafl/hook.h"
 
 //// --- End LibAFL code ---
 

diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
@@ -114,8 +114,8 @@ static void gen_tb_end(const TranslationBlock *tb, uint32_t cflags,
 
 //// --- Begin LibAFL code ---
 
-#include "libafl_extras/exit.h"
-#include "libafl_extras/hook.h"
+#include "libafl/exit.h"
+#include "libafl/hook.h"
 
 #ifndef TARGET_LONG_BITS
 #error "TARGET_LONG_BITS not defined"

diff --git a/block/block-backend.c b/block/block-backend.c
@@ -30,7 +30,7 @@
 
 //// --- Begin LibAFL code ---
 #ifdef CONFIG_SOFTMMU
-#include "libafl_extras/syx-snapshot/syx-snapshot.h"
+#include "libafl/syx-snapshot/syx-snapshot.h"
 #endif
 //// --- End LibAFL code ---
 

diff --git a/cpu-target.c b/cpu-target.c
@@ -45,8 +45,8 @@
 
 //// --- Begin LibAFL code ---
 
-#include "libafl_extras/exit.h"
-#include "libafl_extras/hook.h"
+#include "libafl/exit.h"
+#include "libafl/hook.h"
 
 static __thread GByteArray *libafl_qemu_mem_buf = NULL;
 

diff --git a/libafl_extras/exit.h → include/libafl/exit.h b/libafl_extras/exit.h → include/libafl/exit.h
diff --git a/libafl_extras/hook.h → include/libafl/hook.h b/libafl_extras/hook.h → include/libafl/hook.h
diff --git a/libafl_extras/jit.h → include/libafl/jit.h b/libafl_extras/jit.h → include/libafl/jit.h
diff --git a/libafl_extras/syx-misc.h → include/libafl/syx-misc.h b/libafl_extras/syx-misc.h → include/libafl/syx-misc.h
diff --git a/...s/syx-snapshot/channel-buffer-writeback.h → ...l/syx-snapshot/channel-buffer-writeback.h b/...s/syx-snapshot/channel-buffer-writeback.h → ...l/syx-snapshot/channel-buffer-writeback.h
diff --git a/libafl_extras/syx-snapshot/device-save.h → include/libafl/syx-snapshot/device-save.h b/libafl_extras/syx-snapshot/device-save.h → include/libafl/syx-snapshot/device-save.h
diff --git a/libafl_extras/syx-snapshot/syx-cow-cache.h → include/libafl/syx-snapshot/syx-cow-cache.h b/libafl_extras/syx-snapshot/syx-cow-cache.h → include/libafl/syx-snapshot/syx-cow-cache.h
diff --git a/libafl_extras/syx-snapshot/syx-snapshot.h → include/libafl/syx-snapshot/syx-snapshot.h b/libafl_extras/syx-snapshot/syx-snapshot.h → include/libafl/syx-snapshot/syx-snapshot.h
@@ -14,7 +14,7 @@
 
 #include "device-save.h"
 #include "syx-cow-cache.h"
-#include "../syx-misc.h"
+#include "libafl/syx-misc.h"
 
 #define SYX_SNAPSHOT_COW_CACHE_DEFAULT_CHUNK_SIZE 64
 #define SYX_SNAPSHOT_COW_CACHE_DEFAULT_MAX_BLOCKS (1024 * 1024)

diff --git a/include/libafl/user.h b/include/libafl/user.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+
+struct libafl_mapinfo {
+    target_ulong start;
+    target_ulong end;
+    target_ulong offset;
+    const char* path;
+    int flags;
+    int is_priv;
+};
+
+IntervalTreeNode * libafl_maps_first(IntervalTreeRoot * map_info);
+IntervalTreeNode * libafl_maps_next(IntervalTreeNode *node, struct libafl_mapinfo* ret);
diff --git a/libafl_extras/exit.c → libafl/exit.c b/libafl_extras/exit.c → libafl/exit.c
@@ -1,4 +1,4 @@
-#include "exit.h"
+#include "libafl/exit.h"
 
 #include "sysemu/runstate.h"
 #include "cpu.h"