Commit: 154 - kmbasic (svn)

BASIC compiler/interpreter for PIC32MX/MZ-80K (suspended)

Commit MetaInfo

• Revision: 154 (tree)
• Time: 2016-08-24 06:18:08
• Author: kmorimatsu

Log Message

Implement CONTINUE statement.

Change Summary

• modified: mips/branches/zoea/compiler.h
• modified: mips/branches/zoea/debug.c
• modified: mips/branches/zoea/globalvars.c
• modified: mips/branches/zoea/linker.c
• modified: mips/branches/zoea/statement.c

Incremental Difference

--- mips/branches/zoea/compiler.h	(revision 153)
+++ mips/branches/zoea/compiler.h	(revision 154)
@@ -168,6 +168,7 @@
 extern unsigned char* g_pcg_font;
 extern char g_use_graphic;
 extern unsigned short* g_graphic_area;
+extern int g_temp;
 
 /* Prototypes */
 int get_gp(void);

--- mips/branches/zoea/debug.c	(revision 153)
+++ mips/branches/zoea/debug.c	(revision 154)
@@ -139,12 +139,11 @@
 
 static const char bastext[]=
 "CLS\n"
-"T#=10\n"
-"T#=-10\n"
-"T#=0\n"
-"IF INT(T#=0) THEN X=1\n"
-"T#=-10\n"
-"PRINT T#\n"
+"for i=1 to 10\n"
+" print i;\n"
+" continue\n"
+" print \"NG\";\n"
+"next\n"
 "\n";
 
 /*

--- mips/branches/zoea/globalvars.c	(revision 153)
+++ mips/branches/zoea/globalvars.c	(revision 154)
@@ -69,3 +69,5 @@
 // Pointer to graphic RAM
 unsigned short* g_graphic_area;
 
+// General purpose integer used for asigning value with pointer
+int g_temp;

--- mips/branches/zoea/linker.c	(revision 153)
+++ mips/branches/zoea/linker.c	(revision 154)
@@ -122,7 +122,7 @@
 	}
 }
 
-void* search_breakout(unsigned int start){
+void* search_breakout(unsigned int start, int* prevcode){
 	unsigned int pos,code1,depth;
 	// Start search from start point where BREAK statement is used.
 	depth=0;
@@ -147,6 +147,8 @@
 					break;
 				}
 				// Destination found.
+				// Previous code will be also set if required for CONTINUE statement.
+				if (prevcode) prevcode[0]=g_object[pos-1];
 				return (void*)&g_object[pos];
 			default:
 				break;
@@ -194,6 +196,7 @@
 	0x0814xxxx, 0x0815xxxx: SOUND etc, for setting v0 as pointer to DATA array.
 	0x0816xxxx: BREAK statemant and relatives
 		0x08160000: BREAK
+		0x08160008: CONTINUE
 		0x08160100: Jump to next ELSE, ELSEIF or ENDIF
 	0x082xyyyy: Begin block (FOR/DO/WHILE)
 	0x083xyyyy: End block (NEXT/LOOP/WEND)
@@ -202,6 +205,7 @@
 	                        MLB 2 bits show skip byte length in DATA.
 	0x30000000: Begin block (IF-THEN-ELSEIF-ELSE-ENDIF)
 	0x30008000: End block (IF-THEN-ELSEIF-ELSE-ENDIF)
+	0x3000Fxxx: General purpose NOP with value 0x0000-0x0FFF.
 
 	IF-THEN-ELSEIF-ELSE-ENDIF is written as follows:
 		IF-THEN: 0x30000000 0x10400000 0x30000000
@@ -280,7 +284,7 @@
 						// BREAK statement
 						// Find next the NEXT or WHILE statement and insert jump code after this.
 						g_label=g_line;
-						code1=(int)search_breakout(pos);
+						code1=(int)search_breakout(pos,0);
 						if (!code1) return ERR_INVALID_BREAK;
 						code1&=0x0FFFFFFF;
 						code1>>=2;
@@ -287,6 +291,24 @@
 						code1|=0x08000000; // j xxxx
 						g_object[pos]=code1;
 						break;
+					case 0x0008:
+						// CONTINUE statement
+						// Find next the NEXT or WHILE statement and insert jump code after this.
+						g_label=g_line;
+						code1=(int)search_breakout(pos,&g_temp);
+						if (!code1) return ERR_INVALID_BREAK;
+						if (0x3000F000 == (g_temp&0xFFFFF000)) {
+							// WEND or LOOP statement found
+							code1-=(g_temp&0x0FFF)<<2;
+						} else {
+							// NEXT statement found
+							code1-=3<<2;
+						}
+						code1&=0x0FFFFFFF;
+						code1>>=2;
+						code1|=0x08000000; // j xxxx
+						g_object[pos]=code1;
+						break;
 					case 0x0100:
 						// Jump to next ENDIF
 						g_label=g_line;

--- mips/branches/zoea/statement.c	(revision 153)
+++ mips/branches/zoea/statement.c	(revision 154)
@@ -717,6 +717,13 @@
 	return 0;
 }
 
+char* continue_statement(){
+	check_obj_space(2);
+	g_object[g_objpos++]=0x08160008; // j           xxxx     (See link() function)
+	g_object[g_objpos++]=0x00000000; // nop
+	return 0;
+}
+
 char* for_statement(){
 	char* err;
 	char b1;
@@ -776,7 +783,9 @@
 
 char* next_statement(){
 	// Return to address stored in 4($sp)
-	// while set $v0 to 8($sp) (see for_statement) 
+	// while set $v0 to 8($sp) (see for_statement)
+	// Following assembly must be 4 words.
+	// If the number of words will be changed, link.c must be reviced for CONTINUE statement.
 	check_obj_space(4);
 	g_object[g_objpos++]=0x8FBF0004; // lw          ra,4(sp)
 	g_object[g_objpos++]=0x03E00008; // jr          ra
@@ -821,6 +830,8 @@
 
 char* loop_statement(){
 	char* err;
+	int opos;
+	opos=g_objpos;
 	if (nextCodeIs("WHILE ")) {
 		// LOOP WHILE
 		err=get_floatOrValue();
@@ -837,11 +848,12 @@
 		// LOOP statement without WHILE/UNTIL
 	}
 	check_obj_space(4);
-	g_object[g_objpos++]=0x8FBF0004; // lw          ra,4(sp)
-	g_object[g_objpos++]=0x03E00008; // jr          ra
-	g_object[g_objpos++]=0x00000000; // nop
-	                                 // label1:
-	g_object[g_objpos++]=0x08320004; // addiu       sp,sp,4       (See link() function)
+	g_object[g_objpos++]=0x8FBF0004;      // lw          ra,4(sp)
+	g_object[g_objpos++]=0x03E00008;      // jr          ra
+	opos=g_objpos+1-opos;
+	g_object[g_objpos++]=0x3000F000|opos; // nop                 (See linker, used for CONTINUE statement)
+	                                      // label1:
+	g_object[g_objpos++]=0x08320004;      // addiu       sp,sp,4       (See link() function)
 	return 0;
 }
 
@@ -865,9 +877,9 @@
 	check_obj_space(4);
 	g_object[g_objpos++]=0x8FBF0004; // lw          ra,4(sp)
 	g_object[g_objpos++]=0x03E00008; // jr          ra
-	g_object[g_objpos++]=0x00000000; // nop
+	g_object[g_objpos++]=0x3000F003; // nop                 (See linker, used for CONTINUE statement)
 	                                 // label1:
-	g_object[g_objpos++]=0x08310004; // addiu       sp,sp,4       (See link() function)
+	g_object[g_objpos++]=0x08310004; // addiu       sp,sp,4 (See link() function)
 	return 0;
 }
 
@@ -1357,6 +1369,8 @@
 		err=wend_statement();
 	} else if (nextCodeIs("BREAK")) {
 		err=break_statement();
+	} else if (nextCodeIs("CONTINUE")) {
+		err=continue_statement();
 	} else if (nextCodeIs("SYSTEM")) {
 		err=system_statement();
 #ifdef __DEBUG