Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 05:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleaned up some logging messages

Browse source
This commit is contained in:
bunnei 2014-04-10 22:45:40 -04:00
parent d4cb2aab63
commit 5d95bb9843
6 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/core.cpp
View file

@ -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

8
src/core/hw/hw.cpp
View file

@ -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");
}
}

4
src/core/mem_map.cpp
View file

@ -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

2
src/core/mem_map_funcs.cpp
View file

@ -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);
}
}

15
src/core/system.cpp
View file

@ -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