Commit: aeac15e5789baa88885c81631ead80c1d20b0893 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Révision: aeac15e5789baa88885c81631ead80c1d20b0893 (tree)
• l'heure: 2019-04-01 09:53:54
• Auteur: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Message de Log

Interface directory in Zoea source file

Change Summary

• modified: mips/zoea/api.h
• modified: mips/zoea/basic.mcp
• modified: mips/zoea/class.c
• modified: mips/zoea/compiler.h
• modified: mips/zoea/debug.c
• modified: mips/zoea/editor.c
• modified: mips/zoea/envspecific.c
• modified: mips/zoea/envspecific.h
• modified: mips/zoea/function.c
• modified: mips/zoea/help.txt
• modified: mips/zoea/library.c
• modified: mips/zoea/main.c
• modified: mips/zoea/timer.c
• delete: mips/zoea/{ => interface}/SDFSIO.h
• delete: mips/zoea/{ => interface}/keyinput.c
• delete: mips/zoea/{ => interface}/keyinput.h
• delete: mips/zoea/{ => interface}/ps2keyboard.h
• delete: mips/zoea/{ => interface}/videoout.h

Modification

--- a/mips/zoea/api.h
+++ b/mips/zoea/api.h
@@ -32,7 +32,7 @@
 // Used for asm("wait")
 #define WAIT "wait"
 
-#include "videoout.h"
-#include "SDFSIO.h"
-#include "ps2keyboard.h"
+#include "interface/videoout.h"
+#include "interface/SDFSIO.h"
+#include "interface/ps2keyboard.h"
 #include "debug.h"

--- a/mips/zoea/basic.mcp
+++ b/mips/zoea/basic.mcp
@@ -170,37 +170,37 @@ file_004=file.c
 file_005=float.c
 file_006=function.c
 file_007=globalvars.c
-file_008=keyinput.c
-file_009=library.c
-file_010=linker.c
-file_011=main.c
-file_012=memory.c
-file_013=music.c
-file_014=operator.c
-file_015=run.c
-file_016=statement.c
-file_017=string.c
-file_018=value.c
-file_019=debug.c
-file_020=cmpdata.c
-file_021=varname.c
-file_022=envspecific.c
-file_023=class.c
-file_024=args.c
-file_025=timer.c
+file_008=library.c
+file_009=linker.c
+file_010=main.c
+file_011=memory.c
+file_012=music.c
+file_013=operator.c
+file_014=run.c
+file_015=statement.c
+file_016=string.c
+file_017=value.c
+file_018=debug.c
+file_019=cmpdata.c
+file_020=varname.c
+file_021=envspecific.c
+file_022=class.c
+file_023=args.c
+file_024=timer.c
+file_025=interface\keyinput.c
 file_026=api.h
 file_027=compiler.h
 file_028=editor.h
-file_029=keyinput.h
-file_030=main.h
-file_031=ps2keyboard.h
-file_032=SDFSIO.h
-file_033=videoout.h
-file_034=debug.h
-file_035=envspecific.h
-file_036=lib_videoout_machikania.X.a
-file_037=libsdfsio.a
-file_038=ps2keyboard.X.a
+file_029=main.h
+file_030=debug.h
+file_031=envspecific.h
+file_032=interface\keyinput.h
+file_033=interface\ps2keyboard.h
+file_034=interface\SDFSIO.h
+file_035=interface\videoout.h
+file_036=interface\lib_videoout_machikania.X.a
+file_037=interface\libsdfsio.a
+file_038=interface\ps2keyboard.X.a
 file_039=App_32MX170F256B.ld
 file_040=help.txt
 file_041=MACHIKAN.INI

--- a/mips/zoea/class.c
+++ b/mips/zoea/class.c
@@ -157,7 +157,8 @@ char* resolve_unresolved(int class){
 				break;
 			default:
 				return ERR_UNKNOWN;
-		}
	}
