Commit: 7c79891e314b2ab755effc915620ccbe1537db54 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revisión: 7c79891e314b2ab755effc915620ccbe1537db54 (tree)
• Tiempo: 2019-04-04 08:05:37
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Implement several interrupts

Cambiar Resumen

• modified: mips/zoea/compiler.h
• modified: mips/zoea/debug.c
• modified: mips/zoea/envspecific.h
• modified: mips/zoea/globalvars.c
• modified: mips/zoea/help.txt
• modified: mips/zoea/music.c
• modified: mips/zoea/timer.c

Diferencia incremental

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/compiler.h
@@ -222,6 +222,7 @@ extern char g_use_graphic;
 extern unsigned short* g_graphic_area;
 extern int* g_libparams;
 extern int g_long_name_var_num;
+extern char g_music_active;
 extern int g_class;
 extern int g_compiling_class;
 extern int g_temp;
@@ -261,6 +262,7 @@ void err_not_field(int fieldname, int classname);
 void err_str(char* str);
 char* resolve_label(int s6);
 
+void musicint();
 void set_sound(unsigned long* data, int flagsLR);
 int musicRemaining(int flagsLR);
 int waveRemaining(int mode);
@@ -483,11 +485,17 @@ char* interrupt_statement();
 #define ASM_LW_A0_XXXX_S5 0x8EA40000
 
 // Interrupt macros
