The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 14:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nothing important, just cleaning my dev folder. (mostly formatting changes, removed a superfluous strlen from logging in ogl plugin)

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2126 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-06 18:04:24 +00:00
parent 825919aaf8
commit 81631d8452
8 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Src/CPUDetect.h
View File

@ -56,11 +56,6 @@ struct CPUInfo
std::string Summarize(); std::string Summarize();
}; };
extern CPUInfo cpu_info; extern CPUInfo cpu_info;
inline void DetectCPU() {cpu_info.Detect();}
#endif #endif

1
Source/Core/Common/Src/MathUtil.h
View File

@ -31,5 +31,4 @@ void SaveSSEState();
void LoadSSEState(); void LoadSSEState();
void LoadDefaultSSEState(); void LoadDefaultSSEState();
#endif #endif

8
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View File

@ -238,14 +238,6 @@ namespace CPUCompare
} }
Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst); Interpreter::_interpreterInstruction instr = GetInterpreterOp(inst);
ABI_CallFunctionC((void*)instr, inst.hex); ABI_CallFunctionC((void*)instr, inst.hex);
// This was added in revision 1954, I don't know what it does. MegaMan would hang if this was enabled.
/*
if (js.isLastInstruction)
{
MOV(32, R(EAX), M(&NPC));
WriteRfiExitDestInEAX();
}
*/
} }
void Jit64::unknown_instruction(UGeckoInstruction inst) void Jit64::unknown_instruction(UGeckoInstruction inst)

2
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -14,13 +14,13 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include "Common.h" #include "Common.h"
#include "AboutDolphin.h" #include "AboutDolphin.h"
#include "svnrev.h" #include "svnrev.h"
#include "CPUDetect.h" #include "CPUDetect.h"
#include "../resources/dolphin_logo.cpp" #include "../resources/dolphin_logo.cpp"
BEGIN_EVENT_TABLE(AboutDolphin, wxDialog) BEGIN_EVENT_TABLE(AboutDolphin, wxDialog)
EVT_CLOSE(AboutDolphin::OnClose) EVT_CLOSE(AboutDolphin::OnClose)
EVT_BUTTON(ID_CLOSE, AboutDolphin::CloseClick) EVT_BUTTON(ID_CLOSE, AboutDolphin::CloseClick)

4
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -102,8 +102,8 @@ bool DolphinApp::OnInit()
bool LoadElf = false; wxString ElfFile; bool LoadElf = false; wxString ElfFile;
// Detect CPU info and write it to the cpu_info struct // Detect CPU info and write it to the cpu_info struct
DetectCPU(); cpu_info.Detect();
//
#if defined _DEBUG && defined _WIN32 #if defined _DEBUG && defined _WIN32
int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); int tmpflag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF; tmpflag |= _CRTDBG_DELAY_FREE_MEM_DF;

2
Source/Core/DolphinWX/Src/MainNoGUI.cpp
View File

@ -196,7 +196,7 @@ int main(int argc, char* argv[])
std::string bootFile(args_info.inputs[0]); std::string bootFile(args_info.inputs[0]);
updateMainFrameEvent.Init(); updateMainFrameEvent.Init();
DetectCPU(); cpu_info.Detect();
BootManager::BootCore(bootFile); BootManager::BootCore(bootFile);
while (PowerPC::state != PowerPC::CPU_POWERDOWN) while (PowerPC::state != PowerPC::CPU_POWERDOWN)
{ {

17
Source/Plugins/Plugin_VideoOGL/Src/Globals.cpp
View File

@ -51,6 +51,7 @@ void CloseConsole()
} }
//////////////////////////////////////////////////////////////////////////////////////////
// Write logs // Write logs
// The log file handle // The log file handle
@ -62,11 +63,14 @@ bool LocalLogFile = true;
#ifdef LOGGING #ifdef LOGGING
void __Log(const char *fmt, ...) void __Log(const char *fmt, ...)
{ {
char* Msg = (char*)alloca(strlen(fmt)+512); int len = strlen(fmt);
if (!len)
return;
char* Msg = (char*)alloca(len + 512);
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf( Msg, strlen(fmt)+512, fmt, ap ); vsnprintf(Msg, len + 512, fmt, ap);
va_end(ap); va_end(ap);
g_VideoInitialize.pLog(Msg, FALSE); g_VideoInitialize.pLog(Msg, FALSE);
@ -85,15 +89,18 @@ void __Log(const char *fmt, ...)
void __Log(int type, const char *fmt, ...) void __Log(int type, const char *fmt, ...)
{ {
char* Msg = (char*)alloca(strlen(fmt)+512); int len = strlen(fmt);
if (!len)
return;
char* Msg = (char*)alloca(len + 512);
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vsnprintf( Msg, strlen(fmt)+512, fmt, ap ); vsnprintf(Msg, len + 512, fmt, ap);
va_end(ap); va_end(ap);
g_VideoInitialize.pLog(Msg, FALSE); g_VideoInitialize.pLog(Msg, FALSE);
Console::Print(Msg); Console::Print(Msg);
} }
#endif
#endif