From 4ecfa3b7a214288bee6524a72171360d85b261e5 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Mon, 19 Jul 2010 03:32:50 +0000 Subject: [PATCH] Specify union members of new ARAddr type when printing it. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5914 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/ActionReplay.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp index e45d3b90f4..664c19a961 100644 --- a/Source/Core/Core/Src/ActionReplay.cpp +++ b/Source/Core/Core/Src/ActionReplay.cpp @@ -326,7 +326,7 @@ bool RunCode(const ARCode &arcode) continue; } - LogInfo("--- Running Code: %08x %08x ---", addr, data); + LogInfo("--- Running Code: %08x %08x ---", addr.address, data); //LogInfo("Command: %08x", cmd); // Do Fill & Slide @@ -549,7 +549,9 @@ bool Subtype_RamWriteAndFill(const ARAddr addr, const u32 data) default: LogInfo("Bad Size"); - PanicAlert("Action Replay Error: Invalid size (%08x : address = %08x) in Ram Write And Fill (%s)", addr.size, addr, current_code->name.c_str()); + PanicAlert("Action Replay Error: Invalid size " + "(%08x : address = %08x) in Ram Write And Fill (%s)", + addr.size, addr.gcaddr, current_code->name.c_str()); return false; } @@ -607,7 +609,9 @@ bool Subtype_WriteToPointer(const ARAddr addr, const u32 data) default: LogInfo("Bad Size"); - PanicAlert("Action Replay Error: Invalid size (%08x : address = %08x) in Write To Pointer (%s)", addr.size, addr, current_code->name.c_str()); + PanicAlert("Action Replay Error: Invalid size " + "(%08x : address = %08x) in Write To Pointer (%s)", + addr.size, addr.gcaddr, current_code->name.c_str()); return false; } return true; @@ -665,7 +669,9 @@ bool Subtype_AddCode(const ARAddr addr, const u32 data) default: LogInfo("Bad Size"); - PanicAlert("Action Replay Error: Invalid size(%08x : address = %08x) in Add Code (%s)", addr.size, addr, current_code->name.c_str()); + PanicAlert("Action Replay Error: Invalid size " + "(%08x : address = %08x) in Add Code (%s)", + addr.size, addr.gcaddr, current_code->name.c_str()); return false; } return true;