Commit: 0d0d0b27966a8db911d5bc2bf806885f30ed03a8 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revisión: 0d0d0b27966a8db911d5bc2bf806885f30ed03a8 (tree)
• Tiempo: 2019-04-15 13:34:35
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Fast field access implementation.

Cambiar Resumen

• modified: mips/megalopa/class.c
• modified: mips/megalopa/class.txt
• modified: mips/megalopa/compiler.c
• modified: mips/megalopa/compiler.h
• modified: mips/megalopa/debug.c
• modified: mips/megalopa/file.c
• modified: mips/megalopa/globalvars.c
• modified: mips/megalopa/help.txt
• modified: mips/megalopa/statement.c

Diferencia incremental

--- a/mips/megalopa/class.c
+++ b/mips/megalopa/class.c
@@ -33,6 +33,14 @@ static int* g_class_structure;
 		record[1]: field/method name as integer
 		record[2]: pointer to method
 */
+/*
+	CMPDATA_FASTFIELD structure
+		type:      CMPDATA_FASTFIELD
+		len:       2
+		data16:    number of position of public field in object
+		           0 for multiple usage of the same public field name
+		record[1]: field name as integer
+*/
 
 /*
 	CMPDATA_STATIC structure
@@ -62,6 +70,24 @@ static int* g_class_structure;
 */
 
 /*
+	About fast field access
+		When a public field name used only once with a class, 
+		the address of this field of an object is defined quickly when compiling.
+		This logic is always true when there is only a class.
+
+		However, if there are more than two classes and the field name is used
+		by only a class, this logic is true only when the BASIC code does not have
+		error. If there is an error in BASIC code, this type of error cannot be 
+		found by compiler and when executing.
+
+		Therefore, only use this logic when the number of class is one, and/or 
+		OPTION FASTFIELD is defined.
+
+		This logic is useless for public method, because library must be always called
+		before calling public method.
+*/
+
+/*
 	Local prototyping
 */
 char* obj_method(int method);
