diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-02-17 12:00:15 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-26 12:29:16 +0100 |
| commit | ac56c1789be399da5e3367d0de3971ca8931fafc (patch) | |
| tree | db2b5a726c654d5d66d40822810f765efb1816ee /dep/g3dlite/source/System.cpp | |
| parent | 73d2e9d6d6314f3c209dd4f1135f7376e72602fa (diff) | |
Dep/g3d: Support ARM with MSVC
(cherry picked from commit ddba74567c9f6e9cf4596ea9b052d254a0ee50f6)
Diffstat (limited to 'dep/g3dlite/source/System.cpp')
| -rw-r--r-- | dep/g3dlite/source/System.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dep/g3dlite/source/System.cpp b/dep/g3dlite/source/System.cpp index 4a75d320b8d..1c7d913929c 100644 --- a/dep/g3dlite/source/System.cpp +++ b/dep/g3dlite/source/System.cpp @@ -79,7 +79,7 @@ #endif // SIMM include -#if !defined(__aarch64__) +#if !defined(_M_ARM) && !defined(_M_ARM64) && !defined(_M_HYBRID_X86_ARM64) && !defined(_M_ARM64EC) && !defined(__aarch64__) #include <xmmintrin.h> #endif @@ -211,6 +211,10 @@ void System::init() { arch = "ARM"; break; + case PROCESSOR_ARCHITECTURE_ARM64: + arch = "ARM64"; + break; + default: arch = "Unknown"; break; @@ -1690,8 +1694,12 @@ std::string System::currentTimeString() { // Windows 64-bit void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) { +#if !defined(_M_ARM) && !defined(_M_ARM64) && !defined(_M_HYBRID_X86_ARM64) && !defined(_M_ARM64EC) int regs[4] = {eax, ebx, ecx, edx}; __cpuid(regs, func); +#else + int regs[4] = { 0, 0, 0, 0 }; +#endif eax = regs[0]; ebx = regs[1]; ecx = regs[2]; |