Commit: 263 - kmbasic (svn)

BASIC compiler/interpreter for PIC32MX/MZ-80K (suspended)

Commit MetaInfo

• Revision: 263 (tree)
• Time: 2018-07-30 07:41:27
• Author: kmorimatsu

Log Message

Import shared codes.

Change Summary

• modified: mips/branches/zoea/compiler.h
• modified: mips/branches/zoea/debug.c
• modified: mips/branches/zoea/debug.h
• modified: mips/branches/zoea/envspecific.c
• modified: mips/branches/zoea/error.c
• modified: mips/branches/zoea/function.c
• modified: mips/branches/zoea/library.c
• modified: mips/branches/zoea/memory.c
• modified: mips/branches/zoea/music.c
• modified: mips/branches/zoea/reservednames.js
• modified: mips/branches/zoea/run.c
• modified: mips/branches/zoea/statement.c

Incremental Difference

--- mips/branches/zoea/compiler.h	(revision 262)
+++ mips/branches/zoea/compiler.h	(revision 263)
@@ -117,6 +117,7 @@
 	LIB_WIDTH          =LIB_STEP*47,
 	LIB_FILE           =LIB_STEP*48,
 	LIB_PLAYWAVE       =LIB_STEP*49,
+	LIB_PLAYWAVEFUNC   =LIB_STEP*50,
 	LIB_DEBUG          =LIB_STEP*127,
 };
 
@@ -245,10 +246,11 @@
 
 void set_sound(unsigned long* data, int flagsLR);
 int musicRemaining(int flagsLR);
+int waveRemaining(int mode);
 void set_music(char* str, int flagsLR);
 void stop_music(void);
 void init_music(void);
-void play_wave(char* filename);
+void play_wave(char* filename, int start);
 
 char* statement(void);
 char* gosub_statement();
@@ -271,6 +273,7 @@
 void* calloc_memory(int size, int var_num);
 void move_to_perm_block(int var_num);
 void move_from_perm_block(int var_num);
+int get_permanent_var_num(void);
 
 char* link(void);
 char* get_label(void);

--- mips/branches/zoea/debug.c	(revision 262)
+++ mips/branches/zoea/debug.c	(revision 263)
@@ -61,8 +61,6 @@
 
 	printstr("BASIC "BASVER"\n");
 	wait60thsec(15);
-	// Initialize music
-	init_music();
 
 	printstr("Compiling...");
 
@@ -88,7 +86,6 @@
 	// Work area (used for A-Z values) is next to the object code area.
 	start_program((void*)(&(RAM[0])),(void*)(&g_var_mem[0]));
 	printstr("\nOK\n");
-	set_graphmode(0);
 	g_use_graphic=0;
 
 	return 1;
@@ -224,9 +221,7 @@
 
 static const char bastext[]=
 "CLS\n"
-"DIM S(512)\n"
-"EXEC 0x8fdd0012, 0x27bd07fc\n"
-"print s\n"
+"print NOT(0);IN(0)\n"
 "\n";
 
 /*

--- mips/branches/zoea/debug.h	(revision 262)
+++ mips/branches/zoea/debug.h	(revision 263)
@@ -15,11 +15,16 @@
 #define ps2init() not_ps2init_but_init_Timer1()
 int not_ps2init_but_init_Timer1();
 
-// Do not use set_graphmode()
-#define set_graphmode(m) (0)
-
 // Do not use asm("wait") but use asm("nop")
 #undef WAIT
 #define WAIT "nop"
 
 #endif // __DEBUG
+
+// key waiting macro
+
+#define debug_wait() lineinput((char*)&g_temp,3)
+#define debug_wait_char(x) do {\
+		printchar(x); \
+		lineinput((char*)&g_temp,3);\
+	} while(0)	

--- mips/branches/zoea/envspecific.c	(revision 262)
+++ mips/branches/zoea/envspecific.c	(revision 263)
@@ -17,6 +17,16 @@
 	For Zoea, disable PS/2 keyboard and enable tact switches, then read.
 */
 
