提交: c6fc4cfbaca492f00f4aca9ddc27cce8efd3d377 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• 修訂: c6fc4cfbaca492f00f4aca9ddc27cce8efd3d377 (tree)
• 時間: 2019-02-05 07:10:30
• 作者: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Standardize arguments construction routines.

Change Summary

• add: mips/megalopa/args.c
• modified: mips/megalopa/class.c
• modified: mips/megalopa/compiler.c
• modified: mips/megalopa/compiler.h
• modified: mips/megalopa/debug.c
• modified: mips/megalopa/function.c
• modified: mips/megalopa/megalopa.mcp
• modified: mips/megalopa/statement.c

差異

--- /dev/null
+++ b/mips/megalopa/args.c
@@ -0,0 +1,108 @@
+/*
+   This file is provided under the LGPL license ver 2.1.
+   Written by Katsumi.
+   http://hp.vector.co.jp/authors/VA016157/
+   [e-mail]
+*/
+
+/*
+	This file is shared by Megalopa and Zoea
+*/
+
+#include "compiler.h"
+
+const unsigned int g_initial_s5_stack[3]={
+	0,                                     // -8($s5): no object
+	(unsigned int) &g_initial_s5_stack[2], // -4($s5): previous $s5 (recursive)
+	0                                      //  0($s5): no parameter
+};
+
+static int g_args_stack;
+/*
+	See ARGS_SP_XXXX and ARGS_S5_XXXX in compiler.h
+	At least 4 stacks are needed even without argument
+		 4($sp) = -12($s5): $sp
+		 8($sp) =  -8($s5): $v0 - pointer to object or previous -8($s5)
+		12($sp) =  -4($s5): previous $s5
+		16($sp) =   0($s5): number of arguments
+		20($sp) =   4($s5): first argument
+	$v0 must be the pointer to an object before comming to this code.
+	After this code, -12($s5) must be set to $sp: 0xAEBDFFF4   sw          sp,-12(s5)
+*/
+char* prepare_args_stack(char start_char){
+	// start_char is either ',' or '('
+	// When ',' mode, there must be a ',' if argument(s) exist(s).
+	// When '(' mode, there shouldn't be a '(', because this character has passed.
+	char* err;
+	int opos,stack;
+	stack=0;
+	opos=g_objpos;
+	check_obj_space(2);
+	g_object[g_objpos++]=0x27BD0000;             // addiu       sp,sp,-xx
+	// 8(sp) is for $v0, which is pointer to an object
+	g_object[g_objpos++]=0xAFA20008;             // sw          v0,8(sp)
+	next_position();
+	do {
+		if (!stack) {
+			// First parameter if exists
+			stack=16;
+			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--;
+			} else {
+				return ERR_UNKNOWN;
+			}
+		}
+		g_srcpos++;
+		stack+=4;
+		err=get_stringFloatOrValue();
+		if (err) return err;
+		check_obj_space(1);
+		g_object[g_objpos++]=0xAFA20000|stack; // sw          v0,xx(sp)
+		next_position();
+	} while (g_source[g_srcpos]==',');
+	// 12(sp) is for $s5, 16(sp) is for # of parameters
+	check_obj_space(5);
+	g_object[g_objpos++]=0xAFB5000C;             // sw          s5,12(sp)
+	g_object[g_objpos++]=0x34020000|(stack/4-4); // ori         v0,zero,xx
+	g_object[g_objpos++]=0xAFA20010;             // sw          v0,16(sp)
+	g_object[g_objpos++]=0x27B50010;             // addiu       s5,sp,16
+	g_object[opos]|=((0-stack)&0xFFFF);          // addiu       sp,sp,-xx (See above)
+	// All done. Register # of stacks to global var.
+	g_args_stack=stack;
+	return 0;
+}
+
+char* remove_args_stack(void){
+	// Remove stack
+	check_obj_space(2);
+	g_object[g_objpos++]=0x8FB5000C;              // lw          s5,12(sp)
+	g_object[g_objpos++]=0x27BD0000|g_args_stack; // addiu       sp,sp,xx
+	return 0;
+}
+
+char* args_function_main(void){
+	char* err;
+	int i;
+	err=get_value();
+	if (err) return err;
+	i=g_object[g_objpos-1];
+	if ((i>>16)==0x3402) {
+		// Previous object is "ori v0,zero,xxxx".
+		i&=0xffff;
+		i=i<<2;
+		g_object[g_objpos-1]=0x8EA20000|i; //   lw          v0,xx(s5)
+	} else {
+		check_obj_space(3);
+		g_object[g_objpos++]=0x00021080;   //   sll         v0,v0,0x2
+		g_object[g_objpos++]=0x02A21021;   //   addu        v0,s5,v0
+		g_object[g_objpos++]=0x8C420000;   //   lw          v0,0(v0)
+	}
+	return 0;	
+}
+

