get rid of all remaining C++ code.

Author: aliaspider

libretro.c

@@ -88,7 +88,7 @@ unsigned retro_api_version() { return RETRO_API_VERSION; }
 
 
 
-void S9xProcessSound (unsigned int);
+void S9xProcessSound (unsigned int samples);
 
 char *rom_filename = NULL;
 char *SDD1_pack = NULL;
@@ -105,7 +105,7 @@ static u8 Buf[MAX_BUFFER_SIZE];
 #define FIXED_POINT_SHIFT 16
 #define FIXED_POINT_REMAINDER 0xffff
 
-void S9xMessage (int /*type*/, int /*number*/, const char *message)
+void S9xMessage (int type, int number, const char *message)
 {
 #if 1
 #define MAX_MESSAGE_LEN (36 * 3)
@@ -226,7 +226,7 @@ void S9xDeinitUpdate (int width, int height)
 
 #endif
 
-void _makepath (char *path, const char *, const char *dir,
+void _makepath (char *path, const char *drive, const char *dir,
       const char *fname, const char *ext)
 {
     if (dir && *dir)
@@ -419,7 +419,7 @@ void init_sfc_setting(void)
 
 void S9xAutoSaveSRAM ()
 {
-    Memory.SaveSRAM (S9xGetFilename (".srm"));
+    SaveSRAM (S9xGetFilename (".srm"));
 }
 
 int game_load_state(char* file)
@@ -456,13 +456,13 @@ int load_gamepak(const char* file)
 {
    CPU.Flags = 0;
    // mdelay(50); // Delete this delay
-   if (!Memory.LoadROM (file))
+   if (!LoadROM (file))
       return -1;
    S9xReset ();
 
    Settings.FrameTime = (Settings.PAL ? Settings.FrameTimePAL : Settings.FrameTimeNTSC);
 
-   Memory.LoadSRAM (S9xGetFilename (".srm"));
+   LoadSRAM (S9xGetFilename (".srm"));
    S9xLoadCheatFile (S9xGetFilename (".chb")); // cheat binary file, as opposed to text
 
    return 0;
@@ -486,7 +486,7 @@ void retro_init (void)
 
    init_sfc_setting();
 
-    if (!Memory.Init () || !S9xInitAPU())
+    if (!Init () || !S9xInitAPU())
       OutOfMemory ();
 
    S9xInitDisplay ();
@@ -654,7 +654,7 @@ static unsigned int LastSoundEmissionTime = 0;
  */
 static unsigned int SoundEmissionTimeError = 0;
 
-void S9xProcessSound (unsigned int)
+void S9xProcessSound (unsigned int samples)
 {
 
 }
@@ -839,7 +839,7 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code)
 bool retro_load_game(const struct retro_game_info *game)
 
 {
-   Memory.LoadROM(game->path);
+   LoadROM(game->path);
    return true;
 }
 

source/65c816.h

@@ -154,7 +154,7 @@ typedef union
     uint16 W;
 } pair;
 
-struct SRegisters{
+typedef struct {
     uint8  PB;
     uint8  DB;
     pair   P;
@@ -164,7 +164,7 @@ struct SRegisters{
     pair   X;
     pair   Y;
     uint16 PC;
-};
+}SRegisters;
 
 #endif
 

source/apu.h

@@ -92,10 +92,10 @@
 
 #include "spc700.h"
 
-struct SIAPU
+typedef struct
 {
     uint8  *PC;
-    struct SAPURegisters Registers;
+    SAPURegisters Registers;
     uint8  *RAM;
     uint8  *DirectPage;
     bool8  APUExecuting;
@@ -111,9 +111,9 @@ struct SIAPU
     uint32 Scanline;
     int32  OneCycle;
     int32  TwoCycles;
-};
+}SIAPU;
 
-struct SAPU
+typedef struct
 {
     int32  Cycles;
     bool8  ShowROM;
@@ -126,10 +126,10 @@ struct SAPU
     uint16 TimerTarget [3];
     bool8  TimerEnabled [3];
     bool8  TimerValueWritten [3];
-};
+}SAPU;
 
-struct SAPU APU;
-struct SIAPU IAPU;
+SAPU APU;
+SIAPU IAPU;
 extern int spc_is_dumping;
 extern int spc_is_dumping_temp;
 extern uint8 spc_dump_dsp[0x100];

source/cheats2.c

@@ -98,7 +98,7 @@ extern SCheatData Cheat;
 void S9xInitCheatData ()
 {
     Cheat.RAM = Memory.RAM;
-    Cheat.SRAM = SRAM;
+    Cheat.SRAM = Memory.SRAM;
     Cheat.FillRAM = Memory.FillRAM;
 }
 

source/cpuexec.h

@@ -101,19 +101,19 @@
     if (CPU.Cycles >= CPU.NextEvent) \
 	S9xDoHBlankProcessing_NoSFX ();
 
-struct SOpcodes {
+typedef struct {
 #ifdef __WIN32__
 	void (__cdecl *S9xOpcode)( void);
 #else
 	void (*S9xOpcode)( void);
 #endif
-};
+}SOpcodes;
 
-struct SICPU
+typedef struct
 {
     uint8  *Speed;
-    struct SOpcodes *S9xOpcodes;
-    struct SRegisters Registers;
+    SOpcodes *S9xOpcodes;
+    SRegisters Registers;
     uint8  _Carry;
     uint8  _Zero;
     uint8  _Negative;
@@ -124,7 +124,7 @@ struct SICPU
     uint32 Frame;
     uint32 Scanline;
     uint32 FrameAdvanceCount;
-};
+}SICPU;
 
 void S9xMainLoop (void);
 void S9xReset (void);
