diff options
| -rw-r--r-- | libretro.c | 6 | ||||
| -rw-r--r-- | source/apumem.h | 8 | ||||
| -rw-r--r-- | source/getset.h | 14 | ||||
| -rw-r--r-- | source/memmap.h | 2 | ||||
| -rw-r--r-- | source/spc700.c | 2 |
5 files changed, 19 insertions, 13 deletions
@@ -11,6 +11,7 @@ #include "cpuexec.h" #include "spc7110.h" #include "srtc.h" +#include "sa1.h" #ifdef PSP #include <pspkernel.h> @@ -382,6 +383,9 @@ void retro_run(void) { int i, port; +// video_cb(NULL, IPPU.RenderedScreenWidth, IPPU.RenderedScreenHeight, GFX.Pitch); +// IPPU.RenderThisFrame = false; + poll_cb(); RETRO_PERFORMANCE_INIT(S9xMainLoop_func); @@ -400,6 +404,8 @@ void retro_run(void) samples_to_play -= (int)samples_to_play; } +// return; + #ifdef FRAMESKIP if (IPPU.RenderThisFrame) { diff --git a/source/apumem.h b/source/apumem.h index 686126c..27d9bfd 100644 --- a/source/apumem.h +++ b/source/apumem.h @@ -93,7 +93,7 @@ extern uint8 W4; extern uint8 APUROM[64]; -uint8 S9xAPUGetByteZ(uint8 Address) +INLINE uint8 S9xAPUGetByteZ(uint8 Address) { if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM) { @@ -124,7 +124,7 @@ uint8 S9xAPUGetByteZ(uint8 Address) return (IAPU.DirectPage [Address]); } -void S9xAPUSetByteZ(uint8 byte, uint8 Address) +INLINE void S9xAPUSetByteZ(uint8 byte, uint8 Address) { if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM) { @@ -150,7 +150,7 @@ void S9xAPUSetByteZ(uint8 byte, uint8 Address) IAPU.DirectPage [Address] = byte; } -uint8 S9xAPUGetByte(uint32 Address) +INLINE uint8 S9xAPUGetByte(uint32 Address) { Address &= 0xffff; @@ -182,7 +182,7 @@ uint8 S9xAPUGetByte(uint32 Address) return (IAPU.RAM [Address]); } -void S9xAPUSetByte(uint8 byte, uint32 Address) +INLINE void S9xAPUSetByte(uint8 byte, uint32 Address) { Address &= 0xffff; diff --git a/source/getset.h b/source/getset.h index 2bba5b1..3d5c529 100644 --- a/source/getset.h +++ b/source/getset.h @@ -100,7 +100,7 @@ extern uint8 OpenBus; -static inline uint8 S9xGetByte(uint32 Address) +INLINE uint8 S9xGetByte(uint32 Address) { int block; uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & @@ -183,7 +183,7 @@ static inline uint8 S9xGetByte(uint32 Address) } } -static inline uint16 S9xGetWord(uint32 Address) +INLINE uint16 S9xGetWord(uint32 Address) { if ((Address & 0x0fff) == 0x0fff) { @@ -296,7 +296,7 @@ static inline uint16 S9xGetWord(uint32 Address) } } -static inline void S9xSetByte(uint8 Byte, uint32 Address) +INLINE void S9xSetByte(uint8 Byte, uint32 Address) { #if defined(CPU_SHUTDOWN) CPU.WaitAddress = NULL; @@ -405,7 +405,7 @@ static inline void S9xSetByte(uint8 Byte, uint32 Address) } } -static inline void S9xSetWord(uint16 Word, uint32 Address) +INLINE void S9xSetWord(uint16 Word, uint32 Address) { if ((Address & 0x0FFF) == 0x0FFF) { @@ -557,7 +557,7 @@ static inline void S9xSetWord(uint16 Word, uint32 Address) } } -static inline uint8* GetBasePointer(uint32 Address) +INLINE uint8* GetBasePointer(uint32 Address) { uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK]; if (GetAddress >= (uint8*) MAP_LAST) @@ -609,7 +609,7 @@ static inline uint8* GetBasePointer(uint32 Address) } } -static inline uint8* S9xGetMemPointer(uint32 Address) +INLINE uint8* S9xGetMemPointer(uint32 Address) { uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK]; if (GetAddress >= (uint8*) MAP_LAST) @@ -654,7 +654,7 @@ static inline uint8* S9xGetMemPointer(uint32 Address) } } -static inline void S9xSetPCBase(uint32 Address) +INLINE void S9xSetPCBase(uint32 Address) { int block; uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) & diff --git a/source/memmap.h b/source/memmap.h index 3304095..d5d89b1 100644 --- a/source/memmap.h +++ b/source/memmap.h @@ -268,7 +268,7 @@ uint8* GetBasePointer(uint32 Address); extern uint8 OpenBus; #else -#define INLINE inline +#define INLINE static inline #include "getset.h" #endif // NO_INLINE_SET_GET diff --git a/source/spc700.c b/source/spc700.c index a17c7b7..e95ff46 100644 --- a/source/spc700.c +++ b/source/spc700.c @@ -103,7 +103,7 @@ void S9xAPUSetByte(uint8, uint32 address); #else #undef INLINE -#define INLINE inline +#define INLINE static inline #include "apumem.h" #endif |