diff --git a/Source/Core/Core/Console.cpp b/Source/Core/Core/Console.cpp deleted file mode 100644 index ced128c402..0000000000 --- a/Source/Core/Core/Console.cpp +++ /dev/null @@ -1,146 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include -#include -#include // Bochs - -#include "Common/Common.h" -#include "Common/Thread.h" -#include "Core/Console.h" -#include "Core/Core.h" -#include "Core/CoreTiming.h" -#include "Core/HW/Memmap.h" -#include "Core/PowerPC/PPCAnalyst.h" -#include "Core/PowerPC/PPCSymbolDB.h" -#include "Core/PowerPC/PPCTables.h" -#include "Core/PowerPC/JitCommon/JitBase.h" - -#define CASE1(x) if (!strcmp(cmd, (x))) -#define CASE(x) else if (!strcmp(cmd, (x))) - -void Console_Submit(const char *cmd) -{ - CASE1("r") - { - Core::StartTrace(false); - INFO_LOG(CONSOLE, "Read tracing started."); - } - CASE("w") - { - Core::StartTrace(true); - INFO_LOG(CONSOLE, "Write tracing started."); - } - CASE("trans") - { - TCHAR temp[256]; - u32 addr; - sscanf(cmd, "%s %08x", temp, &addr); - - if (addr) - { -#if MAX_LOGLEVEL >= INFO_LEVEL - u32 EA = - Memory::TranslateAddress(addr, Memory::FLAG_NO_EXCEPTION); - INFO_LOG(CONSOLE, "EA 0x%08x to 0x%08x", addr, EA); -#endif - } - else - { - DEBUG_LOG(CONSOLE, "Syntax: trans ADDR"); - } - } - CASE("call") - { - TCHAR temp[256]; - u32 addr; - sscanf(cmd, "%s %08x", temp, &addr); - if (addr) - { - g_symbolDB.PrintCalls(addr); - } - else - { - DEBUG_LOG(CONSOLE, "Syntax: call ADDR"); - } - } - CASE("llac") - { - TCHAR temp[256]; - u32 addr; - sscanf(cmd, "%s %08x", temp, &addr); - if (addr) - { - g_symbolDB.PrintCallers(addr); - } - else - { - DEBUG_LOG(CONSOLE, "Syntax: llac ADDR"); - } - } - CASE("pend") - { - CoreTiming::LogPendingEvents(); - } - CASE("dump") - { - char temp[256]; - char filename[256]; - u32 start; - u32 end; - sscanf(cmd, "%s %08x %08x %s", temp, &start, &end, filename); - - File::IOFile f(filename, "wb"); - for (u32 i = start; i < end; i++) - { - u8 b = Memory::ReadUnchecked_U8(i); - fputc(b, f.GetHandle()); - } - INFO_LOG(CONSOLE, "Dumped from %08x to %08x to %s",start,end,filename); - } - CASE("disa") - { - u32 start; - u32 end; - TCHAR temp[256]; - sscanf(cmd, "%s %08x %08x", temp, &start, &end); - char disasm[256]; - for (u32 addr = start; addr <= end; addr += 4) - { - u32 data = Memory::ReadUnchecked_U32(addr); - DisassembleGekko(data, addr, disasm, 256); - DEBUG_LOG(CONSOLE, "%08x: %08x: %s\n", addr, data, disasm); - } - } - CASE("help") - { - ERROR_LOG(CONSOLE, "Dolphin Console Command List"); - ERROR_LOG(CONSOLE, "scan ADDR - will find functions that are called by this function"); - ERROR_LOG(CONSOLE, "call ADDR - will find functions that call this function"); - ERROR_LOG(CONSOLE, "dump START_A END_A FILENAME - will dump memory between START_A and END_A"); - ERROR_LOG(CONSOLE, "help - guess what this does :P"); - ERROR_LOG(CONSOLE, "lisd - list signature database"); - ERROR_LOG(CONSOLE, "lisf - list functions"); - ERROR_LOG(CONSOLE, "trans ADDR - translate address"); - } - CASE("lisd") - { - // PPCAnalyst::ListDB(); - } - CASE("ipro") - { - PPCTables::PrintInstructionRunCounts(); - } - CASE("lisf") - { - g_symbolDB.List(); - } - else - { - ERROR_LOG(CONSOLE, "Invalid command"); - } -} - -#undef CASE1 -#undef CASE diff --git a/Source/Core/Core/Console.h b/Source/Core/Core/Console.h deleted file mode 100644 index 64779aad26..0000000000 --- a/Source/Core/Core/Console.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - - -// Simple debugging console currently residing in the Logging window. Not used much. - -#pragma once - -void Console_Submit(const char *cmd); diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj index c5d85d6bf3..63650ff3b7 100644 --- a/Source/Core/Core/Core.vcxproj +++ b/Source/Core/Core/Core.vcxproj @@ -1,4 +1,4 @@ - + @@ -53,7 +53,6 @@ - @@ -258,7 +257,6 @@ - @@ -474,4 +472,4 @@ - + \ No newline at end of file diff --git a/Source/Core/Core/Core.vcxproj.filters b/Source/Core/Core/Core.vcxproj.filters index a6b8591676..a943f2aade 100644 --- a/Source/Core/Core/Core.vcxproj.filters +++ b/Source/Core/Core/Core.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -137,7 +137,6 @@ - @@ -710,7 +709,6 @@ - @@ -1219,4 +1217,4 @@ - + \ No newline at end of file diff --git a/Source/Core/DolphinWX/LogWindow.cpp b/Source/Core/DolphinWX/LogWindow.cpp index 0f752feb28..ba383e2cdd 100644 --- a/Source/Core/DolphinWX/LogWindow.cpp +++ b/Source/Core/DolphinWX/LogWindow.cpp @@ -33,7 +33,6 @@ #include "Common/FileUtil.h" #include "Common/IniFile.h" #include "Common/LogManager.h" -#include "Core/Console.h" #include "DolphinWX/Frame.h" #include "DolphinWX/LogWindow.h" #include "DolphinWX/WxUtils.h" @@ -44,7 +43,6 @@ BEGIN_EVENT_TABLE(CLogWindow, wxPanel) EVT_CLOSE(CLogWindow::OnClose) - EVT_TEXT_ENTER(IDM_SUBMITCMD, CLogWindow::OnSubmit) EVT_BUTTON(IDM_CLEARLOG, CLogWindow::OnClear) EVT_CHOICE(IDM_FONT, CLogWindow::OnFontChange) EVT_CHECKBOX(IDM_WRAPLINE, CLogWindow::OnWrapLineCheck) @@ -209,13 +207,6 @@ void CLogWindow::SaveSettings() ini.Save(File::GetUserPath(F_LOGGERCONFIG_IDX)); } -void CLogWindow::OnSubmit(wxCommandEvent& WXUNUSED (event)) -{ - if (!m_cmdline) return; - Console_Submit(WxStrToStr(m_cmdline->GetValue()).c_str()); - m_cmdline->SetValue(wxEmptyString); -} - void CLogWindow::OnClear(wxCommandEvent& WXUNUSED (event)) { m_Log->Clear(); diff --git a/Source/Core/DolphinWX/LogWindow.h b/Source/Core/DolphinWX/LogWindow.h index 00fb703cdb..c49c9516fe 100644 --- a/Source/Core/DolphinWX/LogWindow.h +++ b/Source/Core/DolphinWX/LogWindow.h @@ -82,7 +82,6 @@ private: void PopulateBottom(); void UnPopulateBottom(); void OnClose(wxCloseEvent& event); - void OnSubmit(wxCommandEvent& event); void OnFontChange(wxCommandEvent& event); void OnWrapLineCheck(wxCommandEvent& event); void OnClear(wxCommandEvent& event);