@@ -134,13 +134,13 @@ void S9xDoHBlankProcessing_NoSFX ();
 void S9xClearIRQ (uint32);
 void S9xSetIRQ (uint32);
 
-extern struct SOpcodes S9xOpcodesE1 [256];
-extern struct SOpcodes S9xOpcodesM1X1 [256];
-extern struct SOpcodes S9xOpcodesM1X0 [256];
-extern struct SOpcodes S9xOpcodesM0X1 [256];
-extern struct SOpcodes S9xOpcodesM0X0 [256];
+extern SOpcodes S9xOpcodesE1 [256];
+extern SOpcodes S9xOpcodesM1X1 [256];
+extern SOpcodes S9xOpcodesM1X0 [256];
+extern SOpcodes S9xOpcodesM0X1 [256];
+extern SOpcodes S9xOpcodesM0X0 [256];
 
-extern struct SICPU ICPU;
+extern SICPU ICPU;
 
 STATIC inline void S9xUnpackStatus()
 {

source/cpuops.c

@@ -3362,7 +3362,7 @@ static void Op0CM0 (void)
 
 #ifdef CPU_SHUTDOWN
 #ifndef SA1_OPCODES
-inline void CPUShutdown()
+static inline void CPUShutdown()
 {
     if (Settings.Shutdown && CPU.PC == CPU.WaitAddress)
     {
@@ -5025,7 +5025,7 @@ static void Op42 (void)
 /*****************************************************************************/
 /* CPU-S9xOpcodes Definitions                                                                    */
 /*****************************************************************************/
-struct SOpcodes S9xOpcodesM1X1[256] =
+SOpcodes S9xOpcodesM1X1[256] =
 {
     {Op00},	 {Op01M1},    {Op02},      {Op03M1},    {Op04M1},
     {Op05M1},    {Op06M1},    {Op07M1},    {Op08},      {Op09M1},
@@ -5081,7 +5081,7 @@ struct SOpcodes S9xOpcodesM1X1[256] =
     {OpFFM1}
 };
 
-struct SOpcodes S9xOpcodesE1[256] =
+SOpcodes S9xOpcodesE1[256] =
 {
     {Op00},	 {Op01M1},    {Op02},      {Op03M1},    {Op04M1},
     {Op05M1},    {Op06M1},    {Op07M1},    {Op08E1},      {Op09M1},
@@ -5137,7 +5137,7 @@ struct SOpcodes S9xOpcodesE1[256] =
     {OpFFM1}
 };
 
-struct SOpcodes S9xOpcodesM1X0[256] =
+SOpcodes S9xOpcodesM1X0[256] =
 {
     {Op00},	 {Op01M1},    {Op02},      {Op03M1},    {Op04M1},
     {Op05M1},    {Op06M1},    {Op07M1},    {Op08},      {Op09M1},
@@ -5193,7 +5193,7 @@ struct SOpcodes S9xOpcodesM1X0[256] =
     {OpFFM1}
 };
 
-struct SOpcodes S9xOpcodesM0X0[256] =
+SOpcodes S9xOpcodesM0X0[256] =
 {
     {Op00},	 {Op01M0},    {Op02},      {Op03M0},    {Op04M0},
     {Op05M0},    {Op06M0},    {Op07M0},    {Op08},      {Op09M0},
@@ -5249,7 +5249,7 @@ struct SOpcodes S9xOpcodesM0X0[256] =
     {OpFFM0}
 };
 
-struct SOpcodes S9xOpcodesM0X1[256] =
+SOpcodes S9xOpcodesM0X1[256] =
 {
     {Op00},	 {Op01M0},    {Op02},      {Op03M0},    {Op04M0},
     {Op05M0},    {Op06M0},    {Op07M0},    {Op08},      {Op09M0},

source/dsp1.h

@@ -105,7 +105,7 @@ uint8 DSP3GetByte(uint16 address);
 void DSP4SetByte(uint8 byte, uint16 address);
 uint8 DSP4GetByte(uint16 address);
 
-struct SDSP1 {
+typedef struct{
     bool8 waiting4command;
     bool8 first_parameter;
     uint8 command;
@@ -116,12 +116,12 @@ struct SDSP1 {
     uint8 parameters [512];
 //output was 512 for DSP-2 work, updated to reflect current thinking on DSP-3
     uint8 output [512];
-};
+}SDSP1;
 
 void S9xResetDSP1 ();
 uint8 S9xGetDSP (uint16 Address);
 void S9xSetDSP (uint8 Byte, uint16 Address);
-extern struct SDSP1 DSP1;
+extern SDSP1 DSP1;
 
 //extern struct SDSP1 DSP1;
 

source/gfx.h

@@ -245,9 +245,9 @@ GFX.X2 [((((C1) & RGB_REMOVE_LOW_BITS_MASK) + \
 	  ((C2) & RGB_REMOVE_LOW_BITS_MASK)) >> 1) + \
 	((C1) & (C2) & RGB_LOW_BITS_MASK)]
 #else
-inline uint16 COLOR_ADD (uint16, uint16);
+static inline uint16 COLOR_ADD (uint16, uint16);
 
-inline uint16 COLOR_ADD (uint16 C1, uint16 C2)
+static inline uint16 COLOR_ADD (uint16 C1, uint16 C2)
 {
 	if (C1 == 0)
 		return C2;

source/globals.c

@@ -106,19 +106,19 @@ char String[513];
 
 struct Missing missing;
 
-struct SICPU ICPU;
+SICPU ICPU;
 
-struct SCPUState CPU;
+SCPUState CPU;
 
-struct SAPU APU;
+SAPU APU;
 
-struct SIAPU IAPU;
+SIAPU IAPU;
 
-struct SSettings Settings;
+SSettings Settings;
 
-struct SDSP1 DSP1;
+SDSP1 DSP1;
 
-struct SSA1 SA1;
+SSA1 SA1;
 
 SSoundData SoundData;
 
@@ -127,16 +127,16 @@ SnesModel M2SNES={2,4,3};
 SnesModel* Model=&M1SNES;
 
 
-uint8 *SRAM = NULL;
-uint8 *ROM = NULL;
-uint8 *RegRAM = NULL;
+uint8 *SRAM_g = NULL;
+uint8 *ROM_g = NULL;
+uint8 *RegRAM_g = NULL;
 uint8 *C4RAM = NULL;
 
 long OpAddress = 0;
 
 CMemory Memory;
 
-struct SSNESGameFixes SNESGameFixes;
+SSNESGameFixes SNESGameFixes;
 
 uint8 OpenBus = 0;
 

source/port.h

@@ -288,5 +288,15 @@ void MixSound(void);
 #define STATIC static
 #endif
 
+#if defined(_MSC_VER) && !defined(SN_TARGET_PS3)
+/* Hack applied for MSVC when compiling in C89 mode
+ * as it isn't C99-compliant. */
+#define bool unsigned char
+#define true 1
+#define false 0
+#else
+#include <stdbool.h>
+#endif
+
 #endif