diff options
Diffstat (limited to 'wow64/wowbox64.c')
| -rw-r--r-- | wow64/wowbox64.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/wow64/wowbox64.c b/wow64/wowbox64.c index 0aa10a22..a985ef69 100644 --- a/wow64/wowbox64.c +++ b/wow64/wowbox64.c @@ -9,7 +9,6 @@ #include <winternl.h> #include <winnt.h> -#include "compiler.h" #include "debug.h" #include "os.h" #include "custommem.h" @@ -22,6 +21,7 @@ #include "box64cpu.h" #include "box64cpu_util.h" #include "rbtree.h" +#include "wine/compiler.h" #include "wine/debug.h" uintptr_t box64_pagesize = 4096; @@ -210,6 +210,8 @@ STATIC_ASSERT(offsetof(x64emu_t, win64_teb) == 3120, offset_of_b_must_be_4); printf_log(LOG_INFO, "libwowbox64.dll process initializing.\n"); + PrintEnvVariables(&box64env, LOG_INFO); + memset(bopcode, 0xc3, sizeof(bopcode)); memset(unxcode, 0xc3, sizeof(unxcode)); bopcode[0] = 0x2ecd; @@ -346,7 +348,7 @@ NTSTATUS WINAPI BTCpuTurboThunkControl(ULONG enable) return STATUS_SUCCESS; } -void x86IntImpl(x64emu_t *emu, int code) +void EmitInterruptionImpl(x64emu_t *emu, int code) { int inst_off = box64env.dynarec ? 2 : 0; @@ -429,10 +431,10 @@ static void __attribute__((naked)) SEHFrameTrampoline2Args(void* Arg0, int Arg1, ".seh_endproc" ); } -void x86Int(void* emu, int code) +void EmitInterruption(x64emu_t* emu, int num, void* addr) { CONTEXT *entry_context = NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER]; - SEHFrameTrampoline2Args(emu, code, (void*)x86IntImpl, entry_context->Sp, entry_context->Pc); + SEHFrameTrampoline2Args(emu, num, (void*)EmitInterruptionImpl, entry_context->Sp, entry_context->Pc); NtCurrentTeb()->TlsSlots[WOW64_TLS_MAX_NUMBER] = entry_context; } |