diff options
| author | João Silva | 2017-02-12 01:52:03 +0000 |
|---|---|---|
| committer | João Silva | 2017-02-12 01:52:03 +0000 |
| commit | 3777d1fcf4232cde426f46b7ee5c374fd949b1b0 (patch) | |
| tree | e76f38bc1bac83bab19daea51d63ed87236e047e /source/cpuexec.h | |
| parent | b6006bc542f89ad1b7086268f851f0ba880ad6cd (diff) | |
| download | snes9x2005-3777d1fcf4232cde426f46b7ee5c374fd949b1b0.tar.gz snes9x2005-3777d1fcf4232cde426f46b7ee5c374fd949b1b0.tar.bz2 snes9x2005-3777d1fcf4232cde426f46b7ee5c374fd949b1b0.zip | |
Type fixes. Fixes from snes9x 1.50. Minor changes and optimizations.
Diffstat (limited to 'source/cpuexec.h')
| -rw-r--r-- | source/cpuexec.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/source/cpuexec.h b/source/cpuexec.h index c4342be..6d738dd 100644 --- a/source/cpuexec.h +++ b/source/cpuexec.h @@ -6,9 +6,9 @@ typedef struct { #ifdef __WIN32__ - void (__cdecl* S9xOpcode)(void); + void (__cdecl* S9xOpcode)(); #else - void (*S9xOpcode)(void); + void (*S9xOpcode)(); #endif } SOpcodes; @@ -41,9 +41,9 @@ typedef struct uint32_t FrameAdvanceCount; } SICPU; -void S9xMainLoop(void); -void S9xReset(void); -void S9xSoftReset(void); +void S9xMainLoop(); +void S9xReset(); +void S9xSoftReset(); void S9xDoHBlankProcessing_SFX(); void S9xDoHBlankProcessing_NoSFX(); void S9xClearIRQ(uint32_t); @@ -68,8 +68,7 @@ static inline void S9xUnpackStatus() static inline void S9xPackStatus() { ICPU.Registers.PL &= ~(Zero | Negative | Carry | Overflow); - ICPU.Registers.PL |= ICPU._Carry | ((ICPU._Zero == 0) << 1) | - (ICPU._Negative & 0x80) | (ICPU._Overflow << 6); + ICPU.Registers.PL |= ICPU._Carry | ((ICPU._Zero == 0) << 1) | (ICPU._Negative & 0x80) | (ICPU._Overflow << 6); } static inline void CLEAR_IRQ_SOURCE(uint32_t M) @@ -104,8 +103,7 @@ static inline void S9xReschedule() uint8_t which; int32_t max; - if (CPU.WhichEvent == HBLANK_START_EVENT || - CPU.WhichEvent == HTIMER_AFTER_EVENT) + if (CPU.WhichEvent == HBLANK_START_EVENT || CPU.WhichEvent == HTIMER_AFTER_EVENT) { which = HBLANK_END_EVENT; max = Settings.H_Max; |