From 5d95bb98434b8e7cd67010f6064ccdb69c1222bb Mon Sep 17 00:00:00 2001
From: bunnei <ericbunnie@gmail.com>
Date: Thu, 10 Apr 2014 22:45:40 -0400
Subject: [PATCH] cleaned up some logging messages
---
src/core/core.cpp | 22 ++--------------------
src/core/hw/hw.cpp | 8 ++++----
src/core/mem_map.cpp | 4 ++--
src/core/mem_map_funcs.cpp | 2 +-
src/core/system.cpp | 15 ++++++++++-----
src/video_core/video_core.cpp | 3 ++-
6 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/src/core/core.cpp b/src/core/core.cpp
index acb0a6e82e..859a62c78f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -24,24 +24,6 @@ void RunLoop() {
/// Step the CPU one instruction
void SingleStep() {
-
- char current_instr[512];
-
- if (g_app_core->GetPC() == 0x080D1534) {
- g_disasm->disasm(g_app_core->GetPC(), Memory::Read32(g_app_core->GetPC()), current_instr);
-
-
- NOTICE_LOG(ARM11, "0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X",
- g_app_core->GetReg(0),
- g_app_core->GetReg(1),
- g_app_core->GetReg(2),
- g_app_core->GetReg(3), Memory::Read32(g_app_core->GetReg(0)), Memory::Read32(g_app_core->GetReg(1)));
-
-
- NOTICE_LOG(ARM11, "0x%08X\t%s", g_app_core->GetPC(), current_instr);
- }
-
-
g_app_core->Step();
HW::Update();
}
@@ -58,7 +40,7 @@ void Stop() {
/// Initialize the core
int Init() {
- NOTICE_LOG(MASTER_LOG, "Core initialized OK");
+ NOTICE_LOG(MASTER_LOG, "initialized OK");
g_disasm = new ARM_Disasm();
g_app_core = new ARM_Interpreter();
@@ -72,7 +54,7 @@ void Shutdown() {
delete g_app_core;
delete g_sys_core;
- NOTICE_LOG(MASTER_LOG, "Core shutdown OK");
+ NOTICE_LOG(MASTER_LOG, "shutdown OK");
}
} // namespace
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 44625e3af3..7191d7c606 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -12,12 +12,12 @@ namespace HW {
template <typename T>
inline void Read(T &var, const u32 addr) {
- NOTICE_LOG(HW, "Hardware read from address %08X", addr);
+ NOTICE_LOG(HW, "read from address %08X", addr);
}
template <typename T>
inline void Write(u32 addr, const T data) {
- NOTICE_LOG(HW, "Hardware write to address %08X", addr);
+ NOTICE_LOG(HW, "write to address %08X", addr);
}
// Explicitly instantiate template functions because we aren't defining this in the header:
@@ -40,12 +40,12 @@ void Update() {
/// Initialize hardware
void Init() {
LCD::Init();
- NOTICE_LOG(HW, "Hardware initialized OK");
+ NOTICE_LOG(HW, "initialized OK");
}
/// Shutdown hardware
void Shutdown() {
- NOTICE_LOG(HW, "Hardware shutdown OK");
+ NOTICE_LOG(HW, "shutdown OK");
}
}
\ No newline at end of file
diff --git a/src/core/mem_map.cpp b/src/core/mem_map.cpp
index 96f8d0440b..a5865d7859 100644
--- a/src/core/mem_map.cpp
+++ b/src/core/mem_map.cpp
@@ -63,7 +63,7 @@ void Init() {
g_scratchpad = new u8[MEM_SCRATCHPAD_SIZE];
- NOTICE_LOG(MEMMAP, "Memory system initialized. RAM at %p (mirror at 0 @ %p)", g_fcram,
+ NOTICE_LOG(MEMMAP, "initialized OK, RAM at %p (mirror at 0 @ %p)", g_fcram,
g_physical_fcram);
}
@@ -77,7 +77,7 @@ void Shutdown() {
g_base = NULL;
g_scratchpad = NULL;
- NOTICE_LOG(MEMMAP, "Memory system shut down.");
+ NOTICE_LOG(MEMMAP, "shutdown OK");
}
} // namespace
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 4c0e08b3fb..00719445f8 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -40,7 +40,7 @@ inline void _Read(T &var, const u32 addr) {
var = *((const T*)&g_fcram[addr & MEM_FCRAM_MASK]);
} else {
- _assert_msg_(MEMMAP, false, "unknown memory read");
+ _assert_msg_(MEMMAP, false, "unknown memory read @ 0x%08X", addr);
}
}
diff --git a/src/core/system.cpp b/src/core/system.cpp
index edb07fef57..c77092327b 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -7,6 +7,7 @@
#include "core/mem_map.h"
#include "core/system.h"
#include "core/hw/hw.h"
+#include "core/hle/hle.h"
#include "video_core/video_core.h"
@@ -19,15 +20,16 @@ void UpdateState(State state) {
}
void Init(EmuWindow* emu_window) {
- Core::Init();
- Memory::Init();
+ Core::Init();
+ Memory::Init();
HW::Init();
- CoreTiming::Init();
+ HLE::Init();
+ CoreTiming::Init();
VideoCore::Init(emu_window);
}
void RunLoopFor(int cycles) {
- RunLoopUntil(CoreTiming::GetTicks() + cycles);
+ RunLoopUntil(CoreTiming::GetTicks() + cycles);
}
void RunLoopUntil(u64 global_cycles) {
@@ -35,9 +37,12 @@ void RunLoopUntil(u64 global_cycles) {
void Shutdown() {
Core::Shutdown();
+ Memory::Shutdown();
HW::Shutdown();
+ HLE::Shutdown();
+ CoreTiming::Shutdown();
VideoCore::Shutdown();
- g_ctr_file_system.Shutdown();
+ g_ctr_file_system.Shutdown();
}
} // namespace
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index e227b6795f..f2e17f9f93 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -38,12 +38,13 @@ void Init(EmuWindow* emu_window) {
g_current_frame = 0;
- NOTICE_LOG(VIDEO, "initialized ok");
+ NOTICE_LOG(VIDEO, "initialized OK");
}
/// Shutdown the video core
void Shutdown() {
delete g_renderer;
+ NOTICE_LOG(VIDEO, "shutdown OK");
}
} // namespace