+		}
+	}
 	return 0;	
 }
 
@@ -194,6 +195,15 @@ char* update_class_info(int class){
 		cstruct[z+1]: public method pointer
 */
 
+/*
+	Object structure:
+		object[0]:   pointer to class structure
+		object[1]:   field value
+		...
+		object[n]:   field value
+		(according to class structure; public field(s) first, then private field(s))
+*/
+
 char* construct_class_structure(int class){
 	int* record;
 	int i;

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/compiler.h
@@ -482,6 +482,19 @@ char* interrupt_statement();
 #define ASM_LW_A0_XXXX_S8 0x8FC40000
 #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];
+#define raise_interrupt_flag(x) do {\
+	if (g_int_vector[x]) {\
+		IFS0bits.CS1IF=1;\
+		g_interrupt_flags|=(1<<(x));\
+	}\
+} while(0)
+
 // Division macro for unsigned long
 // Valid for 31 bits for all cases and 32 bits for some cases
 #define div32(x,y,z) ((((unsigned long long)((unsigned long)(x)))*((unsigned long long)((unsigned long)(y))))>>(z))

--- a/mips/zoea/debug.c
+++ b/mips/zoea/debug.c
@@ -228,12 +228,14 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
-"USETIMER 600\n"
-"INTERRUPT TIMER,LABEL1\n"
-"END\n"
-"LABEL LABEL1\n"
-"RETURN\n"
+"I=1:WHILE I<=10\n"
+"I=I+1:WEND\n"
 "\n"
+"I=1:DO\n"
+"I=I+1:LOOP UNTIL I=11\n"
+"\n"
+"FOR I=1 TO 10\n"
+"NEXT\n"
 "\n"
 "\n"
 "\n";
@@ -269,6 +271,8 @@ static const void* debugjumptable[]={
 	FSfopen,
 };
 
+#define for2(x,y,z) for(x=y;x<=z;x++)
+
 int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	asm volatile(".set noreorder");
 	asm volatile("b label1");
@@ -279,6 +283,10 @@ int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	asm volatile("nop");
 	asm volatile("nop");
 	asm volatile("nop");
+	int i;
+	for2(i,1,10){
+		asm volatile("nop");
+	}
 	return a2+a3;
 }
 

--- a/mips/zoea/editor.c
+++ b/mips/zoea/editor.c
@@ -4,14 +4,10 @@
    http://www.ze.em-net.ne.jp/~kenken/index.html
 */
 
-/*
-	This file is shared by Megalopa and Zoea
-*/
-
 #include <xc.h>
 #include "api.h"
 #include "editor.h"
-#include "keyinput.h"
+#include "interface/keyinput.h"
 #include "compiler.h"
 #include "main.h"
 

--- a/mips/zoea/envspecific.c
+++ b/mips/zoea/envspecific.c
@@ -8,8 +8,7 @@
 #include <xc.h>
 #include "main.h"
 #include "compiler.h"
-#include "videoout.h"
-#include "ps2keyboard.h"
+#include "api.h"
 
 /*
 	int readbuttons();

--- a/mips/zoea/envspecific.h
+++ b/mips/zoea/envspecific.h
@@ -5,7 +5,7 @@
    [e-mail]
 */
 
-#define CPU_CLOCK_HZ 57272720
+#define CPU_CLOCK_HZ (g_use_graphic ? 53693175 : 57272720)
 #define PERSISTENT_RAM_SIZE (1024*52)
 
 int readbuttons();

--- a/mips/zoea/function.c
+++ b/mips/zoea/function.c
@@ -157,7 +157,6 @@ char* rnd_function(){
 	return 0;
 }
 
