From 960c8e653894be99ba0144895880755c45626f5d Mon Sep 17 00:00:00 2001 From: Eladash Date: Wed, 19 Jun 2019 22:29:04 +0300 Subject: [PATCH] Partial compilation fix for WTH_GDB build --- Utilities/GDBDebugServer.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Utilities/GDBDebugServer.cpp b/Utilities/GDBDebugServer.cpp index 1ae3bb7dac..1155537ef5 100644 --- a/Utilities/GDBDebugServer.cpp +++ b/Utilities/GDBDebugServer.cpp @@ -354,7 +354,7 @@ std::string GDBDebugServer::get_reg(std::shared_ptr thread, u32 rid) case 65: return std::string(16, 'x'); case 66: - return u32_to_padded_hex(thread->cr_pack()); + return u32_to_padded_hex(thread->cr.pack()); case 67: return u64_to_padded_hex(thread->lr); case 68: @@ -368,7 +368,7 @@ std::string GDBDebugServer::get_reg(std::shared_ptr thread, u32 rid) default: if (rid > 70) return ""; return (rid > 31) - ? u64_to_padded_hex(reinterpret_cast(thread->fpr[rid - 32])) //fpr + ? u64_to_padded_hex(std::bit_cast(thread->fpr[rid - 32])) //fpr : u64_to_padded_hex(thread->gpr[rid]); //gpr } } @@ -383,7 +383,7 @@ bool GDBDebugServer::set_reg(std::shared_ptr thread, u32 rid, std::s case 65: return true; case 66: - thread->cr_unpack(hex_to_u32(value)); + thread->cr.unpack(hex_to_u32(value)); return true; case 67: thread->lr = hex_to_u64(value); @@ -401,7 +401,7 @@ bool GDBDebugServer::set_reg(std::shared_ptr thread, u32 rid, std::s if (rid > 70) return false; if (rid > 31) { u64 val = hex_to_u64(value); - thread->fpr[rid - 32] = reinterpret_cast(val); + thread->fpr[rid - 32] = std::bit_cast(val); } else { thread->gpr[rid] = hex_to_u64(value); }