ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove old define WITH_DSP_ON_THREAD 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2938 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-04-08 20:38:23 +00:00
parent 8c3bb3796b
commit e5edb4c4ad
3 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Plugins/Plugin_DSP_LLE/Src/Globals.h
View File

@ -22,10 +22,8 @@
#include "AudioCommon.h" #include "AudioCommon.h"
#include <stdio.h> #include <stdio.h>
#define WITH_DSP_ON_THREAD 1
#define PROFILE 0 #define PROFILE 0
void DSP_DebugBreak(); void DSP_DebugBreak();
u16 Memory_Read_U16(u32 _uAddress); // For PB address detection u16 Memory_Read_U16(u32 _uAddress); // For PB address detection

54
Source/Plugins/Plugin_DSP_LLE/Src/gdsp_interface.cpp
View File

@ -38,9 +38,7 @@
void gdsp_dma(); void gdsp_dma();
#if WITH_DSP_ON_THREAD
Common::CriticalSection g_CriticalSection; Common::CriticalSection g_CriticalSection;
#endif
static volatile u16 gdsp_mbox[2][2]; static volatile u16 gdsp_mbox[2][2];
@ -62,43 +60,33 @@ void gdsp_ifx_init()
u32 gdsp_mbox_peek(u8 mbx) u32 gdsp_mbox_peek(u8 mbx)
{ {
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Enter(); g_CriticalSection.Enter();
#endif
u32 value = ((gdsp_mbox[mbx][0] << 16) | gdsp_mbox[mbx][1]); u32 value = ((gdsp_mbox[mbx][0] << 16) | gdsp_mbox[mbx][1]);
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Leave(); g_CriticalSection.Leave();
#endif
return value; return value;
} }
void gdsp_mbox_write_h(u8 mbx, u16 val) void gdsp_mbox_write_h(u8 mbx, u16 val)
{ {
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Enter(); g_CriticalSection.Enter();
#endif
gdsp_mbox[mbx][0] = val & 0x7fff; gdsp_mbox[mbx][0] = val & 0x7fff;
if (g_dspInitialize.bOnThread)
#if WITH_DSP_ON_THREAD g_CriticalSection.Leave();
g_CriticalSection.Leave();
#endif
} }
void gdsp_mbox_write_l(u8 mbx, u16 val) void gdsp_mbox_write_l(u8 mbx, u16 val)
{ {
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Enter(); g_CriticalSection.Enter();
#endif
gdsp_mbox[mbx][1] = val; gdsp_mbox[mbx][1] = val;
gdsp_mbox[mbx][0] |= 0x8000; gdsp_mbox[mbx][0] |= 0x8000;
if (g_dspInitialize.bOnThread)
#if WITH_DSP_ON_THREAD g_CriticalSection.Leave();
g_CriticalSection.Leave();
#endif
if (mbx == GDSP_MBOX_DSP) if (mbx == GDSP_MBOX_DSP)
{ {
@ -109,25 +97,23 @@ void gdsp_mbox_write_l(u8 mbx, u16 val)
u16 gdsp_mbox_read_h(u8 mbx) u16 gdsp_mbox_read_h(u8 mbx)
{ {
return (gdsp_mbox[mbx][0]); // TODO: mask away the top bit? return gdsp_mbox[mbx][0]; // TODO: mask away the top bit?
} }
u16 gdsp_mbox_read_l(u8 mbx) u16 gdsp_mbox_read_l(u8 mbx)
{ {
u16 val; u16 val;
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Enter(); g_CriticalSection.Enter();
#endif
val = gdsp_mbox[mbx][1]; val = gdsp_mbox[mbx][1];
gdsp_mbox[mbx][0] &= ~0x8000; gdsp_mbox[mbx][0] &= ~0x8000;
DEBUG_LOG(DSPLLE, "- DSP reads mail from mbx %i: %08x (pc=0x%04x)", mbx, gdsp_mbox_peek(mbx), g_dsp.err_pc); DEBUG_LOG(DSPLLE, "- DSP reads mail from mbx %i: %08x (pc=0x%04x)", mbx, gdsp_mbox_peek(mbx), g_dsp.err_pc);
#if WITH_DSP_ON_THREAD if (g_dspInitialize.bOnThread)
g_CriticalSection.Leave(); g_CriticalSection.Leave();
#endif
return val; return val;
} }
@ -281,12 +267,6 @@ void gdsp_ddma_out(u16 dsp_addr, u32 addr, u32 size)
INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)\n", dsp_addr / 2, addr, size); INFO_LOG(DSPLLE, "*** ddma_out DRAM_DSP (0x%04x) -> RAM (0x%08x) : size (0x%08x)\n", dsp_addr / 2, addr, size);
} }
#define DSP_CR_IMEM (2)
#define DSP_CR_DMEM (0)
#define DSP_CR_TO_CPU (1)
#define DSP_CR_FROM_CPU (0)
void gdsp_dma() void gdsp_dma()
{ {
u16 ctl; u16 ctl;

5
Source/Plugins/Plugin_DSP_LLE/Src/gdsp_interpreter.h
View File

@ -66,6 +66,11 @@
#define DSP_STACK_DEPTH 0x20 #define DSP_STACK_DEPTH 0x20
#define DSP_STACK_MASK 0x1f #define DSP_STACK_MASK 0x1f
#define DSP_CR_IMEM 2
#define DSP_CR_DMEM 0
#define DSP_CR_TO_CPU 1
#define DSP_CR_FROM_CPU 0
struct SDSP struct SDSP
{ {
u16 r[32]; u16 r[32];