コミット: 1097fa880c989ed1259667ec25aab57935aa8b0f - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

コミットメタ情報

• リビジョン: 1097fa880c989ed1259667ec25aab57935aa8b0f (tree)
• 日時: 2019-05-25 03:49:31
• 作者: Katsumi <kmorimatsu@sour...>
• コミッター: Katsumi

ログメッセージ

CLIB and MOS for Zoea/Protozoea.

変更サマリ

• modified: mips/protozoea/App_32MX170F256B.ld
• modified: mips/protozoea/class.c
• modified: mips/protozoea/cmpdata.c
• modified: mips/protozoea/compiler.h
• modified: mips/protozoea/debug.c
• modified: mips/protozoea/envspecific.c
• modified: mips/protozoea/envspecific.h
• modified: mips/protozoea/error.c
• modified: mips/protozoea/file.c
• modified: mips/protozoea/float.c
• modified: mips/protozoea/function.c
• modified: mips/protozoea/globalvars.c
• modified: mips/protozoea/interface/ps2keyboard.h
• modified: mips/protozoea/interface/videoout.h
• modified: mips/protozoea/library.c
• modified: mips/protozoea/main.c
• modified: mips/protozoea/main.h
• modified: mips/protozoea/protozoea.mcp
• modified: mips/protozoea/reservednames.js
• modified: mips/protozoea/run.c
• modified: mips/protozoea/sharedfiles.js
• modified: mips/protozoea/statement.c
• modified: mips/protozoea/string.c
• modified: mips/protozoea/value.c
• modified: mips/protozoea/varname.c
• modified: mips/zoea/App_32MX170F256B.ld
• modified: mips/zoea/basic.mcp
• modified: mips/zoea/class.c
• modified: mips/zoea/cmpdata.c
• modified: mips/zoea/compiler.h
• modified: mips/zoea/debug.c
• modified: mips/zoea/editor.c
• modified: mips/zoea/envspecific.h
• modified: mips/zoea/error.c
• modified: mips/zoea/file.c
• modified: mips/zoea/float.c
• modified: mips/zoea/function.c
• modified: mips/zoea/globalvars.c
• modified: mips/zoea/library.c
• modified: mips/zoea/main.c
• modified: mips/zoea/main.h
• modified: mips/zoea/reservednames.js
• modified: mips/zoea/run.c
• modified: mips/zoea/sharedfiles.js
• modified: mips/zoea/statement.c
• modified: mips/zoea/string.c
• modified: mips/zoea/value.c
• modified: mips/zoea/varname.c

差分

--- a/mips/protozoea/App_32MX170F256B.ld
+++ b/mips/protozoea/App_32MX170F256B.ld
@@ -104,7 +104,9 @@ _GEN_EXCPT_ADDR          = _ebase_address + 0x180;
  *************************************************************************/
 MEMORY
 {
-  kseg0_program_mem    (rx)  : ORIGIN = (0x9D006000 + 0x1000 + 0x490), LENGTH = 0x40000 - (0x6000 + 0x1000 + 0x490) /* All C Files will be located here */
+  kseg0_program_mem    (rx)  : ORIGIN = (0x9D006000 + 0x1000 + 0x490), LENGTH = 0x40000 - (0x6000 + 0x1000 + 0x490 + 0xD400) /* Most of C Files will be located here */
+  /* PERSISTENT_RAM_SIZE: 0xD400, MachiKania object section (MOS) size: 0xD000 (to fit to Zoea) */
+  kseg2_program_mem    (rx)  : ORIGIN = (0x9D040000 - 0xD400), LENGTH = 0xD000 /* Some C Functions (editor and compiler) will be located here */
   exception_mem              : ORIGIN = 0x9D006000, LENGTH = 0x1000 /* Interrupt vector table */
   debug_exec_mem             : ORIGIN = 0x9FC00490, LENGTH = 0x760
   kseg0_boot_mem             : ORIGIN = 0x9D006000, LENGTH = 0x0 /* This memory region is dummy */
@@ -139,6 +141,27 @@ SECTIONS
 }
 SECTIONS
 {
+
+  /* MachiKania Object Section (MOS) (size: 0xD000) */
+  .machikaniaobjtext ORIGIN(kseg2_program_mem):
+  {
+    KEEP (*\statement.o(.text))
+    KEEP (*\function.o(.text))
+    KEEP (*\value.o(.text))
+    KEEP (*\string.o(.text))
+    KEEP (*\float.o(.text))
+    KEEP (*\cmpdata.o(.text))
+  } >kseg2_program_mem
+  .machikaniaobjrodata :
+  {
+    KEEP (*\statement.o(.rodata))
+    KEEP (*\function.o(.rodata))
+    KEEP (*\value.o(.rodata))
+    KEEP (*\string.o(.rodata))
+    KEEP (*\float.o(.rodata))
+    KEEP (*\cmpdata.o(.rodata))
+  } >kseg2_program_mem
+
   /* Boot Sections */
   .reset _RESET_ADDR :
   {

--- a/mips/protozoea/class.c
+++ b/mips/protozoea/class.c
@@ -876,7 +876,8 @@ char* static_method(char type){
 	char* err;
 	int* data;
 	int record[3];
-	int i,opos,method,stack;
+	int i,spos,opos,method,stack;
+	spos=g_srcpos;
 	next_position();
 	// Check class name
 	i=check_var_name();
@@ -891,12 +892,15 @@ char* static_method(char type){
 			break;
 		}
 	}
+	if (i) {
+		g_srcpos=spos;
+		return ERR_NO_CLASS;
+	}
 	// Check '::'
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
-	if (i) return ERR_NO_CLASS;
 	data=(int*)data[2];
 	// Check method
 	i=check_var_name();

--- a/mips/protozoea/cmpdata.c
+++ b/mips/protozoea/cmpdata.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 
 /*

--- a/mips/protozoea/compiler.h
+++ b/mips/protozoea/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,
@@ -187,6 +195,8 @@ enum functions{
 };
 
 /* Global vars (see globalvers.c) */
+extern const volatile int g_object_mos;
+extern const volatile int g_objpos_mos;
 extern int g_intconst;
 extern char g_valueisconst;
 extern unsigned int g_rnd_seed;
@@ -228,6 +238,8 @@ 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 char g_fs_valid;
 extern int g_temp;
 
 /* Prototypes */
@@ -247,6 +259,7 @@ char* compile_file();
 int compile_and_link_file(char* buff,char* appname);
 int compile_and_link_main_file(char* buff,char* appname);
 int compile_and_link_class(char* buff,int class);
+int create_self_running_hex(char* hexfilename);
 
 void err_break(void);
 void err_music(char* str);
@@ -340,6 +353,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 +398,23 @@ char* coretimer_statement();
 char* coretimer_function();
 char* interrupt_statement();
 
+char* useclib_statement();
+char* useclib_begin(char* buff);
+char* clib_method(char type);
+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();
+#ifdef  FS_DOT_H
+	char* hex_write(FSFILE* fhandle);
+	char* hex_write_address(FSFILE* fhandle,unsigned short addr);
+	char* hex_write_data_16(FSFILE* fhandle,unsigned short addr,unsigned int* object);
+	char* hex_write_eof(FSFILE* fhandle);
+#endif
+
 /* Error messages */
 #define ERR_SYNTAX (char*)(g_err_str[0])
 #define ERR_NE_BINARY (char*)(g_err_str[1])
@@ -415,6 +446,10 @@ 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])
+#define ERR_NO_CLASS_CLIB (char*)(g_err_str[32])
 
 /* compile data type numbers */
 #define CMPDATA_RESERVED  0
@@ -425,6 +460,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,13 +522,15 @@ 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
 #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
+#define ASM_ORI_A0_ZERO_    0x34040000
+#define ASM_ADDIU_A0_ZERO_  0x24040000
+#define ASM_LW_A0_XXXX_S8   0x8FC40000
+#define ASM_LW_A0_XXXX_S5   0x8EA40000
 
 // Interrupt macros
 // 32 different type interruptions are possible

--- a/mips/protozoea/debug.c
+++ b/mips/protozoea/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,10 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
-"USECLASS CLASS1,CLASS2\n"
-"OPTION FASTFIELD\n"
-"CLS\n"
-"o=new(CLASS1)\n"
-"o.T1=123\n"
-"print o.T2()\n"
+"useclib TCLIB\n"
+"print TCLIB::TEST$(0);\n"
+"print clib$(TCLIB::TEST,1)\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -255,6 +258,47 @@ static const char class2text[]=
 "\n"
 "\n";
 
+static const char hextext[]=
+":020000040000fa\n"
+":1080000000001c3c707f9c2721e09903e0ffbd2706\n"
+":108010001c00bfaf1000bcaf030080101880828f1f\n"
+":1080200005000010000044ac1c80998f09f8200363\n"
+":10803000000000001000bc8f2080828f1c00bf8fca\n"
+":088040000800e0032000bd2749\n"
+":020000040000fa\n"
+":107f80000000000000000080ac7f00a0508000a036\n"
+":107f9000708100a0548100a0000001a0388100a0e1\n"
+":0c7fa000588000a000000000000000005d\n"
+":020000040000fa\n"
+":108050000800e0030000000000001c3c187f9c2783\n"
+":1080600021e09903e0ffbd271c00bfaf1800b0afaf\n"
+":108070001000bcaf110080542880828f1880908f30\n"
+":108080000000048e2480998f09f82003000000006e\n"
+":108090001000bc8f2880848f248184240000058eea\n"
+":1080a0002c80998f09f82003000000001000bc8f7d\n"
+":1080b0002880828f0200001004814224148142240f\n"
+":1080c0001c00bf8f1800b08f0800e0032000bd2700\n"
+":1080d00000001c3ca07e9c2721e09903e0ffbd2707\n"
+":1080e0001c00bfaf1000bcaf3080998f09f820038f\n"
+":1080f000000000001000bc8f1c00bf8f0800e003d0\n"
+":048100002000bd2777\n"
+":020000040000fa\n"
+":1081040048656c6c6f20576f726c6421000000002e\n"
+":108114005468697320697320612074657374000066\n"
+":10812400434c494220746573742e000054455354e3\n"
+":048134000000000047\n"
+":020000040000fa\n"
+":108138000000a38c0c00a28c0c00428c08004000ac\n"
+":0c81480000007c8c0800e0030000000038\n"
+":020000040000fa\n"
+":108154000000838c0c00828c1800428c08004000c4\n"
+":0c81640000007c8c0800e003000000001c\n"
+":020000040000fa\n"
+":108170004001000080000000808100a0000000009d\n"
+":0c818000308100a0d08000a000000000b2\n"
+":00000001FF\n"
+;
+
 /*
     Test function for constructing assemblies from C codes.
 */
@@ -285,6 +329,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/protozoea/envspecific.c
+++ b/mips/protozoea/envspecific.c
@@ -240,9 +240,9 @@ int lib_system(int a0, int a1 ,int v0, int a3, int g_gcolor, int g_prev_x, int g
 		case 200:
 			// ON/OFF monitor
 			if (v0) {
-//				start_composite();
+				start_composite();
 			} else {
-//				stop_composite();
+				stop_composite();
 			}
 			break;
 		default:
@@ -250,3 +250,8 @@ int lib_system(int a0, int a1 ,int v0, int a3, int g_gcolor, int g_prev_x, int g
 	}
 	return 0;
 }
+
+// Do nothing in following functions.
+unsigned char shiftkeys(){ return 0; }
+void start_composite(){}
+void stop_composite(){}

--- a/mips/protozoea/envspecific.h
+++ b/mips/protozoea/envspecific.h
@@ -6,7 +6,9 @@
 */
 
 #define CPU_CLOCK_HZ 48000000
-#define PERSISTENT_RAM_SIZE (1024*53)
+#define PERSISTENT_RAM_SIZE (1024*53) // 0xD400
+#define MACHIKANIA_OBJ_ADDRESS (0x9D040000 - 0xD400)
+#define MACHIKANIA_OBJ_INFO (MACHIKANIA_OBJ_ADDRESS-16)
 
 int readbuttons();
 void scroll(int x, int y);

--- a/mips/protozoea/error.c
+++ b/mips/protozoea/error.c
@@ -42,6 +42,10 @@ 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",
+	"Class or C library not found",
 };
 
 char* resolve_label(int s6){

--- a/mips/protozoea/file.c
+++ b/mips/protozoea/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
@@ -87,6 +89,8 @@ char* compile_file(){
 	char* err;
 	// Read first 512 bytes
 	read_file(512);
+	// Skip BOM (UTF-8) if exists
+	if (0xEF==g_source[0] && 0xBB==g_source[1] && 0xBF==g_source[2]) g_srcpos=3;
 	// Compile line by line
 	while (g_size==512) {
 		err=compile_line();
@@ -147,7 +151,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 +159,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 +248,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]));
@@ -293,4 +302,4 @@ int compile_and_link_main_file(char* buff,char* appname){
 		to use the same long var name in different files (note that g_long_name_var_num is not reseted after
 		compiling each class code).
 	*/
-}
\ No newline at end of file
+}

--- a/mips/protozoea/float.c
+++ b/mips/protozoea/float.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "./compiler.h"
 #include "stdlib.h"
 

--- a/mips/protozoea/function.c
+++ b/mips/protozoea/function.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 #include "api.h"
 
@@ -494,12 +501,17 @@ 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 {
 		// Check if static method of a class
 		err=static_method('#');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('#');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -520,6 +532,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
 };
@@ -539,7 +552,10 @@ char* str_function(void){
 	} else {
 		// Check if static method of a class
 		err=static_method('$');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('$');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -609,6 +625,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
 };
@@ -626,9 +643,12 @@ char* function(void){
 		f=int_func_list[i+1];
 		err=f();
 	} else {
-		// Check if static method of a class
+		// Check if static method of a class of clib
 		err=static_method(0);
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method(0);
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;

--- a/mips/protozoea/globalvars.c
+++ b/mips/protozoea/globalvars.c
@@ -12,6 +12,13 @@
 #include "compiler.h"
 #include "main.h"
 
+// Store g_object/g_objpos values for MOS at jest before MACHIKANIA_OBJ_ADDRESS.
+// When these values are 0, MOS code is not loaded.
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-16))) _reserved1_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-12))) _reserved2_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-8)))  g_object_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-4)))  g_objpos_mos=0;
+
 // Contain the valus of $gp and $s6 (GPR of MIPS32)
 int g_gp;
 int g_s6;
