[WOW64] Small refinement to tls slots usage (#2726)

1 files changed, 19 insertions, 7 deletions

diff --git a/wine/wow64/wowbox64.c b/wine/wow64/wowbox64.c
index d1e74243..8a1f4bb8 100644
--- a/wine/wow64/wowbox64.c
+++ b/wine/wow64/wowbox64.c
@@ -56,6 +56,18 @@ NTSTATUS(WINAPI* __wine_unix_call_dispatcher)(unixlib_handle_t, unsigned int, vo
 #define ROUND_SIZE(addr, size) (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask)
 static const UINT_PTR page_mask = 0xfff;
 
+/* reserved TEB64 TLS slots for Wow64
+#define WOW64_TLS_CPURESERVED      1
+#define WOW64_TLS_TEMPLIST         3
+#define WOW64_TLS_USERCALLBACKDATA 5
+#define WOW64_TLS_APCLIST          7
+#define WOW64_TLS_FILESYSREDIR     8
+#define WOW64_TLS_WOW64INFO        10
+#define WOW64_TLS_MAX_NUMBER       19
+*/
+#define WOW64_TLS_ENTRY_CONTEXT (WOW64_TLS_MAX_NUMBER - 1)
+#define WOW64_TLS_EMU           (WOW64_TLS_MAX_NUMBER - 2)
+
 int is_addr_unaligned(uintptr_t addr)
 {
     // FIXME
@@ -277,7 +289,7 @@ static uint8_t box64_is_addr_in_jit(void* addr)
 NTSTATUS WINAPI BTCpuResetToConsistentState(EXCEPTION_POINTERS* ptrs)
 {
     printf_log(LOG_DEBUG, "BTCpuResetToConsistentState(%p)\n", ptrs);
-    x64emu_t* emu = NtCurrentTeb()->TlsSlots[0]; // FIXME
+    x64emu_t* emu = NtCurrentTeb()->TlsSlots[WOW64_TLS_EMU];
     EXCEPTION_RECORD* rec = ptrs->ExceptionRecord;
     CONTEXT* ctx = ptrs->ContextRecord;
 
@@ -299,7 +311,7 @@ NTSTATUS WINAPI BTCpuResetToConsistentState(EXCEPTION_POINTERS* ptrs)
         return STATUS_SUCCESS;
 
     /* Replace the host context with one captured before JIT entry so host code can unwind */
-    memcpy(ctx, NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER], sizeof(*ctx));
+    memcpy(ctx, NtCurrentTeb()->TlsSlots[WOW64_TLS_ENTRY_CONTEXT], sizeof(*ctx));
     return STATUS_SUCCESS;
 }
 
@@ -313,12 +325,12 @@ void WINAPI BTCpuSimulate(void)
 {
     printf_log(LOG_DEBUG, "BTCpuSimulate()\n");
     WOW64_CPURESERVED* cpu = NtCurrentTeb()->TlsSlots[WOW64_TLS_CPURESERVED];
-    x64emu_t* emu = NtCurrentTeb()->TlsSlots[0]; // FIXME
+    x64emu_t* emu = NtCurrentTeb()->TlsSlots[WOW64_TLS_EMU];
     WOW64_CONTEXT* ctx = (WOW64_CONTEXT*)(cpu + 1);
     CONTEXT entry_context;
 
     RtlCaptureContext(&entry_context);
-    NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER] = &entry_context;
+    NtCurrentTeb()->TlsSlots[WOW64_TLS_ENTRY_CONTEXT] = &entry_context;
 
     R_EAX = ctx->Eax;
     R_EBX = ctx->Ebx;
@@ -364,7 +376,7 @@ NTSTATUS WINAPI BTCpuThreadInit(void)
 
     reset_fpu(emu);
 
-    NtCurrentTeb()->TlsSlots[0] = emu; // FIXME
+    NtCurrentTeb()->TlsSlots[WOW64_TLS_EMU] = emu;
     return STATUS_SUCCESS;
 }
 
@@ -444,9 +456,9 @@ static void __attribute__((naked)) SEHFrameTrampoline2Args(void* Arg0, int Arg1,
 
 void EmitInterruption(x64emu_t* emu, int num, void* addr)
 {
-    CONTEXT* entry_context = NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER];
+    CONTEXT* entry_context = NtCurrentTeb()->TlsSlots[WOW64_TLS_ENTRY_CONTEXT];
     SEHFrameTrampoline2Args(emu, num, (void*)EmitInterruptionImpl, entry_context->Sp, entry_context->Pc);
-    NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER] = entry_context;
+    NtCurrentTeb()->TlsSlots[WOW64_TLS_ENTRY_CONTEXT] = entry_context;
 }
 
 NTSTATUS WINAPI LdrDisableThreadCalloutsForDll(HMODULE);