gryf/gryf-overlay
1
0
Fork 0
mirror of https://github.com/gryf/gryf-overlay.git synced 2026-04-08 07:43:32 +02:00
Code Issues Projects Releases Wiki Activity

initial import

Browse Source
This commit is contained in:
root
2010-02-09 21:25:29 +01:00
commit b2719dc011
1080 changed files with 41656 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3 Normal file
View File

@@ -0,0 +1,3 @@
MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683

3
media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r1 Normal file
View File

@@ -0,0 +1,3 @@
MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683

3
media-plugins/xmms-nsf/files/digest-xmms-nsf-0.0.3-r2 Normal file
View File

@@ -0,0 +1,3 @@
MD5 45c55a17d81cd82d36d59bdb231777df xmms-nsf-0.0.3.tar.gz 185683
RMD160 d7d70b55a9bcf4f36014bcf396f9b1e66855a448 xmms-nsf-0.0.3.tar.gz 185683
SHA256 43480b65b7ccd64396248404ccc54b62eb8cb21949f240a6d45d3a6cc1d352cd xmms-nsf-0.0.3.tar.gz 185683

27
media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-PIC.patch Normal file
View File

@@ -0,0 +1,27 @@
diff -Naur xmms-nsf-0.0.3.orig/src/nes/Makefile.am xmms-nsf-0.0.3/src/nes/Makefile.am
--- xmms-nsf-0.0.3.orig/src/nes/Makefile.am 2000-07-19 19:17:55.000000000 -0700
+++ xmms-nsf-0.0.3/src/nes/Makefile.am 2004-07-06 18:00:50.388728466 -0700
@@ -21,3 +21,5 @@
EXTRA_DIST = license.txt COPYING
INCLUDES = @XMMS_CFLAGS@
+
+CFLAGS = -fPIC -DPIC @CFLAGS@
diff -Naur xmms-nsf-0.0.3.orig/src/nes/device/Makefile.am xmms-nsf-0.0.3/src/nes/device/Makefile.am
--- xmms-nsf-0.0.3.orig/src/nes/device/Makefile.am 2000-07-19 18:56:01.000000000 -0700
+++ xmms-nsf-0.0.3/src/nes/device/Makefile.am 2004-07-06 18:00:38.662674686 -0700
@@ -19,4 +19,4 @@
sct_init.h \
sct_main.h
-CFLAGS = -D_REENTRANT @CFLAGS@
+CFLAGS = -fPIC -DPIC -D_REENTRANT @CFLAGS@
diff -Naur xmms-nsf-0.0.3.orig/src/xmms/Makefile.am xmms-nsf-0.0.3/src/xmms/Makefile.am
--- xmms-nsf-0.0.3.orig/src/xmms/Makefile.am 2001-01-06 20:08:14.000000000 -0800
+++ xmms-nsf-0.0.3/src/xmms/Makefile.am 2004-07-06 18:01:05.425232876 -0700
@@ -22,3 +22,5 @@
LIBS = @LIBS@ @XMMS_LIBS@
INCLUDES = @XMMS_CFLAGS@ @GTK_CFLAGS@
+
+CFLAGS = -fPIC -DPIC @CFLAGS@

188
media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-about.patch Normal file
View File

