Move "jit-cache" into existing files

Author: vacantron

Makefile

@@ -140,13 +140,17 @@ endif
 ifneq ("$(LLVM_CONFIG)", "")
 ifneq ("$(findstring -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS, "$(shell $(LLVM_CONFIG) --cflags)")", "")
 ENABLE_T2C := 1
+ENABLE_JIT_CACHE := 1
 $(call set-feature, T2C)
-OBJS_EXT += jit-cache.o t2c.o
+$(call set-feature, JIT_CACHE)
+OBJS_EXT += t2c.o
 CFLAGS += -g $(shell $(LLVM_CONFIG) --cflags)
 LDFLAGS += $(shell $(LLVM_CONFIG) --libs)
 else
 ENABLE_T2C := 0
+ENABLE_JIT_CACHE := 0
 $(call set-feature, T2C)
+$(call set-feature, JIT_CACHE)
 $(warning No llvm-config-17 installed. Check llvm-config-17 installation in advance)
 endif
 endif

src/jit-cache.c

@@ -37,7 +37,6 @@
 #include "cache.h"
 #include "decode.h"
 #include "io.h"
-#include "jit-cache.h"
 #include "jit.h"
 #include "riscv.h"
 #include "riscv_private.h"
@@ -2030,3 +2029,32 @@ void jit_state_exit(struct jit_state *state)
     free(state->jumps);
     free(state);
 }
+
+#if RV32_HAS(JIT_CACHE)
+struct jit_cache *jit_cache_init()
+{
+    return calloc(MAX_JIT_CACHE_TABLE_ENTRIES, sizeof(struct jit_cache));
+}
+
+void jit_cache_exit(struct jit_cache *cache)
+{
+    free(cache);
+}
+
+void jit_cache_update(struct jit_cache *cache,
+                      uint32_t pc,
+                      uint32_t from,
+                      void *entry)
+{
+    uint32_t pos = pc & (MAX_JIT_CACHE_TABLE_ENTRIES - 1);
+
+    cache[pos].pc = pc;
+    cache[pos].from = from;
+    cache[pos].entry = entry;
+}
+
+void jit_cache_clear(struct jit_cache *cache)
+{
+    memset(cache, 0, MAX_JIT_CACHE_TABLE_ENTRIES * sizeof(struct jit_cache));
+}
+#endif

src/jit-cache.h

@@ -54,3 +54,31 @@ typedef void (*exec_block_func_t)(riscv_t *rv, uintptr_t);
 void t2c_compile(riscv_t *, block_t *);
 typedef void (*exec_t2c_func_t)(riscv_t *);
 #endif
+
+#if RV32_HAS(JIT_CACHE)
+#if !defined(__x86_64__) && !defined(__aarch64__)
+/* make sure LLVM can access the correct address of structure member */
+#error "The JIT-cache only supports 64-bit machine (LP64)."
+#endif
+
+#define MAX_JIT_CACHE_TABLE_ENTRIES (1 << 12)
+
+/* clang-format off */
+struct jit_cache {
+    __attribute__((aligned(4))) uint32_t pc;   /* program counter of ELF */
+    __attribute__((aligned(4))) uint32_t from; /* from whether t1c or t2c,
+                                                  easily to build LLVM IR 
+                                                  because of the alignment
+                                                */
+    void *entry; /* entry of JIT-ed code */
+};
+/* clang-format on */
+
+struct jit_cache *jit_cache_init();
+void jit_cache_exit(struct jit_cache *cache);
+void jit_cache_update(struct jit_cache *cache,
+                      uint32_t pc,
+                      uint32_t from,
+                      void *entry);
+void jit_cache_clear(struct jit_cache *cache);
+#endif

src/jit.c

@@ -32,7 +32,6 @@
 #include <pthread.h>
 #endif
 #include "cache.h"
-#include "jit-cache.h"
 #include "jit.h"
 #define CODE_CACHE_SIZE (4 * 1024 * 1024)
 #endif

src/jit.h

@@ -11,7 +11,6 @@
 #include <llvm-c/Transforms/PassBuilder.h>
 #include <stdlib.h>
 
-#include "jit-cache.h"
 #include "jit.h"
 #include "riscv_private.h"