コミット: 9ef619c3cb83964c1ab02130e663e62713388c75 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

コミットメタ情報

• リビジョン: 9ef619c3cb83964c1ab02130e663e62713388c75 (tree)
• 日時: 2019-02-07 10:45:49
• 作者: Katsumi <kmorimatsu@sour...>
• コミッター: Katsumi

ログメッセージ

Avoid overwriting field in recursive object structure.

変更サマリ

• modified: mips/megalopa/class.c
• modified: mips/megalopa/compiler.h
• modified: mips/megalopa/debug.c

差分

--- a/mips/megalopa/class.c
+++ b/mips/megalopa/class.c
@@ -420,6 +420,13 @@ char* obj_method(int method){
 	// Note that '(' has been passed.
 	char* err;
 	int stack,opos;
+	// When method of an object is called from object, 
+	// current variables must be saved to object fields
+	if (g_compiling_class) {
+		check_obj_space(1);
+		g_object[g_objpos++]=0x00402821; // addu        a1,v0,zero
+		call_quicklib_code(lib_save_vars_to_fields,ASM_LW_A0_XXXX_S5|ARGS_S5_V0_OBJ);
+	}
 	// Parameters preparation (to $s5) here.
 	next_position();
 	opos=g_objpos;
@@ -451,6 +458,13 @@ char* obj_method(int method){
 	// Remove stack
 	err=remove_args_stack();
 	if (err) return err;
+	// When method of an object is called from object, 
+	// current variables must be saved to object fields
+	if (g_compiling_class) {
+		check_obj_space(1);
+		g_object[g_objpos++]=0x00402821; // addu        a1,v0,zero
+		call_quicklib_code(lib_load_vars_from_fields,ASM_LW_A0_XXXX_S5|ARGS_S5_V0_OBJ);
+	}
 	return 0;
 }
 
@@ -558,6 +572,12 @@ void lib_let_str_field(char* prev_str, char* new_str){
 	Library for calling method statement
 */
 
+int lib_load_vars_from_fields(int* object, int v0){
+	// Do nothing if no object
+	if (object) lib_pre_method(object,LABEL_INIT);
+	return v0;
+}
+
 int lib_pre_method(int* object, int methodname){
 	int i,num,nums;
 	int* class;
@@ -604,6 +624,19 @@ int lib_pre_method(int* object, int methodname){
 	return class[1];
 }
 
+int lib_save_vars_to_fields(int* object,int v0){
+	int* class;
+	// Do nothing if no object
+	if (!object) return;
+	// Check if this is an object (if within the RAM).
+	if (!withinRAM(object)) err_not_obj();
+	class=(int*)object[0];
+	if (!withinRAM(class)) err_not_obj();
+	// save vars
+	lib_post_method(object,0);
+	return v0;
+}
+
 int lib_post_method(int* object, int v0){
 	// Note that v0 (a1) contains the return value from a method.
 	int i,num,nums;

--- a/mips/megalopa/compiler.h
+++ b/mips/megalopa/compiler.h
@@ -350,6 +350,9 @@ char* float_obj_field();
 int lib_obj_field(int* object, int fieldname);
 int lib_pre_method(int* object, int methodname);
 int lib_post_method(int* object, int v0);
+int lib_save_vars_to_fields(int* object,int v0);
+int lib_load_vars_from_fields(int* object, int v0);
+
 char* method_statement();
 char* delete_statement();
 char* call_statement();
@@ -463,6 +466,7 @@ char* resolve_unresolved(int class);
 #define ASM_ADDU_A3_V0_ZERO 0x00403821
 #define ASM_ORI_A0_ZERO_ 0x34040000
 #define ASM_LW_A0_XXXX_S8 0x8FC40000
+#define ASM_LW_A0_XXXX_S5 0x8EA40000
 
 // Division macro for unsigned long
 // Valid for 31 bits for all cases and 32 bits for some cases

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -249,7 +249,7 @@ static const char classtext[]=
 " T6=rnd()\n" 
 " return\n"
 "METHOD T3\n"
-" o=new(CLASS1)\n" // TODO: save variables to object field before calling method of another object
+" o=new(CLASS1)\n"
 " return o\n"
 "METHOD T4\n"
 " return T6\n"
@@ -269,10 +269,7 @@ 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,0($v1)");
-	asm volatile("sw $sp,-12($s5)");
-	asm volatile("lw $sp,-12($s5)");
-	asm volatile("lw $v0,-8($s5)");
+	asm volatile("lw    $a0,-8($s5)");
 	asm volatile("nop");
 	asm volatile("nop");
 	asm volatile("nop");