diff options
| author | bunnei <bunneidev@gmail.com> | 2015-08-15 04:29:08 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-08-16 00:03:27 +0200 |
| commit | b39c053785abc4a94ce380885a846c5d8be89675 (patch) | |
| tree | 42911208a051652a7452c8bbbd35ec91aa2d4e20 /src/common/x64 | |
| parent | Common: Cleanup CPU capability detection code. (diff) | |
| download | yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.gz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.bz2 yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.lz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.xz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.zst yuzu-b39c053785abc4a94ce380885a846c5d8be89675.zip | |
Diffstat (limited to 'src/common/x64')
| -rw-r--r-- | src/common/x64/abi.cpp | 4 | ||||
| -rw-r--r-- | src/common/x64/abi.h | 2 | ||||
| -rw-r--r-- | src/common/x64/emitter.cpp | 6 | ||||
| -rw-r--r-- | src/common/x64/emitter.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/common/x64/abi.cpp b/src/common/x64/abi.cpp index 598e7f335..4c07a6ebe 100644 --- a/src/common/x64/abi.cpp +++ b/src/common/x64/abi.cpp @@ -27,7 +27,7 @@ void XEmitter::ABI_EmitPrologue(int maxCallParams) { #ifdef _M_IX86 // Don't really need to do anything -#elif defined(ARCHITECTURE_X64) +#elif defined(ARCHITECTURE_x86_64) #if _WIN32 int stacksize = ((maxCallParams + 1) & ~1) * 8 + 8; // Set up a stack frame so that we can call functions @@ -43,7 +43,7 @@ void XEmitter::ABI_EmitEpilogue(int maxCallParams) { #ifdef _M_IX86 RET(); -#elif defined(ARCHITECTURE_X64) +#elif defined(ARCHITECTURE_x86_64) #ifdef _WIN32 int stacksize = ((maxCallParams+1)&~1)*8 + 8; ADD(64, R(RSP), Imm8(stacksize)); diff --git a/src/common/x64/abi.h b/src/common/x64/abi.h index 0ee189d45..7e9c156ae 100644 --- a/src/common/x64/abi.h +++ b/src/common/x64/abi.h @@ -55,7 +55,7 @@ // 32-bit bog standard cdecl, shared between linux and windows // MacOSX 32-bit is same as System V with a few exceptions that we probably don't care much about. -#elif ARCHITECTURE_X64 // 64 bit calling convention +#elif ARCHITECTURE_x86_64 // 64 bit calling convention #ifdef _WIN32 // 64-bit Windows - the really exotic calling convention diff --git a/src/common/x64/emitter.cpp b/src/common/x64/emitter.cpp index 030c73918..4b79acd1f 100644 --- a/src/common/x64/emitter.cpp +++ b/src/common/x64/emitter.cpp @@ -164,7 +164,7 @@ void XEmitter::WriteSIB(int scale, int index, int base) void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const { if (customOp == -1) customOp = operandReg; -#ifdef ARCHITECTURE_X64 +#ifdef ARCHITECTURE_x86_64 u8 op = 0x40; // REX.W (whether operation is a 64-bit operation) if (opBits == 64) op |= 8; @@ -236,7 +236,7 @@ void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg, _offsetOrBaseReg = 5; emit->WriteModRM(0, _operandReg, _offsetOrBaseReg); //TODO : add some checks -#ifdef ARCHITECTURE_X64 +#ifdef ARCHITECTURE_x86_64 u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes; s64 distance = (s64)offset - (s64)ripAddr; ASSERT_MSG( @@ -1463,7 +1463,7 @@ void XEmitter::MOVD_xmm(const OpArg &arg, X64Reg src) {WriteSSEOp(0x66, 0x7E, sr void XEmitter::MOVQ_xmm(X64Reg dest, OpArg arg) { -#ifdef ARCHITECTURE_X64 +#ifdef ARCHITECTURE_x86_64 // Alternate encoding // This does not display correctly in MSVC's debugger, it thinks it's a MOVD arg.operandReg = dest; diff --git a/src/common/x64/emitter.h b/src/common/x64/emitter.h index aaebb56f6..e9c924126 100644 --- a/src/common/x64/emitter.h +++ b/src/common/x64/emitter.h @@ -21,7 +21,7 @@ #include "common/common_types.h" #include "common/code_block.h" -#if defined(ARCHITECTURE_X64) && !defined(_ARCH_64) +#if defined(ARCHITECTURE_x86_64) && !defined(_ARCH_64) #define _ARCH_64 #endif |