From a25adf84f0bdf82113c75d1c63baebe9d3ae994d Mon Sep 17 00:00:00 2001
From: mio <mio@lazym.io>
Date: Sat, 28 Jan 2023 22:18:39 +0100
Subject: [PATCH] Rename flags to avoid confusion

---
 msvc/config-host.h             | 4 ++--
 qemu/accel/tcg/translate-all.c | 2 +-
 qemu/include/tcg/tcg.h         | 2 +-
 qemu/tcg/tcg.c                 | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/msvc/config-host.h b/msvc/config-host.h
index bf750d2d..a5e1e190 100644
--- a/msvc/config-host.h
+++ b/msvc/config-host.h
@@ -11,6 +11,6 @@
 // QEMU by default allocates (and commits) 1GB memory on Windows, and multiple Unicorn instances will result in OOM error easily.
 // Unfortunately, Windows doesn't have a similar demand paging feature like mmap(), therefore a workaround is to use tcg regions mechanism.
 // Note most Unicorn hacks (and even QEMU!) relies on the assumption that the translation memory won't run out and thus it might result
-// in some unexpected errors. If that is case, define to align with QEMU and Unicorn <= 2.0.1 behavior.
+// in some unexpected errors. If that is case, define WIN32_QEMU_ALLOC_BUFFER to align with QEMU and Unicorn <= 2.0.1 behavior.
 // 
-// #define USE_STATIC_CODE_GEN_BUFFER
\ No newline at end of file
+// #define WIN32_QEMU_ALLOC_BUFFER
\ No newline at end of file
diff --git a/qemu/accel/tcg/translate-all.c b/qemu/accel/tcg/translate-all.c
index aaebd4c5..56ddb35e 100644
--- a/qemu/accel/tcg/translate-all.c
+++ b/qemu/accel/tcg/translate-all.c
@@ -869,7 +869,7 @@ static inline void *alloc_code_gen_buffer(struct uc_struct *uc)
     return buf;
 }
 #elif defined(_WIN32)
-#ifdef USE_STATIC_CODE_GEN_BUFFER
+#ifdef WIN32_QEMU_ALLOC_BUFFER
 static inline void *alloc_code_gen_buffer(struct uc_struct *uc)
 {
     TCGContext *tcg_ctx = uc->tcg_ctx;
diff --git a/qemu/include/tcg/tcg.h b/qemu/include/tcg/tcg.h
index 0b4f9a4c..1134c75c 100644
--- a/qemu/include/tcg/tcg.h
+++ b/qemu/include/tcg/tcg.h
@@ -36,7 +36,7 @@
 #include "qemu/int128.h"
 
 // Unicorn: Default region size for win32
-#if defined(_WIN32) && !defined(USE_STATIC_CODE_GEN_BUFFER)
+#if defined(_WIN32) && !defined(WIN32_QEMU_ALLOC_BUFFER)
 #define UC_TCG_REGION_PAGES_COUNT (128) // Note less pages may cause unexpected and subtle errors.
 #endif
 
diff --git a/qemu/tcg/tcg.c b/qemu/tcg/tcg.c
index d5fba106..cb76f31a 100644
--- a/qemu/tcg/tcg.c
+++ b/qemu/tcg/tcg.c
@@ -408,7 +408,7 @@ static void tcg_region_assign(TCGContext *s, size_t curr_region)
     s->code_gen_buffer = start;
     s->code_gen_ptr = start;
     s->code_gen_buffer_size = (char *)end - (char *)start;
-#if defined(WIN32) && !defined(USE_STATIC_CODE_GEN_BUFFER)
+#if defined(WIN32) && !defined(WIN32_QEMU_ALLOC_BUFFER)
     VirtualAlloc(
         s->code_gen_buffer, 
         ROUND_UP(s->code_gen_buffer_size, s->uc->qemu_real_host_page_size), 
@@ -509,7 +509,7 @@ void tcg_region_init(TCGContext *tcg_ctx)
     size_t n_regions;
     size_t i;
 
-#if defined(WIN32) && !defined(USE_STATIC_CODE_GEN_BUFFER)
+#if defined(WIN32) && !defined(WIN32_QEMU_ALLOC_BUFFER)
     n_regions = size / (tcg_ctx->uc->qemu_real_host_page_size * UC_TCG_REGION_PAGES_COUNT);
 #else
     n_regions = 1;
@@ -551,7 +551,7 @@ void tcg_region_init(TCGContext *tcg_ctx)
 
     tcg_ctx->tree = g_tree_new(tb_tc_cmp);
 
-#if defined(WIN32) && !defined(USE_STATIC_CODE_GEN_BUFFER)
+#if defined(WIN32) && !defined(WIN32_QEMU_ALLOC_BUFFER)
     // Allocate a region immediately, or the highwater is not set correctly.
     tcg_region_alloc(tcg_ctx);
 #endif