diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
index 1bf53a0519..e4a0d6336c 100644
--- a/Source/Core/Core/CMakeLists.txt
+++ b/Source/Core/Core/CMakeLists.txt
@@ -15,7 +15,6 @@ set(SRCS ActionReplay.cpp
PatchEngine.cpp
State.cpp
stdafx.cpp
- Tracer.cpp
VolumeHandler.cpp
Boot/Boot_BS2Emu.cpp
Boot/Boot.cpp
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
index 2fea26a306..91a2299afd 100644
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@@ -130,7 +130,7 @@ void DisplayMessage(const std::string& message, int time_in_ms)
if (_CoreParameter.bRenderToMain &&
SConfig::GetInstance().m_InterfaceStatusbar)
{
- Host_UpdateStatusBar(message);
+ Host_UpdateStatusBar(message);
}
else
{
@@ -492,9 +492,6 @@ void EmuThread()
// Clear on screen messages that haven't expired
g_video_backend->Video_ClearMessages();
- // Close the trace file
- Core::StopTrace();
-
// Reload sysconf file in order to see changes committed during emulation
if (_CoreParameter.bWii)
SConfig::GetInstance().m_SYSCONF->Reload();
diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h
index de16154e8f..1a079ac8ed 100644
--- a/Source/Core/Core/Core.h
+++ b/Source/Core/Core/Core.h
@@ -61,7 +61,6 @@ void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _
void* GetWindowHandle();
-void StartTrace(bool write);
// This displays messages in a user-visible way.
void DisplayMessage(const std::string& message, int time_in_ms);
@@ -69,9 +68,7 @@ void DisplayMessage(const std::string& message, int time_in_ms);
std::string GetStateFileName();
void SetStateFileName(std::string val);
-int SyncTrace();
void SetBlockStart(u32 addr);
-void StopTrace();
bool ShouldSkipFrame(int skipped);
void VideoThrottle();
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index 5addaf0664..064a9b2af3 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -234,7 +234,6 @@
Create
-
@@ -414,7 +413,6 @@
-
diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters
index 4111af1780..85198fece7 100644
--- a/Source/Core/Core/Core.vcxproj.filters
+++ b/Source/Core/Core/Core.vcxproj.filters
@@ -146,7 +146,6 @@
-
@@ -721,7 +720,6 @@
-
ActionReplay
diff --git a/Source/Core/Core/Tracer.cpp b/Source/Core/Core/Tracer.cpp
deleted file mode 100644
index 36eb420d01..0000000000
--- a/Source/Core/Core/Tracer.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include
-
-#include "Common/Common.h"
-#include "Common/FileUtil.h"
-
-#include "Core/Core.h"
-#include "Core/Host.h"
-#include "Core/Tracer.h"
-#include "Core/PowerPC/PowerPC.h"
-
-namespace Core {
-
-static File::IOFile tracefile;
-
-static bool bReadTrace = false;
-static bool bWriteTrace = false;
-
-void StartTrace(bool write)
-{
- if (write)
- {
- tracefile.Open("L:\\trace.dat", "wb");
- bReadTrace = false;
- bWriteTrace = true;
- }
- else
- {
- tracefile.Open("L:\\trace.dat", "rb");
- bReadTrace = true;
- bWriteTrace = false;
- }
-}
-
-void StopTrace()
-{
- tracefile.Close();
-}
-
-static int stateSize = 32*4;// + 32*16 + 6*4;
-
-int SyncTrace()
-{
- if (bWriteTrace)
- {
- tracefile.WriteBytes(&PowerPC::ppcState, stateSize);
- tracefile.Flush();
- return 1;
- }
- if (bReadTrace)
- {
- PowerPC::PowerPCState state;
- if (!tracefile.ReadBytes(&state, stateSize))
- return 1;
-
- bool difference = false;
- for (int i=0; i<32; i++)
- {
- if (PowerPC::ppcState.gpr[i] != state.gpr[i])
- {
- DEBUG_LOG(POWERPC, "DIFFERENCE - r%i (local %08x, remote %08x)", i, PowerPC::ppcState.gpr[i], state.gpr[i]);
- difference = true;
- }
- }
-/*
- for (int i=0; i<32; i++)
- {
- for (int j=0; j<2; j++)
- {
- if (PowerPC::ppcState.ps[i][j] != state.ps[i][j])
- {
- LOG(GEKKO, "DIFFERENCE - ps%i_%i (local %f, remote %f)", i, j, PowerPC::ppcState.ps[i][j], state.ps[i][j]);
- difference = true;
- }
- }
- }*/
- /*
- if (GetCR() != state.cr)
- {
- LOG(GEKKO, "DIFFERENCE - CR (local %08x, remote %08x)", PowerPC::ppcState.cr, state.cr);
- difference = true;
- }
- if (PowerPC::ppcState.pc != state.pc)
- {
- LOG(GEKKO, "DIFFERENCE - PC (local %08x, remote %08x)", PowerPC::ppcState.pc, state.pc);
- difference = true;
- }
- if (PowerPC::ppcState.npc != state.npc)
- {
- LOG(GEKKO, "DIFFERENCE - NPC (local %08x, remote %08x)", PowerPC::ppcState.npc, state.npc);
- difference = true;
- }
- if (PowerPC::ppcState.msr != state.msr)
- {
- LOG(GEKKO, "DIFFERENCE - MSR (local %08x, remote %08x)", PowerPC::ppcState.msr, state.msr);
- difference = true;
- }
- if (PowerPC::ppcState.fpscr != state.fpscr)
- {
- LOG(GEKKO, "DIFFERENCE - FPSCR (local %08x, remote %08x)", PowerPC::ppcState.fpscr, state.fpscr);
- difference = true;
- }
-*/
- if (difference)
- {
- //Also show drec compare window here
- //CDynaViewDlg::Show(true);
- //CDynaViewDlg::ViewAddr(m_BlockStart);
- //CDynaViewDlg::Show(true);
- //PanicAlert("Hang on");
- //Sleep(INFINITE);
- return 0;
- }
- else
- {
- return 1;
- //LOG(GEKKO, "No difference!");
- }
- }
- return 1;
-
-}
-
-} // end of namespace Core
diff --git a/Source/Core/Core/Tracer.h b/Source/Core/Core/Tracer.h
deleted file mode 100644
index 013cbd45db..0000000000
--- a/Source/Core/Core/Tracer.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#pragma once