コミット: 223 - kmbasic (svn)

BASIC compiler/interpreter for PIC32MX/MZ-80K (suspended)

コミットメタ情報

• リビジョン: 223 (tree)
• 日時: 2018-02-05 08:47:33
• 作者: kmorimatsu

ログメッセージ

Megalopa with MUSIC (monaural) enabled

変更サマリ

• modified: mips/branches/megalopa/exception.c
• modified: mips/branches/megalopa/library.c
• modified: mips/branches/megalopa/main.c
• modified: mips/branches/megalopa/music.c
• modified: mips/branches/megalopa/ps2keyboard.h

差分

--- mips/branches/megalopa/exception.c	(revision 222)
+++ mips/branches/megalopa/exception.c	(revision 223)
@@ -71,7 +71,7 @@
 	#ifdef __DEBUG
 		asm volatile("j 0xBFC00000");
 	#else
-//		buttonmode();
+		buttonmode();
 		for(i=0;i<100000;i++){
 			if((KEYPORT&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE))
 				!=(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE)) i=0;

--- mips/branches/megalopa/library.c	(revision 222)
+++ mips/branches/megalopa/library.c	(revision 223)
@@ -625,28 +625,28 @@
 			g_prev_y=y1;
 			break;
 		case FUNC_PSET:// X1,Y1[,C]
-			g_pset(x1,y1,v0&0xFF);
+			g_pset(x1,y1,v0);
 			g_prev_x=x1;
 			g_prev_y=y1;
 			break;
 		case FUNC_LINE:// X1,Y1,X2,Y2[,C]
-			if (y1==y2) g_hline(x1,x2,y1,v0&0xFF);
-			else g_gline(x1,y1,x2,y2,v0&0xFF);
+			if (y1==y2) g_hline(x1,x2,y1,v0);
+			else g_gline(x1,y1,x2,y2,v0);
 			g_prev_x=x2;
 			g_prev_y=y2;
 			break;
 		case FUNC_BOXFILL:// X1,Y1,X2,Y2[,C]
-			g_boxfill(x1,y1,x2,y2,v0&0xFF);
+			g_boxfill(x1,y1,x2,y2,v0);
 			g_prev_x=x2;
 			g_prev_y=y2;
 			break;
 		case FUNC_CIRCLE:// X1,Y1,R[,C]
-			g_circle(x1,y1,x2,v0&0xFF);
+			g_circle(x1,y1,x2,v0);
 			g_prev_x=x1;
 			g_prev_y=y1;
 			break;
 		case FUNC_CIRCLEFILL:// X1,Y1,R[,C]
-			g_circlefill(x1,y1,x2,v0&0xFF);
+			g_circlefill(x1,y1,x2,v0);
 			g_prev_x=x1;
 			g_prev_y=y1;
 			break;

--- mips/branches/megalopa/main.c	(revision 222)
+++ mips/branches/megalopa/main.c	(revision 223)
@@ -206,6 +206,25 @@
 	// Show blue screen if exception before soft reset.
 	blue_screen();
 
+	// Prepare Timer1 for 60 Hz interrupt
+	// This will be replaced by video-library-triggered interruption
+	// TCKPS=0b10 for 1/64 prescaller
+	// 
+	PR1=262*6080/64-1; // = 24889
+	TMR1=0;
+	T1CON=0x0020;
+	IPC1bits.T1IP=3;
+	IPC1bits.T1IS=0;
+	IFS0bits.T1IF=0;
+	IEC0bits.T1IE=1;
+/*	// Software interrupt every 1/60 sec (triggered by Timer1)
+	// This is a test routine.
+	IPC0bits.CS0IP=3;
+	IPC0bits.CS0IS=0;
+	IFS0bits.CS0IF=0;
+	IEC0bits.CS0IE=1; */
+	T1CONbits.ON=1; // Start timer1
+
 	printstr("MachiKania BASIC System\n");
 	printstr(" Ver "SYSVER1" "SYSVER2" by KENKEN\n");
 	printstr("BASIC Compiler "BASVER"\n");
@@ -252,3 +271,20 @@
 	runbasic(tempfile,0);
 	while(1) asm(WAIT);
 }
+
+#pragma interrupt timer1int IPL3SOFT vector 4
+void timer1int(){
+	// Trigger software interrupt 0
+	IFS0bits.T1IF=0;
+	IFS0bits.CS0IF=1;
+}
+
+/*
+unsigned char test_c;
+#pragma interrupt musicint IPL3SOFT vector 1
+void musicint(){
+	IFS0bits.CS0IF=0;
+	test_c++;
+	TVRAM[20]=0x40+(test_c/16);
+}
+*/
\ No newline at end of file

