diff options
author | João Silva | 2017-06-18 16:16:19 +0100 |
---|---|---|
committer | João Silva | 2017-06-18 16:16:19 +0100 |
commit | bcaf44c511efaad9d803dde9b0fdbb046498c66f (patch) | |
tree | c526c7d332be548a42364eea9113b6d33345b840 /source/apumem.h | |
parent | 10a58e72aa3f74a821fa9be07ffd3992ffa93600 (diff) | |
download | snes9x2005-bcaf44c511efaad9d803dde9b0fdbb046498c66f.tar.gz snes9x2005-bcaf44c511efaad9d803dde9b0fdbb046498c66f.tar.bz2 snes9x2005-bcaf44c511efaad9d803dde9b0fdbb046498c66f.zip |
Support for savestate versioning. Plenty of cleanups.
Diffstat (limited to 'source/apumem.h')
-rw-r--r-- | source/apumem.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/source/apumem.h b/source/apumem.h index 8a9f09a..c58b808 100644 --- a/source/apumem.h +++ b/source/apumem.h @@ -6,24 +6,20 @@ extern uint8_t W4; extern uint8_t APUROM[64]; -INLINE uint8_t S9xAPUGetByteZ(uint8_t Address) +static inline uint8_t S9xAPUGetByteZ(uint8_t Address) { if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM) { if (Address >= 0xf4 && Address <= 0xf7) { -#ifdef SPC700_SHUTDOWN IAPU.WaitAddress2 = IAPU.WaitAddress1; IAPU.WaitAddress1 = IAPU.PC; -#endif return (IAPU.RAM [Address]); } if (Address >= 0xfd) { -#ifdef SPC700_SHUTDOWN IAPU.WaitAddress2 = IAPU.WaitAddress1; IAPU.WaitAddress1 = IAPU.PC; -#endif uint8_t t = IAPU.RAM [Address]; IAPU.RAM [Address] = 0; return (t); @@ -33,11 +29,10 @@ INLINE uint8_t S9xAPUGetByteZ(uint8_t Address) return (IAPU.RAM [Address]); } - else - return (IAPU.DirectPage [Address]); + return (IAPU.DirectPage [Address]); } -INLINE void S9xAPUSetByteZ(uint8_t byte, uint8_t Address) +static inline void S9xAPUSetByteZ(uint8_t byte, uint8_t Address) { if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM) { @@ -63,7 +58,7 @@ INLINE void S9xAPUSetByteZ(uint8_t byte, uint8_t Address) IAPU.DirectPage [Address] = byte; } -INLINE uint8_t S9xAPUGetByte(uint32_t Address) +static inline uint8_t S9xAPUGetByte(uint32_t Address) { Address &= 0xffff; @@ -73,13 +68,11 @@ INLINE uint8_t S9xAPUGetByte(uint32_t Address) bool zero = (Address >= 0xfd && Address <= 0xff); uint8_t t = IAPU.RAM [Address]; -#ifdef SPC700_SHUTDOWN if (zero || (Address >= 0xf4 && Address <= 0xf7)) { IAPU.WaitAddress2 = IAPU.WaitAddress1; IAPU.WaitAddress1 = IAPU.PC; } -#endif if(zero) IAPU.RAM [Address] = 0; @@ -87,7 +80,7 @@ INLINE uint8_t S9xAPUGetByte(uint32_t Address) return t; } -INLINE void S9xAPUSetByte(uint8_t byte, uint32_t Address) +static inline void S9xAPUSetByte(uint8_t byte, uint32_t Address) { Address &= 0xffff; |