Commit: c43645516955eab6e38639a5e56bbdf30b942098 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Révision: c43645516955eab6e38639a5e56bbdf30b942098 (tree)
• l'heure: 2019-01-07 12:14:02
• Auteur: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Message de Log

PEEK16(), PEEK32()

Change Summary

• modified: mips/megalopa/debug.c
• modified: mips/megalopa/function.c

Modification

--- a/mips/megalopa/debug.c
+++ b/mips/megalopa/debug.c
@@ -228,12 +228,15 @@ static const char initext[]=
 static const char bastext[]=
 "CLS\n"
 "dim a(0)\n"
-"poke a,0x12\n"
-"print hex$(a(0))\n"
-"poke16 a+2,0x1234\n"
-"print hex$(a(0))\n"
-"poke32 a,0x12345678\n"
-"print hex$(a(0))\n"
+"a(0)=0x89ABCDEF\n"
+"print hex$(peek(a)),\n"
+"print hex$(peek16(a)),\n"
+"print hex$(peek32(a)),\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
 "\n";
 
 
@@ -262,14 +265,9 @@ static const void* debugjumptable[]={
 
 int _debug_test(int a0, int a1, int a2, int a3, int param4, int param5){
 	asm volatile(".set noreorder");
-	asm volatile("addiu $s5,$sp,4");
-	asm volatile("sw $zero,4($s8)");
-	asm volatile("lw $a0,4($s8)");
-	asm volatile("addiu $v0,$s8,4");
-	asm volatile("sh $v0,0($v1)");
-	asm volatile("sw $v0,0($v1)");
-	((unsigned short*)a0)[0]=(unsigned short)a1;
-	asm volatile("nop");
+	asm volatile("lbu $v0,0($v0)");
+	asm volatile("lhu $v0,0($v0)");
+	asm volatile("lw $v0,0($v0)");
 	asm volatile("nop");
 	asm volatile("nop");
 	asm volatile("nop");

--- a/mips/megalopa/function.c
+++ b/mips/megalopa/function.c
@@ -98,12 +98,23 @@ char* val_function(){
 	return 0;	
 }
 
-char* peek_function(){
+char* peek_function_sub(int bits){
 	char* err;
 	err=get_value();
 	if (err) return err;
 	check_obj_space(1);
-	g_object[g_objpos++]=0x90420000; // lbu         v0,0(v0)
+	switch(bits){
+		case 32:
+			g_object[g_objpos++]=0x8C420000; // lw          v0,0(v0)
+			break;
+		case 16:
+			g_object[g_objpos++]=0x94420000; // lhu         v0,0(v0)
+			break;
+		case 8:
+		default:
+			g_object[g_objpos++]=0x90420000; // lbu         v0,0(v0)
+			break;
+	}
 	return 0;
 }
 
@@ -528,6 +539,18 @@ char* str_function(void){
 
 // Aliases follow
 
+char* peek_function(){
+	return peek_function_sub(8);
+}
+
+char* peek16_function(){
+	return peek_function_sub(16);
+}
+
+char* peek32_function(){
+	return peek_function_sub(32);
+}
+
 char* gcolor_function(){
 	return graphic_statement(FUNC_GCOLOR);
 }
@@ -547,6 +570,8 @@ static const void* int_func_list[]={
 	"GOSUB(",gosub_function,
 	"STRNCMP(",strncmp_function,
 	"PEEK(",peek_function,
+	"PEEK16(",peek16_function,
+	"PEEK32(",peek32_function,
 	"LEN(",len_function,
 	"ASC(",asc_function,
 	"SGN(",sgn_function,