--- np2/sound/opngenc.c	2003/10/16 17:58:04	1.1
+++ np2/sound/opngenc.c	2004/07/26 18:52:55	1.10
@@ -1,7 +1,9 @@
 #include	"compiler.h"
 #include	<math.h>
+#include	"pccore.h"
+#include	"iocore.h"
 #include	"sound.h"
-#include	"opngen.h"
+#include	"fmboard.h"
 #include	"keydisp.h"
 
 
@@ -15,29 +17,11 @@
 #define	FREQBASE4096	((double)OPNA_CLOCK / calcrate / 64)
 
 
-	SINT32	env_curve[EVC_ENT*2 + 1];
-	SINT32	envtable[EVC_ENT];
-	SINT32	sintable[SIN_ENT];
-#ifdef SOUND_FM_ASM
+	OPNCFG	opncfg;
+#ifdef OPNGENX86
 	char	envshift[EVC_ENT];
 	char	sinshift[SIN_ENT];
 #endif
-	BYTE	baseratebit;
-
-	OPNCH	opnch[OPNCH_MAX];
-	BYTE	fm_keyreg[OPNCH_MAX];
-
-	UINT	playchannels;
-	SINT32	feedback2;
-	SINT32	feedback3;
-	SINT32	feedback4;
-	SINT32	outdl;
-	SINT32	outdc;
-	SINT32	outdr;
-	SINT32	calc1024;
-	SINT32	calcremain;
-	SINT32	fmvolforasm;
-	SINT32	fmvolforc;
 
 
 static	SINT32	detunetable[8][32];
@@ -47,13 +31,13 @@ static	SINT32	decaytable[94];
 static const SINT32	decayleveltable[16] = {
 		 			SC( 0),SC( 1),SC( 2),SC( 3),SC( 4),SC( 5),SC( 6),SC( 7),
 		 			SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)};
