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

Riccardom patch: 

armcpu.cpp: move some debug stuff under #if 0. Disassembler.cpp, Render3d.cpp: make some functions static
(I didn't removed the #if'ed code... not sure what it was used for...)
This commit is contained in:
yabause 2008-11-04 21:45:48 +00:00
parent e2f9a0029c
commit 1909333fb0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/Disassembler.cpp
View File

@ -3308,7 +3308,7 @@ static char * OP_BKPT(u32 adr, u32 i, char * txt)
//----------------CDP----------------------- //----------------CDP-----------------------
char * OP_CDP(u32 adr, u32 i, char * txt) static char * OP_CDP(u32 adr, u32 i, char * txt)
{ {
sprintf(txt, "CDP-------------------------------"); sprintf(txt, "CDP-------------------------------");
return txt; return txt;

2
desmume/src/armcpu.cpp
View File

@ -417,6 +417,7 @@ armcpu_prefetch()
return MMU.MMU_WAIT16[PROCNUM][(armcpu->instruct_adr>>24)&0xF]; return MMU.MMU_WAIT16[PROCNUM][(armcpu->instruct_adr>>24)&0xF];
} }
#if 0 /* not used */
static BOOL FASTCALL test_EQ(Status_Reg CPSR) { return ( CPSR.bits.Z); } static BOOL FASTCALL test_EQ(Status_Reg CPSR) { return ( CPSR.bits.Z); }
static BOOL FASTCALL test_NE(Status_Reg CPSR) { return (!CPSR.bits.Z); } static BOOL FASTCALL test_NE(Status_Reg CPSR) { return (!CPSR.bits.Z); }
static BOOL FASTCALL test_CS(Status_Reg CPSR) { return ( CPSR.bits.C); } static BOOL FASTCALL test_CS(Status_Reg CPSR) { return ( CPSR.bits.C); }
@ -445,6 +446,7 @@ static BOOL (FASTCALL* test_conditions[])(Status_Reg CPSR)= {
}; };
#define TEST_COND2(cond, CPSR) \ #define TEST_COND2(cond, CPSR) \
(cond<15&&test_conditions[cond](CPSR)) (cond<15&&test_conditions[cond](CPSR))
#endif
BOOL armcpu_irqExeption(armcpu_t *armcpu) BOOL armcpu_irqExeption(armcpu_t *armcpu)

6
desmume/src/render3D.cpp
View File

@ -20,9 +20,9 @@
#include "render3D.h" #include "render3D.h"
void NDS_nullFunc1 (void){} static void NDS_nullFunc1 (void){}
char NDS_nullFunc2 (void){ return 1; } static char NDS_nullFunc2 (void){ return 1; }
void NDS_nullFunc3 (int,unsigned short*) {} static void NDS_nullFunc3 (int,unsigned short*) {}
GPU3DInterface gpu3DNull = { GPU3DInterface gpu3DNull = {
NDS_nullFunc2, //NDS_3D_Init NDS_nullFunc2, //NDS_3D_Init