Commit: e677a14f0b3a2cf6e37bdc7db4baeedee1abbb4d - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revision: e677a14f0b3a2cf6e37bdc7db4baeedee1abbb4d (tree)
• Zeit: 2019-05-13 09:13:02
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

USECLIB and CLIB statements & functions.

Ändern Zusammenfassung

• add: mips/megalopa/clib.c
• modified: mips/megalopa/compiler.h
• modified: mips/megalopa/debug.c
• modified: mips/megalopa/error.c
• modified: mips/megalopa/file.c
• modified: mips/megalopa/function.c
• modified: mips/megalopa/globalvars.c
• modified: mips/megalopa/help.txt
• add: mips/megalopa/hexfile.c
• modified: mips/megalopa/main.h
• modified: mips/megalopa/megalopa.mcp
• modified: mips/megalopa/reservednames.js
• modified: mips/megalopa/sharedfiles.js
• modified: mips/megalopa/statement.c
• modified: mips/megalopa/varname.c

Diff

--- /dev/null
+++ b/mips/megalopa/clib.c
@@ -0,0 +1,329 @@
+/*
+   This file is provided under the LGPL license ver 2.1.
+   Written by K.Tanaka & Katsumi
+   http://www.ze.em-net.ne.jp/~kenken/index.html
+   http://hp.vector.co.jp/authors/VA016157/
+*/
+
+/*
+	This file is shared by Megalopa and Zoea
+*/
+
+#include "compiler.h"
+#include "api.h"
+#include "main.h"
+
+/*
+	CMPDATA_USECLIB structure
+		type:      CMPDATA_USECLIB (8)
+		len:       2
+		data16:    n/a (0)
+		record[1]: clib name as integer
+
+	CMPDATA_CLIBFUNC structure
+		type:      CMPDATA_CLIBFUNC (9)
+		len:       4
+		data16:    n/a (0)
+		record[1]: clib name as integer
+		record[2]: func name as integer
+		record[3]: pointer to function
+*/
+
+// CLIB name used (name as 31 bit integer)
+static unsigned int g_clib;
+
+char* useclib_statement(){
+	int i;
+	int* cmpdata;	
+	do {
+		next_position();
+		i=check_var_name();
+		if (i<65536) return ERR_SYNTAX;
+		// Check if the clib already exists
+		cmpdata_reset();
+		while(cmpdata=cmpdata_find(CMPDATA_USECLIB)){
+			if (cmpdata[1]==i) {
+				// The clib was already defined.
+				i=0;
+				break;
+			}
+		}
+		if (i) {
+			// Load new file to define clib.
+			g_clib=i;
+			return ERR_COMPILE_CLIB;
+		}
+		if (g_source[g_srcpos]==',') {
+			g_srcpos++;
+		} else {
+			break;
+		}
+	} while(1);
+	return 0;
+}
+
+/*
+ * g_data[] contains the data from MachiKania compiler for this library
+ * g_data[0] : lib_calloc_memory
+ * g_data[1] : lib_delete
+ * g_data[2] : g_gp
+ * g_data[3-]: Reserved for higher version of CLIB
+ */
+void* g_data_for_clib[]={
+	lib_calloc_memory,
+	lib_delete,
+	0, // = g_gp
+};
+
+void* call_clib_init(void** data, void* address){
+	// Store gp and ra
+	asm volatile("#":::"s0");
+	asm volatile("#":::"ra");
+	asm volatile("addu $t9,$a1,$zero");
+	asm volatile("addu $s0,$gp,$zero");
+	asm volatile("jalr $ra,$t9");
+	asm volatile("addu $gp,$s0,$zero");
+}
+
+char* clib_main(){
+	char* err;
+	unsigned int begin,end,addr;
+	void* clibdata;
+	int* functions;
+	int* got;
+	int i,opos,adjust;
+	char* clib;
+	int record[3];
+	// Insert CMPDATA_USELIB
+	record[0]=g_clib;
+	err=cmpdata_insert(CMPDATA_USECLIB,0,&record[0],1);
+	if (err) return err;
+	// Determine begin and end addresses
+	begin=0x000fffff;
+	end=0;
+	while(1){
+		err=hex_read_line();
+		if (err) return err;
+		if (g_hexline.type==1) {
+			// EOF
+			break;
+		} else if (g_hexline.type==4) {
+			// extended linear address
+			addr=g_hexline.data[0];
+			addr=addr<<8;
+			addr|=g_hexline.data[0];
+			addr=addr<<16;
+		} else if (g_hexline.type==0) {
+			// data
+			addr&=0xffff0000;
+			addr|=g_hexline.address;
+			if (addr<begin) begin=addr;
+			if (end<addr && addr<0x000fffff) {
+				end=addr+g_hexline.size;
+			}
+		} else {
+			// Unknown type
+			return ERR_HEX_ERROR;
+		}
+	}
+	hex_reinit_file();
+	// Assign and clear region
+	check_obj_space((end-begin+3)>>2);
+	clib=(char*)&g_object[g_objpos];
+	got=(int*)&g_object[g_objpos];
+	for(i=0;i<((end-begin+3)>>2);i++) g_object[g_objpos++]=0;
+	// Load binary from HEX file
+	while(1){
+		err=hex_read_line();
+		if (err) return err;
+		if (g_hexline.type==1) {
+			// EOF
+			break;
+		} else if (g_hexline.type==4) {
+			// extended linear address
+			addr=g_hexline.data[0];
+			addr=addr<<8;
+			addr|=g_hexline.data[0];
+			addr=addr<<16;
+		} else if (g_hexline.type==0) {
+			// data
+			addr&=0xffff0000;
+			addr|=g_hexline.address;
+			for(i=0;i<g_hexline.size;i++){
+				clib[addr-begin+i]=g_hexline.data[i];
+			}
+		} else {
+			// Unknown type
+			return ERR_HEX_ERROR;
+		}
+	}
+	// Calculate the adjustment value.
+	// Note that the address of clib_init() is 0x8000.
+	adjust=(int)clib+0x8000-begin-0xA0008000;
+	// Modify Global Offset Table (GOT)
+	for(i=0;i<(0x8000-begin)>>2;i++){
+		if ((got[i]&0xFFF00000)==0xA0000000) {
+			got[i]+=adjust;
+		}
+	}
+	// Prepare g_data_for_clib[]
+	g_data_for_clib[2]=(void*)g_gp;
+	// Call the clib_init() to get the address of clibdata array.
+	clibdata=call_clib_init(&g_data_for_clib[0],(void*)0xA0008000+adjust);
+	// Check version
+	if (((int*)clibdata)[0]>SYSVERI) {
+		return "Newer version of C library than MachiKania cannot be used.";
+	}
+	// Get functions array
+	clibdata=(void*)(((int*)clibdata)[2])+adjust;
+	functions=clibdata;
+	// Construct CMPDATA_CLIBFUNC records.
+	while(clib=(char*)functions[0]){
+		clibdata=(void*)functions[1];
+		functions+=2;
+		// clib is function name as string
+		// clibdata is address of C function
+		clib+=adjust;
+		clibdata+=adjust;
+		i=str_to_name_int(clib);
+		if (i<65536) return "Wrong C library function name";
+		record[0]=g_clib;
+		record[1]=i;
+		record[2]=(int)clibdata;
+		err=cmpdata_insert(CMPDATA_CLIBFUNC,0,&record[0],3);
+		if (err) return err;
+	}
+	// Initial assembly is a jump statement to jump to the the following routine.
+	g_object[0]=0x08000000 | ((((int)(&g_object[g_objpos]))&0x0FFFFFFF)>>2); // j xxxxxxxx
+	// All done
+	return 0;
+}
+
+char* useclib_begin(char* buff){
+	int i,j,cwd_id;
+	char* err;
+	char* clibname;
+	char filename[11];
+	int* record;
+	// Remove a objects before USECLIB statement
+	g_objpos=0;
+	// Insert twp NOP assemblies. This will be replaced by branch statement.
+	check_obj_space(2);
+	g_object[g_objpos++]=0x00000000; // nop
+	g_object[g_objpos++]=0x00000000; // nop
+	// Construct HEX file name to open
+	clibname=resolve_label(g_clib);
+	for(i=0;filename[i]=clibname[i];i++);
+	filename[i++]='.';
+	filename[i++]='H';
+	filename[i++]='E';
+	filename[i++]='X';
+	filename[i++]=0;
+	// Open file in current directory
+	err=hex_init_file(buff,filename);
+	if (!err) {
+		// HEX file found in current directory.
+		err=clib_main();
+		hex_close_file();
+	} else {
+		// Hex file not found in current directory.
+		// Find it in LIB directory.
+		if (!FSgetcwd(buff,256)) return ERR_UNKNOWN;
+		for(i=0;buff[i];i++);
+		cwd_id=cmpdata_get_id();
+		if (!cwd_id) return ERR_UNKNOWN;
+		err=cmpdata_insert(CMPDATA_TEMP,cwd_id,(int*)(&buff[0]),(i+1+3)>>2);
+		if (err) return err;
+		// Change current directory to class library directory
+		for(i=0;buff[i]="\\LIB\\"[i];i++);
+		for(j=0;buff[i++]=clibname[j];j++);
+		buff[i]=0;
+		FSchdir(buff);
+		err=hex_init_file(buff,filename);
+		if (!err) {
+			// HEX file found in LIB directory
+			err=clib_main();
+			hex_close_file();
+		} else {
+			err=ERR_NO_CLIB;
+		}
+		// Restore current dirctory
+		cmpdata_reset();
+		while(record=cmpdata_find(CMPDATA_TEMP)){
+			if ((record[0]&0xffff)==cwd_id) break;
+		}
+		if (!record) return ERR_UNKNOWN;
+		FSchdir((char*)(&record[1]));
+		cmpdata_delete(record);
+	}
+	return err;
+}
+
+void lib_clib(int* params, void* address){
+	// Store gp and ra
+	asm volatile("#":::"s0");
+	asm volatile("#":::"ra");
+	asm volatile("addu $t9,$a1,$zero");
+	asm volatile("addu $s0,$gp,$zero");
+	asm volatile("lw $a3,16($a0)");
+	asm volatile("lw $a2,12($a0)");
+	asm volatile("lw $a1,8($a0)");
+	asm volatile("lw $a0,4($a0)");
+	asm volatile("jalr $ra,$t9");
+	asm volatile("addu $gp,$s0,$zero");
+}
+
+char* clib_statement(){
+	char* err;
+	int* record;
+	int clib,func;
+	int numparams,stack;
+	// CLIB name
+	next_position();
+	clib=check_var_name();
+	if (clib<65536) return ERR_SYNTAX;
+	// Check if the clib exists
+	cmpdata_reset();
+	while (record=cmpdata_find(CMPDATA_USECLIB)){
+		if (record[1]==clib) break;
+	}
+	if (!record) return ERR_NO_CLIB;
+	next_position();
+	if (g_source[g_srcpos++]!=',') return ERR_SYNTAX;
+	// Function name
+	next_position();
+	func=check_var_name();
+	if (func<65536) return ERR_SYNTAX;
+	cmpdata_reset();
+	while (record=cmpdata_find(CMPDATA_CLIBFUNC)){
+		if (record[1]==clib && record[2]==func) break;
+	}
+	if (!record) return "Function not found in the C library";
+	// Construct parameter(s)
+	next_position();
+	numparams=0;
+	while (g_source[g_srcpos]==',') {
+		numparams++;
+		if (4<numparams) return ERR_SYNTAX;
+		else if (1==numparams) {
+			check_obj_space(1);
+			stack=g_objpos++;
+		}
+		g_srcpos++;
+		g_object[stack]=0x27BD0000|(65536-numparams*4);                     // addiu sp,sp,-xx
+		err=get_stringFloatOrValue();
+		if (err) return err;
+		check_obj_space(1);
+		g_object[g_objpos++]=0xAFA20000|(numparams*4);                      // sw    v0,xx(sp)
+		next_position();
+	}
+	// Call CLIB
+	check_obj_space(2);
+	g_object[g_objpos++]=0x3C050000|(((unsigned int)record[3])>>16);        // lui   a1,xxxx
+	g_object[g_objpos++]=0x34A50000|(((unsigned int)record[3])&0x0000FFFF); // ori   a1,a1,xxxx
+	call_quicklib_code(lib_clib,ASM_ADDU_A0_SP_ZERO);
	// All done
+	check_obj_space(1);
+	if (numparams) g_object[g_objpos++]=0x27BD0000|(numparams*4);           // addiu sp,sp,xx
+	return 0;
+}
+