+void pre_run(){
+	// TODO
+}
+
+void post_run(){
+	// Cool down
+	set_graphmode(0);
+	g_use_graphic=0;
+}
+
 int readbuttons(){
 	// Enable tact switches
 	if (inPS2MODE()) {

--- mips/branches/zoea/error.c	(revision 262)
+++ mips/branches/zoea/error.c	(revision 263)
@@ -69,6 +69,9 @@
 void pre_end_addr(int s6){
 	int i,j;
 	char str[7];
+	// Cool down the system
+	stop_music();
+	// Resolve line and show it
 	if (s6<0) s6=s6&0x7fffffff;
 	g_label=s6;
 	if (s6<65536) {
@@ -90,6 +93,7 @@
 	asm volatile("j pre_end_addr")
 
 void err_break(void){
+	stop_music();
 	printstr(ERR_BREAK);
 	end_exec();
 }

--- mips/branches/zoea/function.c	(revision 262)
+++ mips/branches/zoea/function.c	(revision 263)
@@ -362,6 +362,22 @@
 	return 0;
 }
 
+char* playwave_function(){
+	char* err;
+	next_position();
+	if (g_source[g_srcpos]!=')') {
+		// Get param
+		err=get_value();
+		if (err) return err;
+	} else {
+		// If parameter is omitted, use 0.
+		check_obj_space(1);
+		g_object[g_objpos++]=0x24020000;      // addiu       v0,zero,0
+	}
+	call_lib_code(LIB_PLAYWAVEFUNC);
+	return 0;
+}
+
 char* float_constant(float val){
 	volatile int i;
 	((float*)(&i))[0]=val;
@@ -545,6 +561,7 @@
 	"FPUTC(",fputc_statement,
 	"FREMOVE(",fremove_statement,
 	"FEOF(",feof_function,
+	"PLAYWAVE(",playwave_function,
 	// Additional functions follow
 	ADDITIONAL_INT_FUNCTIONS
 };

--- mips/branches/zoea/library.c	(revision 262)
+++ mips/branches/zoea/library.c	(revision 263)
@@ -1005,8 +1005,10 @@
 			set_music((char*)v0,a0);
 			return v0;
 		case LIB_PLAYWAVE:
-			play_wave((char*)v0);
+			play_wave((char*)g_libparams[1],v0);
 			return v0;
+		case LIB_PLAYWAVEFUNC:
+			return waveRemaining(v0);
 		case LIB_SETDRAWCOUNT:
 			drawcount=(v0&0x0000FFFF);
 			return v0;

--- mips/branches/zoea/memory.c	(revision 262)
+++ mips/branches/zoea/memory.c	(revision 263)
@@ -172,4 +172,13 @@
 	g_var_pointer[var_num]=g_var_pointer[i];
 	// Clear block
 	g_var_size[i]=0;
-}
\ No newline at end of file
+}
+
+int get_permanent_var_num(){
+	int i;
+	for (i=ALLOC_PERM_BLOCK;i<ALLOC_BLOCK_NUM;i++) {
+		if (g_var_size[i]==0) return i;
+	}
+	err_no_block();
+	return 0;
+}

--- mips/branches/zoea/music.c	(revision 262)
+++ mips/branches/zoea/music.c	(revision 263)
@@ -12,8 +12,6 @@
 /*
 	Timer3: 1/32 prescaler, toggle mode : 894886.25 Hz
 	PR3=2047 <-> 437 Hz
-	Timer4: 1/32 prescaler: 1789772.5 Hz
-	Timer4 29737 counts: 262 NTSC lines.
 */
 
 /*
@@ -88,7 +86,10 @@
 #define start_dma() T4CONSET=0x8000; DCH2CONSET=0x00000080; g_sound_mode=SOUND_MODE_WAVE
 #define stop_dma()  T4CONCLR=0x8000; DCH2CONCLR=0x00000080; g_sound_mode=SOUND_MODE_MUSIC
 
-
+int waveRemaining(int mode){
+	// TODO
+	return 0;
+}
 int musicRemaining(int flagsLR){
 	// flagsLR is ignored
 	return (g_musicend-g_musicstart)&31;
@@ -585,7 +586,8 @@
 	DCH2CONSET=0x00000080;
 }
 
-void play_wave(char* filename){
+void play_wave(char* filename, int start){
+	// TODO: Implement start parameter
 	int i;
 	// Stop the previous play
 	T3CONCLR=0x8000;

--- mips/branches/zoea/reservednames.js	(revision 262)
+++ mips/branches/zoea/reservednames.js	(revision 263)
@@ -137,12 +137,33 @@
 	'WEND',
 	'WHILE',
 	'WIDTH',
+	// For megalopa
+	'// For Megalopa',
+	'OUT',
+	'OUT8H',
+	'OUT8L',
+	'OUT16',
+	'IN',
+	'IN8H',
+	'IN8L',
+	'IN16',
+	'ANALOG',
+	'PWM',
+	'SERIAL',
+	'SPI',
+	'SPIOUT',
+	'SPIIN',
 ];
 var result='';
 for(key in namearray){
 	var nameint='0000'+name2int(namearray[key]).toString(16);
 	nameint=nameint.substr(nameint.length-8);
-	result+="\t0x"+nameint+", //"+namearray[key]+"\r\n";
+	if (namearray[key].substr(0,2)=='//') {
+		// This is a comment
+		result+=namearray[key]+"\r\n";
+	} else {
+		result+="\t0x"+nameint+", /*"+namearray[key]+"*/\r\n";
+	}
 }
 
 var fso = new ActiveXObject("Scripting.FileSystemObject");

