From 8a50d176b72a48dc1a8892ee398cf8855c244812 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 30 Oct 2014 02:03:23 +0100
Subject: New Makefile

---
 source/cpuexec.h | 18 ++++++++++--------
 source/getset.h  | 16 ++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'source')

diff --git a/source/cpuexec.h b/source/cpuexec.h
index 3eb6064..ca5eb4f 100644
--- a/source/cpuexec.h
+++ b/source/cpuexec.h
@@ -89,6 +89,16 @@
 
 #ifndef _CPUEXEC_H_
 #define _CPUEXEC_H_
+
+typedef struct
+{
+#ifdef __WIN32__
+   void (__cdecl* S9xOpcode)(void);
+#else
+   void (*S9xOpcode)(void);
+#endif
+} SOpcodes;
+
 #include "ppu.h"
 #include "memmap.h"
 #include "65c816.h"
@@ -101,14 +111,6 @@
     if (CPU.Cycles >= CPU.NextEvent) \
    S9xDoHBlankProcessing_NoSFX ();
 
-typedef struct
-{
-#ifdef __WIN32__
-   void (__cdecl* S9xOpcode)(void);
-#else
-   void (*S9xOpcode)(void);
-#endif
-} SOpcodes;
 
 typedef struct
 {
diff --git a/source/getset.h b/source/getset.h
index 558ed98..05247c9 100644
--- a/source/getset.h
+++ b/source/getset.h
@@ -100,7 +100,7 @@
 
 extern uint8 OpenBus;
 
-uint8 S9xGetByte(uint32 Address)
+static inline uint8 S9xGetByte(uint32 Address)
 {
    int block;
    uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) &
@@ -183,7 +183,7 @@ uint8 S9xGetByte(uint32 Address)
    }
 }
 
-uint16 S9xGetWord(uint32 Address)
+static inline uint16 S9xGetWord(uint32 Address)
 {
    if ((Address & 0x0fff) == 0x0fff)
    {
@@ -296,7 +296,7 @@ uint16 S9xGetWord(uint32 Address)
    }
 }
 
-void S9xSetByte(uint8 Byte, uint32 Address)
+static inline void S9xSetByte(uint8 Byte, uint32 Address)
 {
 #if defined(CPU_SHUTDOWN)
    CPU.WaitAddress = NULL;
@@ -405,7 +405,7 @@ void S9xSetByte(uint8 Byte, uint32 Address)
    }
 }
 
-void S9xSetWord(uint16 Word, uint32 Address)
+static inline void S9xSetWord(uint16 Word, uint32 Address)
 {
    if ((Address & 0x0FFF) == 0x0FFF)
    {
@@ -557,7 +557,7 @@ void S9xSetWord(uint16 Word, uint32 Address)
    }
 }
 
-uint8* GetBasePointer(uint32 Address)
+static inline uint8* GetBasePointer(uint32 Address)
 {
    uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
    if (GetAddress >= (uint8*) MAP_LAST)
@@ -609,7 +609,7 @@ uint8* GetBasePointer(uint32 Address)
    }
 }
 
-uint8* S9xGetMemPointer(uint32 Address)
+static inline uint8* S9xGetMemPointer(uint32 Address)
 {
    uint8* GetAddress = Memory.Map [(Address >> MEMMAP_SHIFT) & MEMMAP_MASK];
    if (GetAddress >= (uint8*) MAP_LAST)
@@ -654,7 +654,7 @@ uint8* S9xGetMemPointer(uint32 Address)
    }
 }
 
-void S9xSetPCBase(uint32 Address)
+static inline void S9xSetPCBase(uint32 Address)
 {
    int block;
    uint8* GetAddress = Memory.Map [block = (Address >> MEMMAP_SHIFT) &
@@ -716,5 +716,5 @@ void S9xSetPCBase(uint32 Address)
       return;
    }
 }
-#endif
 
+#endif
-- 
cgit v1.2.3