--- a/mips/megalopa/compiler.h
+++ b/mips/megalopa/compiler.h
@@ -40,6 +40,14 @@
 // RAM size used for object and heap
 #define RAMSIZE (PERSISTENT_RAM_SIZE-EXCEPTION_DATA_SIZE)
 
+/* Structures */
+typedef struct{
+	unsigned char  size;
+	unsigned short address;
+	unsigned char  type;
+	unsigned char data[16];
+} HEXLINE;
+
 /* Enums */
 enum variable{
 	VAR_INTEGER,
@@ -228,6 +236,7 @@ extern int g_class;
 extern int g_compiling_class;
 extern unsigned char g_num_classes;
 extern char g_option_fastfield;
+extern HEXLINE g_hexline;
 extern int g_temp;
 
 /* Prototypes */
@@ -340,6 +349,7 @@ int* cmpdata_findfirst(unsigned char type);
 void cmpdata_delete(int* record);
 
 int check_var_name();
+int str_to_name_int(char* str);
 int get_var_number();
 int search_var_name(int nameint);
 char* register_var_name(int nameint);
@@ -384,6 +394,16 @@ char* coretimer_statement();
 char* coretimer_function();
 char* interrupt_statement();
 
+char* useclib_statement();
+char* useclib_begin(char* buff);
+char* clib_statement();
+
+char* hex_init_file(char* buff,char* filename);
+void hex_reinit_file();
+void hex_close_file();
+char* hex_read_line();
+char* hex_construct_line();
+
 /* Error messages */
 #define ERR_SYNTAX (char*)(g_err_str[0])
 #define ERR_NE_BINARY (char*)(g_err_str[1])
@@ -415,6 +435,9 @@ char* interrupt_statement();
 #define ERR_INVALID_CLASS (char*)(g_err_str[27])
 #define ERR_NO_INIT (char*)(g_err_str[28])
 #define ERR_OPTION_CLASSCODE (char*)(g_err_str[29])
+#define ERR_COMPILE_CLIB (char*)(g_err_str[30])
+#define ERR_NO_CLIB (char*)(g_err_str[31])
+#define ERR_HEX_ERROR (char*)(g_err_str[32])
 
 /* compile data type numbers */
 #define CMPDATA_RESERVED  0
@@ -425,6 +448,8 @@ char* interrupt_statement();
 #define CMPDATA_UNSOLVED  5
 #define CMPDATA_TEMP      6
 #define CMPDATA_FASTFIELD 7
+#define CMPDATA_USECLIB   8
+#define CMPDATA_CLIBFUNC  9
 // Sub types follow
 #define CMPTYPE_PUBLIC_FIELD 0
 #define CMPTYPE_PRIVATE_FIELD 1
@@ -485,6 +510,7 @@ char* interrupt_statement();
 	} while (0)	
 
 #define ASM_NOP 0x00000000
