diff options
author | Twinaphex | 2017-08-14 07:23:57 +0200 |
---|---|---|
committer | GitHub | 2017-08-14 07:23:57 +0200 |
commit | 262051693823522c34a3e19904bf4ed9f1877e65 (patch) | |
tree | d0dd772a589dbfa07bacd70207fc4db0f37d4109 /source/cpuaddr.h | |
parent | 62be8bed4dc3dc7793f1df1391f153436e4ea949 (diff) | |
parent | 5e450063fbe25926ae50d569c285db428055318a (diff) | |
download | snesemu-262051693823522c34a3e19904bf4ed9f1877e65.tar.gz snesemu-262051693823522c34a3e19904bf4ed9f1877e65.tar.bz2 snesemu-262051693823522c34a3e19904bf4ed9f1877e65.zip |
Merge pull request #39 from jamsilva/master
Fixes and cleanups
Diffstat (limited to 'source/cpuaddr.h')
-rw-r--r-- | source/cpuaddr.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/source/cpuaddr.h b/source/cpuaddr.h index 4c0fb84..bdeb242 100644 --- a/source/cpuaddr.h +++ b/source/cpuaddr.h @@ -13,13 +13,13 @@ static INLINE void Immediate8(void) CPU.PC++; } -static INLINE void Immediate16() +static INLINE void Immediate16(void) { OpAddress = ICPU.ShiftedPB + CPU.PC - CPU.PCBase; CPU.PC += 2; } -static INLINE void Relative() +static INLINE void Relative(void) { int8_t Int8 = *CPU.PC++; #ifndef SA1_OPCODES @@ -28,7 +28,7 @@ static INLINE void Relative() OpAddress = ((int32_t)(CPU.PC - CPU.PCBase) + Int8) & 0xffff; } -static INLINE void RelativeLong() +static INLINE void RelativeLong(void) { #ifdef FAST_LSB_WORD_ACCESS OpAddress = *(uint16_t*) CPU.PC; @@ -152,9 +152,6 @@ static INLINE void DirectIndirectIndexed(bool read) if (read) OpenBus = (uint8_t)(OpAddress >> 8); OpAddress += ICPU.ShiftedDB + ICPU.Registers.Y.W; - - // XXX: always add one if STA - // XXX: else Add one cycle if crosses page boundary } static INLINE void DirectIndirectIndexedLong(bool read) @@ -221,8 +218,6 @@ static INLINE void AbsoluteIndexedX(bool read) #ifndef SA1_OPCODES CPU.Cycles += CPU.MemSpeedx2; #endif - // XXX: always add one cycle for ROL, LSR, etc - // XXX: else is cross page boundary add one cycle } static INLINE void AbsoluteIndexedY(bool read) @@ -238,8 +233,6 @@ static INLINE void AbsoluteIndexedY(bool read) #ifndef SA1_OPCODES CPU.Cycles += CPU.MemSpeedx2; #endif - // XXX: always add cycle for STA - // XXX: else is cross page boundary add one cycle } static INLINE void AbsoluteLongIndexedX(bool read) |