-// 16 different type interruptions are possible
-#define NUM_INTERRUPT_TYPES 1
-#define INTERRUPT_TIMER 0
-extern short g_interrupt_flags;
-extern int g_int_vector[NUM_INTERRUPT_TYPES];
+// 32 different type interruptions are possible
+// See also envspecific.h for additional interruptions
+#define INTERRUPT_TIMER     0
+#define INTERRUPT_DRAWCOUNT 1
+#define INTERRUPT_KEYS      2
+#define INTERRUPT_KEYINPUT  3
+#define INTERRUPT_MUSIC     4
+#define INTERRUPT_WAVE      5
+
+extern int g_interrupt_flags;
+extern int g_int_vector[];
 #define raise_interrupt_flag(x) do {\
 	if (g_int_vector[x]) {\
 		IFS0bits.CS1IF=1;\

--- a/mips/zoea/debug.c
+++ b/mips/zoea/debug.c
@@ -280,8 +280,8 @@ int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	asm volatile("ori $v1,$v1,0x5678");
 	asm volatile("sw $v0,0($v1)");
 	asm volatile("label1:");
-	asm volatile("nop");
-	asm volatile("nop");
+	asm volatile("sw $zero,0x1234($v1)");
+	asm volatile("sw $zero,0x1234($gp)");
 	asm volatile("nop");
 	int i;
 	for2(i,1,10){

--- a/mips/zoea/envspecific.h
+++ b/mips/zoea/envspecific.h
@@ -34,4 +34,4 @@ int lib_system(int a0, int a1 ,int v0, int a3, int g_gcolor, int g_prev_x, int g
 #define ADDITIONAL_INT_FUNCTIONS
 #define ADDITIONAL_STR_FUNCTIONS
 #define ADDITIONAL_RESERVED_VAR_NAMES
-
+#define ADDITIONAL_INTERRUPT_FUNCTIONS

--- a/mips/zoea/globalvars.c
+++ b/mips/zoea/globalvars.c
@@ -83,6 +83,9 @@ int* g_libparams;
 // Number of long name variables
 int g_long_name_var_num;
 
+// Flag for active music/sound/wave function
+char g_music_active;
+
 // Class name being compiled
 int g_class;
 // Flag to compile class file

--- a/mips/zoea/help.txt
+++ b/mips/zoea/help.txt
@@ -253,10 +253,23 @@ TIMER()
 
 INTERRUPT xxx,yyy[,z1[,z2 ... ]]
 	割り込みを設定する。xxxは割り込みの種類、yyyは割り込み時のサブルーチンをラベ
-	ルで指定。z1, z2等を指定すると、割り込み用サブルーチンの引数となる。現在使用
-	可能な割り込みの種類は以下の通り。
+	ルで指定。z1, z2等を指定すると、割り込み用サブルーチンの引数となる。使用可能
+	な割り込みの種類は以下の通り。
 		TIMER
 			タイマー割り込み。タイマー値が１増えるごとに割り込みがかかる。
+		DRAWCOUNT
+			1/60秒毎の割り込み。
+		KEYS
+			ボタンの押下状態が変化した時。
+		KEYINPUT
+			キーボード押下時。
+		MUSIC
+			音楽再生の時、最後の音の再生時に割り込み。
+		WAVE
+			WAVEファイル再生終了時。
+
+INTERRUPT STOP xxx
+	割り込みを停止する。xxxは割り込みの種類。
 
 ＜整数型関数＞
 以下、x, y, zは整数値を、x$, y$, z$は文字列を指します。[ ]は省略可能である事

--- a/mips/zoea/music.c
+++ b/mips/zoea/music.c
@@ -106,12 +106,10 @@ int musicRemaining(int flagsLR){
 	return (g_musicend-g_musicstart)&31;
 }
 
-#pragma interrupt musicint IPL3SOFT vector 1
 void musicint(){
 	unsigned int i;
 	static unsigned short wavtable_pos;
 	// This function is called every 1/60 sec.
-	IFS0bits.CS0IF=0;
 	switch(g_sound_mode){
 		case SOUND_MODE_MUSIC:
 			if (g_soundstart!=g_soundend){
@@ -160,6 +158,10 @@ void musicint(){
 					g_musicstart++;
 					g_musicstart&=31;
 					g_musicwait=g_musiclen[g_musicstart];
+					if (((g_musicstart+1)&31)==g_musicend) {
+						// Raise MUSIC interrupt flag
+						raise_interrupt_flag(INTERRUPT_MUSIC);
+					}
 				}
 			} else {
 				// Stop timer
@@ -181,6 +183,8 @@ void musicint(){
 				g_fhandle=0;
 				g_sound_mode=SOUND_MODE_MUSIC;
 				stop_music();
+				// Raise WAVE interrupt flag
+				raise_interrupt_flag(INTERRUPT_WAVE);
 				break;
 			}
 			break;
@@ -216,12 +220,6 @@ void stop_music(){
 	OC4CONSET=0x8000;// Start OC4
 	T3CON=0x0050;    // Prescaller: 1:32 (1.8 MHz), not yet started
 
-	// 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_musicstart=g_musicend=g_musicwait=g_soundstart=g_soundend=g_soundwait=g_soundrepeat=0;
 	g_sound_mode=SOUND_MODE_MUSIC;
@@ -238,6 +236,9 @@ void stop_music(){
 	// Close handle if open.
 	if (g_fhandle) FSfclose(g_fhandle);
 	g_fhandle=0;
+
+	// Inactive music first
+	g_music_active=0;
 }
 
 void init_music(){
@@ -445,6 +446,7 @@ void set_sound(unsigned long* data, int flagsLR){
 	g_soundend=pos;
 	g_soundwait=g_soundlen[0];
 	IEC0bits.T4IE=1; // Restart interrupt.
+	g_music_active=1;// Activate music system
 }
 
 void set_music(char* str, int flagsLR){
@@ -547,6 +549,7 @@ void set_music(char* str, int flagsLR){
 		// Go to next character
 		while(0<g_mstr[g_mspos] && g_mstr[g_mspos]<=0x20 || g_mstr[g_mspos]=='|') g_mspos++;
 	}
+	g_music_active=1;// Activate music system
 }
 
 /*
@@ -636,4 +639,5 @@ void play_wave(char* filename, int start){
 	init_dma_music();	
 	g_sound_mode=SOUND_MODE_WAVE;
 
+	g_music_active=1;// Activate music system
 }

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -11,22 +11,33 @@
 
 #include <xc.h>
 #include "compiler.h"
+#include "api.h"
 
 /*
-	16 different type interruptions are possible.
+	32 different type interruptions are possible.
 	See definition in compiler.h like:
-		#define NUM_INTERRUPT_TYPES 1
 		#define INTERRUPT_TIMER 0
-		extern short g_interrupt_flags;
-		extern int g_int_vector[NUM_INTERRUPT_TYPES];
+		extern int g_interrupt_flags;
+		extern int g_int_vector[];
 		#define raise_interrupt_flag(x) do {\
 */
 
 // Timer value that increments every timer event
 static int g_timer;
 
+// Interrupt types
+static const void* interrupt_list[]={
+	"TIMER",    (void*)INTERRUPT_TIMER,
+	"DRAWCOUNT",(void*)INTERRUPT_DRAWCOUNT,
+	"KEYS",     (void*)INTERRUPT_KEYS,
+	"KEYINPUT", (void*)INTERRUPT_KEYINPUT,
+	"MUSIC",    (void*)INTERRUPT_MUSIC,
+	"WAVE",     (void*)INTERRUPT_WAVE,
+	ADDITIONAL_INTERRUPT_FUNCTIONS
+};
+#define NUM_INTERRUPT_TYPES ((sizeof(interrupt_list)/sizeof(interrupt_list[0]))/2)
 // Flags for interrupt
-short g_interrupt_flags;
+int g_interrupt_flags;
 // Jump address when interrupt
 int g_int_vector[NUM_INTERRUPT_TYPES];
 
@@ -45,6 +56,11 @@ void init_timer(){
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
 	for(i=0;i<NUM_INTERRUPT_TYPES;i++) g_int_vector[i]=0;
+	// CS0 interrupt every 1/60 sec (triggered by Timer2)
+	IPC0bits.CS0IP=3;
+	IPC0bits.CS0IS=0;
+	IFS0bits.CS0IF=0;
+	IEC0bits.CS0IE=1;	
 }
 
 void stop_timer(){
@@ -190,12 +206,29 @@ char* interrupt_statement(){
 	int itype;
 	int i,opos;
 	char* err;
-	next_position();
-	if (nextCodeIs("TIMER")) {
-		itype=INTERRUPT_TIMER;
+	int stop=0;
+	// Check if STOP
+	stop=nextCodeIs("STOP ");
+	// Seek the interrupt
+	for (i=0;i<NUM_INTERRUPT_TYPES;i++){
+		if (nextCodeIs((char*)interrupt_list[i*2])) break;
+	}
+	if (i<NUM_INTERRUPT_TYPES) {
+		// Interrupt found
+		itype=(int)interrupt_list[i*2+1];
 	} else {
+		// Interrupt not found
 		return ERR_SYNTAX;
 	}
+	// Compile INTERRUPT STOP
+	if (stop) {
+		// g_int_vector[itype]=0;
+		i=(int)(&g_int_vector[itype]);
+		i-=g_gp;
+		check_obj_space(1);
+		g_object[g_objpos++]=0xAF800000|(i&0x0000FFFF); // sw          zero,xxxx(gp)
+		return 0;
+	}
 	// Detect ','
 	next_position();
 	if (g_source[g_srcpos]!=',') return ERR_SYNTAX;
@@ -225,3 +258,40 @@ char* interrupt_statement(){
 	return 0;
 }
 
+/*
+	CS0 interrupt
+	IPL3SOFT vector 1
+
+	This interrupt is always active. Therefore, Do things as few as possible.
+	1) Call music function if needed.
+		MUSIC interrupt is taken by music.c
+	2) Check buttons for KEYS interrupt
+	3) Check PS/2 for KEYINPUT interrupt
+	4) DRAWCOUNT interrupt
+*/
+
+#pragma interrupt CS0Handler IPL3SOFT vector 1
+void CS0Handler(void){
+	static int s_keys=-1;
+	static int s_vkey=0;
+	IFS0bits.CS0IF=0;
+	// Call music function
+	if (g_music_active) musicint();
+	// The interrupts are valid only when CS1 is active
+	if (IEC0bits.CS1IE) {
+		// Raise DRAWCOUNT interrupt flag
+		raise_interrupt_flag(INTERRUPT_DRAWCOUNT);
+		// Check buttons
+		if (0<=s_keys && s_keys!=(KEYPORT&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE))) {
+			// Raise KEYS interrupt flag
+			raise_interrupt_flag(INTERRUPT_KEYS);
+		}
+		s_keys!=KEYPORT&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE);
+		// Check PS/2 keyboard down
+		if ((vkey&0xff) && !s_vkey) {
+			// Raise KEYINPUT interrupt flag
+			raise_interrupt_flag(INTERRUPT_KEYINPUT);
+		}
+		s_vkey=vkey&0xff;
+	}
+}
\ No newline at end of file