From cd168bca56469b7a3fef2a9959dea313ee1b9d79 Mon Sep 17 00:00:00 2001
From: wheremyfoodat <gponiris2004@gmail.com>
Date: Thu, 15 Sep 2022 17:56:05 +0300
Subject: [PATCH] Fix printing
---
src/core/elf.cpp | 2 +-
src/core/memory.cpp | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/core/elf.cpp b/src/core/elf.cpp
index d456ebf5..153bdfc6 100644
--- a/src/core/elf.cpp
+++ b/src/core/elf.cpp
@@ -14,6 +14,7 @@ std::optional<u32> Memory::loadELF(std::filesystem::path& path) {
auto segNum = reader.segments.size();
printf("Number of segments: %d\n", segNum);
+ printf(" # Perms Vaddr File Size Mem Size\n");
for (int i = 0; i < segNum; ++i) {
const auto seg = reader.segments[i];
const auto flags = seg->get_flags();
@@ -27,7 +28,6 @@ std::optional<u32> Memory::loadELF(std::filesystem::path& path) {
const bool w = (flags & 0b010) != 0;
const bool x = (flags & 0b001) != 0;
- printf(" # Perms Vaddr File Size Mem Size\n");
printf("[%d] (%c%c%c)\t%08X\t%08X\t%08X\n", i, r ? 'r' : '-', w ? 'w' : '-', x ? 'x' : '-', vaddr, fileSize, memorySize);
// Assert that the segment will be loaded in the executable region. If it isn't then panic.
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 2d4a1055..000450da 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -46,7 +46,6 @@ u32 Memory::read32(u32 vaddr) {
uintptr_t pointer = readTable[page];
if (pointer != 0) [[likely]] {
- printf("Read %08X from %08X\n", *(u32*)(pointer + offset), vaddr);
return *(u32*)(pointer + offset);
} else {
Helpers::panic("Unimplemented 32-bit read, addr: %08X", vaddr);
@@ -67,7 +66,6 @@ void Memory::write32(u32 vaddr, u32 value) {
uintptr_t pointer = writeTable[page];
if (pointer != 0) [[likely]] {
- printf("Wrote %08X to %08X\n", value, vaddr);
*(u32*)(pointer + offset) = value;
} else {
Helpers::panic("Unimplemented 32-bit write, addr: %08X, val: %08X", vaddr, value);