コミット: 238 - kmbasic (svn)

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

コミットメタ情報

• リビジョン: 238 (tree)
• 日時: 2018-06-19 10:01:18
• 作者: kmorimatsu

ログメッセージ

Move lib_system to envspecific.c

変更サマリ

• modified: mips/branches/megalopa/envspecific.c
• modified: mips/branches/megalopa/envspecific.h
• modified: mips/branches/megalopa/library.c

差分

--- mips/branches/megalopa/envspecific.c	(revision 237)
+++ mips/branches/megalopa/envspecific.c	(revision 238)
@@ -6,6 +6,7 @@
 */
 
 #include <xc.h>
+#include "main.h"
 #include "compiler.h"
 #include "lib_video_megalopa.h"
 #include "ps2keyboard.h"
@@ -121,6 +122,75 @@
 	}
 }
 
+int lib_system(int a0, int a1 ,int v0, int a3, int g_gcolor, int g_prev_x, int g_prev_y){
+	switch((enum extra)(a3 & EXTRA_MASK)){
+		case EXTRA_SYSTEM:
+			// SYSTEM statement/function (see below)
+			break;
+		case EXTRA_OUT:
+		case EXTRA_OUT8H:
+		case EXTRA_OUT8L:
+		case EXTRA_OUT16:
+		case EXTRA_IN:
+		case EXTRA_IN8H:
+		case EXTRA_IN8L:
+		case EXTRA_IN16:
+		case EXTRA_ANALOG:
+		case EXTRA_PWM:
+		case EXTRA_SERIALOUT:
+		case EXTRA_SERIALIN:
+		case EXTRA_SPIOUT:
+		case EXTRA_SPIIN:
+			// TODO: Implement IO functions
+			return v0;
+		default:
+			err_unknown();
+			return v0;
+	}		
+	switch(a0){
+		// Version info
+		case 0: return (int)SYSVER1;
+		case 1: return (int)SYSVER2;
+		case 2: return (int)BASVER;
+		case 3: return (int)FILENAME_FLASH_ADDRESS;
+		// Display info
+		case 20: return twidth;
+		case 21: return twidthy;
+		case 22: return gwidth;
+		case 23: return gwidthy;
+		case 24: return cursorcolor;
+		case 25: return g_gcolor;
+		case 26: return ((int)(cursor-TVRAM))%twidth;
+		case 27: return ((int)(cursor-TVRAM))/twidth;
+		case 28: return g_prev_x;
+		case 29: return g_prev_y;
+		// Keyboard info
+		case 40: return (int)inPS2MODE();
+		case 41: return (int)vkey;
+		case 42: return (int)lockkey;
+		case 43: return (int)keytype;
+		// Pointers to gloval variables
+		case 100: return (int)&g_var_mem[0];
+		case 101: return (int)&g_rnd_seed;
+		case 102: return (int)&TVRAM[0];
+		case 103: return (int)&FontData[0];
+		case 104: return (int)g_var_mem[ALLOC_PCG_BLOCK];
+		case 105: return (int)g_var_mem[ALLOC_GRAPHIC_BLOCK];
+		// Change system settings
+		case 200:
+			// ON/OFF monitor
+			if (v0) {
+				start_composite();
+			} else {
+				stop_composite();
+			}
+			break;
+		default:
+			break;
+	}
+	return 0;
+}
+
 void videowidth(int width){
 	// TODO: must do something here
 

--- mips/branches/megalopa/envspecific.h	(revision 237)
+++ mips/branches/megalopa/envspecific.h	(revision 238)
@@ -12,11 +12,8 @@
 void usegraphic(int mode);
 void videowidth(int width);
 void set_graphmode(unsigned char m);
+int lib_system(int a0, int a1 ,int v0, int a3, int g_gcolor, int g_prev_x, int g_prev_y);
 
-// Graphic resolution is frexible (see lib_system)
-#define G_X_RES gwidth
-#define G_Y_RES gwidthy
-
 // 30 or 40 characters per line for Zoea
 #define printcomma() printstr("          "+rem10_32((unsigned int)(cursor-TVRAM)))
 
@@ -32,3 +29,24 @@
 #define ADDITIONAL_STATEMENTS
 #define ADDITIONAL_INT_FUNCTIONS
 #define ADDITIONAL_STR_FUNCTIONS
+
+#define EXTRA_MASK 0x003F
+#define EXTRA_STEP 0x0001
+enum extra{
+	EXTRA_SYSTEM     =EXTRA_STEP*0,
+	EXTRA_OUT        =EXTRA_STEP*1,
+	EXTRA_OUT8H      =EXTRA_STEP*2,
+	EXTRA_OUT8L      =EXTRA_STEP*3,
+	EXTRA_OUT16      =EXTRA_STEP*4,
+	EXTRA_IN         =EXTRA_STEP*5,
+	EXTRA_IN8H       =EXTRA_STEP*6,
+	EXTRA_IN8L       =EXTRA_STEP*7,
+	EXTRA_IN16       =EXTRA_STEP*8,
+	EXTRA_ANALOG     =EXTRA_STEP*9,
+	EXTRA_PWM        =EXTRA_STEP*10,
+	EXTRA_SERIALOUT  =EXTRA_STEP*11,
+	EXTRA_SERIALIN   =EXTRA_STEP*12,
+	EXTRA_SPIOUT     =EXTRA_STEP*13,
+	EXTRA_SPIIN      =EXTRA_STEP*14,
+	// MAX 63
+};

--- mips/branches/megalopa/library.c	(revision 237)
+++ mips/branches/megalopa/library.c	(revision 238)
@@ -608,51 +608,6 @@
 }
 
 
