aboutsummaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-12 23:20:01 -0500
committerbunnei <bunneidev@gmail.com>2014-12-12 23:20:01 -0500
commitaf1cd769e7b407af71496e788e218add31f8b2b0 (patch)
tree1e3fd71256c04a15970b09abd3f7280f8b1ff678 /src/core/core_timing.cpp
parenta6791e4fc73dda4853c8363d8ecf5094dbedd0ab (diff)
parent4d2a6f8b9b3eeb85574a5e4f93422ffd4feebcd3 (diff)
Merge pull request #258 from yuriks/log-ng
New logging system
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index bf8acf41f6..1a0b2724a7 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -124,7 +124,7 @@ int RegisterEvent(const char *name, TimedCallback callback)
void AntiCrashCallback(u64 userdata, int cyclesLate)
{
- ERROR_LOG(TIME, "Savestate broken: an unregistered event was called.");
+ LOG_CRITICAL(Core, "Savestate broken: an unregistered event was called.");
Core::Halt("invalid timing events");
}
@@ -176,7 +176,7 @@ void Shutdown()
u64 GetTicks()
{
- ERROR_LOG(TIME, "Unimplemented function!");
+ LOG_ERROR(Core, "Unimplemented function!");
return 0;
//return (u64)globalTimer + slicelength - currentMIPS->downcount;
}
@@ -510,7 +510,7 @@ void MoveEvents()
void Advance()
{
- ERROR_LOG(TIME, "Unimplemented function!");
+ LOG_ERROR(Core, "Unimplemented function!");
//int cyclesExecuted = slicelength - currentMIPS->downcount;
//globalTimer += cyclesExecuted;
//currentMIPS->downcount = slicelength;
@@ -547,7 +547,7 @@ void LogPendingEvents()
void Idle(int maxIdle)
{
- ERROR_LOG(TIME, "Unimplemented function!");
+ LOG_ERROR(Core, "Unimplemented function!");
//int cyclesDown = currentMIPS->downcount;
//if (maxIdle != 0 && cyclesDown > maxIdle)
// cyclesDown = maxIdle;