mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-19 06:40:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve lost symbols in HLE/LLE-t DSP

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2744 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2009-03-23 21:15:37 +00:00
parent 7f66eaa694
commit 63ecc01cc6
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Plugins/Plugin_DSP_HLE/Src/Globals.h
View File

@ -22,6 +22,7 @@
#include "pluginspecs_dsp.h" #include "pluginspecs_dsp.h"
#include "StringUtil.h" #include "StringUtil.h"
#include "../../../Core/Core/Src/ConfigManager.h" // FIXME
extern DSPInitialize g_dspInitialize; extern DSPInitialize g_dspInitialize;
extern bool gSSBM; extern bool gSSBM;
@ -37,4 +38,6 @@ u16 Memory_Read_U16(u32 _uAddress);
u32 Memory_Read_U32(u32 _uAddress); u32 Memory_Read_U32(u32 _uAddress);
float Memory_Read_Float(u32 _uAddress); float Memory_Read_Float(u32 _uAddress);
extern PLUGIN_GLOBALS* globals;
#endif #endif

40
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -24,6 +24,7 @@ extern CDebugger* m_frame;
#endif #endif
#include <sstream> #include <sstream>
#include "../Globals.h"
#include "../PCHW/Mixer.h" #include "../PCHW/Mixer.h"
#include "../MailHandler.h" #include "../MailHandler.h"
@ -41,7 +42,6 @@ extern bool gSSBMremedy2;
extern bool gSequenced; extern bool gSequenced;
extern bool gVolume; extern bool gVolume;
extern bool gReset; extern bool gReset;
extern std::string gpName;
std::vector<std::string> sMailLog, sMailTime; std::vector<std::string> sMailLog, sMailTime;
// ----------- // -----------
@ -67,27 +67,24 @@ CUCode_AX::~CUCode_AX()
} }
// ============================================
// Save file to harddrive // Save file to harddrive
// ----------------
void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii) void CUCode_AX::SaveLogFile(std::string f, int resizeTo, bool type, bool Wii)
{ {
if (gpName.length() > 0) // this is currently off in the Release build //#ifdef DEBUG_LEVEL
{ std::ostringstream ci;
std::ostringstream ci; std::ostringstream cType;
std::ostringstream cType;
ci << (resizeTo - 1); // write ci
ci << (resizeTo - 1); // write ci cType << type; // write cType
cType << type; // write cType
std::string FileName = FULL_MAIL_LOGS_DIR + ((struct SConfig *)globals->config)->m_LocalCoreStartupParameter.GetUniqueID();
std::string FileName = FULL_MAIL_LOGS_DIR + gpName; FileName += "_sep"; FileName += ci.str(); FileName += "_sep"; FileName += cType.str();
FileName += "_sep"; FileName += ci.str(); FileName += "_sep"; FileName += cType.str(); FileName += Wii ? "_sepWii_sep" : "_sepGC_sep"; FileName += ".log";
FileName += Wii ? "_sepWii_sep" : "_sepGC_sep"; FileName += ".log";
FILE* fhandle = fopen(FileName.c_str(), "w");
FILE* fhandle = fopen(FileName.c_str(), "w"); fprintf(fhandle, "%s", f.c_str());
fprintf(fhandle, "%s", f.c_str()); fflush(fhandle); fhandle = NULL;
fflush(fhandle); fhandle = NULL; //#endif
}
} }
@ -103,8 +100,6 @@ void CUCode_AX::SaveLog_(bool Wii, const char* _fmt, va_list ap)
if(m_frame->ScanMails) if(m_frame->ScanMails)
{ {
//wxMessageBox( wxString::Format("SaveLog_ again: %s\n", Msg) );
if(strcmp(Msg, "Begin") == 0) if(strcmp(Msg, "Begin") == 0)
{ {
TmpMailLog = ""; TmpMailLog = "";
@ -113,14 +108,13 @@ if(m_frame->ScanMails)
{ {
if(saveNext && saveNext < 100) // limit because saveNext is not initialized if(saveNext && saveNext < 100) // limit because saveNext is not initialized
{ {
//Console::Print("End");
// Save the timestamps and comment // Save the timestamps and comment
std::ostringstream ci; std::ostringstream ci;
ci << (saveNext - 1); ci << (saveNext - 1);
TmpMailLog += "\n\n"; TmpMailLog += "\n\n";
TmpMailLog += "-----------------------------------------------------------------------\n"; TmpMailLog += "-----------------------------------------------------------------------\n";
TmpMailLog += "Current mail: " + gpName + " mail " + ci.str() + "\n"; TmpMailLog += "Current mail: " + ((struct SConfig *)globals->config)->m_LocalCoreStartupParameter.GetUniqueID() + " mail " + ci.str() + "\n";
if(Wii) if(Wii)
TmpMailLog += "Current CRC: " + StringFromFormat("0x%08x \n\n", _CRC); TmpMailLog += "Current CRC: " + StringFromFormat("0x%08x \n\n", _CRC);

2
Source/Plugins/Plugin_DSP_LLE-testing/Src/SConscript
View File

@ -39,7 +39,7 @@ files = [
lleenv = env.Clone() lleenv = env.Clone()
lleenv.Append( lleenv.Append(
CXXFLAGS = [ '-fPIC' ], CXXFLAGS = [ '-fPIC' ],
LIBS = [ 'common' ], LIBS = [ 'common', 'audiocommon' ],
) )
lleenv.SharedLibrary(env['plugin_dir']+name, files) lleenv.SharedLibrary(env['plugin_dir']+name, files)