+#define ASM_ADDU_A0_SP_ZERO 0x03A02021
 #define ASM_ADDU_A0_V0_ZERO 0x00402021
 #define ASM_ADDU_A1_V0_ZERO 0x00402821
 #define ASM_ADDU_A2_V0_ZERO 0x00403021

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -34,6 +34,7 @@ static const char initext[];
 static const char bastext[];
 static const char class1text[];
 static const char class2text[];
+static const char hextext[];
 
 static char* readtext;
 static int filepos;
@@ -130,6 +131,9 @@ FSFILE* FSfopen(const char * fileName, const char *mode){
 	} else if (fileName[i+1]=='I' && fileName[i+2]=='N' && fileName[i+3]=='I') {
 		// INI file
 		readtext=(char*)&initext[0];
+	} else if (fileName[i+1]=='H' && fileName[i+2]=='E' && fileName[i+3]=='X') {
+		// HEX file
+		readtext=(char*)&hextext[0];
 	} else if (fileName[i+1]=='B' && fileName[i+2]=='A' && fileName[i+3]=='S') {
 		// Select BAS file
 		if (fileName[i-6]=='C' && fileName[i-5]=='L' && fileName[i-4]=='A' &&
@@ -184,6 +188,7 @@ long FSftell (FSFILE * fo){
 	return 0;
 }
 int FSfseek(FSFILE *stream, long offset, int whence){
+	filepos=offset;
 	return 0;
 }
 /*
@@ -228,12 +233,11 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
-"USECLASS CLASS1,CLASS2\n"
-"OPTION FASTFIELD\n"
+"useclib TCLIB\n"
 "CLS\n"
-"o=new(CLASS1)\n"
-"o.T1=123\n"
-"print o.T2()\n"
+"print clib$(TCLIB,TEST,0);\n"
+"print clib$(TCLIB,TEST,1)\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -255,6 +259,36 @@ static const char class2text[]=
 "\n"
 "\n";
 
+static const char hextext[]=
+":020000040000fa\n"
+":1080000000001c3c707f9c2721e09903e0ffbd2706\n"
+":108010001c00bfaf1000bcaf1880828f000044acc2\n"
+":108020001c80998f09f82003000000001000bc8f0d\n"
+":108030002080828f1c00bf8f0800e0032000bd2736\n"
+":020000040000fa\n"
+":107f80000000000000000080a07f00a0708000a022\n"
+":107f9000fc8000a0000001a0788000a0000000008c\n"
+":020000040000fa\n"
+":108070000800e0030000000000001c3cf87e9c2784\n"
+":1080800021e09903040080542480828f2480828f11\n"
+":108090000800e003d48042240800e003e480422486\n"
+":1080a00000001c3cd07e9c2721e09903e0ffbd2707\n"
+":1080b0001c00bfaf1000bcaf2880998f09f82003c7\n"
+":1080c000000000001000bc8f1c00bf8f0800e00300\n"
+":0480d0002000bd27a8\n"
+":020000040000fa\n"
+":1080d40048656c6c6f20576f726c6421000000005f\n"
+":1080e4005468697320697320612074657374000097\n"
+":0880f400544553540000000044\n"
+":020000040000fa\n"
+":1080fc0040010000800000001c8100a00000000076\n"
+":020000040000fa\n"
+":10810c0000000000222222222222222222222222cb\n"
+":020000040000fa\n"
+":0c811c00f48000a0a08000a00000000083\n"
+":00000001FF\n"
+;
+
 /*
     Test function for constructing assemblies from C codes.
 */
@@ -285,6 +319,15 @@ int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	return a2+a3;
 }
 
+int _debug_test2(int a0, int a1, int a2, int a3, int a4){
+	int v0;
+	v0=v0+a0;
+	v0=v0*a1;
+	v0=v0 & a3;
+	v0=v0 | a4;
+	return v0;
+}
+
 /*
 	Break point used for debugging object code.
 

--- a/mips/megalopa/error.c
+++ b/mips/megalopa/error.c
@@ -42,6 +42,9 @@ const char* g_err_str[]={
 	"Invalid in class file",
 	"INIT method does not exist",
 	"ERR_OPTION_CLASSCODE",
+	"ERR_COMPILE_CLIB",
+	"C library not found",
+	"HEX file syntax error",
 };
 
 char* resolve_label(int s6){

--- a/mips/megalopa/file.c
+++ b/mips/megalopa/file.c
@@ -13,10 +13,12 @@
 #include "api.h"
 #include "compiler.h"
 
-static FSFILE* g_fhandle;
-static char* g_fbuff;
-static int g_size;
-static int g_filepoint;
+// Variables used for file handling, shared with the other components
+// Note that only one file can be open
+FSFILE* g_fhandle;
+char* g_fbuff;
+int g_size;
+int g_filepoint;
 
 char* init_file(char* buff,char* appname){
 	// Open file
@@ -147,7 +149,7 @@ int compile_and_link_file(char* buff,char* appname){
 		err=compile_file();
 		close_file();
 
-		// If compiling a class file is required, do it.
+		// If compiling a class file or a clib is required, do it.
 		if (err==ERR_COMPILE_CLASS) {
 			j=g_compiling_class;
 			i=compile_and_link_class(buff, g_class);
@@ -155,6 +157,11 @@ int compile_and_link_file(char* buff,char* appname){
 			if (i) return i;
 			// Continue compiling current file from the beginning.
 			continue;
+		} else if (err==ERR_COMPILE_CLIB) {
+			err=useclib_begin(buff);
+			// Continue compiling current file from the beginning.
+			if (err) break;
+			continue;
 		}
 		break;
 	}
@@ -239,7 +246,7 @@ int compile_and_link_class(char* buff,int class){
 			// Restore current dirctory
 			cmpdata_reset();
 			while(record=cmpdata_find(CMPDATA_TEMP)){
-				if (cwd_id=(record[0]&0xffff)) break;
+				if ((record[0]&0xffff)==cwd_id) break;
 			}
 			if (!record) break;
 			FSchdir((char*)(&record[1]));

--- a/mips/megalopa/function.c
+++ b/mips/megalopa/function.c
@@ -494,6 +494,8 @@ char* float_function(void){
 		err=gosub_function();
 	} else if (nextCodeIs("ARGS#(")) {
 		err=args_function();
+	} else if (nextCodeIs("CLIB#(")) {
+		err=clib_statement();
 	} else if (nextCodeIs("PI#")) {
 		return float_constant(3.141593);
 	} else {
@@ -520,6 +522,7 @@ static const void* str_func_list[]={
 	"SYSTEM$(",system_function,
 	"FINPUT$(",finput_function,
 	"GETDIR$(",getdir_function,
+	"CLIB$(",clib_statement,
 	// Additional functions follow
 	ADDITIONAL_STR_FUNCTIONS
 };
@@ -609,6 +612,7 @@ static const void* int_func_list[]={
 	"EXEC(",exec_function,
 	"CORETIMER(",coretimer_function,
 	"READKEY(",readkey_function,
+	"CLIB(",clib_statement,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };

--- a/mips/megalopa/globalvars.c
+++ b/mips/megalopa/globalvars.c
@@ -95,5 +95,8 @@ unsigned char g_num_classes;
 // OPTION FASTFIELD
 char g_option_fastfield;
 
+// Result of reading a HEX file line
+HEXLINE g_hexline;
+
 // General purpose integer used for asigning value with pointer
 int g_temp;

--- a/mips/megalopa/help.txt
+++ b/mips/megalopa/help.txt
@@ -863,7 +863,7 @@ ON GOTO分やON GOSUB文はサポートしていません。ただし、例え
 を扱いたい場合は、同名の変数をVAR指定しないようにして下さい。
 
 ＜バージョン履歴＞
-・KM-1303 2019年5月公開。
+・KM-1303 2019年？月公開。
 　・タイマー機能(USETIMER,TIMER, CORETIMERステートメントとTIMER(), CORETIMER()関
 　　数)を追加。
 　・割り込み機能(INTERRUPTステートメント)を追加。

--- /dev/null
+++ b/mips/megalopa/hexfile.c
@@ -0,0 +1,222 @@
+/*
+   This file is provided under the LGPL license ver 2.1.
+   Written by K.Tanaka & Katsumi
+   http://www.ze.em-net.ne.jp/~kenken/index.html
+   http://hp.vector.co.jp/authors/VA016157/
+*/
+
+/*
+	This file is shared by Megalopa and Zoea
+*/
+
+#include "compiler.h"
+#include "api.h"
+
+/*
+ Intel HEX format example
+ :040bf000ffffffcf35
+    +--------------------- Byte count
+    |    +---------------- Address
+    |    |  +------------- Record type (00:Data, 01:EOF, 04: Extended linear addres
+    |    |  |        +---- Data
+    |    |  |        |  +- Checksum
+    |    |  |        |  |
+ : 04 0bf0 00 ffffffcf 35
+
+	Record types:
+		case 0:  // data
+		case 4:  // extended linear address
+		case 1:  // EOF
+
+*/
+
+/*
+	Example of HEX file
+
+:020000040000fa
+:1080000000001c3c707f9c2721e09903e0ffbd2706
+:108010001c00bfaf1000bcaf0e0080101880828f14
+:10802000000044ac1c80828f80ff42241c80848f1f
+:10803000000040a0010042242b184400fdff6054c2
+:10804000000040a02080998f09f820030000000064
+:108050001000bc8f2480828f1c00bf8f0800e003bb
+:048060002000bd2718
+:020000040000fa
+:107f80000000000000000080a47f00a0008000a08e
+:107f9000708000a0fc8000a0000001a0788000a0fc
+:047fa00000000000dd
+:020000040000fa
+:108070000800e0030000000000001c3cf87e9c2784
+:1080800021e09903040080542880828f2880828f09
+:108090000800e003d48042240800e003e480422486
+:1080a00000001c3cd07e9c2721e09903e0ffbd2707
+:1080b0001c00bfaf1000bcaf2c80998f09f82003c3
+:1080c000000000001000bc8f1c00bf8f0800e00300
+:0480d0002000bd27a8
+:020000040000fa
+:1080d40048656c6c6f20576f726c6421000000005f
+:1080e4005468697320697320612074657374000097
+:0880f400544553540000000044
+:020000040000fa
+:1080fc0040010000800000001c8100a00000000076
+:020000040000fa
+:10810c0000000000222222222222222222222222cb
+:020000040000fa
+:0c811c00f48000a0a08000a00000000083
+:00000001FF
+*/
+
+// Use the same global vars in file.c
+extern FSFILE* g_fhandle;
+extern char* g_fbuff;
+extern int g_size;
+extern int g_filepoint;
+// Vars used only in this file
+static unsigned char g_checksum;
+
+void hex_read_file(int blocklen){
+	int i;
+	if (blocklen==512) {
+		// This is first read. Initialize parameter(s).
+		g_srcpos=0;
+		g_filepoint=0;
+	} else if (g_size<512) {
+		// Already reached the end of file.
+		return;
+	} else {
+		// Shift buffer and source position 256 bytes.
+		for(i=0;i<256;i++) g_fbuff[i]=g_fbuff[i+256];
+		g_srcpos-=256;
+		g_filepoint+=256;
+	}
+	// Read 512 or 256 bytes from SD card.
+	g_size=512-blocklen+FSfread((void*)&g_fbuff[512-blocklen],1,blocklen,g_fhandle);
+	// All lower cases
+	for(i=512-blocklen;i<512;i++){
+		if ('A'<=g_fbuff[i] && g_fbuff[i]<='F') g_fbuff[i]+=0x20;
+	}
+}
+
+int hex_read_byte(){
+	unsigned char b1,b2;
+	b1=g_fbuff[g_srcpos++];
+	b2=g_fbuff[g_srcpos++];
+	if ('0'<=b1 && b1<='9') {
+		b1-='0';
+	} else if ('a'<=b1 && b1<='f') {
+		b1-='a';
+		b1+=0x0a;
+	} else {
+		return -1;
+	}
+	if ('0'<=b2 && b2<='9') {
+		b2-='0';
+	} else if ('a'<=b2 && b2<='f') {
+		b2-='a';
+		b2+=0x0a;
+	} else {
+		return -1;
+	}
+	b1=(b1<<4)|b2;
+	g_checksum+=b1;
+	return b1;
+}
+
+char* hex_read_line(){
+	int i,j;
+	// Initialize checksum
+	g_checksum=0;
+	// Maintain at least 256 characters in cache.
+	if (256<=g_srcpos) hex_read_file(256);
+	// Read a hex file line
+	if (g_fbuff[g_srcpos++]!=':') return ERR_HEX_ERROR;
+	// Read size
+	i=hex_read_byte();
+	if (i<0) return ERR_HEX_ERROR;
+	g_hexline.size=(unsigned char)i;
+	// Read address
+	i=hex_read_byte();
+	if (i<0) return ERR_HEX_ERROR;
+	g_hexline.address=(unsigned short)(i<<8);
+	i=hex_read_byte();
+	if (i<0) return ERR_HEX_ERROR;
+	g_hexline.address|=(unsigned short)(i);
+	// Ready type
+	i=hex_read_byte();
+	if (i<0) return ERR_HEX_ERROR;
+	g_hexline.type=(unsigned char)i;
+	// Read data
+	for(j=0;j<g_hexline.size;j++){
+		i=hex_read_byte();
+		if (i<0) return ERR_HEX_ERROR;
+		g_hexline.data[j]=(unsigned char)i;
+	}
+	// Read checksum
+	i=hex_read_byte();
+	if (i<0) return ERR_HEX_ERROR;
+	if (g_checksum) return ERR_HEX_ERROR;
+	// All done. Remove enter.
+	if (g_fbuff[g_srcpos]=='\r') g_srcpos++;
+	if (g_fbuff[g_srcpos]=='\n') g_srcpos++;
+	return 0;
+}
+
+static char g_hex_line[46];
+void hex_construct_byte(unsigned char data,int pos){
+	g_hex_line[pos]  ="0123456789abcdef"[data>>8];
+	g_hex_line[pos+1]="0123456789abcdef"[data&15];
+	g_checksum+=data;
+}
+char* hex_construct_line(){
+	int i;
+	g_checksum=0;
+	// Write size
+	hex_construct_byte(g_hexline.size,0);
+	// Write address
+	hex_construct_byte(g_hexline.address>>8,2);
+	hex_construct_byte(g_hexline.address&15,4);
+	// Write type
+	hex_construct_byte(g_hexline.type,6);
+	// Write data
+	for(i=0;i<g_hexline.size;i++){
+		hex_construct_byte(g_hexline.data[i],8+i);
+	}
+	// Write checksum
+	hex_construct_byte(0-g_checksum,8+i);
+	// All done. Add CRLF and 0x00
+	g_hex_line[10+i]=0x0d;
+	g_hex_line[11+i]=0x0a;
+	g_hex_line[12+i]=0;
+	return (char*)&g_hex_line[0];
+}
+
+void hex_reinit_file(){
+	// Go to point 0
+	FSfseek(g_fhandle,0,SEEK_SET);
+	// Initialize parameters
+	g_srcpos=0;
+	g_filepoint=0;
+	// Read first 512 bytes
+	hex_read_file(512);
+}
+
+char* hex_init_file(char* buff,char* filename){
+	// Open file
+	g_fhandle=FSfopen(filename,"r");
+	if (!g_fhandle) {
+		return ERR_UNKNOWN;
+	}
+	// Initialize parameters
+	g_fbuff=buff;
+	g_source=buff;
+	g_srcpos=0;
+	g_filepoint=0;
+	// Read first 512 bytes
+	hex_read_file(512);
+	return 0;
+}
+
+void hex_close_file(){
+	FSfclose(g_fhandle);
+}
+

--- a/mips/megalopa/main.h
+++ b/mips/megalopa/main.h
@@ -7,8 +7,9 @@
 
 #define MEGALOPA
 #define SYSVER1 "Megalopa"
-#define SYSVER2 "1.3"
-#define BASVER "KM-1303"
+#define SYSVER2 "1.4"
+#define SYSVERI 0x0140
+#define BASVER "KM-1304"
 
 #define INIFILE "MACHIKAM.INI" // 初期設定ファイル
 #define HEXFILE "MACHIKAM.HEX" // 実行中HEXファイル名がこれと一致した場合はエディタ起動

--- a/mips/megalopa/megalopa.mcp
+++ b/mips/megalopa/megalopa.mcp
@@ -72,6 +72,8 @@ file_044=.
 file_045=.
 file_046=.
 file_047=.
+file_048=.
+file_049=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -121,6 +123,8 @@ file_044=no
 file_045=no
 file_046=no
 file_047=no
+file_048=no
+file_049=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -166,10 +170,12 @@ file_040=no
 file_041=no
 file_042=no
 file_043=no
-file_044=yes
-file_045=yes
+file_044=no
+file_045=no
 file_046=yes
 file_047=yes
+file_048=yes
+file_049=yes
 [FILE_INFO]
 file_000=compiler.c
 file_001=debug.c
@@ -200,25 +206,27 @@ file_025=class.c
 file_026=args.c
 file_027=interface\keyinput.c
 file_028=timer.c
-file_029=api.h
-file_030=compiler.h
-file_031=debug.h
-file_032=editor.h
-file_033=main.h
-file_034=envspecific.h
-file_035=io.h
-file_036=interface\keyinput.h
-file_037=interface\lib_video_megalopa.h
-file_038=interface\ps2keyboard.h
-file_039=interface\sdfsio370f.h
-file_040=interface\lib_videoout_megalopa.X.a
-file_041=interface\ps2keyboard370f.X.a
-file_042=interface\sdfsio370fLib.X.a
-file_043=app_p32MX370F512H.ld
-file_044=help.txt
-file_045=reservednames.js
-file_046=class.txt
-file_047=sharedfiles.js
+file_029=clib.c
+file_030=hexfile.c
+file_031=api.h
+file_032=compiler.h
+file_033=debug.h
+file_034=editor.h
+file_035=main.h
+file_036=envspecific.h
+file_037=io.h
+file_038=interface\keyinput.h
+file_039=interface\lib_video_megalopa.h
+file_040=interface\ps2keyboard.h
+file_041=interface\sdfsio370f.h
+file_042=interface\lib_videoout_megalopa.X.a
+file_043=interface\ps2keyboard370f.X.a
+file_044=interface\sdfsio370fLib.X.a
+file_045=app_p32MX370F512H.ld
+file_046=help.txt
+file_047=reservednames.js
+file_048=class.txt
+file_049=sharedfiles.js
 [SUITE_INFO]
 suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337}
 suite_state=

