From 2a77ed724652923271935eb3dcb25567c73aee2c Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 6 Dec 2022 15:59:01 +0000 Subject: [PATCH] cpu/backend/x64/x64_tracers: fix thread matching --- src/xenia/cpu/backend/x64/x64_tracers.cc | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/xenia/cpu/backend/x64/x64_tracers.cc b/src/xenia/cpu/backend/x64/x64_tracers.cc index 404f4ecac..325589bad 100644 --- a/src/xenia/cpu/backend/x64/x64_tracers.cc +++ b/src/xenia/cpu/backend/x64/x64_tracers.cc @@ -30,7 +30,7 @@ namespace x64 { bool trace_enabled = true; #define THREAD_MATCH \ - (!TARGET_THREAD || thread_state->thread_id() == TARGET_THREAD) + (!TARGET_THREAD || ppc_context->thread_id == TARGET_THREAD) #define IFLUSH() #define IPRINT(s) \ if (trace_enabled && THREAD_MATCH) \ @@ -52,41 +52,41 @@ uint32_t GetTracingMode() { } void TraceString(void* raw_context, const char* str) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); IPRINT(str); IFLUSH(); } void TraceContextLoadI8(void* raw_context, uint64_t offset, uint8_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = ctx i8 +{}\n", (int8_t)value, value, offset); } void TraceContextLoadI16(void* raw_context, uint64_t offset, uint16_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = ctx i16 +{}\n", (int16_t)value, value, offset); } void TraceContextLoadI32(void* raw_context, uint64_t offset, uint32_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = ctx i32 +{}\n", (int32_t)value, value, offset); } void TraceContextLoadI64(void* raw_context, uint64_t offset, uint64_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = ctx i64 +{}\n", (int64_t)value, value, offset); } void TraceContextLoadF32(void* raw_context, uint64_t offset, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = ctx f32 +{}\n", xe::m128_f32<0>(value), xe::m128_i32<0>(value), offset); } void TraceContextLoadF64(void* raw_context, uint64_t offset, const double* value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); auto v = _mm_loadu_pd(value); DPRINT("{} ({:X}) = ctx f64 +{}\n", xe::m128_f64<0>(v), xe::m128_i64<0>(v), offset); } void TraceContextLoadV128(void* raw_context, uint64_t offset, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("[{}, {}, {}, {}] [{:08X}, {:08X}, {:08X}, {:08X}] = ctx v128 +{}\n", xe::m128_f32<0>(value), xe::m128_f32<1>(value), xe::m128_f32<2>(value), xe::m128_f32<3>(value), xe::m128_i32<0>(value), xe::m128_i32<1>(value), @@ -94,35 +94,35 @@ void TraceContextLoadV128(void* raw_context, uint64_t offset, __m128 value) { } void TraceContextStoreI8(void* raw_context, uint64_t offset, uint8_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx i8 +{} = {} ({:X})\n", offset, (int8_t)value, value); } void TraceContextStoreI16(void* raw_context, uint64_t offset, uint16_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx i16 +{} = {} ({:X})\n", offset, (int16_t)value, value); } void TraceContextStoreI32(void* raw_context, uint64_t offset, uint32_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx i32 +{} = {} ({:X})\n", offset, (int32_t)value, value); } void TraceContextStoreI64(void* raw_context, uint64_t offset, uint64_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx i64 +{} = {} ({:X})\n", offset, (int64_t)value, value); } void TraceContextStoreF32(void* raw_context, uint64_t offset, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx f32 +{} = {} ({:X})\n", offset, xe::m128_f32<0>(value), xe::m128_i32<0>(value)); } void TraceContextStoreF64(void* raw_context, uint64_t offset, const double* value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); auto v = _mm_loadu_pd(value); DPRINT("ctx f64 +{} = {} ({:X})\n", offset, xe::m128_f64<0>(v), xe::m128_i64<0>(v)); } void TraceContextStoreV128(void* raw_context, uint64_t offset, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("ctx v128 +{} = [{}, {}, {}, {}] [{:08X}, {:08X}, {:08X}, {:08X}]\n", offset, xe::m128_f32<0>(value), xe::m128_f32<1>(value), xe::m128_f32<2>(value), xe::m128_f32<3>(value), xe::m128_i32<0>(value), @@ -131,33 +131,33 @@ void TraceContextStoreV128(void* raw_context, uint64_t offset, __m128 value) { } void TraceMemoryLoadI8(void* raw_context, uint32_t address, uint8_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.i8 {:08X}\n", (int8_t)value, value, address); } void TraceMemoryLoadI16(void* raw_context, uint32_t address, uint16_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.i16 {:08X}\n", (int16_t)value, value, address); } void TraceMemoryLoadI32(void* raw_context, uint32_t address, uint32_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.i32 {:08X}\n", (int32_t)value, value, address); } void TraceMemoryLoadI64(void* raw_context, uint32_t address, uint64_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.i64 {:08X}\n", (int64_t)value, value, address); } void TraceMemoryLoadF32(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.f32 {:08X}\n", xe::m128_f32<0>(value), xe::m128_i32<0>(value), address); } void TraceMemoryLoadF64(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("{} ({:X}) = load.f64 {:08X}\n", xe::m128_f64<0>(value), xe::m128_i64<0>(value), address); } void TraceMemoryLoadV128(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT( "[{}, {}, {}, {}] [{:08X}, {:08X}, {:08X}, {:08X}] = load.v128 {:08X}\n", xe::m128_f32<0>(value), xe::m128_f32<1>(value), xe::m128_f32<2>(value), @@ -166,33 +166,33 @@ void TraceMemoryLoadV128(void* raw_context, uint32_t address, __m128 value) { } void TraceMemoryStoreI8(void* raw_context, uint32_t address, uint8_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.i8 {:08X} = {} ({:X})\n", address, (int8_t)value, value); } void TraceMemoryStoreI16(void* raw_context, uint32_t address, uint16_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.i16 {:08X} = {} ({:X})\n", address, (int16_t)value, value); } void TraceMemoryStoreI32(void* raw_context, uint32_t address, uint32_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.i32 {:08X} = {} ({:X})\n", address, (int32_t)value, value); } void TraceMemoryStoreI64(void* raw_context, uint32_t address, uint64_t value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.i64 {:08X} = {} ({:X})\n", address, (int64_t)value, value); } void TraceMemoryStoreF32(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.f32 {:08X} = {} ({:X})\n", address, xe::m128_f32<0>(value), xe::m128_i32<0>(value)); } void TraceMemoryStoreF64(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("store.f64 {:08X} = {} ({:X})\n", address, xe::m128_f64<0>(value), xe::m128_i64<0>(value)); } void TraceMemoryStoreV128(void* raw_context, uint32_t address, __m128 value) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT( "store.v128 {:08X} = [{}, {}, {}, {}] [{:08X}, {:08X}, {:08X}, {:08X}]\n", address, xe::m128_f32<0>(value), xe::m128_f32<1>(value), @@ -202,7 +202,7 @@ void TraceMemoryStoreV128(void* raw_context, uint32_t address, __m128 value) { void TraceMemset(void* raw_context, uint32_t address, uint8_t value, uint32_t length) { - auto thread_state = *reinterpret_cast(raw_context); + auto ppc_context = reinterpret_cast(raw_context); DPRINT("memset {:08X}-{:08X} ({}) = {:02X}", address, address + length, length, value); }