diff options
| author | 2015-08-14 22:29:08 -0400 | |
|---|---|---|
| committer | 2015-08-15 18:03:27 -0400 | |
| commit | b39c053785abc4a94ce380885a846c5d8be89675 (patch) | |
| tree | 42911208a051652a7452c8bbbd35ec91aa2d4e20 /src/common/x64/emitter.cpp | |
| parent | Common: Cleanup CPU capability detection code. (diff) | |
| download | yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.gz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.tar.xz yuzu-b39c053785abc4a94ce380885a846c5d8be89675.zip | |
Rename ARCHITECTURE_X64 definition to ARCHITECTURE_x86_64.
Diffstat (limited to 'src/common/x64/emitter.cpp')
| -rw-r--r-- | src/common/x64/emitter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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) | |||
| 164 | void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const | 164 | void OpArg::WriteRex(XEmitter *emit, int opBits, int bits, int customOp) const |
| 165 | { | 165 | { |
| 166 | if (customOp == -1) customOp = operandReg; | 166 | if (customOp == -1) customOp = operandReg; |
| 167 | #ifdef ARCHITECTURE_X64 | 167 | #ifdef ARCHITECTURE_x86_64 |
| 168 | u8 op = 0x40; | 168 | u8 op = 0x40; |
| 169 | // REX.W (whether operation is a 64-bit operation) | 169 | // REX.W (whether operation is a 64-bit operation) |
| 170 | if (opBits == 64) op |= 8; | 170 | if (opBits == 64) op |= 8; |
| @@ -236,7 +236,7 @@ void OpArg::WriteRest(XEmitter *emit, int extraBytes, X64Reg _operandReg, | |||
| 236 | _offsetOrBaseReg = 5; | 236 | _offsetOrBaseReg = 5; |
| 237 | emit->WriteModRM(0, _operandReg, _offsetOrBaseReg); | 237 | emit->WriteModRM(0, _operandReg, _offsetOrBaseReg); |
| 238 | //TODO : add some checks | 238 | //TODO : add some checks |
| 239 | #ifdef ARCHITECTURE_X64 | 239 | #ifdef ARCHITECTURE_x86_64 |
| 240 | u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes; | 240 | u64 ripAddr = (u64)emit->GetCodePtr() + 4 + extraBytes; |
| 241 | s64 distance = (s64)offset - (s64)ripAddr; | 241 | s64 distance = (s64)offset - (s64)ripAddr; |
| 242 | ASSERT_MSG( | 242 | ASSERT_MSG( |
| @@ -1463,7 +1463,7 @@ void XEmitter::MOVD_xmm(const OpArg &arg, X64Reg src) {WriteSSEOp(0x66, 0x7E, sr | |||
| 1463 | 1463 | ||
| 1464 | void XEmitter::MOVQ_xmm(X64Reg dest, OpArg arg) | 1464 | void XEmitter::MOVQ_xmm(X64Reg dest, OpArg arg) |
| 1465 | { | 1465 | { |
| 1466 | #ifdef ARCHITECTURE_X64 | 1466 | #ifdef ARCHITECTURE_x86_64 |
| 1467 | // Alternate encoding | 1467 | // Alternate encoding |
| 1468 | // This does not display correctly in MSVC's debugger, it thinks it's a MOVD | 1468 | // This does not display correctly in MSVC's debugger, it thinks it's a MOVD |
| 1469 | arg.operandReg = dest; | 1469 | arg.operandReg = dest; |