diff --git a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp index 97519ea500..e001a7ace0 100644 --- a/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp +++ b/Userland/DevTools/UserspaceEmulator/SoftCPU.cpp @@ -125,9 +125,7 @@ ValueWithShadow SoftCPU::read_memory8(X86::LogicalAddress address) { VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b); auto value = m_emulator.mmu().read8(address); -#if MEMORY_DEBUG - outln("\033[36;1mread_memory8: @{:04x}:{:08x} -> {:02x} ({:02x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mread_memory8: @{:04x}:{:08x} -> {:02x} ({:02x})\033[0m", address.selector(), address.offset(), value, value.shadow()); return value; } @@ -135,9 +133,7 @@ ValueWithShadow SoftCPU::read_memory16(X86::LogicalAddress address) { VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b); auto value = m_emulator.mmu().read16(address); -#if MEMORY_DEBUG - outln("\033[36;1mread_memory16: @{:04x}:{:08x} -> {:04x} ({:04x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mread_memory16: @{:04x}:{:08x} -> {:04x} ({:04x})\033[0m", address.selector(), address.offset(), value, value.shadow()); return value; } @@ -145,9 +141,7 @@ ValueWithShadow SoftCPU::read_memory32(X86::LogicalAddress address) { VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b); auto value = m_emulator.mmu().read32(address); -#if MEMORY_DEBUG - outln("\033[36;1mread_memory32: @{:04x}:{:08x} -> {:08x} ({:08x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mread_memory32: @{:04x}:{:08x} -> {:08x} ({:08x})\033[0m", address.selector(), address.offset(), value, value.shadow()); return value; } @@ -155,45 +149,35 @@ ValueWithShadow SoftCPU::read_memory64(X86::LogicalAddress address) { VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b); auto value = m_emulator.mmu().read64(address); -#if MEMORY_DEBUG - outln("\033[36;1mread_memory64: @{:04x}:{:08x} -> {:016x} ({:016x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mread_memory64: @{:04x}:{:08x} -> {:016x} ({:016x})\033[0m", address.selector(), address.offset(), value, value.shadow()); return value; } void SoftCPU::write_memory8(X86::LogicalAddress address, ValueWithShadow value) { VERIFY(address.selector() == 0x23 || address.selector() == 0x2b); -#if MEMORY_DEBUG - outln("\033[36;1mwrite_memory8: @{:04x}:{:08x} <- {:02x} ({:02x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory8: @{:04x}:{:08x} <- {:02x} ({:02x})\033[0m", address.selector(), address.offset(), value, value.shadow()); m_emulator.mmu().write8(address, value); } void SoftCPU::write_memory16(X86::LogicalAddress address, ValueWithShadow value) { VERIFY(address.selector() == 0x23 || address.selector() == 0x2b); -#if MEMORY_DEBUG - outln("\033[36;1mwrite_memory16: @{:04x}:{:08x} <- {:04x} ({:04x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory16: @{:04x}:{:08x} <- {:04x} ({:04x})\033[0m", address.selector(), address.offset(), value, value.shadow()); m_emulator.mmu().write16(address, value); } void SoftCPU::write_memory32(X86::LogicalAddress address, ValueWithShadow value) { VERIFY(address.selector() == 0x23 || address.selector() == 0x2b); -#if MEMORY_DEBUG - outln("\033[36;1mwrite_memory32: @{:04x}:{:08x} <- {:08x} ({:08x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory32: @{:04x}:{:08x} <- {:08x} ({:08x})\033[0m", address.selector(), address.offset(), value, value.shadow()); m_emulator.mmu().write32(address, value); } void SoftCPU::write_memory64(X86::LogicalAddress address, ValueWithShadow value) { VERIFY(address.selector() == 0x23 || address.selector() == 0x2b); -#if MEMORY_DEBUG - outln("\033[36;1mwrite_memory64: @{:04x}:{:08x} <- {:016x} ({:016x})\033[0m", address.selector(), address.offset(), value, value.shadow()); -#endif + outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory64: @{:04x}:{:08x} <- {:016x} ({:016x})\033[0m", address.selector(), address.offset(), value, value.shadow()); m_emulator.mmu().write64(address, value); }