提交: 5a625009f29bc655ee8e57a23fe50811e929cbb0 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• 修订版: 5a625009f29bc655ee8e57a23fe50811e929cbb0 (tree)
• 时间: 2019-04-14 15:57:33
• 作者: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

MZP: coretimer implementations.

更改概述

• modified: mips/megalopa/timer.c
• modified: mips/protozoa/compiler.h
• modified: mips/protozoa/function.c
• modified: mips/protozoa/statement.c
• modified: mips/protozoa/timer.c
• modified: mips/zoea/compiler.h
• modified: mips/zoea/function.c
• modified: mips/zoea/statement.c
• modified: mips/zoea/timer.c

差异

--- a/mips/megalopa/timer.c
+++ b/mips/megalopa/timer.c
@@ -70,6 +70,7 @@ void stop_timer(){
 	IEC0bits.T1IE=0;
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
+	IEC0bits.CTIE=0;
 }
 
 /*

--- a/mips/protozoa/compiler.h
+++ b/mips/protozoa/compiler.h
@@ -280,6 +280,7 @@ char* fput_statement();
 char* fputc_statement();
 char* fremove_statement();
 char* label_statement();
+char* exec_statement();
 
 char* function(void);
 char* str_function(void);
@@ -375,6 +376,8 @@ void stop_timer();
 char* usetimer_statement();
 char* timer_statement();
 char* timer_function();
+char* coretimer_statement();
+char* coretimer_function();
 char* interrupt_statement();
 
 /* Error messages */
@@ -493,6 +496,7 @@ char* interrupt_statement();
 #define INTERRUPT_INKEY     3
 #define INTERRUPT_MUSIC     4
 #define INTERRUPT_WAVE      5
+#define INTERRUPT_CORETIMER 6
 
 extern int g_interrupt_flags;
 extern int g_int_vector[];

--- a/mips/protozoa/function.c
+++ b/mips/protozoa/function.c
@@ -391,6 +391,10 @@ char* getdir_function(){
 	return 0;
 }
 
