summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/asm/qasm-inline.h2
-rw-r--r--src/qcommon/common.c10
-rw-r--r--src/qcommon/q_platform.h14
-rw-r--r--src/qcommon/q_shared.h4
-rw-r--r--src/qcommon/vm_x86.c68
-rw-r--r--src/sys/sys_win32.c2
6 files changed, 53 insertions, 47 deletions
diff --git a/src/asm/qasm-inline.h b/src/asm/qasm-inline.h
index 7ac30533..b609aecc 100644
--- a/src/asm/qasm-inline.h
+++ b/src/asm/qasm-inline.h
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "../qcommon/q_platform.h"
-#ifdef idx64
+#if idx64
#define EAX "%%rax"
#define EBX "%%rbx"
#define ESP "%%rsp"
diff --git a/src/qcommon/common.c b/src/qcommon/common.c
index c5f49ace..02689141 100644
--- a/src/qcommon/common.c
+++ b/src/qcommon/common.c
@@ -87,9 +87,9 @@ cvar_t *com_abnormalExit;
cvar_t *com_homepath;
cvar_t *com_busyWait;
-#if defined(idx64)
+#if idx64
void (*Q_VMftol)(void);
-#elif defined(id386)
+#elif id386
long (QDECL *Q_ftol)(float f);
void (QDECL *Q_VMftol)(void);
void (QDECL *Q_SnapVector)(vec3_t vec);
@@ -2457,11 +2457,11 @@ Find out whether we have SSE support for Q_ftol function
=================
*/
-#if defined(id386) || defined(idx64)
+#if id386 || idx64
static void Com_DetectSSE(void)
{
-#ifndef idx64
+#if !idx64
cpuFeatures_t feat;
feat = Sys_GetProcessorFeatures();
@@ -2478,7 +2478,7 @@ static void Com_DetectSSE(void)
Q_VMftol = qvmftolsse;
Com_Printf("Have SSE support\n");
-#ifndef idx64
+#if !idx64
}
else
{
diff --git a/src/qcommon/q_platform.h b/src/qcommon/q_platform.h
index ddc8039d..85b176eb 100644
--- a/src/qcommon/q_platform.h
+++ b/src/qcommon/q_platform.h
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define __Q_PLATFORM_H
// this is for determining if we have an asm version of a C function
+#define idx64 0
+
#ifdef Q3_VM
#define id386 0
@@ -77,7 +79,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if defined(_WIN64) || defined(__WIN64__)
-#define idx64
+#undef idx64
+#define idx64 1
#undef QDECL
#define QDECL __cdecl
@@ -147,7 +150,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define ARCH_STRING "x86"
#define Q3_LITTLE_ENDIAN
#elif defined __x86_64__
-#define idx64
+#undef idx64
+#define idx64 1
#define ARCH_STRING "x86_64"
#define Q3_LITTLE_ENDIAN
#endif
@@ -174,7 +178,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if defined __i386__
#define ARCH_STRING "x86"
#elif defined __x86_64__
-#define idx64
+#undef idx64
+#define idx64 1
#define ARCH_STRING "x86_64"
#elif defined __powerpc64__
#define ARCH_STRING "ppc64"
@@ -237,7 +242,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifdef __i386__
#define ARCH_STRING "x86"
#elif defined __amd64__
-#define idx64
+#undef idx64
+#define idx64 1
#define ARCH_STRING "amd64"
#elif defined __axp__
#define ARCH_STRING "alpha"
diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
index 08e202d7..3994f861 100644
--- a/src/qcommon/q_shared.h
+++ b/src/qcommon/q_shared.h
@@ -421,7 +421,7 @@ extern vec3_t axisDefault[3];
int Q_isnan(float x);
-#ifdef idx64
+#if idx64
extern long qftolsse(float f);
extern void qvmftolsse(void);
extern void qsnapvectorsse(vec3_t vec);
@@ -430,7 +430,7 @@ int Q_isnan(float x);
#define Q_SnapVector qsnapvectorsse
extern void (*Q_VMftol)(void);
-#elif defined(id386)
+#elif id386
extern long QDECL qftolx87(float f);
extern long QDECL qftolsse(float f);
extern void QDECL qvmftolx87(void);
diff --git a/src/qcommon/vm_x86.c b/src/qcommon/vm_x86.c
index 72225473..9e30e32f 100644
--- a/src/qcommon/vm_x86.c
+++ b/src/qcommon/vm_x86.c
@@ -150,7 +150,7 @@ static void EmitPtr(void *ptr)
intptr_t v = (intptr_t) ptr;
Emit4(v);
-#ifdef idx64
+#if idx64
Emit1((v >> 32) & 0xFF);
Emit1((v >> 40) & 0xFF);
Emit1((v >> 48) & 0xFF);
@@ -193,7 +193,7 @@ static void EmitString( const char *string ) {
}
static void EmitRexString(byte rex, const char *string)
{
-#ifdef idx64
+#if idx64
if(rex)
Emit1(rex);
#endif
@@ -416,7 +416,7 @@ Uses asm to retrieve arguments from registers to work around different calling c
=================
*/
-#if defined(_MSC_VER) && defined(idx64)
+#if defined(_MSC_VER) && idx64
extern void qsyscall64(void);
extern uint8_t qvmcall64(int *programStack, int *opStack, intptr_t *instructionPointers, byte *dataBase);
@@ -458,7 +458,7 @@ static void DoSyscall(void)
if(syscallNum < 0)
{
int *data;
-#ifdef idx64
+#if idx64
int index;
intptr_t args[11];
#endif
@@ -470,7 +470,7 @@ static void DoSyscall(void)
// modify VM stack pointer for recursive VM entry
savedVM->programStack = programStack - 4;
-#ifdef idx64
+#if idx64
args[0] = ~syscallNum;
for(index = 1; index < ARRAY_LEN(args); index++)
args[index] = data[index];
@@ -526,7 +526,7 @@ Call to DoSyscall()
int EmitCallDoSyscall(vm_t *vm)
{
// use edx register to store DoSyscall address
-#if defined(_MSC_VER) && defined(idx64)
+#if defined(_MSC_VER) && idx64
EmitRexString(0x48, "BA"); // mov edx, qsyscall64
EmitPtr(qsyscall64);
#else
@@ -539,7 +539,7 @@ int EmitCallDoSyscall(vm_t *vm)
EmitString("51"); // push ebx
EmitString("56"); // push esi
EmitString("57"); // push edi
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "50"); // push r8
EmitRexString(0x41, "51"); // push r9
#endif
@@ -557,7 +557,7 @@ int EmitCallDoSyscall(vm_t *vm)
EmitRexString(0x48, "89 EC"); // mov esp, ebp
EmitString("5D"); // pop ebp
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "59"); // pop r9
EmitRexString(0x41, "58"); // pop r8
#endif
@@ -614,7 +614,7 @@ int EmitCallProcedure(vm_t *vm, int sysCallOfs)
EmitString("73"); // jae badAddr
jmpBadAddr = compiledOfs++;
-#ifdef idx64
+#if idx64
EmitRexString(0x49, "FF 14 C0"); // call qword ptr [r8 + eax * 8]
#else
EmitString("FF 14 85"); // call dword ptr [vm->instructionPointers + eax * 4]
@@ -770,7 +770,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_LOAD4:
EmitPushStack(vm);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "8B 81"); // mov eax, dword ptr [r9 + 0x12345678]
Emit4(Constant4() & vm->dataMask);
#else
@@ -786,7 +786,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_LOAD2:
EmitPushStack(vm);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "0F B7 81"); // movzx eax, word ptr [r9 + 0x12345678]
Emit4(Constant4() & vm->dataMask);
#else
@@ -802,7 +802,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_LOAD1:
EmitPushStack(vm);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "0F B6 81"); // movzx eax, byte ptr [r9 + 0x12345678]
Emit4(Constant4() & vm->dataMask);
#else
@@ -818,7 +818,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_STORE4:
EmitMovEAXStack(vm, (vm->dataMask & ~3));
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "C7 04 01"); // mov dword ptr [r9 + eax], 0x12345678
Emit4(Constant4());
#else
@@ -833,7 +833,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_STORE2:
EmitMovEAXStack(vm, (vm->dataMask & ~1));
-#ifdef idx64
+#if idx64
Emit1(0x66); // mov word ptr [r9 + eax], 0x1234
EmitRexString(0x41, "C7 04 01");
Emit2(Constant4());
@@ -850,7 +850,7 @@ qboolean ConstOptimize(vm_t *vm, int callProcOfsSyscall)
case OP_STORE1:
EmitMovEAXStack(vm, vm->dataMask);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "C6 04 01"); // mov byte [r9 + eax], 0x12
Emit1(Constant4());
#else
@@ -1209,7 +1209,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitString("81 C2"); // add edx, 0x12345678
Emit4((Constant1() & 0xFF));
MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1247,7 +1247,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitMovEDXStack(vm, vm->dataMask);
if(v == 1 && oc0 == oc1 && pop0 == OP_LOCAL && pop1 == OP_LOCAL)
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "FF 04 11"); // inc dword ptr [r9 + edx]
#else
EmitString("FF 82"); // inc dword ptr [edx + 0x12345678]
@@ -1256,7 +1256,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
}
else
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "8B 04 11"); // mov eax, dword ptr [r9 + edx]
#else
EmitString("8B 82"); // mov eax, dword ptr [edx + 0x12345678]
@@ -1267,7 +1267,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
if (oc0 == oc1 && pop0 == OP_LOCAL && pop1 == OP_LOCAL)
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1279,7 +1279,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitCommand(LAST_COMMAND_SUB_BL_1); // sub bl, 1
EmitString("8B 14 9F"); // mov edx, dword ptr [edi + ebx * 4]
MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1309,7 +1309,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitMovEDXStack(vm, vm->dataMask);
if(v == 1 && oc0 == oc1 && pop0 == OP_LOCAL && pop1 == OP_LOCAL)
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "FF 0C 11"); // dec dword ptr [r9 + edx]
#else
EmitString("FF 8A"); // dec dword ptr [edx + 0x12345678]
@@ -1318,7 +1318,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
}
else
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "8B 04 11"); // mov eax, dword ptr [r9 + edx]
#else
EmitString("8B 82"); // mov eax, dword ptr [edx + 0x12345678]
@@ -1329,7 +1329,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
if(oc0 == oc1 && pop0 == OP_LOCAL && pop1 == OP_LOCAL)
{
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1341,7 +1341,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitCommand(LAST_COMMAND_SUB_BL_1); // sub bl, 1
EmitString("8B 14 9F"); // mov edx, dword ptr [edi + ebx * 4]
MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1361,7 +1361,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
compiledOfs -= 3;
vm->instructionPointers[instruction - 1] = compiledOfs;
MASK_REG("E0", vm->dataMask); // and eax, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "8B 04 01"); // mov eax, dword ptr [r9 + eax]
#else
EmitString("8B 80"); // mov eax, dword ptr [eax + 0x1234567]
@@ -1372,7 +1372,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
}
EmitMovEAXStack(vm, vm->dataMask);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "8B 04 01"); // mov eax, dword ptr [r9 + eax]
#else
EmitString("8B 80"); // mov eax, dword ptr [eax + 0x12345678]
@@ -1382,7 +1382,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
break;
case OP_LOAD2:
EmitMovEAXStack(vm, vm->dataMask);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "0F B7 04 01"); // movzx eax, word ptr [r9 + eax]
#else
EmitString("0F B7 80"); // movzx eax, word ptr [eax + 0x12345678]
@@ -1392,7 +1392,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
break;
case OP_LOAD1:
EmitMovEAXStack(vm, vm->dataMask);
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "0F B6 04 01"); // movzx eax, byte ptr [r9 + eax]
#else
EmitString("0F B6 80"); // movzx eax, byte ptr [eax + 0x12345678]
@@ -1404,7 +1404,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitMovEAXStack(vm, 0);
EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4]
MASK_REG("E2", vm->dataMask & ~3); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "89 04 11"); // mov dword ptr [r9 + edx], eax
#else
EmitString("89 82"); // mov dword ptr [edx + 0x12345678], eax
@@ -1416,7 +1416,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitMovEAXStack(vm, 0);
EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4]
MASK_REG("E2", vm->dataMask & ~1); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
Emit1(0x66); // mov word ptr [r9 + edx], eax
EmitRexString(0x41, "89 04 11");
#else
@@ -1429,7 +1429,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitMovEAXStack(vm, 0);
EmitString("8B 54 9F FC"); // mov edx, dword ptr -4[edi + ebx * 4]
MASK_REG("E2", vm->dataMask); // and edx, 0x12345678
-#ifdef idx64
+#if idx64
EmitRexString(0x41, "88 04 11"); // mov byte ptr [r9 + edx], eax
#else
EmitString("88 82"); // mov byte ptr [edx + 0x12345678], eax
@@ -1652,7 +1652,7 @@ void VM_Compile(vm_t *vm, vmHeader_t *header)
EmitString("8B 44 9F 04"); // mov eax, dword ptr 4[edi + ebx * 4]
EmitString("81 F8"); // cmp eax, vm->instructionCount
Emit4(vm->instructionCount);
-#ifdef idx64
+#if idx64
EmitString("73 04"); // jae +4
EmitRexString(0x49, "FF 24 C0"); // jmp qword ptr [r8 + eax * 8]
#else
@@ -1780,7 +1780,7 @@ int VM_CallCompiled(vm_t *vm, int *args)
opStackOfs = 0;
#ifdef _MSC_VER
- #ifdef idx64
+ #if idx64
opStackOfs = qvmcall64(&programStack, opStack, vm->instructionPointers, vm->dataBase);
#else
__asm
@@ -1800,7 +1800,7 @@ int VM_CallCompiled(vm_t *vm, int *args)
popad
}
#endif
-#elif defined(idx64)
+#elif idx64
__asm__ volatile(
"movq %5, %%rax\r\n"
"movq %3, %%r8\r\n"
diff --git a/src/sys/sys_win32.c b/src/sys/sys_win32.c
index 4fddfdc0..2988d83c 100644
--- a/src/sys/sys_win32.c
+++ b/src/sys/sys_win32.c
@@ -70,7 +70,7 @@ Set FPU control word to default value
#define FPUCWMASK1 (_MCW_RC | _MCW_EM)
#define FPUCW (_RC_CHOP | _MCW_EM | _PC_53)
-#ifdef idx64
+#if idx64
#define FPUCWMASK (FPUCWMASK1)
#else
#define FPUCWMASK (FPUCWMASK1 | _MCW_PC)
generated by cgit (git 2.34.1) at 2024-11-15 03:37:23 +0000