diff options
| author | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2014-03-05 09:26:02 +1300 |
| commit | 09212d49121d57f2fc670af64c71f4ff731c14ba (patch) | |
| tree | 3941a217046e39148768a1c7eb1aff0289251d4b /Source/Core/VideoCommon | |
| parent | d1ccd964cd7c552068c1ed649235eac83e3b1195 (diff) | |
| parent | 4f02132f9323a147c68b7dc1a79a62be33c1f170 (diff) | |
Merge pull request #120 from Sonicadvance1/Arch-clean
Make our architecture defines less stupid.
Diffstat (limited to 'Source/Core/VideoCommon')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader.cpp | 8 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/VideoCommon.h | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/memcpy_amd.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 29abdb227c..dac42c0b4d 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/Source/Core/VideoCommon/VertexLoader.cpp @@ -768,7 +768,7 @@ void VertexLoader::CompileVertexTranslator() #ifdef USE_VERTEX_LOADER_JIT // End loop here -#ifdef _M_X64 +#if _M_X86_64 MOV(64, R(RAX), Imm64((u64)&loop_counter)); SUB(32, MatR(RAX), Imm8(1)); #else @@ -787,7 +787,7 @@ void VertexLoader::CompileVertexTranslator() void VertexLoader::WriteCall(TPipelineFunction func) { #ifdef USE_VERTEX_LOADER_JIT -#ifdef _M_X64 +#if _M_X86_64 MOV(64, R(RAX), Imm64((u64)func)); CALLptr(R(RAX)); #else @@ -802,7 +802,7 @@ void VertexLoader::WriteCall(TPipelineFunction func) void VertexLoader::WriteGetVariable(int bits, OpArg dest, void *address) { #ifdef USE_VERTEX_LOADER_JIT -#ifdef _M_X64 +#if _M_X86_64 MOV(64, R(RAX), Imm64((u64)address)); MOV(bits, dest, MatR(RAX)); #else @@ -814,7 +814,7 @@ void VertexLoader::WriteGetVariable(int bits, OpArg dest, void *address) void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value) { #ifdef USE_VERTEX_LOADER_JIT -#ifdef _M_X64 +#if _M_X86_64 MOV(64, R(RAX), Imm64((u64)address)); MOV(bits, MatR(RAX), value); #else diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index b18afce482..12b1863871 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -13,7 +13,7 @@ #include "Common/MathUtil.h" #include "VideoCommon/VideoBackendBase.h" -#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64) +#if defined(_MSC_VER) && _M_X86_32 void * memcpy_amd(void *dest, const void *src, size_t n); unsigned char memcmp_mmx(const void* src1, const void* src2, int cmpsize); #define memcpy_gc memcpy_amd diff --git a/Source/Core/VideoCommon/memcpy_amd.cpp b/Source/Core/VideoCommon/memcpy_amd.cpp index a563b80886..a0ef5b7881 100644 --- a/Source/Core/VideoCommon/memcpy_amd.cpp +++ b/Source/Core/VideoCommon/memcpy_amd.cpp @@ -75,7 +75,7 @@ MEMCPY_AMD.CPP #include <windows.h> #endif -#if defined(_MSC_VER) && !defined(__x86_64__) && !defined(_M_X64) +#if defined(_MSC_VER) && _M_X86_32 void * memcpy_amd(void *dest, const void *src, size_t n) { |