--- mips/branches/zoea/run.c	(revision 262)
+++ mips/branches/zoea/run.c	(revision 263)
@@ -73,11 +73,12 @@
 	g_long_name_var_num=0;
 	cmpdata_init();
 
-	printstr("BASIC "BASVER"\n");
-	wait60thsec(15);
 	// Initialize music system
 	init_music();
 
+	printstr("BASIC "BASVER"\n");
+	wait60thsec(15);
+
 	printstr("Compiling...");
 
 	// Compile the file
@@ -134,14 +135,17 @@
 	// Assign memory
 	set_free_area((void*)(g_object+g_objpos),(void*)(&RAM[RAMSIZE]));
 
+	// Warm up environment
+	pre_run();
+
 	// Execute program
 	// Start program from the beginning of RAM.
 	// Work area (used for A-Z values) is next to the object code area.
 	start_program((void*)(&(RAM[0])),(void*)(&g_var_mem[0]));
 	printstr("\nOK\n");
-	// Cool down
-	set_graphmode(0);
-	g_use_graphic=0;
+
+	// Cool down environment
+	post_run();
 	lib_file(FUNC_FINIT,0,0,0);
 
 	return 0;

--- mips/branches/zoea/statement.c	(revision 262)
+++ mips/branches/zoea/statement.c	(revision 263)
@@ -1450,7 +1450,22 @@
 	char* err;
 	err=get_string();
 	if (err) return err;
+	check_obj_space(2);
+	g_object[g_objpos++]=0x27BDFFFC; // addiu       sp,sp,-4
+	g_object[g_objpos++]=0xAFA20004; // sw          v0,4(sp)
+	if (g_source[g_srcpos]==',') {
+		g_srcpos++;
+		// Get 2nd
+		err=get_value();
+		if (err) return err;
+	} else {
+		// If 2rd parameter is omitted, use 0.
+		check_obj_space(1);
+		g_object[g_objpos++]=0x24020000;      // addiu       v0,zero,0
+	}
 	call_lib_code(LIB_PLAYWAVE);
+	check_obj_space(1);
+	g_object[g_objpos++]=0x27BD0004; // addiu       sp,sp,4
 	return 0;
 }