@@ -259,10 +285,36 @@ char* construct_class_structure(int class){
 
 void delete_cmpdata_for_class(int class){
 	int* record;
+	int i;
+	short pos;
 	// Delete field/method data
 	cmpdata_reset();
+	pos=0; // # of position of public field
 	while(record=cmpdata_find(CMPDATA_FIELD)){
-		cmpdata_delete(record);
+		if ((record[0]&0xffff)==CMPTYPE_PUBLIC_FIELD) {
+			pos++;
+			i=record[1]; // Field name
+			cmpdata_delete(record);
+			// Construct or disable CMPDATA_FASTFIELD
+			// Note that the sequence of public fields here is the same
+			// as that in the function, construct_class_struction().
+			cmpdata_reset();
+			while(record=cmpdata_find(CMPDATA_FASTFIELD)){
+				if (record[1]==i) break;
+			}
+			if (record) {
+				// Multiple definition of field name
+				// Clear data16 if the position is different
+				if (pos!=(record[0]&0xffff)) record[0]&=0xffff0000;
+			} else { 
+				// Previous CMPDATA_FASTFIELD not found
+				// Create now one for fast field implementation
+				g_temp=i;
+				cmpdata_insert(CMPDATA_FASTFIELD,pos,&g_temp,1);
+			}
+		} else {
+			cmpdata_delete(record);
+		}
 		cmpdata_reset();
 	}	
 	// Delete longvar data
@@ -488,6 +540,8 @@ char* _obj_field(char mode){
 	// $v0 contains the address of object.
 	int i;
 	char* err;
+	int* record;
+	char fastfield;
 	do {
 		i=check_var_name();
 		if (i<65536) return ERR_SYNTAX;
@@ -506,11 +560,38 @@ char* _obj_field(char mode){
 			// This is a string field. Raise 31st bit.
 			i|=0x80000000;
 		}
-		check_obj_space(2);
-		g_object[g_objpos++]=0x3C050000|((i>>16)&0x0000FFFF); // lui   a1,xxxx
-		g_object[g_objpos++]=0x34A50000|(i&0x0000FFFF);       // ori a1,a1,xxxx
-		// First and second arguments are address of object and field name, respectively.
-		call_quicklib_code(lib_obj_field,ASM_ADDU_A0_V0_ZERO);
+		// Check if Fast Field Access can be used.
+		cmpdata_reset();
+		while(record=cmpdata_find(CMPDATA_FASTFIELD)){
+			if (record[1]==(i&0x7FFFFFFF)) break;
+		}
+		if (!record) {
+			// Record wasn't found
+			fastfield=0;
+		} else if (1!=g_num_classes && !g_option_fastfield) {
+			// No fast field opttion
+			fastfield=0;
+		} else if (!(record[0]&0xffff)) {
+			// The same field name used twice at the different positions
+			fastfield=0;
+		} else {
+			// All requirements passed
+			fastfield=1;
+		}
+		// Generate code here
+		if (fastfield) {
+			// Get field value in $v0 and address in $v1
+			i=(record[0]&0xffff)*4;
+			check_obj_space(2);
+			g_object[g_objpos++]=0x24430004|i; // addiu v1,v0,xxxx
+			g_object[g_objpos++]=0x8C620000;   // lw v0,0(v1)
+		} else {
+			check_obj_space(2);
+			g_object[g_objpos++]=0x3C050000|((i>>16)&0x0000FFFF); // lui   a1,xxxx
+			g_object[g_objpos++]=0x34A50000|(i&0x0000FFFF);       // ori a1,a1,xxxx
+			// First and second arguments are address of object and field name, respectively.
+			call_quicklib_code(lib_obj_field,ASM_ADDU_A0_V0_ZERO);
+		}
 		// Check if "." follows
 		if (g_source[g_srcpos]=='.') {
 			// "." found. $v0 is adress of an object. See the field.

--- a/mips/megalopa/class.txt
+++ b/mips/megalopa/class.txt
@@ -56,9 +56,6 @@ METHOD命令で宣言されたメソッドは、すべてパブリックです
 メソッドが指定された場合、オブジェクト作成時に、このメソッドが呼ばれます。INIT
 メソッドに引数を与える事も可能です(引数は必須ではありません)。
 
-クラス中でオブジェクトへのポインターが必要な場合は、ARGS(-2)で取り出す事が出来
-ます。
-
 記述例(CLASS1.BASの名前で保存)：
 　FIELD PUBLIC TEST1,TEST2
 　FIELD PRIVATE TEST3

--- a/mips/megalopa/compiler.c
+++ b/mips/megalopa/compiler.c
@@ -163,7 +163,7 @@ char* compile_line(void){
 			printstr(resolve_label(g_line));
 			return ERR_MULTIPLE_LABEL;
 		}
-		if (!g_nolinenum) {
+		if (!g_option_nolinenum) {
 			check_obj_space(1);
 			g_object[g_objpos++]=0x34160000|g_line; //ori         s6,zero,xxxx;
 		}

--- a/mips/megalopa/compiler.h
+++ b/mips/megalopa/compiler.h
@@ -213,7 +213,7 @@ extern int g_var_mem[ALLOC_BLOCK_NUM];
 extern unsigned short g_var_pointer[ALLOC_BLOCK_NUM];
 extern unsigned short g_var_size[ALLOC_BLOCK_NUM];
 extern char g_temp_area_used;
-extern char g_nolinenum;
+extern char g_option_nolinenum;
 extern int* g_heap_mem;
 extern int g_max_mem;
 extern char g_disable_break;
@@ -225,6 +225,8 @@ extern int g_long_name_var_num;
 extern char g_music_active;
 extern int g_class;
 extern int g_compiling_class;
+extern unsigned char g_num_classes;
+extern char g_option_fastfield;
 extern int g_temp;
 
 /* Prototypes */
@@ -412,13 +414,14 @@ char* interrupt_statement();
 #define ERR_NO_INIT (char*)(g_err_str[28])
 
 /* compile data type numbers */
-#define CMPDATA_RESERVED 0
-#define CMPDATA_USEVAR   1
-#define CMPDATA_CLASS    2
-#define CMPDATA_FIELD    3
-#define CMPDATA_STATIC   4
-#define CMPDATA_UNSOLVED 5
-#define CMPDATA_TEMP     6
+#define CMPDATA_RESERVED  0
+#define CMPDATA_USEVAR    1
+#define CMPDATA_CLASS     2
+#define CMPDATA_FIELD     3
+#define CMPDATA_STATIC    4
+#define CMPDATA_UNSOLVED  5
+#define CMPDATA_TEMP      6
+#define CMPDATA_FASTFIELD 7
 // Sub types follow
 #define CMPTYPE_PUBLIC_FIELD 0
 #define CMPTYPE_PRIVATE_FIELD 1

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -228,32 +228,28 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
+"USECLASS CLASS1,CLASS2\n"
+"OPTION FASTFIELD\n"
 "CLS\n"
-"LABEL TEST_:i=0/0\n"
-"\n"
-"\n"
+"o=new(CLASS1)\n"
+"o.T1=123\n"
+"print o.T2()\n"
 "\n"
 "\n"
 "\n"
 "\n";
 
 static const char class1text[]=
-"STATIC T1\n"
-"useclass CLASS2\n"
-"method T3\n"
-" return CLASS2::T2\n"
-"method T5\n"
-" return T1\n"
+"FIELD T1\n"
+"method T2\n"
+" return T1+100\n"
 "\n"
 "\n";
 
 static const char class2text[]=
-"STATIC T2\n"
-"useclass CLASS1\n"
-"method T4\n"
-" return CLASS1::T1\n"
+"FIELD T3\n"
 "method T6\n"
-" return T2\n"
+" return T3+100\n"
 "\n"
 "\n"
 "\n"

--- a/mips/megalopa/file.c
+++ b/mips/megalopa/file.c
@@ -124,7 +124,8 @@ int compile_and_link_file(char* buff,char* appname){
 		}
 
 		// Option initialization(s)
-		g_nolinenum=0;
+		g_option_nolinenum=0;
+		g_option_fastfield=0;
 
 		// Compile the file
 		err=compile_file();
@@ -181,6 +182,7 @@ int compile_and_link_class(char* buff,int class){
 	int data[2];
 	unsigned short cwd_id;
 	int* record;
+	g_num_classes++;
 	while(1){
 		// Begin compiling class
 		err=begin_compiling_class(class);
@@ -250,7 +252,10 @@ int compile_and_link_class(char* buff,int class){
 
 int compile_and_link_main_file(char* buff,char* appname){
 	int i;
+	// Reset parameters
 	g_compiling_class=0;
+	g_num_classes=0;
+	// Compile the file
 	i=compile_and_link_file(buff,appname);
 	if (i) return i;
 	return 0;

--- a/mips/megalopa/globalvars.c
+++ b/mips/megalopa/globalvars.c
@@ -56,7 +56,7 @@ unsigned short g_var_size[ALLOC_BLOCK_NUM];
 char g_temp_area_used;
 
 // Flag to use option nolinenum
-char g_nolinenum;
+char g_option_nolinenum;
 
 // Heap area
 int* g_heap_mem;
@@ -88,8 +88,12 @@ char g_music_active;
 
 // Class name being compiled
 int g_class;
-// Flag to compile class file
+// Flag (and class name) to compile class file
 int g_compiling_class;
+// Number of classes used
+unsigned char g_num_classes;
+// OPTION FASTFIELD
+char g_option_fastfield;
 
 // General purpose integer used for asigning value with pointer
 int g_temp;

--- a/mips/megalopa/help.txt
+++ b/mips/megalopa/help.txt
@@ -635,11 +635,13 @@ SYSTEM関数及びSYSTEMステートメントを用いて、各種システム
 SYSTEM$(0)
 	MachiKania バージョン文字列、"Zoea"等を返す。
 SYSTEM$(1)
-	MachiKania バージョン文字列、"1.0"等を返す。
+	MachiKania バージョン文字列、"1.2"等を返す。
 SYSTEM$(2)
-	BASIC バージョン文字列、"KM-1200"等を返す。
+	BASIC バージョン文字列、"KM-1208"等を返す。
 SYSTEM$(3)
 	現在実行中のHEXファイル名、"ZOEA.HEX"等を返す。
+SYSTEM(4)
+	現在実行中のCPUのクロック周波数を返す。
 SYSTEM(20)
 	キャラクターディスプレイ横幅を返す。
 SYSTEM(21)
@@ -817,7 +819,7 @@ CALL x
 ＜ヒント＞
 MachiKania ver 1.2 以降、FOR-NEXTループ、WHILE-WENDループ、DO-LOOPループの途中で、
 RETURN文が使えるようになりました。ただし、GOTO文でループの外に飛ぶと、予期せぬ結
-果（機器のリセット等）を引き起こします。ただし、GOSUB文でサブルーチンを呼んだり、別の
+果（機器のリセット等）を引き起こします。また、GOSUB文でサブルーチンを呼んだり、別の
 ループをネストして使う事は可能です。
 
 ON GOTO分やON GOSUB文はサポートしていません。ただし、例えば次のように記述す
@@ -841,6 +843,7 @@ ON GOTO分やON GOSUB文はサポートしていません。ただし、例え
 　・オプション機能(OPTIONステートメント)を追加。
 　・アイドル機能(IDLEステートメント)を追加。
 　・EXEC()関数を追加。
+　・変数名などで、英数字に加えてアンダースコアーが使用可能に。
 ・KM-1302 2019年3月公開。
 　・オブジェクト指向プログラミングに対応
 　・args(0)で引数の数を取得できるようにした

--- a/mips/megalopa/statement.c
+++ b/mips/megalopa/statement.c
@@ -1568,7 +1568,9 @@ char* option_statement(){
 	while(1){
 		next_position();
 		if (nextCodeIs("NOLINENUM")) {
-			g_nolinenum=1;
+			g_option_nolinenum=1;
+		} else if (nextCodeIs("FASTFIELD")) {
+			g_option_fastfield=1;
 		} else {
 			return ERR_SYNTAX;
 		}