Revert "Merge pull request #83 from lioncash/remove-console"
This breaks Linux stdout logging. This reverts commit7ac5b1f2f8, reversing changes made to9bc14012fc. Revert "Merge pull request #77 from lioncash/remove-console" This reverts commit9bc14012fc, reversing changes made tob18a33377d. Conflicts: Source/Core/Common/LogManager.cpp Source/Core/DolphinWX/Frame.cpp Source/Core/DolphinWX/FrameAui.cpp Source/Core/DolphinWX/LogConfigWindow.cpp Source/Core/DolphinWX/LogWindow.cpp
This commit is contained in:
Pierre Bourdon committed
1 parent
60a5d8900b
commit
70f3a069f2
24 files changed
+834
-17
No files matched your search
@@ -2,6 +2,7 @@ set(SRCS ActionReplay.cpp
|
||||
ARDecrypt.cpp
|
||||
BootManager.cpp
|
||||
ConfigManager.cpp
|
||||
Console.cpp
|
||||
Core.cpp
|
||||
CoreParameter.cpp
|
||||
CoreTiming.cpp
|
||||
|
||||
@@ -184,6 +184,7 @@ void SConfig::SaveSettings()
|
||||
ini.Set("Interface", "ShowStatusbar", m_InterfaceStatusbar);
|
||||
ini.Set("Interface", "ShowLogWindow", m_InterfaceLogWindow);
|
||||
ini.Set("Interface", "ShowLogConfigWindow", m_InterfaceLogConfigWindow);
|
||||
ini.Set("Interface", "ShowConsole", m_InterfaceConsole);
|
||||
ini.Set("Interface", "ThemeName40", m_LocalCoreStartupParameter.theme_name);
|
||||
|
||||
// Hotkeys
|
||||
@@ -331,6 +332,7 @@ void SConfig::LoadSettings()
|
||||
ini.Get("Interface", "ShowStatusbar", &m_InterfaceStatusbar, true);
|
||||
ini.Get("Interface", "ShowLogWindow", &m_InterfaceLogWindow, false);
|
||||
ini.Get("Interface", "ShowLogConfigWindow", &m_InterfaceLogConfigWindow, false);
|
||||
ini.Get("Interface", "ShowConsole", &m_InterfaceConsole, false);
|
||||
ini.Get("Interface", "ThemeName40", &m_LocalCoreStartupParameter.theme_name, "Clean");
|
||||
|
||||
// Hotkeys
|
||||
|
||||
@@ -55,6 +55,7 @@ struct SConfig : NonCopyable
|
||||
bool m_InterfaceStatusbar;
|
||||
bool m_InterfaceLogWindow;
|
||||
bool m_InterfaceLogConfigWindow;
|
||||
bool m_InterfaceConsole;
|
||||
|
||||
bool m_ListDrives;
|
||||
bool m_ListWad;
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
// Copyright 2013 Dolphin Emulator Project
|
||||
// Licensed under GPLv2
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <PowerPCDisasm.h> // 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
|
||||
@@ -0,0 +1,10 @@
|
||||
// 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);
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
@@ -53,6 +53,7 @@
|
||||
<ClCompile Include="Boot\Boot_WiiWAD.cpp" />
|
||||
<ClCompile Include="Boot\ElfReader.cpp" />
|
||||
<ClCompile Include="ConfigManager.cpp" />
|
||||
<ClCompile Include="Console.cpp" />
|
||||
<ClCompile Include="Core.cpp" />
|
||||
<ClCompile Include="CoreParameter.cpp" />
|
||||
<ClCompile Include="CoreTiming.cpp" />
|
||||
@@ -257,6 +258,7 @@
|
||||
<ClInclude Include="Boot\ElfReader.h" />
|
||||
<ClInclude Include="Boot\ElfTypes.h" />
|
||||
<ClInclude Include="ConfigManager.h" />
|
||||
<ClInclude Include="Console.h" />
|
||||
<ClInclude Include="Core.h" />
|
||||
<ClInclude Include="CoreParameter.h" />
|
||||
<ClInclude Include="CoreTiming.h" />
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="ActionReplay">
|
||||
@@ -137,6 +137,7 @@
|
||||
<ItemGroup>
|
||||
<ClCompile Include="BootManager.cpp" />
|
||||
<ClCompile Include="ConfigManager.cpp" />
|
||||
<ClCompile Include="Console.cpp" />
|
||||
<ClCompile Include="Core.cpp" />
|
||||
<ClCompile Include="CoreParameter.cpp" />
|
||||
<ClCompile Include="CoreTiming.cpp" />
|
||||
@@ -709,6 +710,7 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="BootManager.h" />
|
||||
<ClInclude Include="ConfigManager.h" />
|
||||
<ClInclude Include="Console.h" />
|
||||
<ClInclude Include="Core.h" />
|
||||
<ClInclude Include="CoreParameter.h" />
|
||||
<ClInclude Include="CoreTiming.h" />
|
||||
@@ -1217,4 +1219,4 @@
|
||||
<ItemGroup>
|
||||
<Text Include="CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
Reference in new issue
Block a user