diff options
| -rw-r--r-- | src/apuaux.c (renamed from src/apuaux.cpp) | 4 | ||||
| -rw-r--r-- | src/notas | 1 | ||||
| -rw-r--r-- | src/port.h | 348 | ||||
| -rw-r--r-- | src/rops.cpp | 37 | ||||
| -rw-r--r-- | src/sa1.s | 1 | ||||
| -rw-r--r-- | src/spc700.h | 2 |
6 files changed, 8 insertions, 385 deletions
diff --git a/src/apuaux.cpp b/src/apuaux.c index e10ac6e..9705dd6 100644 --- a/src/apuaux.cpp +++ b/src/apuaux.c @@ -2,8 +2,6 @@ #include "spc700.h" #include "apu.h" -extern "C" { - void S9xAPUSetByteFFtoF0 (uint8 val, uint32 Address) { if (Address >= 0xf4 && Address <= 0xf7) @@ -28,5 +26,3 @@ void S9xAPUSetByteFFC0 (uint8 val, uint32 Address) if (!APU.ShowROM) IAPU.RAM [Address] = val; } - -} diff --git a/src/notas b/src/notas deleted file mode 100644 index c7a908b..0000000 --- a/src/notas +++ /dev/null @@ -1 +0,0 @@ -echale un vistazo a S9xDoHBlankProcessing, está todavía en C++ @@ -95,9 +95,15 @@ typedef short int16_32; //Defines for Extern C -#define EXTERN_C extern +#if defined(__cplusplus) || defined(c_plusplus) +#define EXTERN_C extern "C" #define START_EXTERN_C extern "C" { #define END_EXTERN_C } +#else +#define EXTERN_C extern +#define START_EXTERN_C +#define END_EXTERN_C +#endif //Path Defines #undef _MAX_PATH @@ -159,344 +165,4 @@ void _splitpath (const char *path, char *drive, char *dir, char *fname, #endif // _SNESPPC -#if defined(__GP2X__) || defined(__WIZ__) - -#define ZDELTA 0x13000 - -//Title -#define TITLE "Snes9x" - -//Required Includes -#include "pixform.h" -#include <zlib.h> //RC -//#include <windows.h> -#include <limits.h> -#include <string.h> -//Types Defined -typedef unsigned char bool8; -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef unsigned int bool32; -typedef unsigned int uint32; -typedef signed char int8; -typedef short int16; -typedef int int32; -typedef long long int64; - -//CSNES Types for conversion to 32 bit -/*typedef unsigned long bool8_32; -typedef unsigned long uint8_32; -typedef unsigned long uint16_32; -typedef long int8_32; -typedef long int16_32;*/ - -//For Debugging Purposes: - -typedef unsigned char bool8_32; -typedef unsigned char uint8_32; -typedef unsigned short uint16_32; -typedef signed char int8_32; -typedef short int16_32; - -//Defines for Extern C -#define EXTERN_C extern -#define START_EXTERN_C extern "C" { -#define END_EXTERN_C } - -//Path Defines -#undef _MAX_PATH -#define _MAX_DIR PATH_MAX -#define _MAX_DRIVE 1 -#define _MAX_FNAME PATH_MAX -#define _MAX_EXT PATH_MAX -#define _MAX_PATH (1024) - -//True/False Defines -#define TRUE 1 -#define FALSE 0 - -//Slash Char Definitions -#define SLASH_STR "/" -#define SLASH_CHAR '/' - -//Misc Items -#define VAR_CYCLES -//#define SPC700_SHUTDOWN -#define LSB_FIRST -#define STATIC static -#define FASTCALL -#define PIXEL_FORMAT RGB565 -#define CHECK_SOUND() -#define VOID void -#define CPU_SHUTDOWN -//#define UNZIP_SUPPORT -#define ZeroMemory(a,b) memset((a),0,(b)) -#define PACKING __attribute__ ((packed)) -#define ALIGN_BY_ONE __attribute__ ((aligned (1), packed)) -#define LSB_FIRST -#undef FAST_LSB_WORD_ACCESS -#define ASM_SPC700 -#define SUPER_FX - -EXTERN_C void S9xGenerateSound (); - -//Additional Items for _SNESPPC port -void _makepath (char *path, const char *drive, const char *dir, - const char *fname, const char *ext); -void _splitpath (const char *path, char *drive, char *dir, char *fname, - char *ext); -#define strcasecmp strcmp -#define strncasecmp strncmp - -#ifdef INLINE -#undef INLINE -#define INLINE inline -#endif - -#endif // _SNESPPC #endif // _PORT_H_ - -/* -#ifndef _SNESPPC -#define _SNESPPC -#endif - -#ifndef RC_OPTIMIZED -#define RC_OPTIMIZED -#endif - -#ifdef inline -#undef inline -#endif - -#ifdef INLINE -#undef INLINE -#endif - -#define inline __inline -#define INLINE __inline - -#ifdef DEBUG -#ifndef _PROFILE_ -#define _PROFILE_ -#endif -#endif - -#ifndef _SNESPPC -#ifndef STORM -#include <memory.h> -#include <string.h> -#else -//#include <strings.h> -//#include <clib/powerpc_protos.h> -#endif - -#include <sys/types.h> -#else -#include <windows.h> -#endif - -#define PIXEL_FORMAT RGB565 -//#define GFX_MULTI_FORMAT - -#if defined(TARGET_OS_MAC) && TARGET_OS_MAC - -#ifdef _SNESPPC -#include "zlib/zlib.h" //RC -#else -#include "zlib.h" -#endif - -#define ZLIB -#define EXECUTE_SUPERFX_PER_LINE -#define SOUND -#define VAR_CYCLES -#define CPU_SHUTDOWN -#define SPC700_SHUTDOWN -#define PIXEL_FORMAT RGB555 -#define CHECK_SOUND() -#define M_PI 3.14159265359 -#undef _MAX_PATH - -#undef DEBUGGER // Apple Universal Headers sometimes #define DEBUGGER -#undef GFX_MULTI_FORMAT - -int strncasecmp(const char *s1, const char *s2, unsigned n); -int strcasecmp(const char *s1, const char *s2 ); - -#endif - -#ifndef snes9x_types_defined -#define snes9x_types_defined - -//CSNES -#ifdef _SNESPPC -typedef unsigned long bool8; -#else -typedef unsigned char bool8; -#endif - -#ifndef __WIN32__ -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef signed char int8; -typedef short int16; -//typedef long int32; -//typedef unsigned long uint32; -typedef int int32; -typedef unsigned int uint32; -#ifdef _SNESPPC -typedef __int64 int64; -//CSNES -typedef unsigned long uint8_32; -typedef unsigned long uint16_32; -typedef long int8_32; -typedef long int16_32; - -#else -typedef long long int64; -#endif -#else // __WIN32__ - -#ifdef __BORLANDC__ -//#include <systypes.h> -#else - -typedef unsigned char uint8; -typedef unsigned short uint16; -typedef signed char int8; -typedef short int16; - -#ifndef WSAAPI -// winsock2.h typedefs int32 as well. -typedef long int32; -#endif - -typedef unsigned int uint32; - -#endif // __BORLANDC__ - -typedef __int64 int64; - -#endif // __WIN32__ -#endif // snes9x_types_defined -#include "pixform.h" - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifdef STORM -#define EXTERN_C -#define START_EXTERN_C -#define END_EXTERN_C -#else -#if defined(__cplusplus) || defined(c_plusplus) -#define EXTERN_C extern "C" -#define START_EXTERN_C extern "C" { -#define END_EXTERN_C } -#else -#define EXTERN_C extern -#define START_EXTERN_C -#define END_EXTERN_C -#endif -#endif - -#ifndef __WIN32__ - -#ifndef PATH_MAX -#define PATH_MAX 1024 -#endif - -#define _MAX_DIR PATH_MAX -#define _MAX_DRIVE 1 -#define _MAX_FNAME PATH_MAX -#define _MAX_EXT PATH_MAX -#ifndef _MAX_PATH -#define _MAX_PATH PATH_MAX -#endif - -#ifdef _SNESPPC -#define strcasecmp strcmp -#define strncasecmp strncmp -#define time(a) (0) -#ifdef _MAX_PATH -#undef _MAX_PATH -#define _MAX_PATH (1024) -#endif -#endif - -#define ZeroMemory(a,b) memset((a),0,(b)) - -void _makepath (char *path, const char *drive, const char *dir, - const char *fname, const char *ext); -void _splitpath (const char *path, char *drive, char *dir, char *fname, - char *ext); -#else // __WIN32__ -#define strcasecmp stricmp -#define strncasecmp strnicmp -#endif - -EXTERN_C void S9xGenerateSound (); - -#ifdef STORM -EXTERN_C int soundsignal; -EXTERN_C void MixSound(void); -//Yes, CHECK_SOUND is getting defined correctly! -#define CHECK_SOUND if (Settings.APUEnabled) if(SetSignalPPC(0L, soundsignal) & soundsignal) MixSound -#else -#define CHECK_SOUND() -#endif - -#ifdef __DJGPP -#define SLASH_STR "\\" -#define SLASH_CHAR '\\' -#else -#define SLASH_STR "/" -#define SLASH_CHAR '/' -#endif - -#ifdef __linux -typedef void (*SignalHandler)(int); -#define SIG_PF SignalHandler -#endif - -#if defined(__i386__) || defined(__i486__) || defined(__i586__) || \ - defined(__WIN32__) || defined(__alpha__) -#define LSB_FIRST -#define FAST_LSB_WORD_ACCESS -#else -#ifdef _SNESPPC -#define LSB_FIRST -//NOPE! #define FAST_LSB_WORD_ACCESS //RC -#else -#define MSB_FIRST -#endif -#endif - -#ifdef __sun -#define TITLE "Snes9X: Solaris" -#endif - -#ifdef __linux -#define TITLE "Snes9X: Linux" -#endif - -#ifndef TITLE -#define TITLE "Snes9x" -#endif - -#ifdef STORM -#define STATIC -#define strncasecmp strnicmp -#else -#define STATIC static -#endif - -#endif -*/ - diff --git a/src/rops.cpp b/src/rops.cpp index 8628ccd..e4eab04 100644 --- a/src/rops.cpp +++ b/src/rops.cpp @@ -5,42 +5,8 @@ ROPSTRUCT rops[MAX_ROPS]; unsigned int ROpCount; -//#define __DEBUG__ - -#ifdef __DEBUG__ -static char *rasterNames[] = { - "ROP_NOP", - "ROP_FIXEDCOLOUR", - "ROP_PALETTE", - "ROP_SCREEN_MODE", - "ROP_BRIGHTNESS", - "ROP_FORCE_BLANKING", - "ROP_TILE_ADDRESS", - "ROP_MOSAIC", - "ROP_BG_SCSIZE_SCBASE", - "ROP_BG_NAMEBASE", - "ROP_MODE7_ROTATION", - "ROP_BG_WINDOW_ENABLE", - "ROP_WINDOW1_LEFT", - "ROP_WINDOW1_RIGHT", - "ROP_WINDOW2_LEFT", - "ROP_WINDOW2_RIGHT", - "ROP_BG_WINDOW_LOGIC", - "ROP_OBJS_WINDOW_LOGIC", - "ROP_MAIN_SCREEN_DESIG", - "ROP_SUB_SCREEN_DESIG", - "ROP_MAIN_SCREEN_WMASK", - "ROP_SUB_SCREEN_WMASK", - "ROP_FIXEDCOL_OR_SCREEN", - "ROP_ADD_OR_SUB_COLOR" - }; -#endif - void doRaster(ROPSTRUCT *rop) { if (!rop) return; -#ifdef __DEBUG__ - printf("%s, line: %d, value: %x\n", rasterNames[rop->rop], rop->line, rop->value); -#endif switch (rop->rop) { case ROP_NOP: // NOP @@ -182,9 +148,6 @@ void doRaster(ROPSTRUCT *rop) { GFX.r2131_s = rop->value; break; } -#ifdef __DEBUG__ - printf("ROP OK\n"); -#endif rop->rop = 0; // Raster Operation already done, invalidate it } diff --git a/src/sa1.s b/src/sa1.s deleted file mode 100644 index aaeea37..0000000 --- a/src/sa1.s +++ /dev/null @@ -1 +0,0 @@ - .file "sa1.cpp" diff --git a/src/spc700.h b/src/spc700.h index 8cde84d..6b73f44 100644 --- a/src/spc700.h +++ b/src/spc700.h @@ -132,7 +132,7 @@ EXTERN_C int32 ESPC (int32); // return cycles left (always negative)
-extern "C" int spc700_execute(int cycles);
+EXTERN_C int spc700_execute(int cycles);
#endif // SPCTOOL
|