make LLE "work" on linux

also with XK's patch to fix LLE save state


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@539 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2008-09-16 13:53:11 +00:00
parent 17b8a7511b
commit 4de10e2d94
6 changed files with 24 additions and 14 deletions

View File

@ -54,7 +54,7 @@ dirs = [
"Source/Core/VideoCommon/Src", "Source/Core/VideoCommon/Src",
"Source/Plugins/Plugin_VideoOGL/Src", "Source/Plugins/Plugin_VideoOGL/Src",
"Source/Plugins/Plugin_DSP_HLE/Src", "Source/Plugins/Plugin_DSP_HLE/Src",
#"Source/Plugins/Plugin_DSP_LLE/Src", "Source/Plugins/Plugin_DSP_LLE/Src",
"Source/Plugins/Plugin_PadSimple/Src", "Source/Plugins/Plugin_PadSimple/Src",
"Source/Plugins/Plugin_nJoy_SDL/Src", "Source/Plugins/Plugin_nJoy_SDL/Src",
"Source/Plugins/Plugin_Wiimote_Test/Src", "Source/Plugins/Plugin_Wiimote_Test/Src",

View File

@ -29,11 +29,7 @@
// //
#include "Globals.h" #include "Globals.h"
#include "gdsp_ext_op.h" #include "gdsp_opcodes_helper.h"
#include "gdsp_interpreter.h"
#include "gdsp_memory.h"
extern inline void dsp_op_write_reg(uint8 reg, uint16 val);
// //

View File

@ -25,11 +25,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "gdsp_opcodes.h"
#include "gdsp_interpreter.h"
#include "gdsp_memory.h"
#include "gdsp_registers.h"
#include "gdsp_interface.h" #include "gdsp_interface.h"
#include "gdsp_opcodes_helper.h"
#include "Tools.h" #include "Tools.h"
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------

View File

@ -47,7 +47,4 @@ void dsp_opf(uint16 opc);
#define FLAG_ENABLE_INTERUPT 11 #define FLAG_ENABLE_INTERUPT 11
extern inline bool dsp_SR_is_flag_set(uint8 flag);
#endif #endif

View File

@ -27,6 +27,13 @@
#define _GDSP_OPCODES_HELPER_H #define _GDSP_OPCODES_HELPER_H
#include "Globals.h" #include "Globals.h"
#include "gdsp_opcodes.h"
#include "gdsp_memory.h"
#include "gdsp_interpreter.h"
#include "gdsp_registers.h"
#include "gdsp_ext_op.h"
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
// //
// --- SR // --- SR
@ -185,7 +192,7 @@ inline sint16 dsp_get_acc_m(uint8 _reg)
} }
sint16 dsp_get_acc_h(uint8 _reg) inline sint16 dsp_get_acc_h(uint8 _reg)
{ {
_dbg_assert_(_reg < 2); _dbg_assert_(_reg < 2);
return(g_dsp.r[0x10 + _reg]); return(g_dsp.r[0x10 + _reg]);

View File

@ -98,6 +98,10 @@ void DllConfig(HWND _hParent)
{} {}
void DSP_DoState(unsigned char **ptr, int mode) {
PointerWrap p(ptr, mode);
}
void DllDebugger(HWND _hParent) void DllDebugger(HWND _hParent)
{ {
#if defined (_DEBUG) && defined (_WIN32) #if defined (_DEBUG) && defined (_WIN32)
@ -165,6 +169,7 @@ void Mixer(short* buffer, int numSamples, int bits, int rate, int channels)
void DSP_Initialize(DSPInitialize _dspInitialize) void DSP_Initialize(DSPInitialize _dspInitialize)
{ {
bool bCanWork = true;
g_dspInitialize = _dspInitialize; g_dspInitialize = _dspInitialize;
gdsp_init(); gdsp_init();
@ -175,14 +180,21 @@ void DSP_Initialize(DSPInitialize _dspInitialize)
if (!gdsp_load_rom("data\\dsp_rom.bin")) if (!gdsp_load_rom("data\\dsp_rom.bin"))
{ {
bCanWork = false;
PanicAlert("No DSP ROM");
ErrorLog("Cannot load DSP ROM\n"); ErrorLog("Cannot load DSP ROM\n");
} }
if (!gdsp_load_coef("data\\dsp_coef.bin")) if (!gdsp_load_coef("data\\dsp_coef.bin"))
{ {
bCanWork = false;
PanicAlert("No DSP COEF");
ErrorLog("Cannot load DSP COEF\n"); ErrorLog("Cannot load DSP COEF\n");
} }
if(!bCanWork)
return; // TODO: Don't let it work
/* Dump UCode to file... /* Dump UCode to file...
FILE* t = fopen("e:\\hmm.txt", "wb"); FILE* t = fopen("e:\\hmm.txt", "wb");
gd_globals_t gdg; gd_globals_t gdg;