Commit: ca87cc9f5488601454618a4fbf7a71d06a2ce98b - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Révision: ca87cc9f5488601454618a4fbf7a71d06a2ce98b (tree)
• l'heure: 2019-03-25 07:01:27
• Auteur: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Message de Log

USETIMER, TIMER, and TIMER()

Change Summary

• modified: mips/zoea/basic.mcp
• modified: mips/zoea/compiler.h
• modified: mips/zoea/debug.c
• modified: mips/zoea/envspecific.h
• modified: mips/zoea/function.c
• modified: mips/zoea/main.c
• modified: mips/zoea/reservednames.js
• modified: mips/zoea/run.c
• modified: mips/zoea/statement.c
• add: mips/zoea/timer.c
• modified: mips/zoea/varname.c

Modification

--- a/mips/zoea/basic.mcp
+++ b/mips/zoea/basic.mcp
@@ -68,6 +68,7 @@ file_040=.
 file_041=.
 file_042=.
 file_043=.
+file_044=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -113,6 +114,7 @@ file_040=no
 file_041=no
 file_042=no
 file_043=no
+file_044=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -153,11 +155,12 @@ file_035=no
 file_036=no
 file_037=no
 file_038=no
-file_039=yes
+file_039=no
 file_040=yes
 file_041=yes
 file_042=yes
 file_043=yes
+file_044=yes
 [FILE_INFO]
 file_000=compiler.c
 file_001=editor.c
@@ -184,25 +187,26 @@ file_021=varname.c
 file_022=envspecific.c
 file_023=class.c
 file_024=args.c
-file_025=api.h
-file_026=compiler.h
-file_027=editor.h
-file_028=keyinput.h
-file_029=main.h
-file_030=ps2keyboard.h
-file_031=SDFSIO.h
-file_032=videoout.h
-file_033=debug.h
-file_034=envspecific.h
-file_035=lib_videoout_machikania.X.a
-file_036=libsdfsio.a
-file_037=ps2keyboard.X.a
-file_038=App_32MX170F256B.ld
-file_039=help.txt
-file_040=MACHIKAN.INI
-file_041=reservednames.js
-file_042=class.txt
-file_043=sharedfiles.js
+file_025=timer.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_039=App_32MX170F256B.ld
+file_040=help.txt
+file_041=MACHIKAN.INI
+file_042=reservednames.js
+file_043=class.txt
+file_044=sharedfiles.js
 [SUITE_INFO]
 suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337}
 suite_state=

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/compiler.h
@@ -368,6 +368,13 @@ char* static_statement();
 char* static_method(char type);
 char* resolve_unresolved(int class);
 
+void init_timer();
+void stop_timer();
+char* usetimer_statement();
+char* timer_statement();
+char* timer_function();
+
+
 /* Error messages */
 #define ERR_SYNTAX (char*)(g_err_str[0])
 #define ERR_NE_BINARY (char*)(g_err_str[1])

--- a/mips/zoea/debug.c
+++ b/mips/zoea/debug.c
@@ -228,13 +228,13 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
-"REM 1\n"
-"REM 2\n"
-"REM 3\n"
+"USETIMER 600\n"
+"END\n"
+"\n"
+"\n"
+"\n"
 "\n"
-"CLS\n"
 "\n"
-"LABEL TST:PRINT\n"
 "\n";
 
 static const char class1text[]=