+char* exec_function(){
+	return exec_statement();
+}
+
 char* float_constant(float val){
 	volatile int i;
 	((float*)(&i))[0]=val;
@@ -597,6 +601,8 @@ static const void* int_func_list[]={
 	"NEW(",new_function,
 	"SETDIR(",setdir_function,
 	"TIMER(",timer_function,
+	"EXEC(",exec_function,
+	"CORETIMER(",coretimer_function,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };

--- a/mips/protozoa/statement.c
+++ b/mips/protozoa/statement.c
@@ -1741,6 +1741,7 @@ static const void* statement_list[]={
 	"TIMER ",timer_statement,
 	"INTERRUPT ",interrupt_statement,
 	"IDLE",idle_statement,
+	"CORETIMER",coretimer_statement,
 	// List of additional statements follows
 	ADDITIONAL_STATEMENTS
 };

--- a/mips/protozoa/timer.c
+++ b/mips/protozoa/timer.c
@@ -33,6 +33,7 @@ static const void* interrupt_list[]={
 	"INKEY",    (void*)INTERRUPT_INKEY,
 	"MUSIC",    (void*)INTERRUPT_MUSIC,
 	"WAVE",     (void*)INTERRUPT_WAVE,
+	"CORETIMER",(void*)INTERRUPT_CORETIMER,
 	ADDITIONAL_INTERRUPT_FUNCTIONS
 };
 #define NUM_INTERRUPT_TYPES ((sizeof(interrupt_list)/sizeof(interrupt_list[0]))/2)
@@ -69,6 +70,7 @@ void stop_timer(){
 	IEC0bits.T1IE=0;
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
+	IEC0bits.CTIE=0;
 }
 
 /*
@@ -157,6 +159,40 @@ char* timer_function(){
 }
 
 /*
+	Coretimer implementaion
+*/
+
+#pragma interrupt CTHandler IPL2SOFT vector 0
+void CTHandler(void){
+	// Clear CT interrupt flag
+	IFS0bits.CTIF=0;
+	// Raise TIMER interrupt flag
+	raise_interrupt_flag(INTERRUPT_CORETIMER);
+}
+
+char* coretimer_function(){
+	check_obj_space(1);
+	g_object[g_objpos++]=0x40024800; // mfc0 v0,Count
+	return 0;
+}
+
+void lib_coretimer(){
+	// CT interrupt: priority 2
+	IPC0bits.CTIP=2;
+	IPC0bits.CTIS=0;
+	IEC0bits.CTIE=1;
+}
+
+char* coretimer_statement(){
+	char* err;
+	err=get_value();
+	if (err) return err;
+	// 0x40825800: mtc0 v0,Compare
+	call_quicklib_code(lib_coretimer,0x40825800);
+	return 0;
+}
+
+/*
 	Interrupt interprtation
 	To cause interruption, use raise_interrupt_flag() macro
 	For example,

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/compiler.h
@@ -280,6 +280,7 @@ char* fput_statement();
 char* fputc_statement();
 char* fremove_statement();
 char* label_statement();
+char* exec_statement();
 
 char* function(void);
 char* str_function(void);
@@ -375,6 +376,8 @@ void stop_timer();
 char* usetimer_statement();
 char* timer_statement();
 char* timer_function();
+char* coretimer_statement();
+char* coretimer_function();
 char* interrupt_statement();
 
 /* Error messages */
@@ -493,6 +496,7 @@ char* interrupt_statement();
 #define INTERRUPT_INKEY     3
 #define INTERRUPT_MUSIC     4
 #define INTERRUPT_WAVE      5
+#define INTERRUPT_CORETIMER 6
 
 extern int g_interrupt_flags;
 extern int g_int_vector[];

--- a/mips/zoea/function.c
+++ b/mips/zoea/function.c
@@ -391,6 +391,10 @@ char* getdir_function(){
 	return 0;
 }
 
+char* exec_function(){
+	return exec_statement();
+}
+
 char* float_constant(float val){
 	volatile int i;
 	((float*)(&i))[0]=val;
@@ -597,6 +601,8 @@ static const void* int_func_list[]={
 	"NEW(",new_function,
 	"SETDIR(",setdir_function,
 	"TIMER(",timer_function,
+	"EXEC(",exec_function,
+	"CORETIMER(",coretimer_function,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };

--- a/mips/zoea/statement.c
+++ b/mips/zoea/statement.c
@@ -1741,6 +1741,7 @@ static const void* statement_list[]={
 	"TIMER ",timer_statement,
 	"INTERRUPT ",interrupt_statement,
 	"IDLE",idle_statement,
+	"CORETIMER",coretimer_statement,
 	// List of additional statements follows
 	ADDITIONAL_STATEMENTS
 };

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -33,6 +33,7 @@ static const void* interrupt_list[]={
 	"INKEY",    (void*)INTERRUPT_INKEY,
 	"MUSIC",    (void*)INTERRUPT_MUSIC,
 	"WAVE",     (void*)INTERRUPT_WAVE,
+	"CORETIMER",(void*)INTERRUPT_CORETIMER,
 	ADDITIONAL_INTERRUPT_FUNCTIONS
 };
 #define NUM_INTERRUPT_TYPES ((sizeof(interrupt_list)/sizeof(interrupt_list[0]))/2)
@@ -69,6 +70,7 @@ void stop_timer(){
 	IEC0bits.T1IE=0;
 	// Disable interrupt
 	IEC0bits.CS1IE=0;
+	IEC0bits.CTIE=0;
 }
 
 /*
@@ -157,6 +159,40 @@ char* timer_function(){
 }
 
 /*
+	Coretimer implementaion
+*/
+
+#pragma interrupt CTHandler IPL2SOFT vector 0
+void CTHandler(void){
+	// Clear CT interrupt flag
+	IFS0bits.CTIF=0;
+	// Raise TIMER interrupt flag
+	raise_interrupt_flag(INTERRUPT_CORETIMER);
+}
+
+char* coretimer_function(){
+	check_obj_space(1);
+	g_object[g_objpos++]=0x40024800; // mfc0 v0,Count
+	return 0;
+}
+
+void lib_coretimer(){
+	// CT interrupt: priority 2
+	IPC0bits.CTIP=2;
+	IPC0bits.CTIS=0;
+	IEC0bits.CTIE=1;
+}
+
+char* coretimer_statement(){
+	char* err;
+	err=get_value();
+	if (err) return err;
+	// 0x40825800: mtc0 v0,Compare
+	call_quicklib_code(lib_coretimer,0x40825800);
+	return 0;
+}
+
+/*
 	Interrupt interprtation
 	To cause interruption, use raise_interrupt_flag() macro
 	For example,