Commit: d8e3fee225552f706f55b3d409501767f40857d0 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revisión: d8e3fee225552f706f55b3d409501767f40857d0 (tree)
• Tiempo: 2019-04-10 06:59:32
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Not TMR1=0 in TIMER statement but g_timer=0 in USETIMER statement.

Cambiar Resumen

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

Diferencia incremental

--- a/mips/megalopa/statement.c
+++ b/mips/megalopa/statement.c
@@ -1431,6 +1431,20 @@ char* fclose_statement(){
 	return 0;
 }
 
+/*
+
+TODO: candidates to add:
+
+int FSattrib (FSFILE * file, unsigned char attributes);
+int FSrename (const char * fileName, FSFILE * fo);
+int FSmkdir (char * path);
+int FSrmdir (char * path, unsigned char rmsubdirs);
+int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
+int FindFirst (const char * fileName, unsigned int attr, SearchRec * rec);
+int FindNext (SearchRec * rec);
+
+*/
+
 char* fget_statement(){
 	return param2_statement(LIB_FILE | FUNC_FGET);
 }

--- a/mips/megalopa/timer.c
+++ b/mips/megalopa/timer.c
@@ -123,6 +123,7 @@ void lib_usetimer(int usec){
 	IPC1bits.T1IS=0;
 	IEC0bits.T1IE=1;
 	// Start timer
+	g_timer=0;
 	T1CONbits.ON=1;
 }
 
@@ -143,9 +144,6 @@ char* timer_statement(){
 	check_obj_space(4);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
 	g_object[g_objpos++]=0xAC620000|((i-0x8000)&0xFFFF);  // sw  v0,xxxx(v1)
-	i=(int)(&TMR1)+0x8000;//0xBF800610
-	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,0xbf80
-	g_object[g_objpos++]=0xAC600000|((i-0x8000)&0xFFFF);  // sw  zero,0x0610(v1)
 	return 0;
 }
 
@@ -285,7 +283,7 @@ char* interrupt_statement(){
 	4) DRAWCOUNT interrupt
 */
 
-const int* keystatus=(int*)&ps2keystatus[0];
+const int* g_keystatus=(int*)&ps2keystatus[0];
 
 #pragma interrupt CS0Handler IPL3SOFT vector 1
 void CS0Handler(void){
@@ -308,7 +306,7 @@ void CS0Handler(void){
 		// Check PS/2 keyboard down
 		if (g_int_vector[INTERRUPT_INKEY]) {
 			for(i=0;i<64;i++){
-				if (keystatus[i]) {
+				if (g_keystatus[i]) {
 					// Raise INKEY interrupt flag
 					if (!s_inkey) raise_interrupt_flag(INTERRUPT_INKEY);
 					break;
@@ -318,8 +316,3 @@ void CS0Handler(void){
 		}
 	}
 }
-/*
-		for(i=0;i<256;i++){
-			if (ps2keystatus[i]) return i;
-		}
-*/

--- a/mips/protozoa/statement.c
+++ b/mips/protozoa/statement.c
@@ -1431,6 +1431,20 @@ char* fclose_statement(){
 	return 0;
 }
 
+/*
+
+TODO: candidates to add:
+
+int FSattrib (FSFILE * file, unsigned char attributes);
+int FSrename (const char * fileName, FSFILE * fo);
+int FSmkdir (char * path);
+int FSrmdir (char * path, unsigned char rmsubdirs);
+int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
+int FindFirst (const char * fileName, unsigned int attr, SearchRec * rec);
+int FindNext (SearchRec * rec);
+
+*/
+
 char* fget_statement(){
 	return param2_statement(LIB_FILE | FUNC_FGET);
 }

--- a/mips/protozoa/timer.c
+++ b/mips/protozoa/timer.c
@@ -123,6 +123,7 @@ void lib_usetimer(int usec){
 	IPC1bits.T1IS=0;
 	IEC0bits.T1IE=1;
 	// Start timer
+	g_timer=0;
 	T1CONbits.ON=1;
 }
 
@@ -143,9 +144,6 @@ char* timer_statement(){
 	check_obj_space(4);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
 	g_object[g_objpos++]=0xAC620000|((i-0x8000)&0xFFFF);  // sw  v0,xxxx(v1)
-	i=(int)(&TMR1)+0x8000;//0xBF800610
-	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,0xbf80
-	g_object[g_objpos++]=0xAC600000|((i-0x8000)&0xFFFF);  // sw  zero,0x0610(v1)
 	return 0;
 }
 
@@ -318,8 +316,3 @@ void CS0Handler(void){
 		}
 	}
 }
-/*
-		for(i=0;i<256;i++){
-			if (ps2keystatus[i]) return i;
-		}
-*/

--- a/mips/zoea/statement.c
+++ b/mips/zoea/statement.c
@@ -1431,6 +1431,20 @@ char* fclose_statement(){
 	return 0;
 }
 
+/*
+
+TODO: candidates to add:
+
+int FSattrib (FSFILE * file, unsigned char attributes);
+int FSrename (const char * fileName, FSFILE * fo);
+int FSmkdir (char * path);
+int FSrmdir (char * path, unsigned char rmsubdirs);
+int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
+int FindFirst (const char * fileName, unsigned int attr, SearchRec * rec);
+int FindNext (SearchRec * rec);
+
+*/
+
 char* fget_statement(){
 	return param2_statement(LIB_FILE | FUNC_FGET);
 }

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -123,6 +123,7 @@ void lib_usetimer(int usec){
 	IPC1bits.T1IS=0;
 	IEC0bits.T1IE=1;
 	// Start timer
+	g_timer=0;
 	T1CONbits.ON=1;
 }
 
@@ -143,9 +144,6 @@ char* timer_statement(){
 	check_obj_space(4);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
 	g_object[g_objpos++]=0xAC620000|((i-0x8000)&0xFFFF);  // sw  v0,xxxx(v1)
-	i=(int)(&TMR1)+0x8000;//0xBF800610
-	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,0xbf80
-	g_object[g_objpos++]=0xAC600000|((i-0x8000)&0xFFFF);  // sw  zero,0x0610(v1)
 	return 0;
 }
 
@@ -285,7 +283,7 @@ char* interrupt_statement(){
 	4) DRAWCOUNT interrupt
 */
 
-const int* keystatus=(int*)&ps2keystatus[0];
+const int* g_keystatus=(int*)&ps2keystatus[0];
 
 #pragma interrupt CS0Handler IPL3SOFT vector 1
 void CS0Handler(void){
@@ -308,7 +306,7 @@ void CS0Handler(void){
 		// Check PS/2 keyboard down
 		if (g_int_vector[INTERRUPT_INKEY]) {
 			for(i=0;i<64;i++){
-				if (keystatus[i]) {
+				if (g_keystatus[i]) {
 					// Raise INKEY interrupt flag
 					if (!s_inkey) raise_interrupt_flag(INTERRUPT_INKEY);
 					break;
@@ -318,8 +316,3 @@ void CS0Handler(void){
 		}
 	}
 }
-/*
-		for(i=0;i<256;i++){
-			if (ps2keystatus[i]) return i;
-		}
-*/