-
 char* chr_function(void){
 	char* err;
 	err=get_value();

--- a/mips/zoea/help.txt
+++ b/mips/zoea/help.txt
@@ -241,6 +241,23 @@ SETDIR x$
 	エラーが有れば0以外を返す。
 （FEOF(), FGETC(), FINPUT$(), FLEN(), FSEEK(), GETDIR$()関数も参照のこと）
 
+＜タイマー及び割り込み関連命令と関数＞
+USETIMER x
+	タイマーを開始する。xはタイマーの速度を、Hzで指定（4以上の値）。
+
+TIMER x
+	現在のタイマー値を32ビット整数(x)で設定する。
+
+TIMER()
+	タイマーの現在値を、32ビット整数値として返す。
+
+INTERRUPT xxx,yyy[,z1[,z2 ... ]]
+	割り込みを設定する。xxxは割り込みの種類、yyyは割り込み時のサブルーチンをラベ
+	ルで指定。z1, z2等を指定すると、割り込み用サブルーチンの引数となる。現在使用
+	可能な割り込みの種類は以下の通り。
+		TIMER
+			タイマー割り込み。タイマー値が１増えるごとに割り込みがかかる。
+
 ＜整数型関数＞
 以下、x, y, zは整数値を、x$, y$, z$は文字列を指します。[ ]は省略可能である事
 を示します。

--- a/mips/zoea/library.c
+++ b/mips/zoea/library.c
@@ -13,7 +13,7 @@
 #include "main.h"
 #include "compiler.h"
 #include "api.h"
-#include "keyinput.h"
+#include "interface/keyinput.h"
 #include "stdlib.h"
 #include "math.h"
 

--- a/mips/zoea/main.c
+++ b/mips/zoea/main.c
@@ -84,7 +84,7 @@
 #include "api.h"
 #include "compiler.h"
 #include "editor.h"
-#include "keyinput.h"
+#include "interface/keyinput.h"
 #include "main.h"
 
 //外付けクリスタル with PLL (16倍)

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -12,17 +12,30 @@
 #include <xc.h>
 #include "compiler.h"
 
-#define INTERRUPT_TIMER 1
+/*
+	16 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];
+		#define raise_interrupt_flag(x) do {\
+*/
 
 // Timer value that increments every timer event
 static int g_timer;
 
-// Enable or disable interrupt
-static char g_interrupt_enabled;
+// Flags for interrupt
+short g_interrupt_flags;
 // Jump address when interrupt
-static int g_int_vector;
+int g_int_vector[NUM_INTERRUPT_TYPES];
+
+/*
+	Initialize and termination
+*/
 
 void init_timer(){
+	int i;
 	// Stop timer, first
 	T1CON=0x0000;
 	IEC0bits.T1IE=0;
@@ -31,7 +44,7 @@ void init_timer(){
 	g_timer=0;
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
-	g_interrupt_enabled=0;
+	for(i=0;i<NUM_INTERRUPT_TYPES;i++) g_int_vector[i]=0;
 }
 
 void stop_timer(){
@@ -40,9 +53,12 @@ void stop_timer(){
 	IEC0bits.T1IE=0;
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
-	g_interrupt_enabled=0;
 }
 
+/*
+	Timer interprtation
+*/
+
 // Interrupt handler
 #ifndef __DEBUG
 	// Timer1 is also used for debug mode
@@ -52,8 +68,8 @@ void T1Handler(void){
 	g_timer++;
 	// Clear Timer1 interrupt flag
 	IFS0bits.T1IF=0;
-	// Raise CS1 interrupt flag if required
-	IFS0bits.CS1IF=g_interrupt_enabled;
+	// Raise TIMER interrupt flag
+	raise_interrupt_flag(INTERRUPT_TIMER);
 }
 
 void lib_usetimer(int hz){
@@ -108,6 +124,7 @@ char* timer_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
+	i=(int)(&g_timer);
 	check_obj_space(3);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
 	g_object[g_objpos++]=0x34630000|(i&0x0000FFFF);       // ori v1,v1,xxxx
@@ -125,9 +142,15 @@ char* timer_function(){
 	return 0;
 }
 
-//CS1 ? Core Software Interrupt 1 2 2 IFS0<2> IEC0<2> IPC0<20:18> IPC0<17:16>
+/*
+	Interrupt interprtation
+	To cause interruption, use raise_interrupt_flag() macro
+	For example,
+		raise_interrupt_flag(INTERRUPT_TIMER);
+
+*/
+
 void BasicInt(int addr){
-//TODO: here
 	// $a0 is the address in BASIC code
 	asm volatile(".set noreorder");
 	asm volatile("jr $a0");
@@ -135,14 +158,21 @@ void BasicInt(int addr){
 }
 #pragma interrupt CS1Handler IPL1SOFT vector 2
 void CS1Handler(void){
+	int i;
+	while(g_interrupt_flags){
+		for(i=0;i<NUM_INTERRUPT_TYPES;i++){
+			if (g_interrupt_flags & (1<<i)) {
+				if (g_int_vector[i]) BasicInt(g_int_vector[i]);
+				g_interrupt_flags &= (1<<i)^0xffff;
+			}
+		}
+	}
 	IFS0bits.CS1IF=0;
-	BasicInt(g_int_vector);
 }
 
-void _lib_interrupt(int itype, int address){
-	// Ignore itype in the first imprementation
-	g_int_vector=address;
-	g_interrupt_enabled=1;
+void lib_interrupt_main(int itype, int address){
+	// Set address
+	g_int_vector[itype]=address;
 	// CS1 interrupt: priority 1
 	IPC0bits.CS1IP=1;
 	IPC0bits.CS1IS=0;
@@ -150,9 +180,10 @@ void _lib_interrupt(int itype, int address){
 }
 
 void lib_interrupt(int itype){
+	// $ra contains the address for interrupt
 	// $ra is 2 word before the interrupt address
 	asm volatile("addiu $a1,$ra,8");
-	asm volatile("j _lib_interrupt");
+	asm volatile("j lib_interrupt_main");
 }
 
 char* interrupt_statement(){
@@ -160,21 +191,24 @@ char* interrupt_statement(){
 	int i,opos;
 	char* err;
 	next_position();
-	if (nextCodeIs("TIMER")) {
		itype=INTERRUPT_TIMER;
+	if (nextCodeIs("TIMER")) {
+		itype=INTERRUPT_TIMER;
 	} else {
 		return ERR_SYNTAX;
 	}
 	// Detect ','
 	next_position();
-	if (g_source[g_srcpos]!=',') return ERR_SYNTAX;
	g_srcpos++;
+	if (g_source[g_srcpos]!=',') return ERR_SYNTAX;
+	g_srcpos++;
 	// Store address to call
 	call_quicklib_code(lib_interrupt,ASM_ORI_A0_ZERO_|itype);
-	check_obj_space(2);
-	opos=g_objpos;
+	check_obj_space(4);
+	// Skip the region used for interrupt-calling
+	opos=g_objpos;
 	g_object[g_objpos++]=0x10000000; // b   xxxxx
 	g_object[g_objpos++]=0x00000000; // nop
+	// Begin interrupt-calling region
 	// Store $ra
-	check_obj_space(2);
 	g_object[g_objpos++]=0x27BDFFFC; // addiu       sp,sp,-4
 	g_object[g_objpos++]=0xAFBF0004; // sw          ra,4(sp)
 	// Compile as GOSUB statement
@@ -185,7 +219,9 @@ char* interrupt_statement(){
 	g_object[g_objpos++]=0x8FBF0004; // lw          ra,4(sp)
 	g_object[g_objpos++]=0x03E00008; // jr          ra
 	g_object[g_objpos++]=0x08320004; // addiu       sp,sp,4
+	// End interrupt-calling region
 	// Complete B assembly
 	g_object[opos]|=g_objpos-opos-1;
 	return 0;
-}
\ No newline at end of file
+}
+