-int lib_system(int a0,int v0){
-	switch(a0){
-		// Version info
-		case 0: return (int)SYSVER1;
-		case 1: return (int)SYSVER2;
-		case 2: return (int)BASVER;
-		case 3: return (int)FILENAME_FLASH_ADDRESS;
-		// Display info
-		case 20: return twidth;
-		case 21: return WIDTH_Y;
-		case 22: return G_X_RES;
-		case 23: return G_Y_RES;
-		case 24: return cursorcolor;
-		case 25: return g_gcolor;
-		case 26: return ((int)(cursor-TVRAM))%twidth;
-		case 27: return ((int)(cursor-TVRAM))/twidth;
-		case 28: return g_prev_x;
-		case 29: return g_prev_y;
-		// Keyboard info
-		case 40: return (int)inPS2MODE();
-		case 41: return (int)vkey;
-		case 42: return (int)lockkey;
-		case 43: return (int)keytype;
-		// Pointers to gloval variables
-		case 100: return (int)&g_var_mem[0];
-		case 101: return (int)&g_rnd_seed;
-		case 102: return (int)&TVRAM[0];
-		case 103: return (int)&FontData[0];
-		case 104: return (int)g_var_mem[ALLOC_PCG_BLOCK];
-		case 105: return (int)g_var_mem[ALLOC_GRAPHIC_BLOCK];
-		// Change system settings
-		case 200:
-			// ON/OFF monitor
-			if (v0) {
-				start_composite();
-			} else {
-				stop_composite();
-			}
-			break;
-		default:
-			break;
-	}
-	return 0;
-}
-
 char* lib_sprintf(char* format, int data){
 	char* str;
 	int i;
@@ -1058,7 +1013,7 @@
 		case LIB_DRAWCOUNT:
 			return drawcount;
 		case LIB_SYSTEM:
-			return lib_system(a0,v0);
+			return lib_system(a0, a1 ,v0, a3, g_gcolor, g_prev_x, g_prev_y);
 		case LIB_RESTORE:
 			return lib_read(0,v0);
 		case LIB_RESTORE2: