diff --git a/src/xenia/base/memory.h b/src/xenia/base/memory.h index bf26ce220..bbff063e3 100644 --- a/src/xenia/base/memory.h +++ b/src/xenia/base/memory.h @@ -724,11 +724,17 @@ static void ReadLineNT(CacheLine* XE_RESTRICT destination, const CacheLine* XE_RESTRICT source) { assert_true((reinterpret_cast(source) & 63ULL) == 0); +#ifdef XENIA_PLATFORM_WINDOWS __m128i first = _mm_stream_load_si128(&source->xmms[0]); __m128i second = _mm_stream_load_si128(&source->xmms[1]); __m128i third = _mm_stream_load_si128(&source->xmms[2]); __m128i fourth = _mm_stream_load_si128(&source->xmms[3]); - +#else + __m128i first = _mm_stream_load_si128(const_cast<__m128i*>(&source->xmms[0])); + __m128i second = _mm_stream_load_si128(const_cast<__m128i*>(&source->xmms[1])); + __m128i third = _mm_stream_load_si128(const_cast<__m128i*>(&source->xmms[2])); + __m128i fourth = _mm_stream_load_si128(const_cast<__m128i*>(&source->xmms[3])); +#endif destination->xmms[0] = first; destination->xmms[1] = second; destination->xmms[2] = third; diff --git a/src/xenia/kernel/kernel_state.h b/src/xenia/kernel/kernel_state.h index d04a4cee2..a67ee35d8 100644 --- a/src/xenia/kernel/kernel_state.h +++ b/src/xenia/kernel/kernel_state.h @@ -153,13 +153,10 @@ struct DPCImpersonationScope { struct KernelVersion { union { xe::be value; - - struct { - xe::be major; - xe::be minor; - xe::be build; - xe::be qfe; - }; + xe::be major; + xe::be minor; + xe::be build; + xe::be qfe; }; KernelVersion(uint16_t build_ver = kBaseKernelBuildVersion) {