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

Fixed compilation on linux.

This commit is contained in:
yabause 2008-12-08 20:27:09 +00:00
parent e40813eece
commit 2a6fa23065
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/arm_instructions.cpp
View File

@ -1185,8 +1185,8 @@ TEMPLATE static u32 FASTCALL OP_ADC_IMM_VAL()
}\ }\
cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,12)]);\ cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,12)]);\
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,12)]==0);\ cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,12)]==0);\
cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(shift_op, cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\ cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(shift_op, (u32) cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\
cpu->CPSR.bits.V = SIGNED_OVERFLOW(shift_op, cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\ cpu->CPSR.bits.V = SIGNED_OVERFLOW(shift_op, (u32) cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(v, tmp, cpu->R[REG_POS(i,12)]);\
return a; \ return a; \
} }

2
desmume/src/cli/main.cpp
View File

@ -776,7 +776,7 @@ int main(int argc, char ** argv) {
} }
update_keypad(keypad); /* Update keypad */ update_keypad(keypad); /* Update keypad */
last_cycle = NDS_exec((560190 << 1) - last_cycle, FALSE); last_cycle = NDS_exec<false>((560190 << 1) - last_cycle);
SPU_Emulate_user(); SPU_Emulate_user();
SPU_Emulate_core(); SPU_Emulate_core();

2
desmume/src/gtk-glade/desmume.cpp
View File

@ -116,7 +116,7 @@ void desmume_cycle()
/* Update keypad value */ /* Update keypad value */
update_keypad(keypad); update_keypad(keypad);
desmume_last_cycle = NDS_exec((560190 << 1) - desmume_last_cycle, FALSE); desmume_last_cycle = NDS_exec<false>((560190 << 1) - desmume_last_cycle);
SPU_Emulate_user(); SPU_Emulate_user();
SPU_Emulate_core(); SPU_Emulate_core();
} }

2
desmume/src/gtk/desmume.cpp
View File

@ -88,7 +88,7 @@ void desmume_cycle( void)
/* Update keypad value */ /* Update keypad value */
update_keypad(keypad); update_keypad(keypad);
desmume_last_cycle = NDS_exec((560190 << 1) - desmume_last_cycle, FALSE); desmume_last_cycle = NDS_exec<false>((560190 << 1) - desmume_last_cycle);
SPU_Emulate_user(); SPU_Emulate_user();
SPU_Emulate_core(); SPU_Emulate_core();
} }

6
desmume/src/thumb_instructions.cpp
View File

@ -355,8 +355,8 @@ TEMPLATE static u32 FASTCALL OP_ADC_REG()
cpu->CPSR.bits.N = BIT31(res); cpu->CPSR.bits.N = BIT31(res);
cpu->CPSR.bits.Z = res == 0; cpu->CPSR.bits.Z = res == 0;
cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(b, cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(tmp, a, res); cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(b, (u32) cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(tmp, a, res);
cpu->CPSR.bits.V = SIGNED_OVERFLOW(b, cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(tmp, a, res); cpu->CPSR.bits.V = SIGNED_OVERFLOW(b, (u32) cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(tmp, a, res);
return 3; return 3;
} }
@ -964,4 +964,4 @@ TEMPLATE static u32 FASTCALL OP_BL_THUMB()
#define NOM_THUMB_TAB thumb_instructions_set_1 #define NOM_THUMB_TAB thumb_instructions_set_1
#define TABDECL(x) x<1> #define TABDECL(x) x<1>
#include "thumb_tabdef.inc" #include "thumb_tabdef.inc"