@@ -95,5 +102,11 @@ unsigned char g_num_classes;
 // OPTION FASTFIELD
 char g_option_fastfield;
 
+// Flag if file system has been initialized
+char g_fs_valid;
+
+// Result of reading a HEX file line
+HEXLINE g_hexline;
+
 // General purpose integer used for asigning value with pointer
 int g_temp;

--- a/mips/protozoea/interface/ps2keyboard.h
+++ b/mips/protozoea/interface/ps2keyboard.h
@@ -161,8 +161,7 @@ extern unsigned char lockkey; // 
 extern unsigned char keytype; // キーボードの種類。0：日本語109キー、1：英語104キー
 
 //int ps2init(); // PS/2ライブラリ関連初期化。正常終了0、エラーで-1を返す
-//unsigned char shiftkeys(); // SHIFT関連キーの押下状態を返す
-#define shiftkeys() 0 // SHIFT関連キーの押下状態を返す
+unsigned char shiftkeys(); // SHIFT関連キーの押下状態を返す（常にゼロを返す）
 unsigned char ps2readkey();
 // 入力された1つのキーのキーコードをグローバル変数vkeyに格納（押されていなければ0を返す）
 // 下位8ビット：キーコード

--- a/mips/protozoea/interface/videoout.h
+++ b/mips/protozoea/interface/videoout.h
@@ -51,8 +51,8 @@ extern unsigned char *fontp;
 extern unsigned char twidth; //テキスト1行文字数（30 or 40）
 extern unsigned int bgcolor; // バックグランドカラー
 
-//void start_composite(void); //カラーコンポジット出力開始
-//void stop_composite(void); //カラーコンポジット出力停止
+void start_composite(void); //カラーコンポジット出力開始（なにもしない）
+void stop_composite(void); //カラーコンポジット出力停止（なにもしない）
 //void init_composite(void); //カラーコンポジット出力初期化
 void clearscreen(void); //テキスト画面クリア
 void set_palette(unsigned char n,unsigned char b,unsigned char r,unsigned char g); //テキストパレット設定