-static const BYTE multipletable[] = {
+static const UINT8 multipletable[] = {
 			    	1, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30};
 static const SINT32 nulltable[] = {
 					0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 					0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-static const BYTE kftable[16] = {0,0,0,0,0,0,0,1,2,3,3,3,3,3,3,3};
-static const BYTE dttable[] = {
+static const UINT8 kftable[16] = {0,0,0,0,0,0,0,1,2,3,3,3,3,3,3,3};
+static const UINT8 dttable[] = {
 					0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 					0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 					0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2,
@@ -68,74 +52,83 @@ static const int fmslot[4] = {0, 2, 1, 3
 
 void opngen_initialize(UINT rate) {
 
+	UINT	ratebit;
 	int		i;
 	int		j;
 	double	pom;
 	double	freq;
 	UINT32	calcrate;
 
-	calcrate = rate * 55466 / 44100;
-
-	calc1024 = FMDIV_ENT * 44100 / 55466;
+	if (rate == 44100) {
+		ratebit = 0;
+	}
+	else if (rate == 22050) {
+		ratebit = 1;
+	}
+	else {
+		ratebit = 2;
+	}
+	calcrate = (OPNA_CLOCK / 72) >> ratebit;
+	opncfg.calc1024 = FMDIV_ENT * 44100 / (OPNA_CLOCK / 72);
 
 	for (i=0; i<EVC_ENT; i++) {
-#ifdef SOUND_FM_ASM
+#ifdef OPNGENX86
 		char sft;
 		sft = ENVTBL_BIT;
 		while(sft < (ENVTBL_BIT + 8)) {
 			pom = (double)(1 << sft) / pow(10.0, EG_STEP*(EVC_ENT-i)/20.0);
-			envtable[i] = (long)pom;
+			opncfg.envtable[i] = (long)pom;
 			envshift[i] = sft - TL_BITS;
-			if (envtable[i] >= (1 << (ENVTBL_BIT - 1))) {
+			if (opncfg.envtable[i] >= (1 << (ENVTBL_BIT - 1))) {
 				break;
 			}
 			sft++;
 		}
 #else
 		pom = (double)(1 << ENVTBL_BIT) / pow(10.0, EG_STEP*(EVC_ENT-i)/20.0);
-		envtable[i] = (long)pom;
+		opncfg.envtable[i] = (long)pom;
 #endif
 	}
 	for (i=0; i<SIN_ENT; i++) {
-#ifdef SOUND_FM_ASM
+#ifdef OPNGENX86
 		char sft;
 		sft = SINTBL_BIT;
 		while(sft < (SINTBL_BIT + 8)) {
 			pom = (double)(1 << sft) * sin(2*PI*i/SIN_ENT);
-			sintable[i] = (long)pom;
+			opncfg.sintable[i] = (long)pom;
 			sinshift[i] = sft;
-			if (sintable[i] >= (1 << (SINTBL_BIT - 1))) {
+			if (opncfg.sintable[i] >= (1 << (SINTBL_BIT - 1))) {
 				break;
 			}
-			if (sintable[i] <= -1 * (1 << (SINTBL_BIT - 1))) {
+			if (opncfg.sintable[i] <= -1 * (1 << (SINTBL_BIT - 1))) {
 				break;
 			}
 			sft++;
 		}
 #else
 		pom = (double)((1 << SINTBL_BIT) - 1) * sin(2*PI*i/SIN_ENT);
-		sintable[i] = (long)pom;							// ver0.27
+		opncfg.sintable[i] = (long)pom;
 #endif
 	}
 	for (i=0; i<EVC_ENT; i++) {
 		pom = pow(((double)(EVC_ENT-1-i)/EVC_ENT), 8) * EVC_ENT;
-		env_curve[i] = (long)pom;							// ver0.27
-		env_curve[EVC_ENT + i] = i;
+		opncfg.envcurve[i] = (long)pom;
+		opncfg.envcurve[EVC_ENT + i] = i;
 	}
-	env_curve[EVC_ENT*2] = EVC_ENT;
+	opncfg.envcurve[EVC_ENT*2] = EVC_ENT;
 
 //	opmbaserate = (1L << FREQ_BITS) / (rate * x / 44100) * 55466;
 //	でも今は x == 55466だから…
 
 //	ここで FREQ_BITS >= 16が条件
 	if (rate == 44100) {
-		baseratebit = 0 + (FREQ_BITS - 16);
+		opncfg.ratebit = 0 + (FREQ_BITS - 16);
 	}
 	else if (rate == 22050) {
-		baseratebit = 1 + (FREQ_BITS - 16);
+		opncfg.ratebit = 1 + (FREQ_BITS - 16);
 	}
 	else {
-		baseratebit = 2 + (FREQ_BITS - 16);
+		opncfg.ratebit = 2 + (FREQ_BITS - 16);
 	}
 
 	for (i=0; i<4; i++) {
@@ -163,8 +156,19 @@ void opngen_initialize(UINT rate) {
 			freq *= 1.0 + (i & 3) * 0.25;
 		}
 		freq *= (double)(1 << ((i >> 2) - 1));
+#if 0
+		attacktable[i] = (long)((freq + OPM_ARRATE - 1) / OPM_ARRATE);
+		decaytable[i] = (long)((freq + OPM_DRRATE - 1) / OPM_DRRATE);
+#else
 		attacktable[i] = (long)(freq / OPM_ARRATE);
 		decaytable[i] = (long)(freq / OPM_DRRATE);
+#endif
+		if (attacktable[i] >= EC_DECAY) {
+			TRACEOUT(("attacktable %d %d %d", i, attacktable[i], EC_DECAY));
+		}
+		if (decaytable[i] >= EC_DECAY) {
+			TRACEOUT(("decaytable %d %d %d", i, decaytable[i], EC_DECAY));
+		}
 	}
 	attacktable[62] = EC_DECAY - 1;
 	attacktable[63] = EC_DECAY - 1;
@@ -176,8 +180,22 @@ void opngen_initialize(UINT rate) {
 
 void opngen_setvol(UINT vol) {
 
-	fmvolforc = vol * 5 / 4;
-	fmvolforasm = fmvolforc << FMASMSHIFT;
+	opncfg.fmvol = vol * 5 / 4;
+#if defined(OPNGENX86)
+	opncfg.fmvol <<= FMASMSHIFT;
+#endif
+}
+
+void opngen_setVR(REG8 channel, REG8 value) {
+
+	if ((channel & 3) && (value)) {
+		opncfg.vr_en = TRUE;
+		opncfg.vr_l = (channel & 1)?value:0;
+		opncfg.vr_r = (channel & 2)?value:0;
+	}
+	else {
+		opncfg.vr_en = FALSE;
+	}
 }
 
 
@@ -186,60 +204,68 @@ void opngen_setvol(UINT vol) {
 static void set_algorithm(OPNCH *ch) {
 
 	SINT32	*outd;
+	UINT8	outslot;
 
-	outd = &outdc;
+	outd = &opngen.outdc;
 	if (ch->stereo) {
 		switch(ch->pan & 0xc0) {
 			case 0x80:
-				outd = &outdl;
+				outd = &opngen.outdl;
 				break;
 
 			case 0x40:
-				outd = &outdr;
+				outd = &opngen.outdr;
 				break;
 		}
 	}
 	switch(ch->algorithm) {
 		case 0:
-			ch->connect1 = &feedback2;
-			ch->connect2 = &feedback3;
-			ch->connect3 = &feedback4;
+			ch->connect1 = &opngen.feedback2;
+			ch->connect2 = &opngen.feedback3;
+			ch->connect3 = &opngen.feedback4;
+			outslot = 0x08;
 			break;
 
 		case 1:
-			ch->connect1 = &feedback3;
-			ch->connect2 = &feedback3;
-			ch->connect3 = &feedback4;
+			ch->connect1 = &opngen.feedback3;
+			ch->connect2 = &opngen.feedback3;
+			ch->connect3 = &opngen.feedback4;
+			outslot = 0x08;
 			break;
 
 		case 2:
-			ch->connect1 = &feedback4;
-			ch->connect2 = &feedback3;
-			ch->connect3 = &feedback4;
+			ch->connect1 = &opngen.feedback4;
+			ch->connect2 = &opngen.feedback3;
+			ch->connect3 = &opngen.feedback4;
+			outslot = 0x08;
 			break;
 
 		case 3:
-			ch->connect1 = &feedback2;
-			ch->connect2 = &feedback4;
-			ch->connect3 = &feedback4;
+			ch->connect1 = &opngen.feedback2;
+			ch->connect2 = &opngen.feedback4;
+			ch->connect3 = &opngen.feedback4;
+			outslot = 0x08;
 			break;
 
 		case 4:
-			ch->connect1 = &feedback2;
+			ch->connect1 = &opngen.feedback2;
 			ch->connect2 = outd;
-			ch->connect3 = &feedback4;
+			ch->connect3 = &opngen.feedback4;
+			outslot = 0x0a;
 			break;
 
 		case 5:
 			ch->connect1 = 0;
 			ch->connect2 = outd;
 			ch->connect3 = outd;
+			outslot = 0x0e;
 			break;
 
 		case 6:
-			ch->connect1 = &feedback2;
+			ch->connect1 = &opngen.feedback2;
 			ch->connect2 = outd;
 			ch->connect3 = outd;
+			outslot = 0x0e;
 			break;
 
 		case 7:
@@ -247,43 +273,49 @@ static void set_algorithm(OPNCH *ch) {
 			ch->connect1 = outd;
 			ch->connect2 = outd;
 			ch->connect3 = outd;
+			outslot = 0x0f;
 	}
 	ch->connect4 = outd;
+	ch->outslot = outslot;
 }
 
-static void set_dt1_mul(OPNSLOT *slot, BYTE value) {
+static void set_dt1_mul(OPNSLOT *slot, REG8 value) {
 
 	slot->multiple = (SINT32)multipletable[value & 0x0f];
 	slot->detune1 = detunetable[(value >> 4) & 7];
 }
 
-static void set_tl(OPNSLOT *slot, BYTE value) {
+static void set_tl(OPNSLOT *slot, REG8 value) {
 
+#if (EVC_BITS >= 7)
 	slot->totallevel = ((~value) & 0x007f) << (EVC_BITS - 7);
+#else
+	slot->totallevel = ((~value) & 0x007f) >> (7 - EVC_BITS);
+#endif
 }
 
-static void set_ks_ar(OPNSLOT *slot, BYTE value) {
+static void set_ks_ar(OPNSLOT *slot, REG8 value) {
 
-	slot->keyscale = (BYTE)(((~value)>>6)&3);
+	slot->keyscale = ((~value) >> 6) & 3;
 	value &= 0x1f;
 	slot->attack = (value)?(attacktable + (value << 1)):nulltable;
-	slot->env_inc_attack = slot->attack[slot->envraito];
+	slot->env_inc_attack = slot->attack[slot->envratio];
 	if (slot->env_mode == EM_ATTACK) {
 		slot->env_inc = slot->env_inc_attack;
 	}
 }
 
-static void set_d1r(OPNSLOT *slot, BYTE value) {
+static void set_d1r(OPNSLOT *slot, REG8 value) {
 
 	value &= 0x1f;
 	slot->decay1 = (value)?(decaytable + (value << 1)):nulltable;
-	slot->env_inc_decay1 = slot->decay1[slot->envraito];
+	slot->env_inc_decay1 = slot->decay1[slot->envratio];
 	if (slot->env_mode == EM_DECAY1) {
 		slot->env_inc = slot->env_inc_decay1;
 	}
 }
 
-static void set_dt2_d2r(OPNSLOT *slot, BYTE value) {
+static void set_dt2_d2r(OPNSLOT *slot, REG8 value) {
 
 	value &= 0x1f;
 	slot->decay2 = (value)?(decaytable + (value << 1)):nulltable;
@@ -291,30 +323,30 @@ static void set_dt2_d2r(OPNSLOT *slot, B
 		slot->env_inc_decay2 = 0;
 	}
 	else {
-		slot->env_inc_decay2 = slot->decay2[slot->envraito];
+		slot->env_inc_decay2 = slot->decay2[slot->envratio];
 	}
 	if (slot->env_mode == EM_DECAY2) {
 		slot->env_inc = slot->env_inc_decay2;
 	}
 }
 
-static void set_d1l_rr(OPNSLOT *slot, BYTE value) {
+static void set_d1l_rr(OPNSLOT *slot, REG8 value) {
 
 	slot->decaylevel = decayleveltable[(value >> 4)];
 	slot->release = decaytable + ((value & 0x0f) << 2) + 2;
-	slot->env_inc_release = slot->release[slot->envraito];
+	slot->env_inc_release = slot->release[slot->envratio];
 	if (slot->env_mode == EM_RELEASE) {
 		slot->env_inc = slot->env_inc_release;
 		if (value == 0xff) {
 			slot->env_mode = EM_OFF;
 			slot->env_cnt = EC_OFF;
-			slot->env_end = EC_OFF+1;
+			slot->env_end = EC_OFF + 1;
 			slot->env_inc = 0;
 		}
 	}
 }
 
-static void set_ssgeg(OPNSLOT *slot, BYTE value) {
+static void set_ssgeg(OPNSLOT *slot, REG8 value) {
 
 	value &= 0xf;
 	if ((value == 0xb) || (value == 0xd)) {
@@ -323,7 +355,7 @@ static void set_ssgeg(OPNSLOT *slot, BYT
 	}
 	else {
 		slot->ssgeg1 = 0;
-		slot->env_inc_decay2 = slot->decay2[slot->envraito];
+		slot->env_inc_decay2 = slot->decay2[slot->envratio];
 	}
 	if (slot->env_mode == EM_DECAY2) {
 		slot->env_inc = slot->env_inc_decay2;
@@ -334,8 +366,8 @@ static void channleupdate(OPNCH *ch) {
 
 	int		i;
 	UINT32	fc = ch->keynote[0];						// ver0.27
-	BYTE	kc = ch->kcode[0];
-	BYTE	evr;
+	UINT8	kc = ch->kcode[0];
+	UINT	evr;
 	OPNSLOT	*slot;
 	int		s;
 
@@ -343,9 +375,9 @@ static void channleupdate(OPNCH *ch) {
 	if (!(ch->extop)) {
 		for (i=0; i<4; i++, slot++) {
 			slot->freq_inc = (fc + slot->detune1[kc]) * slot->multiple;
-			evr = (BYTE)(kc >> slot->keyscale);
-			if (slot->envraito != evr) {
-				slot->envraito = evr;
+			evr = kc >> slot->keyscale;
+			if (slot->envratio != evr) {
+				slot->envratio = evr;
 				slot->env_inc_attack = slot->attack[evr];
 				slot->env_inc_decay1 = slot->decay1[evr];
 				slot->env_inc_decay2 = slot->decay2[evr];
@@ -358,9 +390,9 @@ static void channleupdate(OPNCH *ch) {
 			s = extendslot[i];
 			slot->freq_inc = (ch->keynote[s] + slot->detune1[ch->kcode[s]])
 														* slot->multiple;
-			evr = (BYTE)(ch->kcode[s] >> slot->keyscale);
-			if (slot->envraito != evr) {
-				slot->envraito = evr;
+			evr = ch->kcode[s] >> slot->keyscale;
+			if (slot->envratio != evr) {
+				slot->envratio = evr;
 				slot->env_inc_attack = slot->attack[evr];
 				slot->env_inc_decay1 = slot->decay1[evr];
 				slot->env_inc_decay2 = slot->decay2[evr];
@@ -380,9 +412,9 @@ void opngen_reset(void) {
 	OPNSLOT	*slot;
 	UINT	j;
 
+	ZeroMemory(&opngen, sizeof(opngen));
 	ZeroMemory(opnch, sizeof(opnch));
-	ZeroMemory(fm_keyreg, sizeof(fm_keyreg));
-	playchannels = 3;
+	opngen.playchannels = 3;
 
 	ch = opnch;
 	for (i=0; i<OPNCH_MAX; i++) {
@@ -403,19 +435,19 @@ void opngen_reset(void) {
 		ch++;
 	}
 	for (i=0x30; i<0xc0; i++) {
-		opngen_setreg((BYTE)i, 0xff, 0);
-		opngen_setreg((BYTE)i, 0xff, 3);
-		opngen_setreg((BYTE)i, 0xff, 6);
-		opngen_setreg((BYTE)i, 0xff, 9);
+		opngen_setreg(0, (REG8)i, 0xff);
+		opngen_setreg(3, (REG8)i, 0xff);
+		opngen_setreg(6, (REG8)i, 0xff);
+		opngen_setreg(9, (REG8)i, 0xff);
 	}
 }
 
-void opngen_setcfg(BYTE maxch, UINT flag) {
+void opngen_setcfg(REG8 maxch, UINT flag) {
 
 	OPNCH	*ch;
 	UINT	i;
 
-	playchannels = maxch;
+	opngen.playchannels = maxch;
 	ch = opnch;
 	if ((flag & OPN_CHMASK) == OPN_STEREO) {
 		for (i=0; i<OPNCH_MAX; i++) {
@@ -437,7 +469,7 @@ void opngen_setcfg(BYTE maxch, UINT flag
 	}
 }
 
-void opngen_setextch(UINT chnum, BYTE data) {
+void opngen_setextch(UINT chnum, REG8 data) {
 
 	OPNCH	*ch;
 
@@ -445,13 +477,13 @@ void opngen_setextch(UINT chnum, BYTE da
 	ch[chnum].extop = data;
 }
 
-void opngen_setreg(BYTE chbase, BYTE reg, BYTE value) {
+void opngen_setreg(REG8 chbase, REG8 reg, REG8 value) {
 
 	UINT	chpos;
 	OPNCH	*ch;
 	OPNSLOT	*slot;
 	UINT	fn;
-	BYTE	blk;
+	UINT8	blk;
 
 	chpos = reg & 3;
 	if (chpos == 3) {
@@ -502,7 +534,7 @@ void opngen_setreg(BYTE chbase, BYTE reg
 				fn = ((ch->keyfunc[0] & 7) << 8) + value;
 				ch->kcode[0] = (blk << 2) | kftable[fn >> 7];
 //				ch->keynote[0] = fn * opmbaserate / (1L << (22-blk));
-				ch->keynote[0] = (fn << (baseratebit + blk)) >> 6;
+				ch->keynote[0] = (fn << (opncfg.ratebit + blk)) >> 6;
 				channleupdate(ch);
 				break;
 
@@ -516,7 +548,7 @@ void opngen_setreg(BYTE chbase, BYTE reg
 				fn = ((ch->keyfunc[chpos+1] & 7) << 8) + value;
 				ch->kcode[chpos+1] = (blk << 2) | kftable[fn >> 7];
 //				ch->keynote[chpos+1] = fn * opmbaserate / (1L << (22-blk));
-				ch->keynote[chpos+1] = (fn << (baseratebit + blk)) >> 6;
+				ch->keynote[chpos+1] = (fn << (opncfg.ratebit + blk)) >> 6;
 				channleupdate(ch);
 				break;
 
@@ -526,7 +558,7 @@ void opngen_setreg(BYTE chbase, BYTE reg
 				break;
 
 			case 0xb0:
-				ch->algorithm = (BYTE)(value & 7);
+				ch->algorithm = (UINT8)(value & 7);
 				value = (value >> 3) & 7;
 				if (value) {
 					ch->feedback = 8 - value;
@@ -538,23 +570,25 @@ void opngen_setreg(BYTE chbase, BYTE reg
 				break;
 
 			case 0xb4:
-				ch->pan = (BYTE)(value & 0xc0);
+				ch->pan = (UINT8)(value & 0xc0);
 				set_algorithm(ch);
 				break;
 		}
 	}
 }
 
-void opngen_keyon(UINT chnum, BYTE value) {
+void opngen_keyon(UINT chnum, REG8 value) {
 
 	OPNCH	*ch;
 	OPNSLOT	*slot;
-	BYTE	bit;
+	REG8	bit;
 	UINT	i;
 
 	sound_sync();
-	fm_keyreg[chnum] = value;
+	opngen.keyreg[chnum] = value;
+	opngen.playing++;
 	ch = opnch + chnum;
+	ch->playing |= value >> 4;
 	slot = ch->slot;
 	bit = 0x10;
 	for (i=0; i<4; i++) {
@@ -574,8 +608,8 @@ void opngen_keyon(UINT chnum, BYTE value
 			if (slot->env_mode > EM_RELEASE) {
 				slot->env_mode = EM_RELEASE;
 				if (!(slot->env_cnt & EC_DECAY)) {
-					slot->env_cnt = (env_curve[slot->env_cnt >> ENV_BITS]
-													<< ENV_BITS) + EC_DECAY;
+					slot->env_cnt = (opncfg.envcurve[slot->env_cnt
+										>> ENV_BITS] << ENV_BITS) + EC_DECAY;
 				}
 				slot->env_end = EC_OFF;
 				slot->env_inc = slot->env_inc_release;
@@ -584,6 +618,6 @@ void opngen_keyon(UINT chnum, BYTE value
 		slot++;
 		bit <<= 1;
 	}
-	keydisp_fmkeyon((BYTE)chnum, value);
+	keydisp_fmkeyon((UINT8)chnum, value);
 }