mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 02:17:35 +00:00
Everywhere: Turn #if *_DEBUG into dbgln_if/if constexpr
This commit is contained in:
parent
4e6f03a860
commit
6cf59b6ae9
58 changed files with 315 additions and 469 deletions
|
@ -31,9 +31,8 @@ namespace UserspaceEmulator {
|
|||
|
||||
u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3)
|
||||
{
|
||||
#if SPAM_DEBUG
|
||||
reportln("Syscall: {} ({:x})", Syscall::to_string((Syscall::Function)function), function);
|
||||
#endif
|
||||
if constexpr (SPAM_DEBUG)
|
||||
reportln("Syscall: {} ({:x})", Syscall::to_string((Syscall::Function)function), function);
|
||||
switch (function) {
|
||||
case SC_chdir:
|
||||
return virt$chdir(arg1, arg2);
|
||||
|
|
|
@ -310,9 +310,8 @@ void MallocTracer::populate_memory_graph()
|
|||
auto value = m_emulator.mmu().read32({ 0x23, mallocation.address + i * sizeof(u32) });
|
||||
auto other_address = value.value();
|
||||
if (!value.is_uninitialized() && m_memory_graph.contains(value.value())) {
|
||||
#if REACHABLE_DEBUG
|
||||
reportln("region/mallocation {:p} is reachable from other mallocation {:p}", other_address, mallocation.address);
|
||||
#endif
|
||||
if constexpr (REACHABLE_DEBUG)
|
||||
reportln("region/mallocation {:p} is reachable from other mallocation {:p}", other_address, mallocation.address);
|
||||
edges_from_mallocation.edges_from_node.append(other_address);
|
||||
}
|
||||
}
|
||||
|
@ -339,9 +338,8 @@ void MallocTracer::populate_memory_graph()
|
|||
auto value = region.read32(i * sizeof(u32));
|
||||
auto other_address = value.value();
|
||||
if (!value.is_uninitialized() && m_memory_graph.contains(value.value())) {
|
||||
#if REACHABLE_DEBUG
|
||||
reportln("region/mallocation {:p} is reachable from region {:p}-{:p}", other_address, region.base(), region.end() - 1);
|
||||
#endif
|
||||
if constexpr (REACHABLE_DEBUG)
|
||||
reportln("region/mallocation {:p} is reachable from region {:p}-{:p}", other_address, region.base(), region.end() - 1);
|
||||
m_memory_graph.find(other_address)->value.is_reachable = true;
|
||||
reachable_mallocations.append(other_address);
|
||||
}
|
||||
|
@ -388,9 +386,8 @@ void MallocTracer::dump_leak_report()
|
|||
|
||||
populate_memory_graph();
|
||||
|
||||
#if REACHABLE_DEBUG
|
||||
dump_memory_graph();
|
||||
#endif
|
||||
if constexpr (REACHABLE_DEBUG)
|
||||
dump_memory_graph();
|
||||
|
||||
for_each_mallocation([&](auto& mallocation) {
|
||||
if (mallocation.freed)
|
||||
|
|
|
@ -138,18 +138,14 @@ ValueWithShadow<u128> SoftCPU::read_memory128(X86::LogicalAddress address)
|
|||
{
|
||||
VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b);
|
||||
auto value = m_emulator.mmu().read128(address);
|
||||
#if MEMORY_DEBUG
|
||||
outln("\033[36;1mread_memory128: @{:04x}:{:08x} -> {:032x} ({:032x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
#endif
|
||||
outln_if(MEMORY_DEBUG, "\033[36;1mread_memory128: @{:04x}:{:08x} -> {:032x} ({:032x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
return value;
|
||||
}
|
||||
ValueWithShadow<u256> SoftCPU::read_memory256(X86::LogicalAddress address)
|
||||
{
|
||||
VERIFY(address.selector() == 0x1b || address.selector() == 0x23 || address.selector() == 0x2b);
|
||||
auto value = m_emulator.mmu().read256(address);
|
||||
#if MEMORY_DEBUG
|
||||
outln("\033[36;1mread_memory256: @{:04x}:{:08x} -> {:064x} ({:064x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
#endif
|
||||
outln_if(MEMORY_DEBUG, "\033[36;1mread_memory256: @{:04x}:{:08x} -> {:064x} ({:064x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
return value;
|
||||
}
|
||||
|
||||
|
@ -184,18 +180,14 @@ void SoftCPU::write_memory64(X86::LogicalAddress address, ValueWithShadow<u64> v
|
|||
void SoftCPU::write_memory128(X86::LogicalAddress address, ValueWithShadow<u128> value)
|
||||
{
|
||||
VERIFY(address.selector() == 0x23 || address.selector() == 0x2b);
|
||||
#if MEMORY_DEBUG
|
||||
outln("\033[36;1mwrite_memory128: @{:04x}:{:08x} <- {:032x} ({:032x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
#endif
|
||||
outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory128: @{:04x}:{:08x} <- {:032x} ({:032x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
m_emulator.mmu().write128(address, value);
|
||||
}
|
||||
|
||||
void SoftCPU::write_memory256(X86::LogicalAddress address, ValueWithShadow<u256> value)
|
||||
{
|
||||
VERIFY(address.selector() == 0x23 || address.selector() == 0x2b);
|
||||
#if MEMORY_DEBUG
|
||||
outln("\033[36;1mwrite_memory256: @{:04x}:{:08x} <- {:064x} ({:064x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
#endif
|
||||
outln_if(MEMORY_DEBUG, "\033[36;1mwrite_memory256: @{:04x}:{:08x} <- {:064x} ({:064x})\033[0m", address.selector(), address.offset(), value, value.shadow());
|
||||
m_emulator.mmu().write256(address, value);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue