Commit: 0d7dd1dca26f170286f433ed1edcd1840cdbf186 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revision: 0d7dd1dca26f170286f433ed1edcd1840cdbf186 (tree)
• Time: 2019-02-07 07:09:22
• Author: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Debug issues of recursive object.

Change Summary

• modified: mips/megalopa/args.c
• modified: mips/megalopa/class.c
• modified: mips/megalopa/debug.c
• modified: mips/megalopa/file.c

Incremental Difference

--- a/mips/megalopa/args.c
+++ b/mips/megalopa/args.c
@@ -49,8 +49,6 @@ char* prepare_args_stack(char start_char){
 			if (start_char==','){
 				if (g_source[g_srcpos]!=',') break;
 			} else if (start_char=='('){
-				if (g_source[g_srcpos]!='(') return ERR_SYNTAX;
-				g_srcpos++;
 				next_position();
 				if (g_source[g_srcpos]==')') break;
 				g_srcpos--;

--- a/mips/megalopa/class.c
+++ b/mips/megalopa/class.c
@@ -95,7 +95,8 @@ char* end_compiling_class(int class){
 	err=update_class_info(class);
 	if (err) return err;
 	// Resolve CMPDATA_UNSOLVED.
-	resolve_unresolved(class);
+	err=resolve_unresolved(class);
+	if (err) return err;
 	// Delete some cmpdata.
 	delete_cmpdata_for_class(class);
 	return 0;
@@ -136,13 +137,23 @@ char* resolve_unresolved(int class){
 		if (record[1]!=class) continue;
 		switch (record[0]&0xffff) {
 			case CMPTYPE_NEW_FUNCTION:
+				// Shift of code may happen (man not).
+				for(i=-1;i<=0;i++){
+					code=(int*)(record[2]);
+					if (code[i]!=0x3C080000) continue;
+					if (code[i+1]!=0x35080000) continue;
+					code=(int*)(record[3]);
+					if (code[i]!=ASM_ORI_A0_ZERO_) continue;
+					break;
+				}
+				if (0<i) return ERR_UNKNOWN;
 				// Resolve address of code for pointer to class structure
-				code=(int*)record[2];
-				code[0]=(code[0]&0xFFFF0000) | (((int)classdata)>>16);
-				code[1]=(code[1]&0xFFFF0000) | (((int)classdata) & 0x0000FFFF);
+				code=(int*)(record[2]);
+				code[i+0]=0x3C080000 | (((unsigned int)classdata)>>16);
+				code[i+1]=0x35080000 | (((unsigned int)classdata) & 0x0000FFFF);
 				// Resolve size of object
-				code=(int*)record[3];
-				code[0]=(code[0]&0xFFFF0000) | (object_size(classdata) & 0x0000FFFF);
+				code=(int*)(record[3]);
+				code[i+0]=ASM_ORI_A0_ZERO_ | (object_size(classdata) & 0x0000FFFF);
 				// All done
 				break;
 			case CMPTYPE_STATIC_METHOD:
@@ -150,7 +161,7 @@ char* resolve_unresolved(int class){
 				// Find method
 				i=(int)search_method(classdata,record[2]);
 				if (!i) return ERR_NOT_FIELD;
-				code=(int*)record[3];
+				code=(int*)(record[3]);
 				code[0]=(code[0]&0xFC000000)|((i&0x0FFFFFFF)>>2);
 				// All done
 				break;
@@ -324,7 +335,7 @@ char* new_function(){
 		// Class structure is unknown. Use null method.
 		init_method=(int*)&g_return_code[0];
 		// Register CMPDATA
-		cmpdata_insert(CMPDATA_UNSOLVED,CMPTYPE_NEW_FUNCTION,(int*)record[0],3);
+		cmpdata_insert(CMPDATA_UNSOLVED,CMPTYPE_NEW_FUNCTION,(int*)&record[0],3);
 	}		
 	if (!init_method) {
 		// All done
@@ -406,6 +417,7 @@ char* field_statement(){
 */
 char* obj_method(int method){
 	// $v0 contains the address of object.
+	// Note that '(' has been passed.
 	char* err;
 	int stack,opos;
 	// Parameters preparation (to $s5) here.
@@ -466,11 +478,13 @@ char* _obj_field(char mode){
 		if (i<65536) return ERR_SYNTAX;
 		if (g_source[g_srcpos]=='(' && mode==OBJ_FIELD_INTEGER) {
 			// This is a method
+			g_srcpos++;
 			return obj_method(i);
 		} else if (g_source[g_srcpos+1]=='(') {
 			if (g_source[g_srcpos]==mode) {
 				// This is a string/float method
 				g_srcpos++;
+				g_srcpos++;
 				return obj_method(i);
 			}
 		} else if (g_source[g_srcpos]==mode && mode==OBJ_FIELD_STRING) {

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -229,10 +229,10 @@ static const char bastext[]=
 "USECLASS CLASS1\n"
 "CLS\n"
 "a=new(CLASS1)\n"
-"b=new(CLASS1)\n"
-"call a.TEST4(123)\n"
-"call b.TEST4(456)\n"
-"print a.TEST7(),b.TEST7()\n"
+"b=a.T3()\n"
+"c=b.T3()\n"
+"print a,b,c\n"
+"print a.T4(),b.T4(),c.T4()\n"
 "\n"
 "\n"
 "\n"
@@ -243,26 +243,16 @@ static const char bastext[]=
 
 static const char classtext[]=
 "REM\n"
-"STATIC TEST,TEST2\n"
-"FIELD PRIVATE TEST6\n"
-"METHOD TEST3\n"
-" for i=-2 to 2:print args(i),:next\n"
-" print\n"
-"return TEST+TEST2\n"
-"METHOD TEST4\n"
-" TEST6=args(1)\n"
-" while 1\n"
-"  return 3.14\n"
-" wend\n"
-" end\n"
-"METHOD TEST5\n"
-"return hex$(0xabc)\n"
-"METHOD TEST7\n"
-" for i=1 to 2\n"
-"  return TEST6\n"
-" next\n"
-" end\n"
-"\n"
+"STATIC T1,T2\n"
+"FIELD PUBLIC T6\n"
+"METHOD INIT\n"
+" T6=rnd()\n" 
+" return\n"
+"METHOD T3\n"
+" o=new(CLASS1)\n" // TODO: save variables to object field before calling method of another object
+" return o\n"
+"METHOD T4\n"
+" return T6\n"
 "\n"
 "\n"
 "\n"

--- a/mips/megalopa/file.c
+++ b/mips/megalopa/file.c
@@ -189,7 +189,8 @@ int compile_and_link_class(char* buff,int class){
 		i=compile_and_link_file(buff,&classfile[0]);
 		if (i) break;
 		// End compiling class
-		end_compiling_class(class);
+		err=end_compiling_class(class);
+		if (err) break;
 		// Initial assembly is a jump statement to jump to the end of class file
 		g_object[0]=0x08000000 | ((((int)(&g_object[g_objpos]))&0x0FFFFFFF)>>2); // j xxxxxxxx
 		// In the next link, current region of object is ignored.