--- mips/branches/megalopa/music.c	(revision 222)
+++ mips/branches/megalopa/music.c	(revision 223)
@@ -66,30 +66,51 @@
 static int g_mpoint;
 static char* g_mstr;
 static int g_mspos;
-static unsigned short g_music[32];
-static unsigned short g_sound[32];
-static unsigned short g_musiclen[32];
-static unsigned char g_soundlen[32];
-static int g_musicstart;
-static int g_musicend;
-static int g_musicwait;
-static int g_soundstart;
-static int g_soundend;
-static int g_soundwait;
-static int g_soundrepeat;
+static unsigned short g_musicL[32];
+static unsigned short g_soundL[32];
+static unsigned short g_musiclenL[32];
+static unsigned char g_soundlenL[32];
+static int g_musicstartL;
+static int g_musicendL;
+static int g_musicwaitL;
+static int g_soundstartL;
+static int g_soundendL;
+static int g_soundwaitL;
+static int g_soundrepeatL;
+static unsigned short g_musicR[32];
+static unsigned short g_soundR[32];
+static unsigned short g_musiclenR[32];
+static unsigned char g_soundlenR[32];
+static int g_musicstartR;
+static int g_musicendR;
+static int g_musicwaitR;
+static int g_soundstartR;
+static int g_soundendR;
+static int g_soundwaitR;
+static int g_soundrepeatR;
 