--- a/mips/protozoea/library.c
+++ b/mips/protozoea/library.c
@@ -779,6 +779,11 @@ int lib_file(enum functions func, int a0, int a1, int v0){
 	int i;
 	int buff[1];
 	char* str;
+
+	// Immediately return if file system is invalid.
+	// See also "case LIB_FILE:" in _call_library().
+	if (!g_fs_valid) return v0;
+
 	if (activefhandle) fhandle=s_fhandle[activefhandle-1];
 	switch(func){
 		case FUNC_FINIT:
@@ -1011,6 +1016,7 @@ int _call_library(int a0,int a1,int v0,enum libs a3){
 			scroll(g_libparams[1],v0);
 			return v0;
 		case LIB_FILE:
+			if (!g_fs_valid) err_str("File System not initialized");
 			return lib_file((enum functions)(a3 & FUNC_MASK),g_libparams[1],g_libparams[2],v0);
 		case LIB_KEYS:
 			return lib_keys(v0);

--- a/mips/protozoea/main.c
+++ b/mips/protozoea/main.c
@@ -146,6 +146,7 @@ int searchinittext(char *s){
 void readinifile(void){
 	FSFILE *fp;
 	char inittext[9];
+	if (!g_fs_valid) return;
 
 	fp=FSfopen(INIFILE,"r");
 	if(fp==NULL) return;
@@ -192,6 +193,7 @@ void printhex32(unsigned int d){
 
 int main(void){
 	char *appname,*s;
+	int use_editor;
 
 	if(DEVCFG1 & 0x8000){
 		// Set Clock switching enabled and reset
@@ -230,6 +232,18 @@ int main(void){
 	// Show blue screen if exception before soft reset.
 	blue_screen();
 
+	// 実行中HEXファイル名がHEXFILEと一致するかどうか
+	use_editor=0;
+	appname=(char*)FILENAME_FLASH_ADDRESS;
+	s=HEXFILE;
+	while(*s++==*appname++) {
+		if(*s==0) {
+			//テキストエディター呼び出し
+			use_editor=1;
+			break;
+		}
+	}
+
 	printstr("MachiKania BASIC System\n");
 	printstr(" Ver "SYSVER1" "SYSVER2" by KENKEN\n");
 	printstr("BASIC Compiler "BASVER"\n");
@@ -237,34 +251,46 @@ int main(void){
 	//SDカードファイルシステム初期化
 	setcursorcolor(COLOR_NORMALTEXT);
 	printstr("Init File System...");
-	// Initialize the File System
-	if(FSInit()==FALSE){ //ファイルシステム初期化
-		//エラーの場合停止
-		setcursorcolor(COLOR_ERRORTEXT);
-		printstr("\nFile System Error\n");
-		printstr("Insert Correct Card\n");
-		printstr("And Reset\n");
-		while(1) asm("wait");
+	g_fs_valid=FSInit(); //ファイルシステム初期化
+	if(g_fs_valid==FALSE){
+		if (use_editor || !g_objpos_mos) {
+			// Editorモードの場合、及び、BASファイル読み込みモードの場合
+			//エラーの場合停止
+			setcursorcolor(COLOR_ERRORTEXT);
+			printstr("\nFile System Error\n");
+			printstr("Insert Correct Card\n");
+			printstr("And Reset\n");
+			while(1) asm("wait");
+		} else {
+			// MOSモードの場合は、あと二回、トライ
+			// エラー表示の後、続ける
+			g_fs_valid=FSInit();
+			if(g_fs_valid==FALSE) g_fs_valid=FSInit();
+		}
 	}
-	printstr("OK\n");
+	if (g_fs_valid) printstr("OK\n");
+	else printstr("Failed\n");
 	readinifile(); //INIファイル読み込み
 
 	wait60thsec(60); //1秒待ち
 
 	// 実行中HEXファイル名がHEXFILEと一致した場合はエディタ起動
-	appname=(char*)FILENAME_FLASH_ADDRESS;
-	s=HEXFILE;
-	while(*s++==*appname++) if(*s==0) texteditor(); //テキストエディター呼び出し
+	if(use_editor) texteditor(); //テキストエディター呼び出し
 
-	// 実行中HEXファイル名の「.HEX」を「.BAS」に置き換えてBASファイルを実行
-	appname=(char*)FILENAME_FLASH_ADDRESS;
-	s=tempfile;
-	while(*appname!='.') *s++=*appname++;
-	appname=".BAS";
-	while(*appname!=0) *s++=*appname++;
-	*s=0;
-	// buttonmode(); //ボタン有効化
 	g_disable_break=1; // Breakキー無効化
-	runbasic(tempfile,0);
+	// buttonmode(); //ボタン有効化
+	if (g_objpos_mos) {
+		// MOSからコードをコピーして実行
+		runbasic(0,2);
+	} else {
+		// 実行中HEXファイル名の「.HEX」を「.BAS」に置き換えてBASファイルを実行
+		appname=(char*)FILENAME_FLASH_ADDRESS;
+		s=tempfile;
+		while(*appname!='.') *s++=*appname++;
+		appname=".BAS";
+		while(*appname!=0) *s++=*appname++;
+		*s=0;
+		runbasic(tempfile,0);
+	}
 	while(1) asm(WAIT);
 }

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

--- a/mips/protozoea/protozoea.mcp
+++ b/mips/protozoea/protozoea.mcp
@@ -69,6 +69,9 @@ file_041=.
 file_042=.
 file_043=.
 file_044=.
+file_045=.
+file_046=.
+file_047=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -115,6 +118,9 @@ file_041=no
 file_042=no
 file_043=no
 file_044=no
+file_045=no
+file_046=no
+file_047=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -157,10 +163,13 @@ file_037=no
 file_038=no
 file_039=no
 file_040=no
-file_041=yes
-file_042=yes
+file_041=no
+file_042=no
 file_043=yes
 file_044=yes
+file_045=yes
+file_046=yes
+file_047=yes
 [FILE_INFO]
 file_000=args.c
 file_001=class.c
@@ -190,23 +199,26 @@ file_024=varname.c
 file_025=interface\graphlib.c
 file_026=interface\keyinput.c
 file_027=interface\LCDdriver.c
-file_028=api.h
-file_029=compiler.h
-file_030=debug.h
-file_031=editor.h
-file_032=envspecific.h
-file_033=main.h
-file_034=interface\keyinput.h
-file_035=interface\LCDdriver.h
-file_036=interface\ps2keyboard.h
-file_037=interface\SDFSIO.h
-file_038=interface\videoout.h
-file_039=interface\libsdfsio.a
-file_040=App_32MX170F256B.ld
-file_041=reservednames.js
-file_042=sharedfiles.js
-file_043=class.txt
-file_044=help.txt
+file_028=clib.c
+file_029=hexfile.c
+file_030=api.h
+file_031=compiler.h
+file_032=debug.h
+file_033=editor.h
+file_034=envspecific.h
+file_035=main.h
+file_036=interface\keyinput.h
+file_037=interface\LCDdriver.h
+file_038=interface\ps2keyboard.h
+file_039=interface\SDFSIO.h
+file_040=interface\videoout.h
+file_041=interface\libsdfsio.a
+file_042=App_32MX170F256B.ld
+file_043=reservednames.js
+file_044=sharedfiles.js
+file_045=class.txt
+file_046=help.txt
+file_047=clib.txt
 [SUITE_INFO]
 suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337}
 suite_state=

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

--- a/mips/protozoea/run.c
+++ b/mips/protozoea/run.c
@@ -32,10 +32,14 @@ char* printdec(int num){
 	}
 }
 
-int runbasic(char *appname,int test){
+#define RUNMODE_COMPILE_AND_RUN 0
+#define RUNMODE_COMPILE_ONLY    1
+#define RUNMODE_COPY_AND_RUN    2
+
+int runbasic(char *appname,int mode){
 // BASICソースのコンパイルと実行
 // appname 実行するBASICソースファイル
-// test 0:コンパイルと実行、0以外:コンパイルのみで終了
+// mode 0:コンパイルと実行、1:コンパイルのみで終了、2:コンパイル済みオブジェクトを実行
 //
 // 戻り値
 //　　0:正常終了
@@ -57,16 +61,18 @@ int runbasic(char *appname,int test){
 	// Clear object area
 	for(i=0;i<RAMSIZE/4;i++) g_object[i]=0x00000000;
 
-	// Check file error
-	err=init_file(buff,appname);
-	if (err) {
-		setcursorcolor(COLOR_ERRORTEXT);
-		printstr("Can't Open ");
-		printstr(appname);
-		printchar('\n');
-		return -1;
+	if (mode!=RUNMODE_COPY_AND_RUN) {
+		// Check file error
+		err=init_file(buff,appname);
+		if (err) {
+			setcursorcolor(COLOR_ERRORTEXT);
+			printstr("Can't Open ");
+			printstr(appname);
+			printchar('\n');
+			return -1;
+		}
+		close_file();
 	}
-	close_file();	
 
 	// Initialize parameters
 	g_pcg_font=0;
@@ -75,7 +81,6 @@ int runbasic(char *appname,int test){
 	clearscreen();
 	setcursor(0,0,7);
 	g_long_name_var_num=0;
-	cmpdata_init();
 
 	// Initialize music system
 	init_music();
@@ -85,13 +90,24 @@ int runbasic(char *appname,int test){
 
 	printstr("Compiling...");
 
-	// Compile the file
-	i=compile_and_link_main_file(buff,appname);
-	if (i) return i;
-
+	if (mode==RUNMODE_COPY_AND_RUN) {
+		// Copy the object from MOS
+		appname=(char*)MACHIKANIA_OBJ_ADDRESS;
+		for(i=0;i<RAMSIZE;i++) RAM[i]=appname[i];
+		// Set g_object/g_objpos for library functions like lib_read().
+		// The g_object/g_objpos values are stoared just before MOS.
+		g_object=(int*)g_object_mos;
+		g_objpos=g_objpos_mos;
+	} else {
+		// Initialize compiler
+		cmpdata_init();
+		// Compile the file
+		i=compile_and_link_main_file(buff,appname);
+		if (i) return i;
+	}
 	// All done
 	printstr("done\n");
-	if(test) return 0; //コンパイルのみの場合
+	if(mode==RUNMODE_COMPILE_ONLY) return 0; //コンパイルのみの場合
 	wait60thsec(15);
 
 	// Initialize the other parameters
@@ -131,3 +147,114 @@ int runbasic(char *appname,int test){
 
 	return 0;
 }
+
+int create_self_running_hex(char* hexfilename){
+	int i,j,fpos;
+	FSFILE* dst_file;
+	char* buff;
+	char* err;
+	unsigned int* object;
+	unsigned int addr,adjust;
+	unsigned int data[4];
+	// Set buffer positions
+	buff=(char*)&(RAM[RAMSIZE-512]);
+	// Open original and destination HEX files.
+	if (hex_init_file(buff,HEXFILE)) return -1;
+	dst_file=FSfopen(hexfilename,"w");
+	if (!dst_file) {
+		hex_close_file();
+		return -1;
+	}
+	// Copy the HEX file from original MachiKania, except for MOS.
+	addr=0;
+	fpos=0;
+	while(1) {
+		if (0==((fpos++)&0x3ff)) {
+			// Indicator works every 1024 lines
+			printchar('.');
+		}
+		err=hex_read_line();
+		if (err) break;
+		// Determine type and current address.
+		// If address is OK, write it to destination.
+		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[1];
+			addr=addr<<16;
+			// Highest bit will be 1 for 0x9D0xxxxx instead of 0x1D0xxxxx
+			addr|=0x80000000;
+			// Write this anyway
+			err=hex_write(dst_file);
+			if (err) break;
+		} else if (g_hexline.type==0) {
+			// data
+			addr&=0xffff0000;
+			addr|=g_hexline.address;
+			// Write this line if not in MOS
+			if (addr<MACHIKANIA_OBJ_INFO || FILENAME_FLASH_ADDRESS<=addr) {
+				err=hex_write(dst_file);
+				if (err) break;
+			}
+		} else {
+			// Unknown type
+			err=ERR_HEX_ERROR;
+			break;
+		}
+	}
+	hex_close_file();
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// Save MACHIKANIA_OBJ_INFO
+	addr=MACHIKANIA_OBJ_INFO;
+	err=hex_write_address(dst_file,addr>>16);
+	if (!err) {
+		data[2]=(int)g_object;
+		data[3]=(int)g_objpos;
+		err=hex_write_data_16(dst_file,addr&0xffff,&data[0]);
+	}
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// Add MOS. Adjustment is for changing address from RAM area to MOS.
+	addr=-1;
+	object=(unsigned int*)(&RAM[0]);
+	adjust=(unsigned int)MACHIKANIA_OBJ_ADDRESS-(unsigned int)object;
+	while(object<(unsigned int*)(&g_object[g_objpos])){
+		if (0==((fpos++)&0x3ff)) {
+			// Indicator works every 1024 lines
+			printchar('.');
+		}
+		if ((0x7fff0000 & ((unsigned int)object+adjust)) != addr) {
+			// Construct a hex line for providing Extended linear addres
+			addr=0x7fff0000 & ((unsigned int)object+adjust);
+			err=hex_write_address(dst_file,addr>>16);
+			if (err) break;
+		}
+		// Construct a hex line for data
+		err=hex_write_data_16(dst_file,((unsigned int)object+adjust)&0xffff,object);
+		if (err) break;
+		// All OK for these 4 words (16 bytes).
+		object+=4;
+		err=0;
+	}
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// All done. Write EOF
+	err=hex_write_eof(dst_file);
+	FSfclose(dst_file);
+	if (err) return -1;
+	return 0;
+}

--- a/mips/protozoea/sharedfiles.js
+++ b/mips/protozoea/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',
@@ -36,6 +38,7 @@ var filearray=[
 	'reservednames.js',
 	'sharedfiles.js',
 	'class.txt',
+	'clib.txt',
 ];
 
 var WshShell = WScript.CreateObject("WScript.Shell");

--- a/mips/protozoea/statement.c
+++ b/mips/protozoea/statement.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "api.h"
 #include "compiler.h"
 
@@ -1435,11 +1442,11 @@ char* fclose_statement(){
 
 TODO: candidates to add:
 
-int FSattrib (FSFILE * file, unsigned char attributes);
+// int FSattrib (FSFILE * file, unsigned char attributes);
 int FSrename (const char * fileName, FSFILE * fo);
 int FSmkdir (char * path);
 int FSrmdir (char * path, unsigned char rmsubdirs);
-int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
+// int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
 int FindFirst (const char * fileName, unsigned int attr, SearchRec * rec);
 int FindNext (SearchRec * rec);
 
@@ -1754,6 +1761,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/protozoea/string.c
+++ b/mips/protozoea/string.c
@@ -15,6 +15,13 @@
 	char* simple_string(void);
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "api.h"
 #include "compiler.h"
 

--- a/mips/protozoea/value.c
+++ b/mips/protozoea/value.c
@@ -13,6 +13,13 @@
   Public function is only get_value().
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 
 char* get_value();

--- a/mips/protozoea/varname.c
+++ b/mips/protozoea/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

--- a/mips/zoea/App_32MX170F256B.ld
+++ b/mips/zoea/App_32MX170F256B.ld
@@ -105,7 +105,7 @@ _GEN_EXCPT_ADDR          = _ebase_address + 0x180;
 MEMORY
 {
   kseg0_program_mem    (rx)  : ORIGIN = (0x9D006000 + 0x1000 + 0x490), LENGTH = 0x40000 - 0xD000 - (0x6000 + 0x1000 + 0x490) /* Most C Functions will be located here */
-  kseg2_program_mem    (rx)  : ORIGIN = (0x9D040000 - (0xD000-4)), LENGTH = 0xD000 -4 /* Some C Functions (editor and compiler) will be located here */
+  kseg2_program_mem    (rx)  : ORIGIN = (0x9D040000 - 0xD000), LENGTH = 0xD000 /* Some C Functions (editor and compiler) will be located here */
   exception_mem              : ORIGIN = 0x9D006000, LENGTH = 0x1000 /* Interrupt vector table */
   debug_exec_mem             : ORIGIN = 0x9FC00490, LENGTH = 0x760
   kseg0_boot_mem             : ORIGIN = 0x9D006000, LENGTH = 0x0 /* This memory region is dummy */
@@ -119,18 +119,6 @@ MEMORY
   configsfrs                 : ORIGIN = 0xBFC00BF0, LENGTH = 0x10
 }
 
-
-/*
- * MachiKania specific section containing some functions for editor and compiler
- */
-
-SECTIONS
-{
-  .machikania_object : {
-    KEEP(*(.machikania_object))
-  } > kseg2_program_mem
-}
-
 /*************************************************************************
  * Configuration-word sections. Map the config-pragma input sections to
  * absolute-address output sections.
@@ -152,6 +140,27 @@ SECTIONS
 }
 SECTIONS
 {
+
+  /* MachiKania Object Section (MOS) (size: 0xD000) */
+  .machikaniaobjtext ORIGIN(kseg2_program_mem):
+  {
+    KEEP (*\statement.o(.text))
+    KEEP (*\function.o(.text))
+    KEEP (*\value.o(.text))
+    KEEP (*\string.o(.text))
+    KEEP (*\float.o(.text))
+    KEEP (*\cmpdata.o(.text))
+  } >kseg2_program_mem
+  .machikaniaobjrodata :
+  {
+    KEEP (*\statement.o(.rodata))
+    KEEP (*\function.o(.rodata))
+    KEEP (*\value.o(.rodata))
+    KEEP (*\string.o(.rodata))
+    KEEP (*\float.o(.rodata))
+    KEEP (*\cmpdata.o(.rodata))
+  } >kseg2_program_mem
+
   /* Boot Sections */
   .reset _RESET_ADDR :
   {

--- a/mips/zoea/basic.mcp
+++ b/mips/zoea/basic.mcp
@@ -69,6 +69,9 @@ file_041=.
 file_042=.
 file_043=.
 file_044=.
+file_045=.
+file_046=.
+file_047=.
 [GENERATED_FILES]
 file_000=no
 file_001=no
@@ -115,6 +118,9 @@ file_041=no
 file_042=no
 file_043=no
 file_044=no
+file_045=no
+file_046=no
+file_047=no
 [OTHER_FILES]
 file_000=no
 file_001=no
@@ -156,11 +162,14 @@ file_036=no
 file_037=no
 file_038=no
 file_039=no
-file_040=yes
-file_041=yes
+file_040=no
+file_041=no
 file_042=yes
 file_043=yes
 file_044=yes
+file_045=yes
+file_046=yes
+file_047=yes
 [FILE_INFO]
 file_000=compiler.c
 file_001=editor.c
@@ -188,25 +197,28 @@ file_022=class.c
 file_023=args.c
 file_024=timer.c
 file_025=interface\keyinput.c
-file_026=api.h
-file_027=compiler.h
-file_028=editor.h
-file_029=main.h
-file_030=debug.h
-file_031=envspecific.h
-file_032=interface\keyinput.h
-file_033=interface\ps2keyboard.h
-file_034=interface\SDFSIO.h
-file_035=interface\videoout.h
-file_036=interface\lib_videoout_machikania.X.a
-file_037=interface\libsdfsio.a
-file_038=interface\ps2keyboard.X.a
-file_039=App_32MX170F256B.ld
-file_040=help.txt
-file_041=MACHIKAN.INI
-file_042=reservednames.js
-file_043=class.txt
-file_044=sharedfiles.js
+file_026=hexfile.c
+file_027=clib.c
+file_028=api.h
+file_029=compiler.h
+file_030=editor.h
+file_031=main.h
+file_032=debug.h
+file_033=envspecific.h
+file_034=interface\keyinput.h
+file_035=interface\ps2keyboard.h
+file_036=interface\SDFSIO.h
+file_037=interface\videoout.h
+file_038=interface\lib_videoout_machikania.X.a
+file_039=interface\libsdfsio.a
+file_040=interface\ps2keyboard.X.a
+file_041=App_32MX170F256B.ld
+file_042=help.txt
+file_043=MACHIKAN.INI
+file_044=reservednames.js
+file_045=class.txt
+file_046=sharedfiles.js
+file_047=clib.txt
 [SUITE_INFO]
 suite_guid={62D235D8-2DB2-49CD-AF24-5489A6015337}
 suite_state=

--- a/mips/zoea/class.c
+++ b/mips/zoea/class.c
@@ -876,7 +876,8 @@ char* static_method(char type){
 	char* err;
 	int* data;
 	int record[3];
-	int i,opos,method,stack;
+	int i,spos,opos,method,stack;
+	spos=g_srcpos;
 	next_position();
 	// Check class name
 	i=check_var_name();
@@ -891,12 +892,15 @@ char* static_method(char type){
 			break;
 		}
 	}
+	if (i) {
+		g_srcpos=spos;
+		return ERR_NO_CLASS;
+	}
 	// Check '::'
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
 	if (g_source[g_srcpos]!=':') return ERR_SYNTAX;
 	g_srcpos++;
-	if (i) return ERR_NO_CLASS;
 	data=(int*)data[2];
 	// Check method
 	i=check_var_name();

--- a/mips/zoea/cmpdata.c
+++ b/mips/zoea/cmpdata.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 
 /*

--- a/mips/zoea/compiler.h
+++ b/mips/zoea/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,
@@ -187,6 +195,8 @@ enum functions{
 };
 
 /* Global vars (see globalvers.c) */
+extern const volatile int g_object_mos;
+extern const volatile int g_objpos_mos;
 extern int g_intconst;
 extern char g_valueisconst;
 extern unsigned int g_rnd_seed;
@@ -228,6 +238,8 @@ 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 char g_fs_valid;
 extern int g_temp;
 
 /* Prototypes */
@@ -247,6 +259,7 @@ char* compile_file();
 int compile_and_link_file(char* buff,char* appname);
 int compile_and_link_main_file(char* buff,char* appname);
 int compile_and_link_class(char* buff,int class);
+int create_self_running_hex(char* hexfilename);
 
 void err_break(void);
 void err_music(char* str);
@@ -340,6 +353,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 +398,23 @@ char* coretimer_statement();
 char* coretimer_function();
 char* interrupt_statement();
 
+char* useclib_statement();
+char* useclib_begin(char* buff);
+char* clib_method(char type);
+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();
+#ifdef  FS_DOT_H
+	char* hex_write(FSFILE* fhandle);
+	char* hex_write_address(FSFILE* fhandle,unsigned short addr);
+	char* hex_write_data_16(FSFILE* fhandle,unsigned short addr,unsigned int* object);
+	char* hex_write_eof(FSFILE* fhandle);
+#endif
+
 /* Error messages */
 #define ERR_SYNTAX (char*)(g_err_str[0])
 #define ERR_NE_BINARY (char*)(g_err_str[1])
@@ -415,6 +446,10 @@ 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])
+#define ERR_NO_CLASS_CLIB (char*)(g_err_str[32])
 
 /* compile data type numbers */
 #define CMPDATA_RESERVED  0
@@ -425,6 +460,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
@@ -451,9 +488,6 @@ char* interrupt_statement();
 
 /* Macros */
 
-// For object section
-#define OBJECTSECTION __attribute__((section(".machikania_object")))
-
 // Lables as 31 bit integer
 #define LABEL_INIT 0x0008727b
 
@@ -488,13 +522,15 @@ 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
 #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
+#define ASM_ORI_A0_ZERO_    0x34040000
+#define ASM_ADDIU_A0_ZERO_  0x24040000
+#define ASM_LW_A0_XXXX_S8   0x8FC40000
+#define ASM_LW_A0_XXXX_S5   0x8EA40000
 
 // Interrupt macros
 // 32 different type interruptions are possible

--- a/mips/zoea/debug.c
+++ b/mips/zoea/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,10 @@ static const char initext[]=
 "#PRINT\n";
 
 static const char bastext[]=
-"USECLASS CLASS1,CLASS2\n"
-"OPTION FASTFIELD\n"
-"CLS\n"
-"o=new(CLASS1)\n"
-"o.T1=123\n"
-"print o.T2()\n"
+"useclib TCLIB\n"
+"print TCLIB::TEST$(0);\n"
+"print clib$(TCLIB::TEST,1)\n"
+"\n"
 "\n"
 "\n"
 "\n"
@@ -255,6 +258,47 @@ static const char class2text[]=
 "\n"
 "\n";
 
+static const char hextext[]=
+":020000040000fa\n"
+":1080000000001c3c707f9c2721e09903e0ffbd2706\n"
+":108010001c00bfaf1000bcaf030080101880828f1f\n"
+":1080200005000010000044ac1c80998f09f8200363\n"
+":10803000000000001000bc8f2080828f1c00bf8fca\n"
+":088040000800e0032000bd2749\n"
+":020000040000fa\n"
+":107f80000000000000000080ac7f00a0508000a036\n"
+":107f9000708100a0548100a0000001a0388100a0e1\n"
+":0c7fa000588000a000000000000000005d\n"
+":020000040000fa\n"
+":108050000800e0030000000000001c3c187f9c2783\n"
+":1080600021e09903e0ffbd271c00bfaf1800b0afaf\n"
+":108070001000bcaf110080542880828f1880908f30\n"
+":108080000000048e2480998f09f82003000000006e\n"
+":108090001000bc8f2880848f248184240000058eea\n"
+":1080a0002c80998f09f82003000000001000bc8f7d\n"
+":1080b0002880828f0200001004814224148142240f\n"
+":1080c0001c00bf8f1800b08f0800e0032000bd2700\n"
+":1080d00000001c3ca07e9c2721e09903e0ffbd2707\n"
+":1080e0001c00bfaf1000bcaf3080998f09f820038f\n"
+":1080f000000000001000bc8f1c00bf8f0800e003d0\n"
+":048100002000bd2777\n"
+":020000040000fa\n"
+":1081040048656c6c6f20576f726c6421000000002e\n"
+":108114005468697320697320612074657374000066\n"
+":10812400434c494220746573742e000054455354e3\n"
+":048134000000000047\n"
+":020000040000fa\n"
+":108138000000a38c0c00a28c0c00428c08004000ac\n"
+":0c81480000007c8c0800e0030000000038\n"
+":020000040000fa\n"
+":108154000000838c0c00828c1800428c08004000c4\n"
+":0c81640000007c8c0800e003000000001c\n"
+":020000040000fa\n"
+":108170004001000080000000808100a0000000009d\n"
+":0c818000308100a0d08000a000000000b2\n"
+":00000001FF\n"
+;
+
 /*
     Test function for constructing assemblies from C codes.
 */
@@ -285,6 +329,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/zoea/editor.c
+++ b/mips/zoea/editor.c
@@ -74,7 +74,7 @@ const unsigned char Message2[]="File System Error\n";
 const unsigned char Message3[]="Retry:[Enter] / Quit:[ESC]\n";
 const unsigned char ROOTDIR[]="\\";
 
-OBJECTSECTION unsigned char * editormalloc(int size){
+unsigned char * editormalloc(int size){
 //配列RAM[]内にサイズsizeの領域を確保し、先頭アドレスを返す
 //確保できない場合は、エラー表示し動作停止
 	unsigned char *p;
@@ -93,7 +93,7 @@ void wait60thsec(unsigned short n){
 	while(drawcount!=n) asm(WAIT);
 }
 
-OBJECTSECTION unsigned int bpixtopos(_tbuf *bp,unsigned int ix){
+unsigned int bpixtopos(_tbuf *bp,unsigned int ix){
 // テキストバッファ上の位置からテキスト全体の先頭から何文字目かを返す
 // bp:テキストバッファポインタ
 // ix:bp->Bufの先頭からの文字数
@@ -108,7 +108,7 @@ OBJECTSECTION unsigned int bpixtopos(_tbuf *bp,unsigned int ix){
 	}
 	return pos+ix;
 }
-OBJECTSECTION _tbuf * postobpix(int pos,unsigned short *pix){
+_tbuf * postobpix(int pos,unsigned short *pix){
 // テキスト全体の先頭からpos文字目のテキストバッファ上の位置を返す
 // 戻り値　テキストバッファポインタ
 // *pix（戻り値）：戻り値テキストバッファの先頭からの位置（ポインタ渡し）
@@ -127,7 +127,7 @@ OBJECTSECTION _tbuf * postobpix(int pos,unsigned short *pix){
 	*pix=pos;
 	return bp;
 }
-OBJECTSECTION _tbuf * linetobpix(int line,unsigned short *pix){
+_tbuf * linetobpix(int line,unsigned short *pix){
 // テキスト全体の先頭からline行目のテキストバッファ上の位置を返す
 // 戻り値　テキストバッファポインタ
 // *pix（戻り値）：戻り値テキストバッファの先頭からの位置（ポインタ渡し）
@@ -157,7 +157,7 @@ OBJECTSECTION _tbuf * linetobpix(int line,unsigned short *pix){
 	return bp2;
 }
 
-OBJECTSECTION _tbuf * newTBuf(_tbuf *prev){
+_tbuf * newTBuf(_tbuf *prev){
 // 新しいテキストバッファ1行を生成
 // prev:挿入先の行（prevの後ろに追加）
 // 戻り値　生成したバッファへのポインタ、生成できない場合NULL
@@ -180,7 +180,7 @@ OBJECTSECTION _tbuf * newTBuf(_tbuf *prev){
 	return bp;
 }
 
-OBJECTSECTION _tbuf * deleteTBuf(_tbuf *bp){
+_tbuf * deleteTBuf(_tbuf *bp){
 // テキストバッファの削除
 // bp:削除する行のポインタ
 // 戻り値　削除前の次のバッファへのポインタ、ない場合NULL
@@ -226,7 +226,7 @@ UNDOBUFSIZE
 　UNDO_CONTDEL,繰り返し数,消去文字列,開始位置,繰り返し数,UNDO_CONTDEL
 */
 
-OBJECTSECTION void pushundomem(unsigned char c){
+void pushundomem(unsigned char c){
 // アンドゥ用メモリの先頭に1バイトを貯める
 // 空きがなくなった場合、最後尾の1命令分を無効化
 	unsigned char *p;
@@ -267,12 +267,12 @@ OBJECTSECTION void pushundomem(unsigned char c){
 	if(undobuf_top>=undobuf+UNDOBUFSIZE) undobuf_top-=UNDOBUFSIZE;
 	undobuf_used++;
 }
-OBJECTSECTION void pushundomem2(unsigned short w){
+void pushundomem2(unsigned short w){
 // アンドゥバッファに2バイト貯める、下位、上位の順
 	pushundomem((unsigned char)w);
 	pushundomem(w>>8);
 }
-OBJECTSECTION unsigned char popundomem(){
+unsigned char popundomem(){
 // アンドゥバッファから1バイト読み出し、先頭を1つ戻す
 // 戻り値：読み出したコード
 	undobuf_top--;
@@ -280,7 +280,7 @@ OBJECTSECTION unsigned char popundomem(){
 	undobuf_used--;
 	return *undobuf_top;
 }
-OBJECTSECTION unsigned short popundomem2(){
+unsigned short popundomem2(){
 // アンドゥバッファから2バイト読み出し
 // 戻り値：読み出した2バイトコード
 	unsigned short w;
@@ -288,7 +288,7 @@ OBJECTSECTION unsigned short popundomem2(){
 	w+=popundomem();
 	return w;
 }
-OBJECTSECTION void setundobuf(int com,_tbuf *bp,unsigned short ix,unsigned char c,unsigned short n){
+void setundobuf(int com,_tbuf *bp,unsigned short ix,unsigned char c,unsigned short n){
 //アンドゥバッファにデータをセットする
 //com:コマンド　1:1文字削除、2:1文字上書き、3:1文字挿入、4:連続削除、5:連続挿入開始
 //bp,ix:バッファ上の実行場所（カーソル位置）
@@ -324,7 +324,7 @@ OBJECTSECTION void setundobuf(int com,_tbuf *bp,unsigned short ix,unsigned char
 	}
 }
 
-OBJECTSECTION int insertchar(_tbuf *bp,unsigned int ix,unsigned char c,int undo){
+int insertchar(_tbuf *bp,unsigned int ix,unsigned char c,int undo){
 //テキストバッファbpの先頭からixバイトの位置にcを挿入
 //undo 0:通常（アンドゥバッファに格納する）、1:連続挿入中、2:アンドゥ中
 //戻り値　成功：0、不正または容量オーバー：-1、空きがあるはずなのに失敗：1
@@ -362,7 +362,7 @@ OBJECTSECTION int insertchar(_tbuf *bp,unsigned int ix,unsigned char c,int undo)
 	return 0;
 }
 
-OBJECTSECTION int overwritechar(_tbuf *bp,unsigned int ix,unsigned char c,int undo){
+int overwritechar(_tbuf *bp,unsigned int ix,unsigned char c,int undo){
 //テキストバッファbpの先頭からixバイトの位置をcで上書き
 //undo 0:通常（アンドゥバッファに格納する）、1:連続中、2:アンドゥ中
 //戻り値　成功：0、不正または容量オーバー：-1、空きがあるはずなのに失敗：1
@@ -383,7 +383,7 @@ OBJECTSECTION int overwritechar(_tbuf *bp,unsigned int ix,unsigned char c,int un
 	return 0;
 }
 
-OBJECTSECTION void deletechar(_tbuf *bp,unsigned int ix,int undo){
+void deletechar(_tbuf *bp,unsigned int ix,int undo){
 //テキストバッファbpの先頭からixバイトの位置の1バイト削除
 //undo -1:通常BackSpace（アンドゥバッファに格納する）
 //      0:通常DELETE（アンドゥバッファに格納する）、1:連続中、2:アンドゥ中
@@ -407,7 +407,7 @@ OBJECTSECTION void deletechar(_tbuf *bp,unsigned int ix,int undo){
 	if(bp->next==NULL) return; //全体の最後の場合、何もしない
 	deletechar(bp->next,0,undo); //次の行の先頭文字を削除
 }
-OBJECTSECTION int gabagecollect1(void){
+int gabagecollect1(void){
 //断片化されたテキストバッファの隙間を埋めるガベージコレクション
 //カーソルの前と後ろそれぞれ探索して最初の1バイト分のみ実施
 //戻り値 1バイトでも移動した場合：1、なかった場合：0
@@ -476,11 +476,11 @@ OBJECTSECTION int gabagecollect1(void){
 	if(bp->n == 0) deleteTBuf(bp);
 	return f;
 }
-OBJECTSECTION void gabagecollect2(void){
+void gabagecollect2(void){
 // 変化がなくなるまで1バイト分のガベージコレクションを呼び出し
 	while(gabagecollect1()) ;
 }
-OBJECTSECTION void inittextbuf(void){
+void inittextbuf(void){
 // テキストバッファの初期化
 	_tbuf *bp;
 	for(bp=TextBuffer;bp<TextBuffer+TBUFMAXLINE;bp++) bp->prev=NULL; //未使用バッファ化
@@ -492,7 +492,7 @@ OBJECTSECTION void inittextbuf(void){
 	undobuf_top=undobuf;
 	undobuf_used=0;
 }
-OBJECTSECTION void redraw(){
+void redraw(){
 //画面の再描画
 	unsigned char *vp;
 	_tbuf *bp,*bp1,*bp2;
@@ -576,7 +576,7 @@ OBJECTSECTION void redraw(){
 	}
 }
 
-OBJECTSECTION void cursor_left(void){
+void cursor_left(void){
 //カーソルを1つ前に移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -687,7 +687,7 @@ OBJECTSECTION void cursor_left(void){
 	disptopbp=bp;
 	disptopix=ix;
 }
-OBJECTSECTION void cursor_right(void){
+void cursor_right(void){
 //カーソルを1つ後ろに移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -746,7 +746,7 @@ OBJECTSECTION void cursor_right(void){
 	disptopbp=bp;
 	disptopix=ix;
 }
-OBJECTSECTION void cursor_up(void){
+void cursor_up(void){
 //カーソルを1つ上に移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -853,7 +853,7 @@ OBJECTSECTION void cursor_up(void){
 	disptopbp=bp;
 	disptopix=ix;
 }
-OBJECTSECTION void cursor_down(void){
+void cursor_down(void){
 //カーソルを1つ下に移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -925,7 +925,7 @@ OBJECTSECTION void cursor_down(void){
 	disptopbp=bp;
 	disptopix=ix;
 }
-OBJECTSECTION void cursor_home(void){
+void cursor_home(void){
 //カーソルを行先頭に移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -946,7 +946,7 @@ OBJECTSECTION void cursor_home(void){
 	}
 	cx2=0;
 }
-OBJECTSECTION void cursor_end(void){
+void cursor_end(void){
 //カーソルを行末に移動
 //出力：下記変数を移動先の値に変更
 //cursorbp,cursorix バッファ上のカーソル位置
@@ -970,7 +970,7 @@ OBJECTSECTION void cursor_end(void){
 	}
 	cx2=cx;
 }
-OBJECTSECTION void cursor_pageup(void){
+void cursor_pageup(void){
 //PageUpキー
 //最上行が最下行になるまでスクロール
 //出力：下記変数を移動先の値に変更
@@ -996,7 +996,7 @@ OBJECTSECTION void cursor_pageup(void){
 	//元のY座標までカーソルを下に移動、1行も動かなかった場合は最上行に留まる
 	if(i>0) while(cy<cy_old) cursor_down();
 }
-OBJECTSECTION void cursor_pagedown(void){
+void cursor_pagedown(void){
 //PageDownキー
 //最下行が最上行になるまでスクロール
 //出力：下記変数を移動先の値に変更
@@ -1028,7 +1028,7 @@ OBJECTSECTION void cursor_pagedown(void){
 	//下端からさらに移動した行数分、カーソルを上に移動、1行も動かなかった場合は最下行に留まる
 	if(i>0) while(cy>cy_old) cursor_up();
 }
-OBJECTSECTION void cursor_top(void){
+void cursor_top(void){
 //カーソルをテキストバッファの先頭に移動
 	cursorbp=TBufstart;
 	cursorix=0;
@@ -1041,7 +1041,7 @@ OBJECTSECTION void cursor_top(void){
 	line_no=1;
 }
 
-OBJECTSECTION int countarea(void){
+int countarea(void){
 //テキストバッファの指定範囲の文字数をカウント
 //範囲は(cursorbp,cursorix)と(cursorbp1,cursorix1)で指定
 //後ろ側の一つ前の文字までをカウント
@@ -1076,7 +1076,7 @@ OBJECTSECTION int countarea(void){
 		}
 	}
 }
-OBJECTSECTION void deletearea_len(_tbuf *bp,unsigned int ix,int n,int undo){
+void deletearea_len(_tbuf *bp,unsigned int ix,int n,int undo){
 //テキストバッファの指定位置から複数文字削除
 //bp,ix:削除開始位置
 //n:削除する文字数
@@ -1115,7 +1115,7 @@ OBJECTSECTION void deletearea_len(_tbuf *bp,unsigned int ix,int n,int undo){
 		n--;
 	}
 }
-OBJECTSECTION void deletearea(void){
+void deletearea(void){
 //テキストバッファの指定範囲を削除
 //範囲は(cursorbp,cursorix)と(cursorbp1,cursorix1)で指定
 //後ろ側の一つ前の文字までを削除
@@ -1150,7 +1150,7 @@ OBJECTSECTION void deletearea(void){
 	pushundomem2(n);
 	pushundomem(UNDO_CONTDEL);
 }
-OBJECTSECTION void clipcopy(void){
+void clipcopy(void){
 // 選択範囲をクリップボードにコピー
 	_tbuf *bp1,*bp2;
 	int ix1,ix2;
@@ -1186,7 +1186,7 @@ OBJECTSECTION void clipcopy(void){
 		}
 	}
 }
-OBJECTSECTION void clippaste(void){
+void clippaste(void){
 // クリップボードから貼り付け
 	int n,i;
 	unsigned char *p;
@@ -1206,7 +1206,7 @@ OBJECTSECTION void clippaste(void){
 		p++;
 	}
 }
-OBJECTSECTION void movecursor(int pos){
+void movecursor(int pos){
 // カーソルを現在の位置から任意の位置に移動
 // pos：移動したいテキストバッファ先頭からのバイト位置
 	int pos2,d;
@@ -1226,7 +1226,7 @@ OBJECTSECTION void movecursor(int pos){
 		}
 	}
 }
-OBJECTSECTION void undoexec(){
+void undoexec(){
 //アンドゥ実行
 	unsigned char c,c1;
 	_tbuf *bp;
@@ -1286,7 +1286,7 @@ OBJECTSECTION void undoexec(){
 	}
 }
 
-OBJECTSECTION void set_areamode(){
+void set_areamode(){
 //範囲選択モード開始時のカーソル開始位置グローバル変数設定
 	cursorbp1=cursorbp;
 	cursorix1=cursorix;
@@ -1294,7 +1294,7 @@ OBJECTSECTION void set_areamode(){
 	cy1=cy;
 	line_no1=line_no;
 }
-OBJECTSECTION void save_cursor(void){
+void save_cursor(void){
 //カーソル関連グローバル変数を一時避難
 	cursorbp_t=cursorbp;
 	cursorix_t=cursorix;
@@ -1304,7 +1304,7 @@ OBJECTSECTION void save_cursor(void){
 	cy_t=cy;
 	line_no_t=line_no;
 }
-OBJECTSECTION void restore_cursor(void){
+void restore_cursor(void){
 //カーソル関連グローバル変数を一時避難場所から戻す
 	cursorbp=cursorbp_t;
 	cursorix=cursorix_t;
@@ -1315,7 +1315,7 @@ OBJECTSECTION void restore_cursor(void){
 	line_no=line_no_t;
 }
 
-OBJECTSECTION int filesystemretry(){
+int filesystemretry(){
 // SDファイルシステムの再初期化確認と実施
 // SDファイルへの保存や読み込み時にファイルエラーが発生した場合に呼び出す
 // 戻り値　0：初期化成功、-1：成功することなくEscapeで抜けた
@@ -1337,7 +1337,7 @@ OBJECTSECTION int filesystemretry(){
 	}
 }
 
-OBJECTSECTION int sdfilecopy(char *sourcefile,char *distfile){
+int sdfilecopy(char *sourcefile,char *distfile){
 // SDカード上のファイルをコピー
 // soucefile:コピー元ファイル名
 // distfile:コピー先ファイル名
@@ -1370,7 +1370,7 @@ OBJECTSECTION int sdfilecopy(char *sourcefile,char *distfile){
 	FSfclose(dfp);
 	return er;
 }
-OBJECTSECTION int savetextfile(char *filename){
+int savetextfile(char *filename){
 // テキストバッファをテキストファイルに書き込み
 // 書き込み成功で0、失敗でエラーコード（負数）を返す
 	FSFILE *fp;
@@ -1414,7 +1414,7 @@ OBJECTSECTION int savetextfile(char *filename){
 	FSfclose(fp);
 	return er;
 }
-OBJECTSECTION int loadtextfile(char *filename){
+int loadtextfile(char *filename){
 // テキストファイルをテキストバッファに読み込み
 // 読み込み成功で0、失敗でエラーコード（負数）を返す
 	FSFILE *fp;
@@ -1463,7 +1463,7 @@ OBJECTSECTION int loadtextfile(char *filename){
 	}
 	return er;
 }
-OBJECTSECTION int overwritecheck(char *fn){
+int overwritecheck(char *fn){
 // ファイルの上書き確認
 // ファイルの存在をチェックし、存在する場合キーボードから上書き確認する
 // fn:ファイル名へのポインタ
@@ -1483,7 +1483,7 @@ OBJECTSECTION int overwritecheck(char *fn){
 		if(vk==VK_ESCAPE) return -1;
 	}
 }
-OBJECTSECTION void printfilename(unsigned char x,unsigned char y,int f,int num_dir){
+void printfilename(unsigned char x,unsigned char y,int f,int num_dir){
 // x,yの位置にファイル名またはディレクトリ名を表示
 
 	if(f==-2){
@@ -1509,7 +1509,7 @@ OBJECTSECTION void printfilename(unsigned char x,unsigned char y,int f,int num_d
 		printstr(filenames[f]);
 	}
 }
-OBJECTSECTION int select_dir_file(int filenum,int num_dir, unsigned char* msg){
+int select_dir_file(int filenum,int num_dir, unsigned char* msg){
 // filenames[]配列に読み込まれたファイルまたはディレクトリを画面表示しキーボードで選択する
 // filenum:ファイル＋ディレクトリ数
 // num_dir:ディレクトリ数（filenames[]は先頭からnum_dir-1までがディレクトリ）
@@ -1665,7 +1665,7 @@ OBJECTSECTION int select_dir_file(int filenum,int num_dir, unsigned char* msg){
 		}
 	}
 }
-OBJECTSECTION int getfilelist(int *p_num_dir){
+int getfilelist(int *p_num_dir){
 // カレントディレクトリでのディレクトリ、.BAS、.TXT、.INIファイル一覧を読み込む
 // *p_num_dir:ディレクトリ数を返す
 // filenames[]:ファイル名およびディレクトリ名一覧
@@ -1729,7 +1729,7 @@ OBJECTSECTION int getfilelist(int *p_num_dir){
 	}
 	return filenum;
 }
-OBJECTSECTION void save_as(int ow){
+void save_as(int ow){
 // 現在のテキストバッファの内容をSDカードに保存
 // ow　0:名前を付けて保存　　1:上書き保存
 // ファイル名はグローバル変数currentfile[]
@@ -1817,7 +1817,7 @@ OBJECTSECTION void save_as(int ow){
 	}
 }
 
-OBJECTSECTION void newtext(void){
+void newtext(void){
 // 新規テキスト作成
 	unsigned char vk;
 	if(edited && num){
@@ -1841,7 +1841,7 @@ OBJECTSECTION void newtext(void){
 	currentfile[0]=0; //作業中ファイル名クリア
 }
 
-OBJECTSECTION void msra(void){
+void msra(void){
 // Make Self-Running Application （自己実行アプリケーションの作成）
 // 最初にソースファイルを名前を付けて保存
 // 次にBASICシステムのHEXファイルをソースファイル名の拡張子をHEXにした名前でコピー
@@ -1852,7 +1852,8 @@ OBJECTSECTION void msra(void){
 	setcursor(0,0,COLOR_NORMALTEXT);
 	printstr("Make Self-Running Application\n\n");
 	printstr("(Work on Root Directory)\n");
-
+// MOS: delete region not required
+/*
 	//カレントディレクトリを変数cwdpathにコピー
 	while(1){
 		if(FSgetcwd(cwdpath,PATHNAMEMAX)) break;
@@ -1872,30 +1873,44 @@ OBJECTSECTION void msra(void){
 	pd=tempfile;
 	while(*ps!=0) *pd++=*ps++;
 	*pd=0;
-
+//*/
 	while(1){
 		setcursorcolor(COLOR_NORMALTEXT);
-		printstr("Input File Name (xxx.BAS)\n");
+// MOS: modification
+		printstr("Input File Name (xxx.HEX)\n");
+//		printstr("Input File Name (xxx.BAS)\n");
+
 		if(lineinput(tempfile,8+1+3)<0){
 			//ESCキーが押された
-			FSchdir(cwdpath); //カレントディレクトリを元に戻す
+// MOS: delete region not required
+//			FSchdir(cwdpath); //カレントディレクトリを元に戻す
 			return;
 		}
 		ps=tempfile;
 		while(*ps!='.' && *ps!=0) ps++;
 		if(ps+4>=tempfile+13 ||
 			*ps!='.' ||
-			(*(ps+1)!='b' && *(ps+1)!='B') ||
-			(*(ps+2)!='a' && *(ps+2)!='A') ||
-			(*(ps+3)!='s' && *(ps+3)!='S') ||
+// MOS: modification
+			(*(ps+1)!='h' && *(ps+1)!='H') ||
+			(*(ps+2)!='e' && *(ps+2)!='E') ||
+			(*(ps+3)!='x' && *(ps+3)!='X') ||
+//			(*(ps+1)!='b' && *(ps+1)!='B') ||
+//			(*(ps+2)!='a' && *(ps+2)!='A') ||
+//			(*(ps+3)!='s' && *(ps+3)!='S') ||
 			*(ps+4)!=0){
 				setcursorcolor(COLOR_ERRORTEXT);
-				printstr("File Name Must Be xxx.BAS\n");
+// MOS: modification
+				printstr("File Name Must Be xxx.HEX\n");
+//				printstr("File Name Must Be xxx.BAS\n");
 				continue;
 		}
 		if(overwritecheck(tempfile)) continue;
-		printstr("Writing BASIC File\n");
-		er=savetextfile(tempfile); //ファイル保存、er:エラーコード
+// MOS: modification
+		printstr("Writing HEX File\n");
+//		printstr("Writing BASIC File\n");
+// MOS: modification
+		er=create_self_running_hex(tempfile); //ファイル保存、er:エラーコード
+//		er=savetextfile(tempfile); //ファイル保存、er:エラーコード
 		if(er==0) break;
 		setcursorcolor(COLOR_ERRORTEXT);
 		if(er==ERR_CANTFILEOPEN) printstr("Bad File Name or File Error\n");
@@ -1911,6 +1926,8 @@ OBJECTSECTION void msra(void){
 		}
 	}
 	printstr("OK\n\n");
+// MOS: delete region not required
+/*
 	FSremove(TEMPFILENAME); //実行時に生成する一時ファイルを削除
 	//tempfileからcurrentfileにコピーして終了
 	ps=tempfile;
@@ -1946,12 +1963,13 @@ OBJECTSECTION void msra(void){
 	else if(er==ERR_CANTWRITEFILE){
 		printstr("Write Error\n");
 	}
+//*/
 	setcursorcolor(COLOR_NORMALTEXT);
 	printstr((unsigned char *)Message1);// Hit Any Key
 	inputchar(); //1文字入力待ち
 	return;
 }
-OBJECTSECTION int fileload(void){
+int fileload(void){
 // SDカードからファイルを選択して読み込み
 // currenfile[]にファイル名を記憶
 // 対象ファイル拡張子 BASおよびTXT
@@ -2047,16 +2065,16 @@ OBJECTSECTION int fileload(void){
 		}
 	}
 }
-OBJECTSECTION void changewidth(void){
+void changewidth(void){
 // 30文字モードと40文字モードの切り替え
 	if(twidth==WIDTH_X1) set_width(1);
 	else set_width(0);
 	cursor_top(); //カーソルをテキストバッファの先頭に設定
 	redraw(); //再描画
 }
-OBJECTSECTION void run(int test){
+void run(int test){
 //KM-BASICコンパイル＆実行
-// test 0:コンパイルと実行、0以外:コンパイルのみで終了
+// test 0:コンパイルと実行、1:コンパイルのみで終了、2:コンパイルの後、HEXファイルを作製
 	int er,er2;
 	FSFILE *fp;
 	unsigned int disptoppos,cursorpos;
@@ -2132,7 +2150,18 @@ OBJECTSECTION void run(int test){
 	// Enable Break key
 	g_disable_break=0;
 	//KM-BASIC実行
-	er2=runbasic(TEMPFILENAME,test);
+// MOS: modification
+	switch(test){
+		case 2:
+			er2=runbasic(TEMPFILENAME,1);
+			break;
+		case 0:
+		case 1:
+		default:
+			er2=runbasic(TEMPFILENAME,test);
+			break;
+	}
+//	er2=runbasic(TEMPFILENAME,test);
 
 	stopPCG();//システムフォントに戻す
 	setcursorcolor(COLOR_NORMALTEXT);
@@ -2176,6 +2205,12 @@ OBJECTSECTION void run(int test){
 		FSremove(WORKDIRFILE); //パス名保存ファイル削除
 		break;
 	}
+// MOS: insertion
+	if (2==test && !er2) {
+		// Create HEX file as Self Running Apprication
+		msra();
+	}
+//*/
 	while(1){
 		//カレントディレクトリを元に戻す
 		if(FSchdir(cwdpath)){
@@ -2224,7 +2259,7 @@ OBJECTSECTION void run(int test){
 	edited=edited1;
 	FSremove(TEMPFILENAME);
 }
-OBJECTSECTION void displaybottomline(void){
+void displaybottomline(void){
 //エディター画面最下行の表示
 	unsigned char *p;
 	unsigned char c;
@@ -2259,7 +2294,7 @@ OBJECTSECTION void displaybottomline(void){
 	cursor=p; //カーソル位置戻し
 	cursorcolor=c;
 }
-OBJECTSECTION void normal_code_process(unsigned char k){
+void normal_code_process(unsigned char k){
 // 通常文字入力処理
 // k:入力された文字コード
 	int i;
@@ -2286,7 +2321,7 @@ OBJECTSECTION void normal_code_process(unsigned char k){
 		if(i==0) cursor_right();//画面上、バッファ上のカーソル位置を1つ後ろに移動
 	}
 }
-OBJECTSECTION void control_code_process(unsigned char k,unsigned char sh){
+void control_code_process(unsigned char k,unsigned char sh){
 // 制御文字入力処理
 // k:制御文字の仮想キーコード
 // sh:シフト関連キー状態
@@ -2459,7 +2494,9 @@ OBJECTSECTION void control_code_process(unsigned char k,unsigned char sh){
 			break;
 		case VK_F2: //F2キー
 			if(num==0) break;
-			if(sh & CHK_SHIFT) msra(); //create direct running file
+// MOS: modification
+			if(sh & CHK_SHIFT) run(2); //create direct running file
+//			if(sh & CHK_SHIFT) msra(); //create direct running file
 			else save_as(0); //ファイル名を付けて保存
 			break;
 		case VK_F3: //F3キー
@@ -2476,7 +2513,7 @@ OBJECTSECTION void control_code_process(unsigned char k,unsigned char sh){
 			break;
 	}
 }
-OBJECTSECTION void texteditor(void){
+void texteditor(void){
 //テキストエディター本体
 	unsigned char k1,k2,sh;
 	FSFILE *fp;

--- a/mips/zoea/envspecific.h
+++ b/mips/zoea/envspecific.h
@@ -6,8 +6,9 @@
 */
 
 #define CPU_CLOCK_HZ (g_use_graphic ? 53693175 : 57272720)
-#define PERSISTENT_RAM_SIZE (1024*52)
-#define OBJECTSECTION_ADDRESS 0x9D033000
+#define PERSISTENT_RAM_SIZE (1024*52) // 0xD000
+#define MACHIKANIA_OBJ_ADDRESS (0x9D040000 - (0xd000))
+#define MACHIKANIA_OBJ_INFO (MACHIKANIA_OBJ_ADDRESS-16)
 
 int readbuttons();
 void scroll(int x, int y);

--- a/mips/zoea/error.c
+++ b/mips/zoea/error.c
@@ -42,6 +42,10 @@ 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",
+	"Class or C library not found",
 };
 
 char* resolve_label(int s6){

--- a/mips/zoea/file.c
+++ b/mips/zoea/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
@@ -87,6 +89,8 @@ char* compile_file(){
 	char* err;
 	// Read first 512 bytes
 	read_file(512);
+	// Skip BOM (UTF-8) if exists
+	if (0xEF==g_source[0] && 0xBB==g_source[1] && 0xBF==g_source[2]) g_srcpos=3;
 	// Compile line by line
 	while (g_size==512) {
 		err=compile_line();
@@ -147,7 +151,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 +159,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 +248,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]));
@@ -293,4 +302,4 @@ int compile_and_link_main_file(char* buff,char* appname){
 		to use the same long var name in different files (note that g_long_name_var_num is not reseted after
 		compiling each class code).
 	*/
-}
\ No newline at end of file
+}

--- a/mips/zoea/float.c
+++ b/mips/zoea/float.c
@@ -9,6 +9,13 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "./compiler.h"
 #include "stdlib.h"
 

--- a/mips/zoea/function.c
+++ b/mips/zoea/function.c
@@ -9,10 +9,17 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 #include "api.h"
 
-OBJECTSECTION char* music_function(){
+char* music_function(){
 	char* err;
 	next_position();
 	if (g_source[g_srcpos]==')') {
@@ -26,26 +33,26 @@ OBJECTSECTION char* music_function(){
 	return 0;
 }
 
-OBJECTSECTION char* read_function(){
+char* read_function(){
 	// This function is not valid in class file.
 	if (g_compiling_class) return ERR_INVALID_CLASS;
 	call_lib_code(LIB_READ);
 	return 0;
 }
 
-OBJECTSECTION char* cread_function(){
+char* cread_function(){
 	call_lib_code(LIB_CREAD);
 	return 0;
 }
 
-OBJECTSECTION char* gosub_function(){
+char* gosub_function(){
 	// Check if garbage collection has been done.
 	// This check is required because the used temporary area would be changed 
 	// in sub routine. 
 	if (g_temp_area_used) return ERR_GOSUB_ASH;
 	return gosub_statement();
 }
-OBJECTSECTION char* strncmp_function(){
+char* strncmp_function(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -67,7 +74,7 @@ OBJECTSECTION char* strncmp_function(){
 	g_object[g_objpos++]=0x27BD0008; // addiu       sp,sp,8
 	return 0;
 }
-OBJECTSECTION char* len_function(){
+char* len_function(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -81,7 +88,7 @@ OBJECTSECTION char* len_function(){
 	return 0;
 }
 
-OBJECTSECTION char* asc_function(){
+char* asc_function(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -90,7 +97,7 @@ OBJECTSECTION char* asc_function(){
 	return 0;
 }
 
-OBJECTSECTION char* val_function(){
+char* val_function(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -98,7 +105,7 @@ OBJECTSECTION char* val_function(){
 	return 0;	
 }
 
-OBJECTSECTION char* peek_function_sub(int bits){
+char* peek_function_sub(int bits){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -118,7 +125,7 @@ OBJECTSECTION char* peek_function_sub(int bits){
 	return 0;
 }
 
-OBJECTSECTION char* sgn_function(){
+char* sgn_function(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -132,7 +139,7 @@ OBJECTSECTION char* sgn_function(){
 	return 0;
 }
 
-OBJECTSECTION char* abs_function(){
+char* abs_function(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -143,7 +150,7 @@ OBJECTSECTION char* abs_function(){
 	return 0;
 }
 
-OBJECTSECTION char* not_function(){
+char* not_function(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -152,19 +159,19 @@ OBJECTSECTION char* not_function(){
 	return 0;
 }
 
-OBJECTSECTION char* rnd_function(){
+char* rnd_function(){
 	call_lib_code(LIB_RND);
 	return 0;
 }
 
-OBJECTSECTION char* chr_function(void){
+char* chr_function(void){
 	char* err;
 	err=get_value();
 	if (err) return err;
 	call_lib_code(LIB_CHR);
 	return 0;
 }
-OBJECTSECTION char* hex_function(void){
+char* hex_function(void){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -191,7 +198,7 @@ OBJECTSECTION char* hex_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* dec_function(void){
+char* dec_function(void){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -199,7 +206,7 @@ OBJECTSECTION char* dec_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* keys_function(void){
+char* keys_function(void){
 	char* err;
 	next_position();
 	if (g_source[g_srcpos]==')') {
@@ -213,7 +220,7 @@ OBJECTSECTION char* keys_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* tvram_function(void){
+char* tvram_function(void){
 	char* err;
 	int i;
 	next_position();
@@ -235,17 +242,17 @@ OBJECTSECTION char* tvram_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* drawcount_function(void){
+char* drawcount_function(void){
 	call_lib_code(LIB_DRAWCOUNT);
 	return 0;
 }
 
-OBJECTSECTION char* input_function(void){
+char* input_function(void){
 	call_lib_code(LIB_INPUT);
 	return 0;
 }
 
-OBJECTSECTION char* inkey_function(void){
+char* inkey_function(void){
 	char* err;
 	next_position();
 	if (g_source[g_srcpos]==')') {
@@ -259,11 +266,11 @@ OBJECTSECTION char* inkey_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* args_function(void){
+char* args_function(void){
 	return args_function_main();
 }
 
-OBJECTSECTION char* system_function(void){
+char* system_function(void){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -272,7 +279,7 @@ OBJECTSECTION char* system_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* sprintf_function(void){
+char* sprintf_function(void){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -292,7 +299,7 @@ OBJECTSECTION char* sprintf_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* floatstr_function(void){
+char* floatstr_function(void){
 	char* err;
 	err=get_float();
 	if (err) return err;
@@ -303,7 +310,7 @@ OBJECTSECTION char* floatstr_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* floatsharp_function(void){
+char* floatsharp_function(void){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -311,7 +318,7 @@ OBJECTSECTION char* floatsharp_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* valsharp_function(void){
+char* valsharp_function(void){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -319,7 +326,7 @@ OBJECTSECTION char* valsharp_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* int_function(void){
+char* int_function(void){
 	char* err;
 	err=get_float();
 	if (err) return err;
@@ -327,22 +334,22 @@ OBJECTSECTION char* int_function(void){
 	return 0;
 }
 
-OBJECTSECTION char* fseek_function(){
+char* fseek_function(){
 	call_lib_code(LIB_FILE | FUNC_FTELL);
 	return 0;
 }
 
-OBJECTSECTION char* flen_function(){
+char* flen_function(){
 	call_lib_code(LIB_FILE | FUNC_FLEN);
 	return 0;
 }
 
-OBJECTSECTION char* fgetc_function(){
+char* fgetc_function(){
 	call_lib_code(LIB_FILE | FUNC_FGETC);
 	return 0;
 }
 
-OBJECTSECTION char* finput_function(){
+char* finput_function(){
 	char* err;
 	next_position();
 	if (g_source[g_srcpos]!=')') {
@@ -357,12 +364,12 @@ OBJECTSECTION char* finput_function(){
 	return 0;
 }
 
-OBJECTSECTION char* feof_function(){
+char* feof_function(){
 	call_lib_code(LIB_FILE | FUNC_FEOF);
 	return 0;
 }
 
-OBJECTSECTION char* playwave_function(){
+char* playwave_function(){
 	char* err;
 	next_position();
 	if (g_source[g_srcpos]!=')') {
@@ -378,7 +385,7 @@ OBJECTSECTION char* playwave_function(){
 	return 0;
 }
 
-OBJECTSECTION char* setdir_function(){
+char* setdir_function(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -386,21 +393,21 @@ OBJECTSECTION char* setdir_function(){
 	return 0;
 }
 
-OBJECTSECTION char* getdir_function(){
+char* getdir_function(){
 	call_lib_code(LIB_GETDIR);
 	return 0;
 }
 
-OBJECTSECTION char* exec_function(){
+char* exec_function(){
 	return exec_statement();
 }
 
-OBJECTSECTION char* readkey_function(){
+char* readkey_function(){
 	call_lib_code(LIB_READKEY);
 	return 0;
 }
 
-OBJECTSECTION char* float_constant(float val){
+char* float_constant(float val){
 	volatile int i;
 	((float*)(&i))[0]=val;
 	if (i&0xFFFF0000) {
@@ -416,7 +423,7 @@ OBJECTSECTION char* float_constant(float val){
 	return 0;	
 }
 
-OBJECTSECTION char* float_1param_function(enum functions func){
+char* float_1param_function(enum functions func){
 	char* err;
 	err=get_float();
 	if (err) return err;
@@ -424,7 +431,7 @@ OBJECTSECTION char* float_1param_function(enum functions func){
 	return 0;
 }
 
-OBJECTSECTION char* float_2param_function(enum functions func){
+char* float_2param_function(enum functions func){
 	char* err;
 	err=get_float();
 	if (err) return err;
@@ -444,7 +451,7 @@ OBJECTSECTION char* float_2param_function(enum functions func){
 	return 0;
 }
 
-OBJECTSECTION char* float_function(void){
+char* float_function(void){
 	char* err;
 	if (nextCodeIs("FLOAT#(")) {
 		err=floatsharp_function();
@@ -494,12 +501,17 @@ OBJECTSECTION 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 {
 		// Check if static method of a class
 		err=static_method('#');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('#');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -520,11 +532,12 @@ static const void* str_func_list[]={
 	"SYSTEM$(",system_function,
 	"FINPUT$(",finput_function,
 	"GETDIR$(",getdir_function,
+	"CLIB$(",clib_statement,
 	// Additional functions follow
 	ADDITIONAL_STR_FUNCTIONS
 };
 
-OBJECTSECTION char* str_function(void){
+char* str_function(void){
 	char* err;
 	int i;
 	char* (*f)();
@@ -539,7 +552,10 @@ OBJECTSECTION char* str_function(void){
 	} else {
 		// Check if static method of a class
 		err=static_method('$');
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method('$');
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;
@@ -549,23 +565,23 @@ OBJECTSECTION char* str_function(void){
 
 // Aliases follow
 
-OBJECTSECTION char* peek_function(){
+char* peek_function(){
 	return peek_function_sub(8);
 }
 
-OBJECTSECTION char* peek16_function(){
+char* peek16_function(){
 	return peek_function_sub(16);
 }
 
-OBJECTSECTION char* peek32_function(){
+char* peek32_function(){
 	return peek_function_sub(32);
 }
 
-OBJECTSECTION char* gcolor_function(){
+char* gcolor_function(){
 	return graphic_statement(FUNC_GCOLOR);
 }
 
-OBJECTSECTION char* fopen_function(){
+char* fopen_function(){
 	return fopen_statement_main(FUNC_FOPEN);
 }
 
@@ -609,11 +625,12 @@ static const void* int_func_list[]={
 	"EXEC(",exec_function,
 	"CORETIMER(",coretimer_function,
 	"READKEY(",readkey_function,
+	"CLIB(",clib_statement,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };
 
-OBJECTSECTION char* function(void){
+char* function(void){
 	char* err;
 	int i;
 	char* (*f)();
@@ -626,9 +643,12 @@ OBJECTSECTION char* function(void){
 		f=int_func_list[i+1];
 		err=f();
 	} else {
-		// Check if static method of a class
+		// Check if static method of a class of clib
 		err=static_method(0);
-		//return ERR_SYNTAX;
+		if (err==ERR_NO_CLASS) {
+			err=clib_method(0);
+			if (err==ERR_NO_CLIB) err=ERR_NO_CLASS_CLIB;
+		}
 	}
 	if (err) return err;
 	if (g_source[g_srcpos]!=')') return ERR_SYNTAX;

--- a/mips/zoea/globalvars.c
+++ b/mips/zoea/globalvars.c
@@ -12,8 +12,12 @@
 #include "compiler.h"
 #include "main.h"
 
-// Flag (NOP assembly) to use OBJECTSECTION for object.
-const __attribute__((address(OBJECTSECTION_ADDRESS))) int g_objectsection=0;
+// Store g_object/g_objpos values for MOS at jest before MACHIKANIA_OBJ_ADDRESS.
+// When these values are 0, MOS code is not loaded.
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-16))) _reserved1_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-12))) _reserved2_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-8)))  g_object_mos=0;
+const volatile int __attribute__((address(MACHIKANIA_OBJ_ADDRESS-4)))  g_objpos_mos=0;
 
 // Contain the valus of $gp and $s6 (GPR of MIPS32)
 int g_gp;
@@ -98,5 +102,11 @@ unsigned char g_num_classes;
 // OPTION FASTFIELD
 char g_option_fastfield;
 
+// Flag if file system has been initialized
+char g_fs_valid;
+
+// Result of reading a HEX file line
+HEXLINE g_hexline;
+
 // General purpose integer used for asigning value with pointer
 int g_temp;

--- a/mips/zoea/library.c
+++ b/mips/zoea/library.c
@@ -779,6 +779,11 @@ int lib_file(enum functions func, int a0, int a1, int v0){
 	int i;
 	int buff[1];
 	char* str;
+
+	// Immediately return if file system is invalid.
+	// See also "case LIB_FILE:" in _call_library().
+	if (!g_fs_valid) return v0;
+
 	if (activefhandle) fhandle=s_fhandle[activefhandle-1];
 	switch(func){
 		case FUNC_FINIT:
@@ -1011,6 +1016,7 @@ int _call_library(int a0,int a1,int v0,enum libs a3){
 			scroll(g_libparams[1],v0);
 			return v0;
 		case LIB_FILE:
+			if (!g_fs_valid) err_str("File System not initialized");
 			return lib_file((enum functions)(a3 & FUNC_MASK),g_libparams[1],g_libparams[2],v0);
 		case LIB_KEYS:
 			return lib_keys(v0);

--- a/mips/zoea/main.c
+++ b/mips/zoea/main.c
@@ -157,6 +157,7 @@ int searchinittext(char *s){
 void readinifile(void){
 	FSFILE *fp;
 	char inittext[9];
+	if (!g_fs_valid) return;
 
 	fp=FSfopen(INIFILE,"r");
 	if(fp==NULL) return;
@@ -203,6 +204,7 @@ void printhex32(unsigned int d){
 
 int main(void){
 	char *appname,*s;
+	int use_editor;
 
 	if(DEVCFG1 & 0x8000){
 		// Set Clock switching enabled and reset
@@ -234,6 +236,17 @@ int main(void){
 	// Show blue screen if exception before soft reset.
 	blue_screen();
 
+	// 実行中HEXファイル名がHEXFILEと一致するかどうか
+	use_editor=0;
+	appname=(char*)FILENAME_FLASH_ADDRESS;
+	s=HEXFILE;
+	while(*s++==*appname++) {
+		if(*s==0) {
+			//テキストエディター呼び出し
+			use_editor=1;
+			break;
+		}
+	}
 	printstr("MachiKania BASIC System\n");
 	printstr(" Ver "SYSVER1" "SYSVER2" by KENKEN\n");
 	printstr("BASIC Compiler "BASVER"\n");
@@ -241,16 +254,26 @@ int main(void){
 	//SDカードファイルシステム初期化
 	setcursorcolor(COLOR_NORMALTEXT);
 	printstr("Init File System...");
-	// Initialize the File System
-	if(FSInit()==FALSE){ //ファイルシステム初期化
-		//エラーの場合停止
-		setcursorcolor(COLOR_ERRORTEXT);
-		printstr("\nFile System Error\n");
-		printstr("Insert Correct Card\n");
-		printstr("And Reset\n");
-		while(1) asm("wait");
+	g_fs_valid=FSInit(); //ファイルシステム初期化
+	if(g_fs_valid==FALSE){
+		if (use_editor || !g_objpos_mos) {
+			// Editorモードの場合、及び、BASファイル読み込みモードの場合
+			//エラーの場合停止
+			setcursorcolor(COLOR_ERRORTEXT);
+			printstr("\nFile System Error\n");
+			printstr("Insert Correct Card\n");
+			printstr("And Reset\n");
+			while(1) asm("wait");
+		} else {
+			// MOSモードの場合は、あと二回、トライ
+			// エラー表示の後、続ける
+			g_fs_valid=FSInit();
+			if(g_fs_valid==FALSE) g_fs_valid=FSInit();
+		}
 	}
-	printstr("OK\n");
+	if (g_fs_valid) printstr("OK\n");
+	else printstr("Failed\n");
+
 	lockkey=2; // NumLockキーオン
 	keytype=0; // 日本語キーボード
 	readinifile(); //INIファイル読み込み
@@ -264,20 +287,23 @@ int main(void){
 	wait60thsec(60); //1秒待ち
 
 	// 実行中HEXファイル名がHEXFILEと一致した場合はエディタ起動
-	appname=(char*)FILENAME_FLASH_ADDRESS;
-	s=HEXFILE;
-	while(*s++==*appname++) if(*s==0) texteditor(); //テキストエディター呼び出し
+	if(use_editor) texteditor(); //テキストエディター呼び出し
 
-	// 実行中HEXファイル名の「.HEX」を「.BAS」に置き換えてBASファイルを実行
-	appname=(char*)FILENAME_FLASH_ADDRESS;
-	s=tempfile;
-	while(*appname!='.') *s++=*appname++;
-	appname=".BAS";
-	while(*appname!=0) *s++=*appname++;
-	*s=0;
-	// buttonmode(); //ボタン有効化
 	g_disable_break=1; // Breakキー無効化
-	runbasic(tempfile,0);
+	// buttonmode(); //ボタン有効化
+	if (g_objpos_mos) {
+		// MOSからコードをコピーして実行
+		runbasic(0,2);
+	} else {
+		// 実行中HEXファイル名の「.HEX」を「.BAS」に置き換えてBASファイルを実行
+		appname=(char*)FILENAME_FLASH_ADDRESS;
+		s=tempfile;
+		while(*appname!='.') *s++=*appname++;
+		appname=".BAS";
+		while(*appname!=0) *s++=*appname++;
+		*s=0;
+		runbasic(tempfile,0);
+	}
 	while(1) asm(WAIT);
 }
 

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

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

--- a/mips/zoea/run.c
+++ b/mips/zoea/run.c
@@ -32,10 +32,14 @@ char* printdec(int num){
 	}
 }
 
-int runbasic(char *appname,int test){
+#define RUNMODE_COMPILE_AND_RUN 0
+#define RUNMODE_COMPILE_ONLY    1
+#define RUNMODE_COPY_AND_RUN    2
+
+int runbasic(char *appname,int mode){
 // BASICソースのコンパイルと実行
 // appname 実行するBASICソースファイル
-// test 0:コンパイルと実行、0以外:コンパイルのみで終了
+// mode 0:コンパイルと実行、1:コンパイルのみで終了、2:コンパイル済みオブジェクトを実行
 //
 // 戻り値
 //　　0:正常終了
@@ -57,16 +61,18 @@ int runbasic(char *appname,int test){
 	// Clear object area
 	for(i=0;i<RAMSIZE/4;i++) g_object[i]=0x00000000;
 
-	// Check file error
-	err=init_file(buff,appname);
-	if (err) {
-		setcursorcolor(COLOR_ERRORTEXT);
-		printstr("Can't Open ");
-		printstr(appname);
-		printchar('\n');
-		return -1;
+	if (mode!=RUNMODE_COPY_AND_RUN) {
+		// Check file error
+		err=init_file(buff,appname);
+		if (err) {
+			setcursorcolor(COLOR_ERRORTEXT);
+			printstr("Can't Open ");
+			printstr(appname);
+			printchar('\n');
+			return -1;
+		}
+		close_file();
 	}
-	close_file();	
 
 	// Initialize parameters
 	g_pcg_font=0;
@@ -75,7 +81,6 @@ int runbasic(char *appname,int test){
 	clearscreen();
 	setcursor(0,0,7);
 	g_long_name_var_num=0;
-	cmpdata_init();
 
 	// Initialize music system
 	init_music();
@@ -85,13 +90,24 @@ int runbasic(char *appname,int test){
 
 	printstr("Compiling...");
 
-	// Compile the file
-	i=compile_and_link_main_file(buff,appname);
-	if (i) return i;
-
+	if (mode==RUNMODE_COPY_AND_RUN) {
+		// Copy the object from MOS
+		appname=(char*)MACHIKANIA_OBJ_ADDRESS;
+		for(i=0;i<RAMSIZE;i++) RAM[i]=appname[i];
+		// Set g_object/g_objpos for library functions like lib_read().
+		// The g_object/g_objpos values are stoared just before MOS.
+		g_object=(int*)g_object_mos;
+		g_objpos=g_objpos_mos;
+	} else {
+		// Initialize compiler
+		cmpdata_init();
+		// Compile the file
+		i=compile_and_link_main_file(buff,appname);
+		if (i) return i;
+	}
 	// All done
 	printstr("done\n");
-	if(test) return 0; //コンパイルのみの場合
+	if(mode==RUNMODE_COMPILE_ONLY) return 0; //コンパイルのみの場合
 	wait60thsec(15);
 
 	// Initialize the other parameters
@@ -131,3 +147,114 @@ int runbasic(char *appname,int test){
 
 	return 0;
 }
+
+int create_self_running_hex(char* hexfilename){
+	int i,j,fpos;
+	FSFILE* dst_file;
+	char* buff;
+	char* err;
+	unsigned int* object;
+	unsigned int addr,adjust;
+	unsigned int data[4];
+	// Set buffer positions
+	buff=(char*)&(RAM[RAMSIZE-512]);
+	// Open original and destination HEX files.
+	if (hex_init_file(buff,HEXFILE)) return -1;
+	dst_file=FSfopen(hexfilename,"w");
+	if (!dst_file) {
+		hex_close_file();
+		return -1;
+	}
+	// Copy the HEX file from original MachiKania, except for MOS.
+	addr=0;
+	fpos=0;
+	while(1) {
+		if (0==((fpos++)&0x3ff)) {
+			// Indicator works every 1024 lines
+			printchar('.');
+		}
+		err=hex_read_line();
+		if (err) break;
+		// Determine type and current address.
+		// If address is OK, write it to destination.
+		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[1];
+			addr=addr<<16;
+			// Highest bit will be 1 for 0x9D0xxxxx instead of 0x1D0xxxxx
+			addr|=0x80000000;
+			// Write this anyway
+			err=hex_write(dst_file);
+			if (err) break;
+		} else if (g_hexline.type==0) {
+			// data
+			addr&=0xffff0000;
+			addr|=g_hexline.address;
+			// Write this line if not in MOS
+			if (addr<MACHIKANIA_OBJ_INFO || FILENAME_FLASH_ADDRESS<=addr) {
+				err=hex_write(dst_file);
+				if (err) break;
+			}
+		} else {
+			// Unknown type
+			err=ERR_HEX_ERROR;
+			break;
+		}
+	}
+	hex_close_file();
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// Save MACHIKANIA_OBJ_INFO
+	addr=MACHIKANIA_OBJ_INFO;
+	err=hex_write_address(dst_file,addr>>16);
+	if (!err) {
+		data[2]=(int)g_object;
+		data[3]=(int)g_objpos;
+		err=hex_write_data_16(dst_file,addr&0xffff,&data[0]);
+	}
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// Add MOS. Adjustment is for changing address from RAM area to MOS.
+	addr=-1;
+	object=(unsigned int*)(&RAM[0]);
+	adjust=(unsigned int)MACHIKANIA_OBJ_ADDRESS-(unsigned int)object;
+	while(object<(unsigned int*)(&g_object[g_objpos])){
+		if (0==((fpos++)&0x3ff)) {
+			// Indicator works every 1024 lines
+			printchar('.');
+		}
+		if ((0x7fff0000 & ((unsigned int)object+adjust)) != addr) {
+			// Construct a hex line for providing Extended linear addres
+			addr=0x7fff0000 & ((unsigned int)object+adjust);
+			err=hex_write_address(dst_file,addr>>16);
+			if (err) break;
+		}
+		// Construct a hex line for data
+		err=hex_write_data_16(dst_file,((unsigned int)object+adjust)&0xffff,object);
+		if (err) break;
+		// All OK for these 4 words (16 bytes).
+		object+=4;
+		err=0;
+	}
+	if (err) {
+		FSfclose(dst_file);
+		printstr(err);
+		return -1;
+	}
+	// All done. Write EOF
+	err=hex_write_eof(dst_file);
+	FSfclose(dst_file);
+	if (err) return -1;
+	return 0;
+}

--- a/mips/zoea/sharedfiles.js
+++ b/mips/zoea/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',
@@ -36,6 +38,7 @@ var filearray=[
 	'reservednames.js',
 	'sharedfiles.js',
 	'class.txt',
+	'clib.txt',
 ];
 
 var WshShell = WScript.CreateObject("WScript.Shell");

--- a/mips/zoea/statement.c
+++ b/mips/zoea/statement.c
@@ -9,10 +9,17 @@
 	This file is shared by Megalopa and Zoea
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "api.h"
 #include "compiler.h"
 
-OBJECTSECTION char* rem_statement(){
+char* rem_statement(){
 	if (g_source[g_srcpos-4]<0x20) {
 		// This line contains only "REM" statement
 		// Delete $s6-setting command if exists.
@@ -24,7 +31,7 @@ OBJECTSECTION char* rem_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* sound_statement(){
+char* sound_statement(){
 	char *err;
 	err=get_label();
 	if (err) return err;
@@ -62,7 +69,7 @@ OBJECTSECTION char* sound_statement(){
 	call_lib_code(LIB_SOUND);
 	return 0;
 }
-OBJECTSECTION char* music_statement(){
+char* music_statement(){
 	char *err;
 	err=get_string();
 	if (err) return err;
@@ -88,7 +95,7 @@ OBJECTSECTION char* music_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* exec_statement(){
+char* exec_statement(){
 	char *err;
 	char b1;
 	int i,prevpos;
@@ -123,7 +130,7 @@ OBJECTSECTION char* exec_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* cdata_statement(){
+char* cdata_statement(){
 	// 0x00000020, 0x00000021, 0x00000022, and 0x00000023 (add/addu/sub/subu zero,zero,zero) 
 	// are the sign of data region
 	int beginpos,prevpos;
@@ -191,7 +198,7 @@ OBJECTSECTION char* cdata_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* data_statement(){
+char* data_statement(){
 	// 0x00000020, 0x00000021, 0x00000022, and 0x00000023 (add/addu/sub/subu zero,zero,zero) 
 	// are the sign of data region
 	int i,prevpos;
@@ -232,12 +239,12 @@ OBJECTSECTION char* data_statement(){
 	}
 }
 
-OBJECTSECTION char* clear_statement(){
+char* clear_statement(){
 	call_lib_code(LIB_CLEAR);
 	return 0;
 }
 
-OBJECTSECTION char* poke_statement_sub(int bits){
+char* poke_statement_sub(int bits){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -266,7 +273,7 @@ OBJECTSECTION char* poke_statement_sub(int bits){
 	return 0;
 }
 
-OBJECTSECTION char* dim_statement(){
+char* dim_statement(){
 	char* err;
 	char b1;
 	int i;
@@ -309,7 +316,7 @@ OBJECTSECTION char* dim_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* label_statement(){
+char* label_statement(){
 	char* err;
 	char b1;
 	b1=g_source[g_srcpos];
@@ -329,7 +336,7 @@ OBJECTSECTION char* label_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* restore_statement(){
+char* restore_statement(){
 	char* err;
 	// This statement is not valid in class file.
 	if (g_compiling_class) return ERR_INVALID_CLASS;
@@ -351,7 +358,7 @@ OBJECTSECTION char* restore_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* gosub_statement_sub(){
+char* gosub_statement_sub(){
 	char* err;
 	err=get_label();
 	if (err) return err;
@@ -388,7 +395,7 @@ OBJECTSECTION char* gosub_statement_sub(){
 	return 0;
 }
 
-OBJECTSECTION char* gosub_statement(){
+char* gosub_statement(){
 	char* err;
 	int opos,spos,stack;
 	// Skip label first (see below)
@@ -417,7 +424,7 @@ OBJECTSECTION char* gosub_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* return_statement(){
+char* return_statement(){
 	char* err;
 	char b1;
 	next_position();
@@ -435,7 +442,7 @@ OBJECTSECTION char* return_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* goto_statement(){
+char* goto_statement(){
 	char* err;
 	err=get_label();
 	if (err) return err;
@@ -458,7 +465,7 @@ OBJECTSECTION char* goto_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* if_statement(){
+char* if_statement(){
 	char* err;
 	int prevpos,bpos;
 	// Get value.
@@ -537,7 +544,7 @@ OBJECTSECTION char* if_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* elseif_statement(void){
+char* elseif_statement(void){
 	// Multiple line mode
 	char* err;
 	g_object[g_objpos++]=0x08160100; // breakif (see linker)
@@ -560,7 +567,7 @@ OBJECTSECTION char* elseif_statement(void){
 	
 }
 
-OBJECTSECTION char* else_statement(void){
+char* else_statement(void){
 	// Multiple line mode
 	g_object[g_objpos++]=0x08160100; // breakif (see linker)
 	g_object[g_objpos++]=0x30008000; // nop (see linker)
@@ -575,7 +582,7 @@ OBJECTSECTION char* else_statement(void){
 	return 0;
 }
 
-OBJECTSECTION char* endif_statement(void){
+char* endif_statement(void){
 	// Multiple line mode
 	g_object[g_objpos++]=0x30008000; // nop (see linker)
 	g_object[g_objpos++]=0x30008000; // nop (see linker)
@@ -589,7 +596,7 @@ OBJECTSECTION char* endif_statement(void){
 	return 0;
 }
 
-OBJECTSECTION char* end_statement(void){
+char* end_statement(void){
 	int i;
 	i=(int)&g_end_addr;
 	i-=g_gp;
@@ -600,7 +607,7 @@ OBJECTSECTION char* end_statement(void){
 	return 0;
 }
 
-OBJECTSECTION char* let_dim_sub(int i){
+char* let_dim_sub(int i){
 	char* err;
 	g_srcpos++;
 	err=get_value();
@@ -626,7 +633,7 @@ OBJECTSECTION char* let_dim_sub(int i){
 	return 0;
 };
 
-OBJECTSECTION char* let_statement(){
+char* let_statement(){
 	char* err;
 	char b2,b3;
 	int i,spos,opos;
@@ -718,7 +725,7 @@ OBJECTSECTION char* let_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* print_statement_main(enum libs lib_printstr, enum libs lib_string){
+char* print_statement_main(enum libs lib_printstr, enum libs lib_string){
 	char* err;
 	char b1;
 	int i;
@@ -773,21 +780,21 @@ OBJECTSECTION char* print_statement_main(enum libs lib_printstr, enum libs lib_s
 	return 0;
 }
 
-OBJECTSECTION char* break_statement(){
+char* break_statement(){
 	check_obj_space(2);
 	g_object[g_objpos++]=0x08160000; // j           xxxx     (See link() function)
 	g_object[g_objpos++]=0x00000000; // nop
 	return 0;
 }
 
-OBJECTSECTION char* continue_statement(){
+char* continue_statement(){
 	check_obj_space(2);
 	g_object[g_objpos++]=0x08160008; // j           xxxx     (See link() function)
 	g_object[g_objpos++]=0x00000000; // nop
 	return 0;
 }
 
-OBJECTSECTION char* for_statement(){
+char* for_statement(){
 	char* err;
 //	char b1;
 	int i;
@@ -852,7 +859,7 @@ OBJECTSECTION char* for_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* next_statement(){
+char* next_statement(){
 	// Return to address stored in 4($sp)
 	// while set $v0 to 8($sp) (see for_statement)
 	// Following assembly must be 4 words.
@@ -865,7 +872,7 @@ OBJECTSECTION char* next_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* do_statement(){
+char* do_statement(){
 	char* err;
 	// Usage of stack:
 	//    4(sp): Address to return to in "DO" statement.
@@ -899,7 +906,7 @@ OBJECTSECTION char* do_statement(){
 	}
 }
 
-OBJECTSECTION char* loop_statement(){
+char* loop_statement(){
 	char* err;
 	int opos;
 	opos=g_objpos;
@@ -928,7 +935,7 @@ OBJECTSECTION char* loop_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* while_statement(){
+char* while_statement(){
 	char* err;
 	check_obj_space(3);
 	g_object[g_objpos++]=0x04130001; // bgezall     zero,label1:
@@ -944,7 +951,7 @@ OBJECTSECTION char* while_statement(){
 		                             // label2:
 }
 
-OBJECTSECTION char* wend_statement(){
+char* wend_statement(){
 	check_obj_space(4);
 	g_object[g_objpos++]=0x8FBF0004; // lw          ra,4(sp)
 	g_object[g_objpos++]=0x03E00008; // jr          ra
@@ -954,7 +961,7 @@ OBJECTSECTION char* wend_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* param4_statement(enum libs lib){
+char* param4_statement(enum libs lib){
 	// lib is either LIB_PALETTE or LIB_GPALETTE
 	// PALETTE N,R,G,B
 	char* err;
@@ -989,7 +996,7 @@ OBJECTSECTION char* param4_statement(enum libs lib){
 	return 0;
 }
 
-OBJECTSECTION char* param3_statement(enum libs lib){
+char* param3_statement(enum libs lib){
 	char* err;
 	// Get 1st parameter
 	err=get_value();
@@ -1015,17 +1022,17 @@ OBJECTSECTION char* param3_statement(enum libs lib){
 	return 0;
 }
 
-OBJECTSECTION char* bgcolor_statement(){
+char* bgcolor_statement(){
 	// BGCOLOR R,G,B
 	return param3_statement(LIB_BGCOLOR);
 }
 
-OBJECTSECTION char* pcg_statement(){
+char* pcg_statement(){
 	// PCG ASCII,D1,D2
 	return param3_statement(LIB_PCG);
 }
 
-OBJECTSECTION char* usepcg_statement(){
+char* usepcg_statement(){
 	int objpos=g_objpos;
 	if (get_value()) {
 		// Getting integer failed.
@@ -1039,7 +1046,7 @@ OBJECTSECTION char* usepcg_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* usegraphic_statement(){
+char* usegraphic_statement(){
 	int objpos=g_objpos;
 	if (get_value()) {
 		// Getting integer failed.
@@ -1053,17 +1060,17 @@ OBJECTSECTION char* usegraphic_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* cls_statement(){
+char* cls_statement(){
 	call_lib_code(LIB_CLS);
 	return 0;
 }
 
-OBJECTSECTION char* gcls_statement(){
+char* gcls_statement(){
 	call_lib_code(LIB_GCLS);
 	return 0;
 }
 
-OBJECTSECTION char* color_statement(){
+char* color_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1071,7 +1078,7 @@ OBJECTSECTION char* color_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* gcolor_statement(){
+char* gcolor_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1079,7 +1086,7 @@ OBJECTSECTION char* gcolor_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* param2_statement(enum libs lib){
+char* param2_statement(enum libs lib){
 	char* err;
 	// Get 1st
 	err=get_value();
@@ -1098,7 +1105,7 @@ OBJECTSECTION char* param2_statement(enum libs lib){
 	return 0;
 }
 
-OBJECTSECTION char* system_statement(){
+char* system_statement(){
 	// SYSTEM X,Y
 	char* err;
 	// Get 1st
@@ -1119,17 +1126,17 @@ OBJECTSECTION char* system_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* cursor_statement(){
+char* cursor_statement(){
 	// CURSOR X,Y
 	return param2_statement(LIB_CURSOR);
 }
 
-OBJECTSECTION char* scroll_statement(){
+char* scroll_statement(){
 	// SCROLL X,Y
 	return param2_statement(LIB_SCROLL);
 }
 
-OBJECTSECTION char* drawcount_statement(){
+char* drawcount_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1137,7 +1144,7 @@ OBJECTSECTION char* drawcount_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* wait_statement(){
+char* wait_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1145,7 +1152,7 @@ OBJECTSECTION char* wait_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* width_statement(){
+char* width_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1153,7 +1160,7 @@ OBJECTSECTION char* width_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* var_statement_sub(int a0, int a1){
+char* var_statement_sub(int a0, int a1){
 	// Construct parameter-setting scripts
 	if (a0&0xffff0000) {
 		check_obj_space(1);
@@ -1184,7 +1191,7 @@ OBJECTSECTION char* var_statement_sub(int a0, int a1){
 	return 0;
 }
 
-OBJECTSECTION char* var_statement(){
+char* var_statement(){
 	char* err;
 	int i,j,a0,a1;
 	static int prevpos;
@@ -1243,7 +1250,7 @@ OBJECTSECTION char* var_statement(){
 }
 
 
-OBJECTSECTION char* graphic_statement(enum functions func){
+char* graphic_statement(enum functions func){
 	/*
 		PSET X1,Y1[,C]
 		LINE X1,Y1,X2,Y2[,C]
@@ -1376,7 +1383,7 @@ OBJECTSECTION char* graphic_statement(enum functions func){
 	return 0;
 }
 
-OBJECTSECTION char* fopen_statement_main(enum functions func){
+char* fopen_statement_main(enum functions func){
 	// func is either FUNC_FOPENST or FUNC_FOPEN
 	char* err;
 	// Get 1st
@@ -1408,7 +1415,7 @@ OBJECTSECTION char* fopen_statement_main(enum functions func){
 	return 0;
 }
 
-OBJECTSECTION char* file_statement(){
+char* file_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1416,7 +1423,7 @@ OBJECTSECTION char* file_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* fclose_statement(){
+char* fclose_statement(){
 	char* err;
 	int orgpos=g_srcpos;
 	if (endOfStatement()) {
@@ -1435,25 +1442,25 @@ OBJECTSECTION char* fclose_statement(){
 
 TODO: candidates to add:
 
-int FSattrib (FSFILE * file, unsigned char attributes);
+// int FSattrib (FSFILE * file, unsigned char attributes);
 int FSrename (const char * fileName, FSFILE * fo);
 int FSmkdir (char * path);
 int FSrmdir (char * path, unsigned char rmsubdirs);
-int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
+// int SetClockVars (unsigned int year, unsigned char month, unsigned char day, unsigned char hour, unsigned char minute, unsigned char second);
 int FindFirst (const char * fileName, unsigned int attr, SearchRec * rec);
 int FindNext (SearchRec * rec);
 
 */
 
-OBJECTSECTION char* fget_statement(){
+char* fget_statement(){
 	return param2_statement(LIB_FILE | FUNC_FGET);
 }
 
-OBJECTSECTION char* fput_statement(){
+char* fput_statement(){
 	return param2_statement(LIB_FILE | FUNC_FPUT);
 }
 
-OBJECTSECTION char* fseek_statement(){
+char* fseek_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1461,7 +1468,7 @@ OBJECTSECTION char* fseek_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* fputc_statement(){
+char* fputc_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
@@ -1469,7 +1476,7 @@ OBJECTSECTION char* fputc_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* fremove_statement(){
+char* fremove_statement(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -1477,7 +1484,7 @@ OBJECTSECTION char* fremove_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* usevar_statement(){
+char* usevar_statement(){
 	char* err;
 	int i;
 	do {
@@ -1497,7 +1504,7 @@ OBJECTSECTION char* usevar_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* playwave_statement(){
+char* playwave_statement(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -1520,7 +1527,7 @@ OBJECTSECTION char* playwave_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* useclass_statement(){
+char* useclass_statement(){
 	char* err;
 	int i;
 	int* cmpdata;
@@ -1556,7 +1563,7 @@ OBJECTSECTION char* useclass_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* setdir_statement(){
+char* setdir_statement(){
 	char* err;
 	err=get_string();
 	if (err) return err;
@@ -1564,7 +1571,7 @@ OBJECTSECTION char* setdir_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* option_statement(){
+char* option_statement(){
 	while(1){
 		next_position();
 		if (nextCodeIs("NOLINENUM")) {
@@ -1594,7 +1601,7 @@ OBJECTSECTION char* option_statement(){
 	return 0;
 }
 
-OBJECTSECTION char* idle_statement(){
+char* idle_statement(){
 	check_obj_space(2);
 	g_object[g_objpos++]=0x42000020; // wait
 	return 0;	
@@ -1609,67 +1616,67 @@ OBJECTSECTION char* idle_statement(){
 
 // Aliases follow
 
-OBJECTSECTION char* poke_statement(){
+char* poke_statement(){
 	return poke_statement_sub(8);
 }
 
-OBJECTSECTION char* poke16_statement(){
+char* poke16_statement(){
 	return poke_statement_sub(16);
 }
 
-OBJECTSECTION char* poke32_statement(){
+char* poke32_statement(){
 	return poke_statement_sub(32);
 }
 
-OBJECTSECTION char* palette_statement(){
+char* palette_statement(){
 	return param4_statement(LIB_PALETTE);
 }
 
-OBJECTSECTION char* gpalette_statement(){
+char* gpalette_statement(){
 	return param4_statement(LIB_GPALETTE);
 }
 
-OBJECTSECTION char* print_statement(){
+char* print_statement(){
 	return print_statement_main(LIB_PRINTSTR,LIB_STRING);
 }
 
-OBJECTSECTION char* pset_statement(){
+char* pset_statement(){
 	return graphic_statement(FUNC_PSET);
 }
 
-OBJECTSECTION char* line_statement(){
+char* line_statement(){
 	return graphic_statement(FUNC_LINE);
 }
 
-OBJECTSECTION char* boxfill_statement(){
+char* boxfill_statement(){
 	return graphic_statement(FUNC_BOXFILL);
 }
 
-OBJECTSECTION char* circle_statement(){
+char* circle_statement(){
 	return graphic_statement(FUNC_CIRCLE);
 }
 
-OBJECTSECTION char* circlefill_statement(){
+char* circlefill_statement(){
 	return graphic_statement(FUNC_CIRCLEFILL);
 }
 
-OBJECTSECTION char* gprint_statement(){
+char* gprint_statement(){
 	return graphic_statement(FUNC_GPRINT);
 }
 
-OBJECTSECTION char* putbmp_statement(){
+char* putbmp_statement(){
 	return graphic_statement(FUNC_PUTBMP);
 }
 
-OBJECTSECTION char* point_statement(){
+char* point_statement(){
 	return graphic_statement(FUNC_POINT);
 }
 
-OBJECTSECTION char* fopen_statement(){
+char* fopen_statement(){
 	return fopen_statement_main(FUNC_FOPENST);
 }
 
-OBJECTSECTION char* fprint_statement(){
+char* fprint_statement(){
 	return print_statement_main(LIB_FILE | FUNC_FPRINTSTR,LIB_FILE | FUNC_FSTRING);
 }
 
@@ -1754,11 +1761,13 @@ 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
 };
 
-OBJECTSECTION char* statement(void){
+char* statement(void){
 	char* err;
 	int prevpos;
 	int i;

--- a/mips/zoea/string.c
+++ b/mips/zoea/string.c
@@ -15,6 +15,13 @@
 	char* simple_string(void);
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "api.h"
 #include "compiler.h"
 

--- a/mips/zoea/value.c
+++ b/mips/zoea/value.c
@@ -13,6 +13,13 @@
   Public function is only get_value().
 */
 
+/*
+	All the code from this file will be assigned in MachiKania Object Section (MOS).
+	MOS will be replaced by BASIC object when constructing self-running HEX file.
+	Therefore, DO NOT place any run-time routine/romdata in this file.
+	See the MOS definition in liker script.
+*/
+
 #include "compiler.h"
 
 char* get_value();

--- a/mips/zoea/varname.c
+++ b/mips/zoea/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