@@ -270,13 +270,9 @@ static const void* debugjumptable[]={
 
 int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	asm volatile(".set noreorder");
-	asm volatile("lw $a0,4($s5)");
-	asm volatile("lw $a1,8($s5)");
-	asm volatile("lw $a2,12($s5)");
-	asm volatile("lw $a3,16($s5)");
-	asm volatile("nop");
-	asm volatile("nop");
-	asm volatile("nop");
+	asm volatile("lui $v1,0x1234");
+	asm volatile("ori $v1,$v1,0x5678");
+	asm volatile("sw $v0,0($v1)");
 	asm volatile("nop");
 	asm volatile("nop");
 	asm volatile("nop");

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

--- a/mips/zoea/function.c
+++ b/mips/zoea/function.c
@@ -597,6 +597,7 @@ static const void* int_func_list[]={
 	"PLAYWAVE(",playwave_function,
 	"NEW(",new_function,
 	"SETDIR(",setdir_function,
+	"TIMER(",timer_function,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };

--- a/mips/zoea/main.c
+++ b/mips/zoea/main.c
@@ -14,6 +14,72 @@
 // lib_colortext32.a : カラービデオ信号出力システムライブラリ（30×27テキスト版）
 // libsdfsio.a ： SDカードアクセス用ライブラリ
 
+/*
+	PIC32MX ペリフェラル使用状況
+	
+	割り込み
+		NTSC,   Timer2, vector  8, priority 5
+		NTSC,   OC3,    vector 14, priority 5
+		NTSC,   OC2,    vector 10, priority 5
+		NTSC,   OC1,    vector  6, priority 5
+		PS/2,   CNF,    vector 33, priority 6
+		PS/2,   Timer5, vector 20, priority 4
+		MUSIC,  CS0,    vector  1, priority 2
+		TIMER,  Timer1, vector  4, priority 3
+		INT,    CS1,    vector  2, priority 1
+	
+	タイマー
+		Timer1 BASIC用タイマー
+		Timer2 NTSC
+		Timer3 MUSIC/PWM
+		Timer4 MUSIC
+		Timer5 PS/2
+	
+	DMA
+		DMA0 未使用
+		DMA1 未使用
+		DMA2 MUSIC
+		DMA3 PS/2
+	
+	Output compair
+		OC1 NTSC
+		OC2 NTSC
+		OC3 NTSC
+		OC4 MUSIC/PWM
+		OC5 
+		
+	SPI
+		SPI1 未使用
+		SPI2 マルチメディアカード
+	
+	I2C
+		I2C1 未使用
+		I2C2 未使用
+	
+	ポート使用
+		A0  MMC
+		A1  PS2/button 切換え
+		A2  Crystal
+		A3  Crystal
+		A4  MMC
+		B0  NTSC
+		B1  NTSC
+		B2  NTSC
+		B3  NTSC
+		B4  NTSC
+		B5  MMC
+		B6  未使用
+		B7  button
+		B8  PS2/button
+		B9  PS2/button
+		B10 button
+		B11 button
+		B12 未使用
+		B13 audio out
+		B14 button
+		B15 MMC
+*/
+
 #include <xc.h>
 #include "api.h"
 #include "compiler.h"

--- a/mips/zoea/reservednames.js
+++ b/mips/zoea/reservednames.js
@@ -139,6 +139,7 @@ var namearray=[
 	'SYSTEM',
 	'TAN',
 	'TANH',
+	'TIMER',
 	'TVRAM',
 	'UNTIL',
 	'USEPCG',

--- a/mips/zoea/run.c
+++ b/mips/zoea/run.c
@@ -116,6 +116,7 @@ int runbasic(char *appname,int test){
 
 	// Warm up environment
 	pre_run();
+	init_timer();
 
 	// Execute program
 	// Start program from the beginning of RAM.
@@ -126,6 +127,7 @@ int runbasic(char *appname,int test){
 	// Cool down environment
 	post_run();
 	lib_file(FUNC_FINIT,0,0,0);
+	stop_timer();
 
 	return 0;
 }

--- a/mips/zoea/statement.c
+++ b/mips/zoea/statement.c
@@ -1717,6 +1717,8 @@ static const void* statement_list[]={
 	"STATIC ",static_statement,
 	"SETDIR ",setdir_statement,
 	"OPTION ",option_statement,
+	"USETIMER ",usetimer_statement,
+	"TIMER ",timer_statement,
 	// List of additional statements follows
 	ADDITIONAL_STATEMENTS
 };

--- /dev/null
+++ b/mips/zoea/timer.c
@@ -0,0 +1,149 @@
+/*
+   This file is provided under the LGPL license ver 2.1.
+   Written by Katsumi.
+   http://hp.vector.co.jp/authors/VA016157/
+   [e-mail]
+*/
+
+/*
+	This file is shared by Megalopa and Zoea
+*/
+
+#include <xc.h>
+#include "compiler.h"
+
+// Timer value that increments every timer event
+static int g_timer;
+
+// Enable or disable interrupt
+static char g_interrupt_enabled;
+// Jump address when interrupt
+static void* g_int_vector;
+
+void init_timer(){
+	// Stop timer, first
+	T1CON=0x0000;
+	IEC0bits.T1IE=0;
+	TMR1=0;
+	PR1=0xffff;
+	g_timer=0;
+	// Disable interrupt
+	IEC0bits.CS1IE=0;
+	g_interrupt_enabled=0;
+}
+
+void stop_timer(){
+	// Stop timer
+	T1CON=0x0000;
+	IEC0bits.T1IE=0;
+	// Disable interrupt
+	IEC0bits.CS1IE=0;
+	g_interrupt_enabled=0;
+}
+
+// Interrupt handler
+#ifndef __DEBUG
+	// Timer1 is also used for debug mode
+	#pragma interrupt T1Handler IPL2SOFT vector 4
+#endif
+void T1Handler(void){
+	g_timer++;
+	// Clear Timer1 interrupt flag
+	IFS0bits.T1IF=0;
+	// Raise CS1 interrupt flag if required
+	IFS0bits.CS1IF=g_interrupt_enabled;
+}
+
+//CS1 ? Core Software Interrupt 1 2 2 IFS0<2> IEC0<2> IPC0<20:18> IPC0<17:16>
+void BasicInt(void){
+//TODO: here
+	// Do the same thing as gosub statement does: 4($sp) is the return address
+	asm volatile(".set noreorder");
+	asm volatile("la $v0,%0"::"i"(&g_int_vector));
+	asm volatile("addiu $sp,$sp,-12");
+	asm volatile("sw $ra,8($sp)");
+	asm volatile("bgezall $zero,label1");
+	asm volatile("lw $v0,0($v0)");
+	asm volatile("beq $zero,$zero,label2");
+	asm volatile("nop");
+	asm volatile("label1:");
+	asm volatile("jr $v0");
+	asm volatile("sw $ra,4($sp)");
+	asm volatile("label2:");
+	asm volatile("lw $ra,4($sp)");
+	asm volatile("addiu $sp,$sp,8"); // 4 was already added by RETURN statement
+}
+#pragma interrupt CS1Handler IPL1SOFT vector 2
+void CS1Handler(void){
+	IFS0bits.CS1IF=0;
+	BasicInt();
+}
+
+void lib_usetimer(int hz){
+	int temppr1;
+	// Stop timer, first
+	T1CON=0x0000;
+	IEC0bits.T1IE=0;
+	TMR1=0;
+	PR1=0xffff;
+	if (!hz) {
+		return;
+	}
+	// PR1 setting
+	temppr1=CPU_CLOCK_HZ/hz;
+	if (temppr1<=65536) {
+		// no prescaler
+		T1CON=0x0000;
+		PR1=temppr1-1;
+	} else if ((temppr1>>3)<=65536) {
+		// 1/8 prescaler
+		T1CON=0x0010;
+		PR1=(temppr1>>3)-1;
+	} else if ((temppr1>>6)<=65536) {
+		// 1/64 prescaler
+		T1CON=0x0020;
+		PR1=(temppr1>>6)-1;
+	} else if ((temppr1>>8)<=65536) {
+		// 1/256 prescaler
+		T1CON=0x0030;
+		PR1=(temppr1>>8)-1;
+	} else {
+		err_invalid_param();
+	}
+	// Timer1 interrupt: priority 2
+	IPC1bits.T1IP=2;
+	IPC1bits.T1IS=0;
+	IEC0bits.T1IE=1;
+	// Start timer
+	T1CONbits.ON=1;
+}
+
+char* usetimer_statement(){
+	char* err;
+	err=get_value();
+	if (err) return err;
+	call_quicklib_code(lib_usetimer,ASM_ADDU_A0_V0_ZERO);
+	return 0;
+}
+
+char* timer_statement(){
+	int i;
+	char* err;
+	err=get_value();
+	if (err) return err;
+	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
+	g_object[g_objpos++]=0xAC620000;                      // sw  v0,0(v1)
+	return 0;
+}
+
+char* timer_function(){
+	int i;
+	i=(int)(&g_timer);
+	check_obj_space(3);
+	g_object[g_objpos++]=0x3C020000|((i>>16)&0x0000FFFF); // lui v0,xxxx
+	g_object[g_objpos++]=0x34420000|(i&0x0000FFFF);       // ori v0,v0,xxxx
+	g_object[g_objpos++]=0x8C420000;                      // lw  v0,0(v0)
+	return 0;
+}
\ No newline at end of file

--- a/mips/zoea/varname.c
+++ b/mips/zoea/varname.c
@@ -120,6 +120,7 @@ static const int reserved_var_names[]={
 	0x47f711de, /*SYSTEM*/
 	0x000166bf, /*TAN*/
 	0x000f72ed, /*TANH*/
+	0x020ed5f3, /*TIMER*/
 	0x02182fee, /*TVRAM*/
 	0x022c2a2d, /*UNTIL*/
 	0x4e8887d0, /*USEPCG*/