--- a/mips/megalopa/class.c
+++ b/mips/megalopa/class.c
@@ -319,51 +319,22 @@ char* obj_method(int method){
 	// Parameters preparation (to $s5) here.
 	next_position();
 	opos=g_objpos;
-
 	// Begin parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
-	stack=12;
-	g_object[g_objpos++]=0x27BD0000;             // addiu       sp,sp,-xx
-	// 4(sp) is for $v0 (pointer to object)
-	g_object[g_objpos++]=0xAFA20004;             // sw          v0,4(sp)
-	if (g_source[g_srcpos]!=')') {
-		g_srcpos--;
-		do {
-			g_srcpos++;
-			stack+=4;
-			err=get_stringFloatOrValue();
-			if (err) return err;
-			check_obj_space(1);
-			g_object[g_objpos++]=0xAFA20000|stack;   // sw          v0,xx(sp)
-			next_position();
-		} while(g_source[g_srcpos]==',');
-	}
+	err=prepare_args_stack('(');
+	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
 	g_srcpos++;
-	// 8(sp) is for $s5, 12(sp) is for # of arguments
-	check_obj_space(4);
-	g_object[g_objpos++]=0xAFB50008;             // sw          s5,8(sp)
-	g_object[g_objpos++]=0x34020000|(stack/4-3); // ori         v0,zero,xx
-	g_object[g_objpos++]=0xAFA2000C;             // sw          v0,12(sp)
-	g_object[g_objpos++]=0x27B50008;             // addiu       s5,sp,8
-	g_object[opos]|=((0-stack)&0xFFFF);          // addiu       sp,sp,-xx (See above)
-
-	// End parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
 	// Determine address of method and store fields to local variables.
 	check_obj_space(3);
-	g_object[g_objpos++]=0x8FA20004;                           // lw          v0,4(sp)
+	g_object[g_objpos++]=0x8FA20000|ARGS_SP_V0_OBJ;            // lw          v0,8(sp)
 	g_object[g_objpos++]=0x3C050000|((method>>16)&0x0000FFFF); // lui   a1,xxxx
 	g_object[g_objpos++]=0x34A50000|(method&0x0000FFFF);       // ori a1,a1,xxxx
 	call_quicklib_code(lib_pre_method,ASM_ADDU_A0_V0_ZERO);
 	// Call method address here. Same routine for GOSUB statement with integer value is used.
 	check_obj_space(6);
-	g_object[g_objpos++]=0x04130003;                           // bgezall     zero,label1
 	g_object[g_objpos++]=0x27BDFFFC;                           // addiu       sp,sp,-4
+	g_object[g_objpos++]=0x04130003;                           // bgezall     zero,label1
+	g_object[g_objpos++]=0xAEBD0000|ARGS_S5_SP;                // sw          sp,-12(s5)
 	g_object[g_objpos++]=0x10000003;                           // beq         zero,zero,label2
 	g_object[g_objpos++]=0x00000000;                           // nop         
 	                                                           // label1:
@@ -371,14 +342,11 @@ char* obj_method(int method){
 	g_object[g_objpos++]=0xAFBF0004;                           // sw          ra,4(sp)	                                                           // label2:
 	// Restore fields from local variables.
 	check_obj_space(3);
-	g_object[g_objpos++]=0x8FA40004;                           // lw          a0,4(sp)
-	g_object[g_objpos++]=0x3C050000|((method>>16)&0x0000FFFF); // lui   a1,xxxx
-	g_object[g_objpos++]=0x34A50000|(method&0x0000FFFF);       // ori a1,a1,xxxx
-	call_quicklib_code(lib_post_method,ASM_ADDU_A2_V0_ZERO);
+	g_object[g_objpos++]=0x8FA40008;                           // lw          a0,8(sp)
+	call_quicklib_code(lib_post_method,ASM_ADDU_A1_V0_ZERO);
 	// Remove stack
-	check_obj_space(2);
-	g_object[g_objpos++]=0x8FB50008;                           // lw          s5,8(sp)
-	g_object[g_objpos++]=0x27BD0000|stack;                     // addiu       sp,sp,xx	
+	err=remove_args_stack();
+	if (err) return err;
 	return 0;
 }
 
@@ -402,17 +370,15 @@ char* _obj_field(char mode){
 	int i;
 	char* err;
 	do {
-		i=check_var_name(); // TODO: consider accepting reserbed var names for field name
+		i=check_var_name();
 		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) {
@@ -539,8 +505,8 @@ int lib_pre_method(int* object, int methodname){
 	return class[1];
 }
 
-int lib_post_method(int* object, int methodname, int v0){
-	// Note that existence of the method was checked in above function before reaching this function.
+int lib_post_method(int* object, int v0){
+	// Note that v0 (a1) contains the return value from a method.
 	int i,num,nums;
 	int* class;
 	// Restore local variables to object field values
@@ -706,51 +672,25 @@ char* static_method(char type){
 
 	}
 	if (g_source[g_srcpos]!='(') return ERR_SYNTAX;
-	g_srcpos++;
-
 	// Begin parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
-	stack=8;
-	opos=g_objpos;
-	g_object[g_objpos++]=0x27BD0000;           // addiu       sp,sp,-xx
-	while(g_source[g_srcpos]==',') {
-		g_srcpos++;
-		stack+=4;
-		err=get_stringFloatOrValue();
-		if (err) return err;
-		check_obj_space(1);
-		g_object[g_objpos++]=0xAFA20000|stack; // sw          v0,xx(sp)
-		next_position();
-	}
-	// 4(sp) is for $s5, 8(sp) is for # of parameters
-	check_obj_space(5);
-	g_object[g_objpos++]=0xAFB50004;             // sw          s5,4(sp)
-	g_object[g_objpos++]=0x34020000|(stack/4-2); // ori         v0,zero,xx
-	g_object[g_objpos++]=0xAFA20008;             // sw          v0,8(sp)
-	g_object[g_objpos++]=0x27B50004;             // addiu       s5,sp,4
-	g_object[opos]|=((0-stack)&0xFFFF);          // addiu       sp,sp,-xx (See above)
-
-	// End parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
+	check_obj_space(1);
+	g_object[g_objpos++]=0x34020000; // ori v0,zero,0
+	err=prepare_args_stack('(');
+	if (err) return err;
 	// Calling subroutine, which is static method of class
-	check_obj_space(6);
-	g_object[g_objpos++]=0x04130003;                            // bgezall     zero,label1
+	check_obj_space(7);
 	g_object[g_objpos++]=0x27BDFFFC;                            // addiu       sp,sp,-4
+	g_object[g_objpos++]=0x04130003;                            // bgezall     zero,label1
+	g_object[g_objpos++]=0xAEBD0000|ARGS_S5_SP;                 // sw          sp,-12(s5)
 	g_object[g_objpos++]=0x10000003;                            // beq         zero,zero,label2
 	g_object[g_objpos++]=0x00000000;                            // nop         
 	                                                            // label1:
 	g_object[g_objpos++]=0x08000000|((method&0x0FFFFFFF)>>2);   // j           xxxx
 	g_object[g_objpos++]=0xAFBF0004;                            // sw          ra,4(sp)
-		                                                            // label2:	
+		                                                        // label2:	
 	// Remove stack
-	check_obj_space(2);
-	g_object[g_objpos++]=0x8FB50004;           // lw          s5,4(sp)
-	g_object[g_objpos++]=0x27BD0000|stack;     // addiu       sp,sp,xx
-
+	err=remove_args_stack();
+	if (err) return err;
 	return 0;
 }
 

--- a/mips/megalopa/compiler.c
+++ b/mips/megalopa/compiler.c
@@ -57,6 +57,8 @@ void start_program(void* addr, void* memory){
 	asm volatile("la $v0,%0"::"i"(&g_end_addr));
 	asm volatile("la $v1,label");
 	asm volatile("sw $v1,0($v0)");
+	// Set s5 for initial_s5_stack
+	asm volatile("la $s5,%0"::"i"(&g_initial_s5_stack[2]));
 	// Set s7 for easy calling call_library()
 	asm volatile("la $s7,%0"::"i"(&call_library));
 	// Set fp and execute program

--- a/mips/megalopa/compiler.h
+++ b/mips/megalopa/compiler.h
@@ -335,6 +335,11 @@ char* update_class_info(int class);
 char* construct_class_structure(int class);
 void delete_cmpdata_for_class();
 
+extern const unsigned int g_initial_s5_stack[3];
+char* prepare_args_stack(char start_char);
+char* remove_args_stack(void);
+char* args_function_main(void);
+
 char* begin_compiling_class(int class);
 char* end_compiling_class(int class);
 char* new_function();
@@ -344,7 +349,7 @@ char* string_obj_field();
 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 methodname, int v0);
+int lib_post_method(int* object, int v0);
 char* method_statement();
 char* delete_statement();
 char* call_statement();
@@ -391,6 +396,16 @@ char* static_method(char type);
 #define CMPDATA_FIELD    3
 #define CMPDATA_STATIC   4
 
+/* Stack position for values in args.c */
+#define ARGS_SP_SP       4
+#define ARGS_SP_V0_OBJ   8
+#define ARGS_SP_PREV_S5  12
+#define ARGS_SP_NUM_ARGS 16
+#define ARGS_S5_SP       (-12 & 0xFFFF)
+#define ARGS_S5_V0_OBJ   (-8  & 0xFFFF)
+#define ARGS_S5_PREV_S5  (-4  & 0xFFFF)
+#define ARGS_S5_NUM_ARGS (0   & 0xFFFF)
+
 /*
 	Hidden varname 31 bit values
 	Note that max number of 31 bit value is 0x61504BFF (for ZZZZZZ)

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -229,26 +229,14 @@ static const char bastext[]=
 "USECLASS CLASS1\n"
 "CLS\n"
 "a=new(CLASS1)\n"
-"call a.INIT(123,456)\n"
-"CLASS1::TEST=123\n"
-"CLASS1::TEST2=456\n"
-"print CLASS1::TEST3(),\n"
-"print CLASS1::TEST4#(),\n"
-"print CLASS1::TEST5$(),\n"
+"b=new(CLASS1)\n"
+"call a.TEST4(123)\n"
+"call b.TEST4(456)\n"
+"print a.TEST7(),b.TEST7()\n"
 "\n"
 "\n"
 "\n"
 "\n"
-"end\n"
-"for i=1 to 150\n"
-"  a=new(CLASS1)\n"
-"  delete a\n"
-"  cursor 0,0\n"
-"  print i,\n"
-"next\n"
-"\n"
-"\n"
-"\n"
 "\n"
 "\n";
 
@@ -256,13 +244,18 @@ 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"
 "return 3.14\n"
 "METHOD TEST5\n"
 "return hex$(0xabc)\n"
-"\n"
+"METHOD TEST7\n"
+"return TEST6\n"
 "\n"
 "\n"
 "\n"
@@ -282,8 +275,9 @@ 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("nop");
-	asm volatile("nop");
+	asm volatile("sw $sp,-12($s5)");
+	asm volatile("lw $sp,-12($s5)");
+	asm volatile("lw $v0,-8($s5)");
 	asm volatile("nop");
 	asm volatile("nop");
 	asm volatile("nop");

--- a/mips/megalopa/function.c
+++ b/mips/megalopa/function.c
@@ -261,23 +261,7 @@ char* inkey_function(void){
 }
 
 char* args_function(void){
-	char* err;
-	int i;
-	err=get_value();
-	if (err) return err;
-	i=g_object[g_objpos-1];
-	if ((i>>16)==0x3402) {
-		// Previous object is "ori v0,zero,xxxx".
-		i&=0xffff;
-		i=(i+1)<<2;
-		g_object[g_objpos-1]=0x8EA20000|i; //   lw          v0,xx(s5)
-	} else {
-		check_obj_space(3);
-		g_object[g_objpos++]=0x00021080;   //   sll         v0,v0,0x2
-		g_object[g_objpos++]=0x02A21021;   //   addu        v0,s5,v0
-		g_object[g_objpos++]=0x8C420004;   //   lw          v0,4(v0)
-	}
-	return 0;	
+	return args_function_main();
 }
 
 char* system_function(void){

--- a/mips/megalopa/megalopa.mcp
+++ b/mips/megalopa/megalopa.mcp
@@ -70,6 +70,7 @@ file_042=.
 file_043=.
 file_044=.
 file_045=.
+file_046=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -117,6 +118,7 @@ file_042=no
 file_043=no
 file_044=no
 file_045=no
+file_046=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -160,10 +162,11 @@ file_038=no
 file_039=no
 file_040=no
 file_041=no
-file_042=yes
+file_042=no
 file_043=yes
 file_044=yes
 file_045=yes
+file_046=yes
 [FILE_INFO]
 file_000=compiler.c
 file_001=debug.c
@@ -192,25 +195,26 @@ file_023=io.c
 file_024=i2c.c
 file_025=spi.c
 file_026=class.c
-file_027=api.h
-file_028=compiler.h
-file_029=debug.h
-file_030=editor.h
-file_031=keyinput.h
-file_032=main.h
-file_033=ps2keyboard.h
-file_034=sdfsio370f.h
-file_035=lib_video_megalopa.h
-file_036=envspecific.h
-file_037=io.h
-file_038=ps2keyboard370f.X.a
-file_039=sdfsio370fLib.X.a
-file_040=lib_videoout_megalopa.X.a
-file_041=app_p32MX370F512H.ld
-file_042=help.txt
-file_043=reservednames.js
-file_044=class.txt
-file_045=sharedfiles.js
+file_027=args.c
+file_028=api.h
+file_029=compiler.h
+file_030=debug.h
+file_031=editor.h
+file_032=keyinput.h
+file_033=main.h
+file_034=ps2keyboard.h
+file_035=sdfsio370f.h
+file_036=lib_video_megalopa.h
+file_037=envspecific.h
+file_038=io.h
+file_039=ps2keyboard370f.X.a
+file_040=sdfsio370fLib.X.a
+file_041=lib_videoout_megalopa.X.a
+file_042=app_p32MX370F512H.ld
+file_043=help.txt
+file_044=reservednames.js
+file_045=class.txt
+file_046=sharedfiles.js
 [SUITE_INFO]
 suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337}
 suite_state=

--- a/mips/megalopa/statement.c
+++ b/mips/megalopa/statement.c
@@ -359,9 +359,10 @@ char* gosub_statement_sub(){
 		// Label/number is constant.
 		// Linker will change following codes later.
 		// Note that 0x0812xxxx and 0x0813xxxx are specific codes for these.
-		check_obj_space(6);
-		g_object[g_objpos++]=0x04130003;                            // bgezall     zero,label1
+		check_obj_space(7);
 		g_object[g_objpos++]=0x27BDFFFC;                            // addiu       sp,sp,-4
+		g_object[g_objpos++]=0x04130003;                            // bgezall     zero,label1
+		g_object[g_objpos++]=0xAEBD0000|ARGS_S5_SP;                 // sw          sp,-12(s5)
 		g_object[g_objpos++]=0x10000003;                            // beq         zero,zero,label2
 		g_object[g_objpos++]=0x08120000|((g_label>>16)&0x0000FFFF); // nop         
 		                                                            // label1:
@@ -373,15 +374,16 @@ char* gosub_statement_sub(){
 		err=get_value();
 		if (err) return err;
 		call_lib_code(LIB_LABEL);
-		check_obj_space(6);
-		g_object[g_objpos++]=0x04130003; // bgezall     zero,label1
-		g_object[g_objpos++]=0x27BDFFFC; // addiu       sp,sp,-4
-		g_object[g_objpos++]=0x10000003; // beq         zero,zero,label2
-		g_object[g_objpos++]=0x00000000; // nop         
-		                                 // label1:
-		g_object[g_objpos++]=0x00400008; // jr          v0
-		g_object[g_objpos++]=0xAFBF0004; // sw          ra,4(sp)
-		                                 // label2:
+		check_obj_space(7);
+		g_object[g_objpos++]=0x27BDFFFC;            // addiu       sp,sp,-4
+		g_object[g_objpos++]=0x04130003;            // bgezall     zero,label1
+		g_object[g_objpos++]=0xAEBD0000|ARGS_S5_SP; // sw          sp,-12(s5)
+		g_object[g_objpos++]=0x10000003;            // beq         zero,zero,label2
+		g_object[g_objpos++]=0x00000000;            // nop         
+		                                            // label1:
+		g_object[g_objpos++]=0x00400008;            // jr          v0
+		g_object[g_objpos++]=0xAFBF0004;            // sw          ra,4(sp)
+		                                            // label2:
 	}
 	return 0;
 }
@@ -397,34 +399,10 @@ char* gosub_statement(){
 	next_position();
 	// Rewind object and construct argument-creating routine.
 	g_objpos=opos;
-
 	// Begin parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
-	stack=8;
-	g_object[g_objpos++]=0x27BD0000;           // addiu       sp,sp,-xx
-	while(g_source[g_srcpos]==',') {
-		g_srcpos++;
-		stack+=4;
-		err=get_stringFloatOrValue();
-		if (err) return err;
-		check_obj_space(1);
-		g_object[g_objpos++]=0xAFA20000|stack; // sw          v0,xx(sp)
-		next_position();
-	}
-	// 4(sp) is for $s5, 8(sp) is for # of parameters
-	check_obj_space(5);
-	g_object[g_objpos++]=0xAFB50004;             // sw          s5,4(sp)
-	g_object[g_objpos++]=0x34020000|(stack/4-2); // ori         v0,zero,xx
-	g_object[g_objpos++]=0xAFA20008;             // sw          v0,8(sp)
-	g_object[g_objpos++]=0x27B50004;             // addiu       s5,sp,4
-	g_object[opos]|=((0-stack)&0xFFFF);          // addiu       sp,sp,-xx (See above)
-
-	// End parameter(s) construction routine
-	// Note that this comment must be copied
-	// when inserting simiar routine to source
-
+	g_object[g_objpos++]=0x8EA20000|ARGS_S5_V0_OBJ;           // lw          v0,-8(s5)
+	err=prepare_args_stack(',');
+	if (err) return err;
 	// Rewind source and construct GOSUB routine again.
 	opos=spos;
 	spos=g_srcpos;
@@ -432,9 +410,8 @@ char* gosub_statement(){
 	err=gosub_statement_sub();
 	if (err) return err;
 	// Remove stack
-	check_obj_space(2);
-	g_object[g_objpos++]=0x8FB50004;           // lw          s5,4(sp)
-	g_object[g_objpos++]=0x27BD0000|stack;     // addiu       sp,sp,xx
+	err=remove_args_stack();
+	if (err) return err;
 	// All done, go back to right source position
 	g_srcpos=spos;
 	return 0;
@@ -450,10 +427,11 @@ char* return_statement(){
 		err=get_stringFloatOrValue();
 		if (err) return err;
 	}
-	check_obj_space(3);
-	g_object[g_objpos++]=0x8FA30004; // lw          v1,4(sp)
-	g_object[g_objpos++]=0x00600008; // jr          v1
-	g_object[g_objpos++]=0x27BD0004; // addiu       sp,sp,4
+	check_obj_space(4);
+	g_object[g_objpos++]=0x8EBD0000|ARGS_S5_SP; // lw          sp,-12(s5)
+	g_object[g_objpos++]=0x8FA30004;            // lw          v1,4(sp)
+	g_object[g_objpos++]=0x00600008;            // jr          v1
+	g_object[g_objpos++]=0x27BD0004;            // addiu       sp,sp,4
 	return 0;
 }
 
@@ -1258,6 +1236,9 @@ char* var_statement(){
 		call_lib_code(LIB_VAR_PUSH);
 
 	} while (g_source[g_srcpos-1]==',');
+	// Renew sp stored in s5 stack.
+	check_obj_space(1);
+	g_object[g_objpos++]=0xAEBD0000|ARGS_S5_SP; // sw          sp,-12(s5)
 	return 0;
 }