@@ -0,0 +1,188 @@
diff -ur xmms-nsf-0.0.3/src/nes/audiosys.c xmms-nsf-0.0.3.about/src/nes/audiosys.c
--- xmms-nsf-0.0.3/src/nes/audiosys.c 2001-01-06 23:17:57.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/nes/audiosys.c 2005-01-02 20:34:41.767192374 -0500
@@ -8,8 +8,11 @@
static NES_AUDIO_HANDLER *nah = 0;
static NES_VOLUME_HANDLER *nvh = 0;
-void NESAudioRender(Int16 *bufp, Uint buflen)
+Uint32 NESAudioRender(Int16 *bufp, Uint buflen)
{
+ Int16 x;
+ Uint32 count = 0;
+
while (buflen--)
{
NES_AUDIO_HANDLER *ph;
@@ -31,9 +34,17 @@
else
output = accum;
output >>= 8;
- *bufp++ = ((Int32)output) - 0x8000;
+ x = ((Int32)output) - 0x8000;
+ if (abs(x) < 96)
+ count++;
+ else
+ count = 0;
+
+ *bufp++ = x;
}
}
+
+ return count;
}
void NESVolume(Uint volume)
diff -ur xmms-nsf-0.0.3/src/nes/audiosys.h xmms-nsf-0.0.3.about/src/nes/audiosys.h
--- xmms-nsf-0.0.3/src/nes/audiosys.h 2001-01-06 23:17:56.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/nes/audiosys.h 2005-01-02 20:42:51.457112634 -0500
@@ -21,7 +21,7 @@
} NES_VOLUME_HANDLER;
-void NESAudioRender(Int16 *bufp, Uint buflen);
+Uint32 NESAudioRender(Int16 *bufp, Uint buflen);
void NESAudioHandlerInstall(NES_AUDIO_HANDLER *ph);
void NESAudioFrequencySet(Uint freq);
Uint NESAudioFrequencyGet(void);
diff -ur xmms-nsf-0.0.3/src/xmms/callbacks.c xmms-nsf-0.0.3.about/src/xmms/callbacks.c
--- xmms-nsf-0.0.3/src/xmms/callbacks.c 2000-07-23 05:06:43.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/xmms/callbacks.c 2005-01-02 20:58:29.052175495 -0500
@@ -219,7 +219,7 @@
widget = lookup_widget(GTK_WIDGET(button), "spinbutton1");
nsf_cfg.play_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
widget = lookup_widget(GTK_WIDGET(button), "spinbutton2");
- nsf_cfg.fadeout_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+ nsf_cfg.silence_time = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
cfg = xmms_cfg_open_file(filename);
@@ -228,7 +228,7 @@
}
xmms_cfg_write_int(cfg, "NSF", "play_time",nsf_cfg.play_time);
- xmms_cfg_write_int(cfg, "NSF", "fadeout_time",nsf_cfg.fadeout_time);
+ xmms_cfg_write_int(cfg, "NSF", "silence_time",nsf_cfg.silence_time);
xmms_cfg_write_file(cfg, filename);
xmms_cfg_free(cfg);
g_free(filename);
diff -ur xmms-nsf-0.0.3/src/xmms/interface.c xmms-nsf-0.0.3.about/src/xmms/interface.c
--- xmms-nsf-0.0.3/src/xmms/interface.c 2000-07-23 04:41:14.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/xmms/interface.c 2005-01-02 20:55:32.754086347 -0500
@@ -106,7 +106,7 @@
gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (label2), 0, 0.5);
- label3 = gtk_label_new ("Fadeout Time:");
+ label3 = gtk_label_new ("Silence Until Next Song:");
gtk_widget_ref (label3);
gtk_object_set_data_full (GTK_OBJECT (configure), "label3", label3,
(GtkDestroyNotify) gtk_widget_unref);
diff -ur xmms-nsf-0.0.3/src/xmms/nsf.c xmms-nsf-0.0.3.about/src/xmms/nsf.c
--- xmms-nsf-0.0.3/src/xmms/nsf.c 2001-01-07 00:15:12.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/xmms/nsf.c 2005-01-02 20:58:06.990044841 -0500
@@ -23,7 +23,8 @@
#define VERSION "0.0.3"
#define PLAYTIME 30
-#define FADEOUTTIME 5
+#define SILENCETIME 5
+#define FREQ 44100
#include "nsf.h"
@@ -328,7 +329,7 @@
widget = lookup_widget(nsf_configure_win, "spinbutton1");
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.play_time);
widget = lookup_widget(nsf_configure_win, "spinbutton2");
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.fadeout_time);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), nsf_cfg.silence_time);
gtk_widget_show(nsf_configure_win);
}else{
@@ -357,7 +358,7 @@
nsf_win->dock_window_list = NULL;
nsf_cfg.play_time = PLAYTIME; /* second */
- nsf_cfg.fadeout_time = FADEOUTTIME; /* second */
+ nsf_cfg.silence_time = SILENCETIME; /* second */
nsf_cfg.player_shaded = FALSE;
nsf_cfg.easy_move = FALSE;
@@ -365,7 +366,7 @@
if ((cfg = xmms_cfg_open_file(filename)) != 0){
xmms_cfg_read_int(cfg, "NSF", "play_time", &nsf_cfg.play_time);
- xmms_cfg_read_int(cfg, "NSF", "fadeout_time", &nsf_cfg.fadeout_time);
+ xmms_cfg_read_int(cfg, "NSF", "silence_time", &nsf_cfg.silence_time);
xmms_cfg_free(cfg);
}
}
@@ -439,10 +440,11 @@
{
char data[2048 * 2];
int bytes, blk_size, rate;
+ Uint32 c = 0, count = 0;
//setting NSF
NSFSetSongNo(nsf_file->current_song);
- NESAudioFrequencySet(44100);
+ NESAudioFrequencySet(FREQ);
NESReset();
//16bit/8bit * 1channel * 512 sample = 1024byte
@@ -460,7 +462,15 @@
}
if (bytes > 0){
//read 1024byte = 512 sample * 2byte
- NESAudioRender(data, bytes/2);
+ c = NESAudioRender(data, bytes/2);
+ if (c < 512)
+ count = 0;
+ else
+ count += c;
+ if (count > FREQ*nsf_cfg.silence_time) {
+ nsf_file->eos = 1;
+ count = 0;
+ }
nsf_ip.add_vis_pcm(nsf_ip.output->written_time(), (nsf_file->bits_per_sample == 16) ? FMT_S16_LE : FMT_U8,
nsf_file->channels, bytes, data);
@@ -512,6 +522,9 @@
if (!(nsf_file->file = fopen(filename, "rb"))){
return;
}
+
+ nsf_about();
+
fseek(nsf_file->file, 0, SEEK_END);
count = ftell(nsf_file->file);
fseek(nsf_file->file, 0, SEEK_SET);
diff -ur xmms-nsf-0.0.3/src/xmms/nsf.h xmms-nsf-0.0.3.about/src/xmms/nsf.h
--- xmms-nsf-0.0.3/src/xmms/nsf.h 2000-07-23 05:00:35.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/xmms/nsf.h 2005-01-02 20:58:37.563297001 -0500
@@ -58,7 +58,7 @@
typedef struct
{
gint play_time;
- gint fadeout_time;
+ gint silence_time;
// reserve
gint resolution;
gint channels;
diff -ur xmms-nsf-0.0.3/src/xmms/nsflib.h xmms-nsf-0.0.3.about/src/xmms/nsflib.h
--- xmms-nsf-0.0.3/src/xmms/nsflib.h 2000-07-23 05:05:21.000000000 -0500
+++ xmms-nsf-0.0.3.about/src/xmms/nsflib.h 2005-01-02 20:45:55.481496508 -0500
@@ -1,10 +1,11 @@
typedef signed short Int16;
typedef unsigned int Uint;
+typedef unsigned int Uint32;
typedef unsigned char Uint8;
Uint NSFLoad(Uint8 *pData, Uint uSize);
void NSFSetSongNo(Uint uSongNo);
void NESAudioFrequencySet(Uint freq);
void NESReset(void);
-void NESAudioRender(Int16 *bufp, Uint buflen);
+Uint32 NESAudioRender(Int16 *bufp, Uint buflen);
void NESTerminate(void);

518
media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-compilefixes.patch Normal file
View File

@@ -0,0 +1,518 @@
diff -ur xmms-nsf-0.0.3/src/nes/handler.c xmms-nsf-0.0.3-gentoo/src/nes/handler.c
--- xmms-nsf-0.0.3/src/nes/handler.c 2001-01-07 17:17:57.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/handler.c 2003-10-12 19:56:48.000000000 +1300
@@ -10,9 +10,9 @@
static NES_READ_HANDLER *(nprh[0x10]) = { 0, };
static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
#define EXTREADWRITE(p) \
-static Uint __fastcall ExtRd##p##(Uint A) \
+static Uint __fastcall ExtRd##p (Uint A) \
{ \
- NES_READ_HANDLER *ph = nprh[0x##p##]; \
+ NES_READ_HANDLER *ph = nprh[0x##p ]; \
do \
{ \
if (ph->min <= A && A <= ph->max) \
@@ -22,9 +22,9 @@
} while ((ph = ph->next) != 0); \
return 0; \
} \
-static void __fastcall ExtWr##p##(Uint A, Uint V) \
+static void __fastcall ExtWr##p (Uint A, Uint V) \
{ \
- NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
+ NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
do \
{ \
if (ph->min <= A && A <= ph->max) \
diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h
--- xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h 2001-01-07 17:18:05.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h 2003-10-12 20:07:08.000000000 +1300
@@ -361,27 +361,27 @@
/* --- ADC --- */
#if BUILD_HUC6280
-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
} \
-static void OpcodeCall TD_Opc##i##(__CONTEXT) \
+static void OpcodeCall TD_Opc##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_ADC(61,NP,KA_INDX) /* 61 - ADC - (Indirect,X) */
DEF_ADC(65,ZP,KA_ZP) /* 65 - ADC - Zero Page */
@@ -397,17 +397,17 @@
/* --- AND --- */
#if BUILD_HUC6280
-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_AND(21,NP,KA_INDX) /* 21 - AND - (Indirect,X) */
DEF_AND(25,ZP,KA_ZP) /* 25 - AND - Zero Page */
@@ -422,10 +422,10 @@
#endif
/* --- ASL --- */
-#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ASL(06,ZP,KA_ZP) /* 06 - ASL - Zero Page */
DEF_ASL(0E,NP,KA_ABS) /* 0E - ASL - Absolute */
@@ -436,7 +436,7 @@
#if BUILD_HUC6280
/* --- BBRi --- */
-#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
@@ -451,7 +451,7 @@
DEF_BBR(6F,6) /* 6F - BBR6 */
DEF_BBR(7F,7) /* 7F - BBR7 */
/* --- BBSi --- */
-#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
@@ -468,8 +468,8 @@
#endif
/* --- BIT --- */
-#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_BIT(24,ZP,KA_ZP) /* 24 - BIT - Zero Page */
DEF_BIT(2C,NP,KA_ABS) /* 2C - BIT - Absolute */
#if BUILD_HUC6280 || BUILD_M65C02
@@ -479,7 +479,7 @@
#endif
/* --- Bcc --- */
-#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
if (a) KM_BRA(__THISP_ rel); \
@@ -536,8 +536,8 @@
{ __THIS__.P &= ~V_FLAG; }
/* --- CMP --- */
-#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CMP(C1,NP,KA_INDX) /* C1 - CMP - (Indirect,X) */
DEF_CMP(C5,ZP,KA_ZP) /* C5 - CMP - Zero Page */
DEF_CMP(C9,NP,KA_IMM) /* C9 - CMP - Immediate */
@@ -551,24 +551,24 @@
#endif
/* --- CPX --- */
-#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CPX(E0,NP,KA_IMM) /* E0 - CPX - Immediate */
DEF_CPX(E4,ZP,KA_ZP) /* E4 - CPX - Zero Page */
DEF_CPX(EC,NP,KA_ABS) /* EC - CPX - Absolute */
/* --- CPY --- */
-#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CPY(C0,NP,KA_IMM) /* C0 - CPY - Immediate */
DEF_CPY(C4,ZP,KA_ZP) /* C4 - CPY - Zero Page */
DEF_CPY(CC,NP,KA_ABS) /* CC - CPY - Absolute */
/* --- DEC --- */
-#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_DEC(C6,ZP,KA_ZP) /* C6 - DEC - Zero Page */
DEF_DEC(CE,NP,KA_ABS) /* CE - DEC - Absolute */
@@ -585,17 +585,17 @@
/* --- EOR --- */
#if BUILD_HUC6280
-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_EOR(41,NP,KA_INDX) /* 41 - EOR - (Indirect,X) */
DEF_EOR(45,ZP,KA_ZP) /* 45 - EOR - Zero Page */
@@ -610,10 +610,10 @@
#endif
/* --- INC --- */
-#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_INC(E6,ZP,KA_ZP) /* E6 - INC - Zero Page */
DEF_INC(EE,NP,KA_ABS) /* EE - INC - Absolute */
@@ -629,12 +629,12 @@
{ __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
/* --- JMP --- */
-#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
#if BUILD_HUC6280 || BUILD_M65C02
#define DEF_JMPBUG(i,a) DEF_JMP(i,a)
#else
-#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
#endif
DEF_JMP(4C,KA_IMM16) /* 4C - JMP - Immediate */
@@ -653,8 +653,8 @@
}
/* --- LDA --- */
-#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDA(A1,NP,KA_INDX) /* A1 - LDA - (Indirect,X) */
DEF_LDA(A5,ZP,KA_ZP) /* A5 - LDA - Zero Page */
DEF_LDA(A9,NP,KA_IMM) /* A9 - LDA - Immediate */
@@ -668,8 +668,8 @@
#endif
/* --- LDX --- */
-#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDX(A2,NP,KA_IMM) /* A2 - LDX - Immediate */
DEF_LDX(A6,ZP,KA_ZP) /* A6 - LDX - Zero Page */
DEF_LDX(AE,NP,KA_ABS) /* AE - LDX - Absolute */
@@ -677,8 +677,8 @@
DEF_LDX(BE,NP,KA_ABSY_) /* BE - LDX - Absolute,Y */
/* --- LDY --- */
-#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDY(A0,NP,KA_IMM) /* A0 - LDY - Immediate */
DEF_LDY(A4,ZP,KA_ZP) /* A4 - LDY - Zero Page */
DEF_LDY(AC,NP,KA_ABS) /* AC - LDY - Absolute */
@@ -686,10 +686,10 @@
DEF_LDY(BC,NP,KA_ABSX_) /* BC - LDY - Absolute,X */
/* --- LSR --- */
-#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_LSR(46,ZP,KA_ZP) /* 46 - LSR - Zero Page */
DEF_LSR(4E,NP,KA_ABS) /* 4E - LSR - Absolute */
@@ -705,17 +705,17 @@
/* --- ORA --- */
#if BUILD_HUC6280
-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_ORA(01,NP,KA_INDX) /* 01 - ORA - (Indirect,X) */
DEF_ORA(05,ZP,KA_ZP) /* 05 - ORA - Zero Page */
@@ -751,7 +751,7 @@
#if BUILD_HUC6280
/* --- RMBi --- */
-#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
@@ -765,7 +765,7 @@
DEF_RMB(67,6) /* 67 - RMB6 */
DEF_RMB(77,7) /* 77 - RMB7 */
/* --- SMBi --- */
-#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
@@ -781,10 +781,10 @@
#endif
/* --- ROL --- */
-#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ROL(26,ZP,KA_ZP) /* 26 - ROL - Zero Page */
DEF_ROL(2E,NP,KA_ABS) /* 2E - ROL - Absolute */
@@ -794,10 +794,10 @@
{ __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
/* --- ROR --- */
-#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ROR(66,ZP,KA_ZP) /* 66 - ROR - Zero Page */
DEF_ROR(6E,NP,KA_ABS) /* 6E - ROR - Absolute */
@@ -841,10 +841,10 @@
#endif
/* --- SBC --- */
-#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_SBC(E1,NP,KA_INDX) /* E1 - SBC - (Indirect,X) */
DEF_SBC(E5,ZP,KA_ZP) /* E5 - SBC - Zero Page */
DEF_SBC(E9,NP,KA_IMM) /* E9 - SBC - Immediate */
@@ -883,8 +883,8 @@
#endif
/* --- STA --- */
-#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
+#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
DEF_STA(81,NP,KA_INDX) /* 81 - STA - (Indirect,X) */
DEF_STA(85,ZP,KA_ZP) /* 85 - STA - Zero Page */
DEF_STA(8D,NP,KA_ABS) /* 8D - STA - Absolute */
@@ -897,23 +897,23 @@
#endif
/* --- STX --- */
-#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
+#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
DEF_STX(86,ZP,KA_ZP) /* 86 - STX - Zero Page */
DEF_STX(8E,NP,KA_ABS) /* 8E - STX - Absolute */
DEF_STX(96,ZP,KA_ZPY) /* 96 - STX - Zero Page,Y */
/* --- STY --- */
-#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
+#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
DEF_STY(84,ZP,KA_ZP) /* 84 - STY - Zero Page */
DEF_STY(8C,NP,KA_ABS) /* 8C - STY - Absolute */
DEF_STY(94,ZP,KA_ZPX) /* 94 - STY - Zero Page,X */
#if BUILD_HUC6280 || BUILD_M65C02
/* --- STZ --- */
-#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
+#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), 0); }
DEF_STZ(64,ZP,KA_ZP) /* 64 - STZ - Zero Page */
DEF_STZ(9C,NP,KA_ABS) /* 9C - STZ - Absolute */
DEF_STZ(74,ZP,KA_ZPX) /* 74 - STZ - Zero Page,X */
@@ -931,18 +931,18 @@
#if BUILD_HUC6280 || BUILD_M65C02
/* --- TRB --- */
-#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_TRB(14,ZP,KA_ZP) /* 14 - TRB - Zero Page */
DEF_TRB(1C,NP,KA_ABS) /* 1C - TRB - Absolute */
/* --- TSB --- */
-#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_TSB(04,ZP,KA_ZP) /* 04 - TSB - Zero Page */
DEF_TSB(0C,NP,KA_ABS) /* 0C - TSB - Absolute */
@@ -950,10 +950,10 @@
#if BUILD_HUC6280
/* --- TST --- */
-#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
- KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
+ KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
}
DEF_TST(83,ZP,KA_ZP) /* 83 - TST - Zero Page */
DEF_TST(93,NP,KA_ABS) /* 93 - TST - Absolute */
diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h
--- xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h 2001-01-07 17:18:05.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h 2003-10-12 20:09:41.000000000 +1300
@@ -1,35 +1,35 @@
#define OPxx(i)
#define OP__(i) \
- case 0x##i##: \
- Opcode##i##(__THISP); \
+ case 0x##i : \
+ Opcode##i (__THISP); \
break;
#define OP_d(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & D_FLAG) \
- D_Opco##i##(__THISP); \
+ D_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#if BUILD_HUC6280
#define OPtd(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & T_FLAG) \
if (__THIS__.P & D_FLAG) \
- TD_Opc##i##(__THISP); \
+ TD_Opc##i (__THISP); \
else \
- T_Opco##i##(__THISP); \
+ T_Opco##i (__THISP); \
else \
if (__THIS__.P & D_FLAG) \
- D_Opco##i##(__THISP); \
+ D_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#define OPt_(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & T_FLAG) \
- T_Opco##i##(__THISP); \
+ T_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#else
#define OPtd OP_d
--- xmms-nsf-0.0.3/src/xmms/nsf.c.orig 2006-06-11 01:07:15.000000000 -0400
+++ xmms-nsf-0.0.3/src/xmms/nsf.c 2006-06-11 01:00:28.000000000 -0400
@@ -462,7 +462,7 @@
}
if (bytes > 0){
//read 1024byte = 512 sample * 2byte
- c = NESAudioRender(data, bytes/2);
+ c = NESAudioRender((Int16*)data, bytes/2);
if (c < 512)
count = 0;
else
@@ -529,7 +529,7 @@
count = ftell(nsf_file->file);
fseek(nsf_file->file, 0, SEEK_SET);
- (void*)buffer = g_malloc0(count);
+ buffer = (void*)g_malloc0(count);
for(i=0;i<count;i++){
*(buffer+i) = fgetc(nsf_file->file);
}

497
media-plugins/xmms-nsf/files/xmms-nsf-0.0.3-gcc3.patch Normal file
View File

@@ -0,0 +1,497 @@
diff -ur xmms-nsf-0.0.3/src/nes/handler.c xmms-nsf-0.0.3-gentoo/src/nes/handler.c
--- xmms-nsf-0.0.3/src/nes/handler.c 2001-01-07 17:17:57.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/handler.c 2003-10-12 19:56:48.000000000 +1300
@@ -10,9 +10,9 @@
static NES_READ_HANDLER *(nprh[0x10]) = { 0, };
static NES_WRITE_HANDLER *(npwh[0x10]) = { 0, };
#define EXTREADWRITE(p) \
-static Uint __fastcall ExtRd##p##(Uint A) \
+static Uint __fastcall ExtRd##p (Uint A) \
{ \
- NES_READ_HANDLER *ph = nprh[0x##p##]; \
+ NES_READ_HANDLER *ph = nprh[0x##p ]; \
do \
{ \
if (ph->min <= A && A <= ph->max) \
@@ -22,9 +22,9 @@
} while ((ph = ph->next) != 0); \
return 0; \
} \
-static void __fastcall ExtWr##p##(Uint A, Uint V) \
+static void __fastcall ExtWr##p (Uint A, Uint V) \
{ \
- NES_WRITE_HANDLER *ph = npwh[0x##p##]; \
+ NES_WRITE_HANDLER *ph = npwh[0x##p ]; \
do \
{ \
if (ph->min <= A && A <= ph->max) \
diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h
--- xmms-nsf-0.0.3/src/nes/km6502/km6502cd.h 2001-01-07 17:18:05.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502cd.h 2003-10-12 20:07:08.000000000 +1300
@@ -361,27 +361,27 @@
/* --- ADC --- */
#if BUILD_HUC6280
-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
} \
-static void OpcodeCall TD_Opc##i##(__CONTEXT) \
+static void OpcodeCall TD_Opc##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_ADC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_ADC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_ADC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_ADC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_ADC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_ADC(61,NP,KA_INDX) /* 61 - ADC - (Indirect,X) */
DEF_ADC(65,ZP,KA_ZP) /* 65 - ADC - Zero Page */
@@ -397,17 +397,17 @@
/* --- AND --- */
#if BUILD_HUC6280
-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_AND(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_AND(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_AND(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_AND(21,NP,KA_INDX) /* 21 - AND - (Indirect,X) */
DEF_AND(25,ZP,KA_ZP) /* 25 - AND - Zero Page */
@@ -422,10 +422,10 @@
#endif
/* --- ASL --- */
-#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ASL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ASL(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ASL(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ASL(06,ZP,KA_ZP) /* 06 - ASL - Zero Page */
DEF_ASL(0E,NP,KA_ABS) /* 0E - ASL - Absolute */
@@ -436,7 +436,7 @@
#if BUILD_HUC6280
/* --- BBRi --- */
-#define DEF_BBR(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BBR(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
@@ -451,7 +451,7 @@
DEF_BBR(6F,6) /* 6F - BBR6 */
DEF_BBR(7F,7) /* 7F - BBR7 */
/* --- BBSi --- */
-#define DEF_BBS(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BBS(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
@@ -468,8 +468,8 @@
#endif
/* --- BIT --- */
-#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_BIT(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_BIT(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_BIT(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_BIT(24,ZP,KA_ZP) /* 24 - BIT - Zero Page */
DEF_BIT(2C,NP,KA_ABS) /* 2C - BIT - Absolute */
#if BUILD_HUC6280 || BUILD_M65C02
@@ -479,7 +479,7 @@
#endif
/* --- Bcc --- */
-#define DEF_BRA(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_BRA(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword rel = K_READ(__THISP_ KA_IMM(__THISP)); \
if (a) KM_BRA(__THISP_ rel); \
@@ -536,8 +536,8 @@
{ __THIS__.P &= ~V_FLAG; }
/* --- CMP --- */
-#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CMP(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CMP(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CMP(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CMP(C1,NP,KA_INDX) /* C1 - CMP - (Indirect,X) */
DEF_CMP(C5,ZP,KA_ZP) /* C5 - CMP - Zero Page */
DEF_CMP(C9,NP,KA_IMM) /* C9 - CMP - Immediate */
@@ -551,24 +551,24 @@
#endif
/* --- CPX --- */
-#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CPX(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CPX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CPX(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CPX(E0,NP,KA_IMM) /* E0 - CPX - Immediate */
DEF_CPX(E4,ZP,KA_ZP) /* E4 - CPX - Zero Page */
DEF_CPX(EC,NP,KA_ABS) /* EC - CPX - Absolute */
/* --- CPY --- */
-#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_CPY(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_CPY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_CPY(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_CPY(C0,NP,KA_IMM) /* C0 - CPY - Immediate */
DEF_CPY(C4,ZP,KA_ZP) /* C4 - CPY - Zero Page */
DEF_CPY(CC,NP,KA_ABS) /* CC - CPY - Absolute */
/* --- DEC --- */
-#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_DEC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_DEC(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_DEC(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_DEC(C6,ZP,KA_ZP) /* C6 - DEC - Zero Page */
DEF_DEC(CE,NP,KA_ABS) /* CE - DEC - Absolute */
@@ -585,17 +585,17 @@
/* --- EOR --- */
#if BUILD_HUC6280
-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_EOR(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_EOR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_EOR(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_EOR(41,NP,KA_INDX) /* 41 - EOR - (Indirect,X) */
DEF_EOR(45,ZP,KA_ZP) /* 45 - EOR - Zero Page */
@@ -610,10 +610,10 @@
#endif
/* --- INC --- */
-#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_INC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_INC(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_INC(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_INC(E6,ZP,KA_ZP) /* E6 - INC - Zero Page */
DEF_INC(EE,NP,KA_ABS) /* EE - INC - Absolute */
@@ -629,12 +629,12 @@
{ __THIS__.Y = KM_INC(__THISP_ __THIS__.Y); }
/* --- JMP --- */
-#define DEF_JMP(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_JMP(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ __THIS__.PC = KI_READWORD(__THISP_ a(__THISP)); }
#if BUILD_HUC6280 || BUILD_M65C02
#define DEF_JMPBUG(i,a) DEF_JMP(i,a)
#else
-#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_JMPBUG(i,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ __THIS__.PC = KI_READWORDBUG(__THISP_ a(__THISP)); }
#endif
DEF_JMP(4C,KA_IMM16) /* 4C - JMP - Immediate */
@@ -653,8 +653,8 @@
}
/* --- LDA --- */
-#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.A = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.A = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDA(A1,NP,KA_INDX) /* A1 - LDA - (Indirect,X) */
DEF_LDA(A5,ZP,KA_ZP) /* A5 - LDA - Zero Page */
DEF_LDA(A9,NP,KA_IMM) /* A9 - LDA - Immediate */
@@ -668,8 +668,8 @@
#endif
/* --- LDX --- */
-#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.X = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.X = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDX(A2,NP,KA_IMM) /* A2 - LDX - Immediate */
DEF_LDX(A6,ZP,KA_ZP) /* A6 - LDX - Zero Page */
DEF_LDX(AE,NP,KA_ABS) /* AE - LDX - Absolute */
@@ -677,8 +677,8 @@
DEF_LDX(BE,NP,KA_ABSY_) /* BE - LDX - Absolute,Y */
/* --- LDY --- */
-#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ __THIS__.Y = KM_LD(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_LDY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ __THIS__.Y = KM_LD(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_LDY(A0,NP,KA_IMM) /* A0 - LDY - Immediate */
DEF_LDY(A4,ZP,KA_ZP) /* A4 - LDY - Zero Page */
DEF_LDY(AC,NP,KA_ABS) /* AC - LDY - Absolute */
@@ -686,10 +686,10 @@
DEF_LDY(BC,NP,KA_ABSX_) /* BC - LDY - Absolute,X */
/* --- LSR --- */
-#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_LSR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_LSR(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_LSR(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_LSR(46,ZP,KA_ZP) /* 46 - LSR - Zero Page */
DEF_LSR(4E,NP,KA_ABS) /* 4E - LSR - Absolute */
@@ -705,17 +705,17 @@
/* --- ORA --- */
#if BUILD_HUC6280
-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall T_Opco##i##(__CONTEXT) \
+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall T_Opco##i (__CONTEXT) \
{ \
Uword saveA = KMI_PRET(__THISP); \
- KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); \
+ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); \
KMI_POSTT(__THISP_ saveA); \
}
#else
-#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KM_ORA(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_ORA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KM_ORA(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
#endif
DEF_ORA(01,NP,KA_INDX) /* 01 - ORA - (Indirect,X) */
DEF_ORA(05,ZP,KA_ZP) /* 05 - ORA - Zero Page */
@@ -751,7 +751,7 @@
#if BUILD_HUC6280
/* --- RMBi --- */
-#define DEF_RMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_RMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) & (~(1 << y)))); \
@@ -765,7 +765,7 @@
DEF_RMB(67,6) /* 67 - RMB6 */
DEF_RMB(77,7) /* 77 - RMB7 */
/* --- SMBi --- */
-#define DEF_SMB(i,y) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_SMB(i,y) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = KA_ZP(__THISP); \
K_WRITEZP(__THISP_ adr, (Uword)(K_READZP(__THISP_ adr) | (1 << y))); \
@@ -781,10 +781,10 @@
#endif
/* --- ROL --- */
-#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ROL(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ROL(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ROL(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ROL(26,ZP,KA_ZP) /* 26 - ROL - Zero Page */
DEF_ROL(2E,NP,KA_ABS) /* 2E - ROL - Absolute */
@@ -794,10 +794,10 @@
{ __THIS__.A = KM_ROL(__THISP_ __THIS__.A); }
/* --- ROR --- */
-#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_ROR(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_ROR(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_ROR(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_ROR(66,ZP,KA_ZP) /* 66 - ROR - Zero Page */
DEF_ROR(6E,NP,KA_ABS) /* 6E - ROR - Absolute */
@@ -841,10 +841,10 @@
#endif
/* --- SBC --- */
-#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ KMI_SBC(__THISP_ K_READ##p##(__THISP_ a(__THISP))); } \
-static void OpcodeCall D_Opco##i##(__CONTEXT) \
-{ KMI_SBC_D(__THISP_ K_READ##p##(__THISP_ a(__THISP))); }
+#define DEF_SBC(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ KMI_SBC(__THISP_ K_READ##p (__THISP_ a(__THISP))); } \
+static void OpcodeCall D_Opco##i (__CONTEXT) \
+{ KMI_SBC_D(__THISP_ K_READ##p (__THISP_ a(__THISP))); }
DEF_SBC(E1,NP,KA_INDX) /* E1 - SBC - (Indirect,X) */
DEF_SBC(E5,ZP,KA_ZP) /* E5 - SBC - Zero Page */
DEF_SBC(E9,NP,KA_IMM) /* E9 - SBC - Immediate */
@@ -883,8 +883,8 @@
#endif
/* --- STA --- */
-#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.A); }
+#define DEF_STA(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.A); }
DEF_STA(81,NP,KA_INDX) /* 81 - STA - (Indirect,X) */
DEF_STA(85,ZP,KA_ZP) /* 85 - STA - Zero Page */
DEF_STA(8D,NP,KA_ABS) /* 8D - STA - Absolute */
@@ -897,23 +897,23 @@
#endif
/* --- STX --- */
-#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.X); }
+#define DEF_STX(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.X); }
DEF_STX(86,ZP,KA_ZP) /* 86 - STX - Zero Page */
DEF_STX(8E,NP,KA_ABS) /* 8E - STX - Absolute */
DEF_STX(96,ZP,KA_ZPY) /* 96 - STX - Zero Page,Y */
/* --- STY --- */
-#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), __THIS__.Y); }
+#define DEF_STY(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), __THIS__.Y); }
DEF_STY(84,ZP,KA_ZP) /* 84 - STY - Zero Page */
DEF_STY(8C,NP,KA_ABS) /* 8C - STY - Absolute */
DEF_STY(94,ZP,KA_ZPX) /* 94 - STY - Zero Page,X */
#if BUILD_HUC6280 || BUILD_M65C02
/* --- STZ --- */
-#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
-{ K_WRITE##p##(__THISP_ a(__THISP), 0); }
+#define DEF_STZ(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
+{ K_WRITE##p (__THISP_ a(__THISP), 0); }
DEF_STZ(64,ZP,KA_ZP) /* 64 - STZ - Zero Page */
DEF_STZ(9C,NP,KA_ABS) /* 9C - STZ - Absolute */
DEF_STZ(74,ZP,KA_ZPX) /* 74 - STZ - Zero Page,X */
@@ -931,18 +931,18 @@
#if BUILD_HUC6280 || BUILD_M65C02
/* --- TRB --- */
-#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TRB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_TRB(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_TRB(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_TRB(14,ZP,KA_ZP) /* 14 - TRB - Zero Page */
DEF_TRB(1C,NP,KA_ABS) /* 1C - TRB - Absolute */
/* --- TSB --- */
-#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TSB(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword adr = a(__THISP); \
- K_WRITE##p##(__THISP_ adr, KM_TSB(__THISP_ K_READ##p##(__THISP_ adr))); \
+ K_WRITE##p (__THISP_ adr, KM_TSB(__THISP_ K_READ##p (__THISP_ adr))); \
}
DEF_TSB(04,ZP,KA_ZP) /* 04 - TSB - Zero Page */
DEF_TSB(0C,NP,KA_ABS) /* 0C - TSB - Absolute */
@@ -950,10 +950,10 @@
#if BUILD_HUC6280
/* --- TST --- */
-#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i##(__CONTEXT) \
+#define DEF_TST(i,p,a) static void OpcodeCall Opcode##i (__CONTEXT) \
{ \
Uword imm = K_READ(__THISP_ KA_IMM(__THISP)); \
- KM_TST(__THISP_ imm, K_READ##p##(__THISP_ a(__THISP))); \
+ KM_TST(__THISP_ imm, K_READ##p (__THISP_ a(__THISP))); \
}
DEF_TST(83,ZP,KA_ZP) /* 83 - TST - Zero Page */
DEF_TST(93,NP,KA_ABS) /* 93 - TST - Absolute */
diff -ur xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h
--- xmms-nsf-0.0.3/src/nes/km6502/km6502ot.h 2001-01-07 17:18:05.000000000 +1300
+++ xmms-nsf-0.0.3-gentoo/src/nes/km6502/km6502ot.h 2003-10-12 20:09:41.000000000 +1300
@@ -1,35 +1,35 @@
#define OPxx(i)
#define OP__(i) \
- case 0x##i##: \
- Opcode##i##(__THISP); \
+ case 0x##i : \
+ Opcode##i (__THISP); \
break;
#define OP_d(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & D_FLAG) \
- D_Opco##i##(__THISP); \
+ D_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#if BUILD_HUC6280
#define OPtd(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & T_FLAG) \
if (__THIS__.P & D_FLAG) \
- TD_Opc##i##(__THISP); \
+ TD_Opc##i (__THISP); \
else \
- T_Opco##i##(__THISP); \
+ T_Opco##i (__THISP); \
else \
if (__THIS__.P & D_FLAG) \
- D_Opco##i##(__THISP); \
+ D_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#define OPt_(i) \
- case 0x##i##: \
+ case 0x##i : \
if (__THIS__.P & T_FLAG) \
- T_Opco##i##(__THISP); \
+ T_Opco##i (__THISP); \
else \
- Opcode##i##(__THISP); \
+ Opcode##i (__THISP); \
break;
#else
#define OPtd OP_d