From 67a7d4b35277f2bd6a5b5a1ea5d6d1aeed1558d4 Mon Sep 17 00:00:00 2001 From: Justin Becker Date: Tue, 29 Sep 2026 11:53:30 -0700 Subject: [PATCH] NIT: Unneeded ifdef --- Source/Windows/ARM64EC/Module.S | 2 -- Source/Windows/ARM64EC/Module.cpp | 6 ------ 2 files changed, 8 deletions(-) diff --git a/Source/Windows/ARM64EC/Module.S b/Source/Windows/ARM64EC/Module.S index 65b2cd985..2489e653c 100644 --- a/Source/Windows/ARM64EC/Module.S +++ b/Source/Windows/ARM64EC/Module.S @@ -101,7 +101,6 @@ ExitFunctionSuspendPoint: brk #0xCAFE // Resume will jump back to `ExitFunctionSuspendResumePoint` -#ifdef ARCHITECTURE_arm64ec // This table will contain all of the possible SVC #x instructions that we might need. // We index into this table in DIRECT_SYSCALL_WRAPPER based on the syscall number we find // by parsing the table __arm64ec_syscall_ffs from NTDLL. @@ -116,7 +115,6 @@ SyscallTable: .endr .global SyscallTableEnd SyscallTableEnd: -#endif // Makes a wrapper for calling a system call directly, skipping the usual ntdll thunks #define HASH # diff --git a/Source/Windows/ARM64EC/Module.cpp b/Source/Windows/ARM64EC/Module.cpp index 2d6edcfe4..092da359c 100644 --- a/Source/Windows/ARM64EC/Module.cpp +++ b/Source/Windows/ARM64EC/Module.cpp @@ -74,10 +74,8 @@ extern void* ExitFunctionEC; extern void* CheckCall; extern void* ExitFunctionSuspendPoint; extern void* ExitFunctionSuspendResumePoint; -#ifdef ARCHITECTURE_arm64ec extern uint64_t SyscallTable[]; extern uint64_t SyscallTableEnd[]; -#endif void* X64ReturnInstr; // See Module.S uintptr_t NtDllBase; @@ -272,7 +270,6 @@ void ParseWineSyscallNumbers(HMODULE NtDll) { } } -#ifdef ARCHITECTURE_arm64ec uint64_t GetNTSyscallNo(HMODULE NtDll, const char* ExportName) { ULONG LoadConfigSize; const _IMAGE_LOAD_CONFIG_DIRECTORY64* NtDllLoadConfig = reinterpret_cast<_IMAGE_LOAD_CONFIG_DIRECTORY64*>( @@ -312,7 +309,6 @@ uint64_t GetNTSyscallNo(HMODULE NtDll, const char* ExportName) { } return -1; } -#endif // Syscall thunks may have been patched before FEX has loaded, the default call checker installed by ntdll into FEX will // try to invoke the JIT when calling such patched syscalls but this obviously doesn't work before FEX is initalised. @@ -329,7 +325,6 @@ bool InitSyscalls() { WineSyscallDispatcher = *WineSyscallDispatcherPtr; ParseWineSyscallNumbers(NtDll); } else { -#ifdef ARCHITECTURE_arm64ec // NT syscall numbers may change between versions, so we need to find the numbers // for the syscalls we need ahead of time. WineNtContinueSyscallId = GetNTSyscallNo(NtDll, "NtContinue"); @@ -345,7 +340,6 @@ bool InitSyscalls() { WineNtRaiseExceptionSyscallId}) >= SyscallTableSize) { return false; } -#endif } FillNtDllLUTs(NtDll);