--- a/mips/megalopa/reservednames.js
+++ b/mips/megalopa/reservednames.js
@@ -100,6 +100,7 @@ var namearray=[
 	'CHR',
 	'CIRCLE',
 	'CLEAR',
+	'CLIB',
 	'CLS',
 	'COLOR',
 	'COS',

--- a/mips/megalopa/sharedfiles.js
+++ b/mips/megalopa/sharedfiles.js
@@ -12,6 +12,7 @@
 var filearray=[
 	'args.c',
 	'class.c',
+	'clib.c',
 	'cmpdata.c',
 	'compiler.c',
 	'debug.c',
@@ -21,6 +22,7 @@ var filearray=[
 	'float.c',
 	'function.c',
 	'globalvars.c',
+	'hexfile.c',
 	'library.c',
 	'linker.c',
 	'memory.c',

--- a/mips/megalopa/statement.c
+++ b/mips/megalopa/statement.c
@@ -1754,6 +1754,8 @@ static const void* statement_list[]={
 	"INTERRUPT ",interrupt_statement,
 	"IDLE",idle_statement,
 	"CORETIMER",coretimer_statement,
+	"USECLIB",useclib_statement,
+	"CLIB",clib_statement,
 	// List of additional statements follows
 	ADDITIONAL_STATEMENTS
 };

--- a/mips/megalopa/varname.c
+++ b/mips/megalopa/varname.c
@@ -32,6 +32,7 @@ static const int reserved_var_names[]={
 	0x0001129b, /*CHR*/
 	0x0e7f3303, /*CIRCLE*/
 	0x0067525f, /*CLEAR*/
+	0x0003c489, /*CLIB*/
 	0x00011330, /*CLS*/
 	0x0069cb6b, /*COLOR*/
 	0x0001139f, /*COS*/
@@ -194,6 +195,18 @@ int check_var_name(){
 	return i;
 }
 
+int str_to_name_int(char* str){
+	int i;
+	char* src=g_source;
+	int pos=g_srcpos;
+	g_source=str;
+	g_srcpos=0;
+	i=check_var_name();
+	g_source=src;
+	g_srcpos=pos;
+	return i;
+}
+
 /*
 	int get_var_number();
 	This function returns variable number that can be used as the index of $s8