-int musicRemaining(){
-	return (g_musicend-g_musicstart)&31;
+#define MFLAG_L 2
+#define MFLAG_R 1
+
+//int musicRemaining(int flagsLR){
+int musicRemaining(){int flagsLR=3;
+	int l, r;
+	l=(g_musicendL-g_musicstartL)&31;
+	r=(g_musicendL-g_musicstartL)&31;
+	if (flagsLR & MFLAG_L) return l;
+	if (flagsLR & MFLAG_R) return r;
+	return (l>r) ? l:r;
 }
 
-#pragma interrupt timer4int IPL3SOFT vector 16
-void timer4int(){
+#pragma interrupt musicint IPL3SOFT vector 1
+void musicint(){
 	unsigned int i;
 	// This function is called every 1/60 sec.
-	IFS0CLR=_IFS0_T4IF_MASK; //IFS0bits.T4IF=0;
-	if (g_soundstart!=g_soundend){
-		// Start timer & OC4
-		i=g_sound[g_soundstart];
+	IFS0bits.CS0IF=0;
+	// Left sound/music uses Timer3
+	if (g_soundstartL!=g_soundendL){
+		// Start timer
+		i=g_soundL[g_soundstartL];
 		if (i<0xffff) {
 			T3CONSET=0x8000;
 			PR3=i;
@@ -97,31 +118,31 @@
 		} else {
 			T3CONCLR=0x8000;
 		}
-		if ((--g_soundwait)<=0) {
-			g_soundstart++;
-			if (g_soundstart==g_soundend || 31<g_soundstart) {
-				g_soundstart=0;
-				g_soundrepeat--;
-				if (0<g_soundrepeat) {
-					g_soundwait=g_soundlen[g_soundstart];
+		if ((--g_soundwaitL)<=0) {
+			g_soundstartL++;
+			if (g_soundstartL==g_soundendL || 31<g_soundstartL) {
+				g_soundstartL=0;
+				g_soundrepeatL--;
+				if (0<g_soundrepeatL) {
+					g_soundwaitL=g_soundlenL[g_soundstartL];
 				} else {
-					g_soundend=g_soundrepeat=g_soundwait=0;
+					g_soundendL=g_soundrepeatL=g_soundwaitL=0;
 				}
 			} else {
-				g_soundwait=g_soundlen[g_soundstart];
+				g_soundwaitL=g_soundlenL[g_soundstartL];
 			}
 		}
 		// Shift music data even though without output.
-		if (g_musicstart!=g_musicend) {
-			if ((--g_musicwait)<=0) {
-				g_musicstart++;
-				g_musicstart&=31;
-				g_musicwait=g_musiclen[g_musicstart];
+		if (g_musicstartL!=g_musicendL) {
+			if ((--g_musicwaitL)<=0) {
+				g_musicstartL++;
+				g_musicstartL&=31;
+				g_musicwaitL=g_musiclenL[g_musicstartL];
 			}
 		}
-	} else if (g_musicstart!=g_musicend) {
-		// Start timer & OC4
-		i=g_music[g_musicstart];
+	} else if (g_musicstartL!=g_musicendL) {
+		// Start timer
+		i=g_musicL[g_musicstartL];
 		if (i<0xffff) {
 			T3CONSET=0x8000;
 			PR3=i;
@@ -129,15 +150,67 @@
 		} else {
 			T3CONCLR=0x8000;
 		}
-		if ((--g_musicwait)<=0) {
-			g_musicstart++;
-			g_musicstart&=31;
-			g_musicwait=g_musiclen[g_musicstart];
+		if ((--g_musicwaitL)<=0) {
+			g_musicstartL++;
+			g_musicstartL&=31;
+			g_musicwaitL=g_musiclenL[g_musicstartL];
 		}
 	} else {
 		// Stop timer
 		T3CONCLR=0x8000;
 	}
+	// Right sound/music uses Timer4
+	if (g_soundstartR!=g_soundendR){
+		// Start timer
+		i=g_soundR[g_soundstartR];
+		if (i<0xffff) {
+			T4CONSET=0x8000;
+			PR4=i;
+			if (i<TMR4) TMR4=0;
+		} else {
+			T4CONCLR=0x8000;
+		}
+		if ((--g_soundwaitR)<=0) {
+			g_soundstartR++;
+			if (g_soundstartR==g_soundendR || 31<g_soundstartR) {
+				g_soundstartR=0;
+				g_soundrepeatR--;
+				if (0<g_soundrepeatR) {
+					g_soundwaitR=g_soundlenR[g_soundstartR];
+				} else {
+					g_soundendR=g_soundrepeatR=g_soundwaitR=0;
+				}
+			} else {
+				g_soundwaitR=g_soundlenR[g_soundstartR];
+			}
+		}
+		// Shift music data even though without output.
+		if (g_musicstartR!=g_musicendR) {
+			if ((--g_musicwaitR)<=0) {
+				g_musicstartR++;
+				g_musicstartR&=31;
+				g_musicwaitR=g_musiclenR[g_musicstartR];
+			}
+		}
+	} else if (g_musicstartR!=g_musicendR) {
+		// Start timer
+		i=g_musicR[g_musicstartR];
+		if (i<0xffff) {
+			T4CONSET=0x8000;
+			PR4=i;
+			if (i<TMR4) TMR4=0;
+		} else {
+			T4CONCLR=0x8000;
+		}
+		if ((--g_musicwaitR)<=0) {
+			g_musicstartR++;
+			g_musicstartR&=31;
+			g_musicwaitR=g_musiclenR[g_musicstartR];
+		}
+	} else {
+		// Stop timer
+		T4CONCLR=0x8000;
+	}
 }
 
 int musicGetNum(){
@@ -157,36 +230,57 @@
 	return ret;
 }
 
+static const unsigned int inv_rf4[1]={0x00000010};
+static const unsigned int inv_rf5[1]={0x00000020};
+
 void init_music(){
-	// Use Timer3, OC3, and OC4 for sound.
-	RPF4R = 0x0b;    //Use RPF4 for OC3
-	OC3R=0;
-	OC3CON=0x000b;   // Timer3, toggle mode
-	OC3CONSET=0x8000;// Start OC4
-	RPF5R = 0x0b;    //Use RPF5 for OC4
-	OC4R=0;
-	OC4CON=0x000b;   // Timer3, toggle mode
-	OC4CONSET=0x8000;// Start OC4
+	// Use Timer3 and DMA2 for left (RF5)
+	// Use Timer4 and DMA1 for right (RF4)
+
+	// Timer3/Timer4 initialization
+	TMR3=0;
 	T3CON=0x0050;    // Prescaller: 1:32 (1.8 MHz), not yet started
+	TMR4=0;
+	T4CON=0x0050;    // Prescaller: 1:32 (1.8 MHz), not yet started
 
-	// Timer4 is used to intterupt every 1/60 sec, just after NTSC view.
-	T4CON=0x0050;    // Prescaller: 1:32
-	PR4=49779;       // 6080*262/32-1
-	// Timer 4 interruption, IPL3
-	IPC4bits.T4IP=3;
-	IPC4bits.T4IS=0;
-	IFS0bits.T4IF=0;
-	IEC0bits.T4IE=1;
-	// Wait until end of NTSC view.
-	while(!drawing);
-	while(drawing);
-	T4CONSET=0x8000; // Start timer 4.
+	//DMA2 settings; used for toggling RF5
+	DMACONSET=0x8000;
+	DCH2CON=0x00000012;  // CHBUSY=0, CHCHNS=0, CHEN=0, CHAED=0, CHCHN=0, CHAEN=1, CHEDET=0, CHPRI=b10
+	DCH2ECON=0x0e10;     // CHAIRQ=0, CHSIRQ=19, CFORCE=0, CABRT=0, PATEN=0, SIRQEN=1, AIRQEN=0
+	                     // CHSIRQ=14: Timer3 interrupt
+	DCH2SSA=((unsigned int)&(inv_rf4[0]))&0x1fffffff;
+	DCH2DSA=0x1F88653C; // LATFINV
+	DCH2SSIZ=1;
+	DCH2DSIZ=1;
+	DCH2CSIZ=1;
+	DCH2INTCLR=0x00FF00FF;
+	DCH2CONSET=0x00000080;
+
+	//DMA1 settings; used for toggling RF4
+	DMACONSET=0x8000;
+	DCH1CON=0x00000012;  // CHBUSY=0, CHCHNS=0, CHEN=0, CHAED=0, CHCHN=0, CHAEN=1, CHEDET=0, CHPRI=b10
+	DCH1ECON=0x1310;     // CHAIRQ=0, CHSIRQ=19, CFORCE=0, CABRT=0, PATEN=0, SIRQEN=1, AIRQEN=0
+	                     // CHSIRQ=19: Timer4 interrupt
+	DCH1SSA=((unsigned int)&(inv_rf5[0]))&0x1fffffff;
+	DCH1DSA=0x1F88653C; // LATFINV
+	DCH1SSIZ=1;
+	DCH1DSIZ=1;
+	DCH1CSIZ=1;
+	DCH1INTCLR=0x00FF00FF;
+	DCH1CONSET=0x00000080;
+
+	// Software interrupt every 1/60 sec (triggered by Timer5)
+	IPC0bits.CS0IP=3;
+	IPC0bits.CS0IS=0;
+	IFS0bits.CS0IF=0;
+	IEC0bits.CS0IE=1;	
 	
 	// Initializations for music/sound.
 	g_qvalue=160; // Q: 1/4=90
 	g_lvalue=20;   // L: 1/8
 	g_tones=(int*)&(g_keys[49]); // C major
-	g_musicstart=g_musicend=g_musicwait=g_soundstart=g_soundend=g_soundwait=g_soundrepeat=0;
+	g_musicstartL=g_musicendL=g_musicwaitL=g_soundstartL=g_soundendL=g_soundwaitL=g_soundrepeatL=0;
+	g_musicstartR=g_musicendR=g_musicwaitR=g_soundstartR=g_soundendR=g_soundwaitR=g_soundrepeatR=0;
 }
 
 void musicSetL(){
@@ -332,7 +426,7 @@
 			g_tones=(int*)&(g_keys[56]);
 			return;
 		default:
-			err_music(g_mstr);
+//			err_music(g_mstr);
 			break;
 	}
 }
@@ -342,14 +436,16 @@
 	musicGetNum();
 }
 
-void set_sound(unsigned long* data){
+//void set_sound(unsigned long* data, int flagsLR){
+void set_sound(unsigned long* data){int flagsLR=3;
 	int sound;
 	int len;
 	int pos;
 	int datalen;
-	IEC0bits.T4IE=0; // Stop interruption, first.
+	IEC0bits.CS0IE=0; // Stop interruption, first.
 	// Initialize
-	g_soundrepeat=g_soundstart=g_soundend=0;
+	if (flagsLR & MFLAG_L) g_soundrepeatL=g_soundstartL=g_soundendL=0;
+	if (flagsLR & MFLAG_R) g_soundrepeatR=g_soundstartR=g_soundendR=0;
 	pos=0;
 	do {
 		while(data[1]!=0x00000020) data++; // Seek DATA statement
@@ -362,30 +458,36 @@
 			data++;
 			if (len) {
 				// Shift tone if graphic is used
-				if (g_use_graphic) {
+				if (/*g_use_graphic*/ 0) {
 					// MUL_15 instead of MUL_16 for CPU clock.
 					// sound=sound*15/16
 					sound-=(sound+7)>>4;
 				}
-				g_sound[pos]=sound-1;
-				g_soundlen[pos]=len;
+				if (flagsLR & MFLAG_L) g_soundL[pos]=sound-1;
+				if (flagsLR & MFLAG_R) g_soundR[pos]=sound-1;
+				if (flagsLR & MFLAG_L) g_soundlenL[pos]=len;
+				if (flagsLR & MFLAG_R) g_soundlenR[pos]=len;
 				pos++;
 				if (32<pos) {
-					err_music("Sound data too long.");
+//					err_music("Sound data too long.");
 					return;
 				}
 			} else {
-				g_soundrepeat=sound;
+				if (flagsLR & MFLAG_L) g_soundrepeatL=sound;
+				if (flagsLR & MFLAG_R) g_soundrepeatR=sound;
 				break;
 			}
 		}
 	} while(len);
-	g_soundend=pos;
-	g_soundwait=g_soundlen[0];
-	IEC0bits.T4IE=1; // Restart interrupt.
+	if (flagsLR & MFLAG_L) g_soundendL=pos;
+	if (flagsLR & MFLAG_R) g_soundendR=pos;
+	if (flagsLR & MFLAG_L) g_soundwaitL=g_soundlenL[0];
+	if (flagsLR & MFLAG_R) g_soundwaitR=g_soundlenR[0];
+	IEC0bits.CS0IE=1; // Restart interrupt.
 }
 
-void set_music(char* str){
+//void set_music(char* str, int flagsLR){
+void set_music(char* str){int flagsLR=3;
 	char b;
 	unsigned long tone,tonenatural;
 	int len;
@@ -409,7 +511,7 @@
 					musicSetM();
 					break;
 				default:
-					err_music(str);
+//					err_music(str);
 					break;
 			}	
 		} else if ('A'<=b && b<='G' || 'a'<=b && b<='g' || b=='z') {
@@ -463,23 +565,36 @@
 				len=len/musicGetNum();
 			}
 			// Shift tone if graphic is used
-			if (g_use_graphic) {
+			if (/*g_use_graphic*/ 0) {
 				// MUL_15 instead of MUL_16 for CPU clock.
 				// tone=tone*15/16
 				tone-=(tone+7)>>4;
 			}
 			// Update music value array
-			IEC0bits.T4IE=0; // Stop interruption, first.
-			if (g_musicstart==g_musicend) {
-				g_musicwait=len;
+			IEC0bits.CS0IE=0; // Stop interruption, first.
+			// Update left music
+			if (flagsLR & MFLAG_L) {
+				if (g_musicstartL==g_musicendL) {
+					g_musicwaitL=len;
+				}
+				g_musicL[g_musicendL]=(tone-1)&0x0000FFFF;
+				g_musiclenL[g_musicendL]=len;
+				g_musicendL++;
+				g_musicendL&=31;
 			}
-			g_music[g_musicend]=(tone-1)&0x0000FFFF;
-			g_musiclen[g_musicend]=len;
-			g_musicend++;
-			g_musicend&=31;
-			IEC0bits.T4IE=1; // Restart interruption.
+			// Update right music
+			if (flagsLR & MFLAG_R) {
+				if (g_musicstartR==g_musicendR) {
+					g_musicwaitR=len;
+				}
+				g_musicR[g_musicendR]=(tone-1)&0x0000FFFF;
+				g_musiclenR[g_musicendR]=len;
+				g_musicendR++;
+				g_musicendR&=31;
+			}
+			IEC0bits.CS0IE=1; // Restart interruption.
 		} else {
-			err_music(str);
+//			err_music(str);
 		}
 		// Go to next character
 		while(0<g_mstr[g_mspos] && g_mstr[g_mspos]<=0x20 || g_mstr[g_mspos]=='|') g_mspos++;

--- mips/branches/megalopa/ps2keyboard.h	(revision 222)
+++ mips/branches/megalopa/ps2keyboard.h	(revision 223)
@@ -168,16 +168,7 @@
 // 上位8ビット：シフト状態（押下：1）、上位から<0><CAPSLK><NUMLK><SCRLK><Win><ALT><CTRL><SHIFT>
 // 英数・記号文字の場合、戻り値としてASCIIコード（それ以外は0を返す）
 
-#ifdef ZOEA
-// PIC32MX1xx/2xx版のキーボードとボタンの排他利用システムで使用する関数、マクロ
-void ps2mode(); // PS/2を有効にする
-void buttonmode(); // ボタンを有効にする
-#define inPS2MODE() ((LATA&2)>>1) // モード確認用マクロ。PS/2モードの場合1、ボタンモードの場合0を返す
-#endif
-
-#ifdef MEGALOPA
 // Macros for dummy functions
 #define ps2mode() (0)
 #define buttonmode() (0)
 #define inPS2MODE() (1)
-#endif
\ No newline at end of file