Commit: a1ee537c7d3b88c5d262424a379540a6e961ec82 - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revisão: a1ee537c7d3b88c5d262424a379540a6e961ec82 (tree)
• Hora: 2019-04-08 10:00:46
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Mensagem de Log

Force TMR1=0 when executing TIMER statement

Mudança Sumário

• modified: mips/megalopa/compiler.c
• modified: mips/megalopa/timer.c
• modified: mips/zoea/compiler.c
• modified: mips/zoea/timer.c

Diff

--- a/mips/megalopa/compiler.c
+++ b/mips/megalopa/compiler.c
@@ -24,15 +24,17 @@
 	$s7:     address of call_library()
 	$t8-$t9: used as temporary registors
 	$k0-$k1: not used
-	$gp:     for accessing global valiables by C
+	$gp:     for accessing global variables by C
 	$sp:     stack pointer
-	$fp($s8) for accessing valiables by BASIC
+	$fp($s8) for accessing variables by BASIC
 	$ra:     contains return address
 */
 
 #include "compiler.h"
 
 void start_program(void* addr, void* memory){
+	// Note that if usage of $s0-$s7, and $fp is changed, 
+	// revice BasicInt() in timer.c, too.
 	static unsigned int stored_sp;
 	// Store s0-s7, fp, and ra in stacks
 	asm volatile("#":::"s0");

--- a/mips/megalopa/timer.c
+++ b/mips/megalopa/timer.c
@@ -139,21 +139,22 @@ char* timer_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
-	i=(int)(&g_timer);
-	check_obj_space(3);
+	i=(int)(&g_timer)+0x8000;
+	check_obj_space(4);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
-	g_object[g_objpos++]=0x34630000|(i&0x0000FFFF);       // ori v1,v1,xxxx
-	g_object[g_objpos++]=0xAC620000;                      // sw  v0,0(v1)
+	g_object[g_objpos++]=0xAC620000|((i-0x8000)&0xFFFF);  // sw  v0,xxxx(v1)
+	i=(int)(&TMR1)+0x8000;//0xBF800610
+	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,0xbf80
+	g_object[g_objpos++]=0xAC600000|((i-0x8000)&0xFFFF);  // sw  zero,0x0610(v1)
 	return 0;
 }
 
 char* timer_function(){
 	int i;
-	i=(int)(&g_timer);
-	check_obj_space(3);
+	i=(int)(&g_timer)+0x8000;
+	check_obj_space(2);
 	g_object[g_objpos++]=0x3C020000|((i>>16)&0x0000FFFF); // lui v0,xxxx
-	g_object[g_objpos++]=0x34420000|(i&0x0000FFFF);       // ori v0,v0,xxxx
-	g_object[g_objpos++]=0x8C420000;                      // lw  v0,0(v0)
+	g_object[g_objpos++]=0x8C420000|((i-0x8000)&0xFFFF);  // lw  v0,xxxx(v0)
 	return 0;
 }
 
@@ -165,16 +166,15 @@ char* timer_function(){
 
 */
 
-void BasicInt(int addr){
-	// Note that $s0-$s7 values must be set again here.
-	asm volatile(".set noreorder");
+void BasicInt(int addr,void* memory){
+	// Note that $s0-$s7 and $fp values must be set again here.
 	// Set s5 for initial_s5_stack
 	asm volatile("la $s5,%0"::"i"(&g_initial_s5_stack[2]));
 	// Set s7 for easy calling call_library()
 	asm volatile("la $s7,%0"::"i"(&call_library));
-	// $a0 is the address in BASIC code
+	// Set fp and execute BASIC code at $a0
+	asm volatile("addu $fp,$zero,$a1");
 	asm volatile("jr $a0");
-	asm volatile("nop");
 }
 #pragma interrupt CS1Handler IPL1SOFT vector 2
 void CS1Handler(void){
@@ -193,7 +193,7 @@ void CS1Handler(void){
 	while(g_interrupt_flags){
 		for(i=0;i<NUM_INTERRUPT_TYPES;i++){
 			if (g_interrupt_flags & (1<<i)) {
-				if (g_int_vector[i]) BasicInt(g_int_vector[i]);
+				if (g_int_vector[i]) BasicInt(g_int_vector[i],(void*)(&g_var_mem[0]));
 				g_interrupt_flags &= (1<<i)^0xffff;
 			}
 		}

--- a/mips/zoea/compiler.c
+++ b/mips/zoea/compiler.c
@@ -24,15 +24,17 @@
 	$s7:     address of call_library()
 	$t8-$t9: used as temporary registors
 	$k0-$k1: not used
-	$gp:     for accessing global valiables by C
+	$gp:     for accessing global variables by C
 	$sp:     stack pointer
-	$fp($s8) for accessing valiables by BASIC
+	$fp($s8) for accessing variables by BASIC
 	$ra:     contains return address
 */
 
 #include "compiler.h"
 
 void start_program(void* addr, void* memory){
+	// Note that if usage of $s0-$s7, and $fp is changed, 
+	// revice BasicInt() in timer.c, too.
 	static unsigned int stored_sp;
 	// Store s0-s7, fp, and ra in stacks
 	asm volatile("#":::"s0");

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -139,21 +139,22 @@ char* timer_statement(){
 	char* err;
 	err=get_value();
 	if (err) return err;
-	i=(int)(&g_timer);
-	check_obj_space(3);
+	i=(int)(&g_timer)+0x8000;
+	check_obj_space(4);
 	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,xxxx
-	g_object[g_objpos++]=0x34630000|(i&0x0000FFFF);       // ori v1,v1,xxxx
-	g_object[g_objpos++]=0xAC620000;                      // sw  v0,0(v1)
+	g_object[g_objpos++]=0xAC620000|((i-0x8000)&0xFFFF);  // sw  v0,xxxx(v1)
+	i=(int)(&TMR1)+0x8000;//0xBF800610
+	g_object[g_objpos++]=0x3C030000|((i>>16)&0x0000FFFF); // lui v1,0xbf80
+	g_object[g_objpos++]=0xAC600000|((i-0x8000)&0xFFFF);  // sw  zero,0x0610(v1)
 	return 0;
 }
 
 char* timer_function(){
 	int i;
-	i=(int)(&g_timer);
-	check_obj_space(3);
+	i=(int)(&g_timer)+0x8000;
+	check_obj_space(2);
 	g_object[g_objpos++]=0x3C020000|((i>>16)&0x0000FFFF); // lui v0,xxxx
-	g_object[g_objpos++]=0x34420000|(i&0x0000FFFF);       // ori v0,v0,xxxx
-	g_object[g_objpos++]=0x8C420000;                      // lw  v0,0(v0)
+	g_object[g_objpos++]=0x8C420000|((i-0x8000)&0xFFFF);  // lw  v0,xxxx(v0)
 	return 0;
 }
 
@@ -165,16 +166,15 @@ char* timer_function(){
 
 */
 
-void BasicInt(int addr){
-	// Note that $s0-$s7 values must be set again here.
-	asm volatile(".set noreorder");
+void BasicInt(int addr,void* memory){
+	// Note that $s0-$s7 and $fp values must be set again here.
 	// Set s5 for initial_s5_stack
 	asm volatile("la $s5,%0"::"i"(&g_initial_s5_stack[2]));
 	// Set s7 for easy calling call_library()
 	asm volatile("la $s7,%0"::"i"(&call_library));
-	// $a0 is the address in BASIC code
+	// Set fp and execute BASIC code at $a0
+	asm volatile("addu $fp,$zero,$a1");
 	asm volatile("jr $a0");
-	asm volatile("nop");
 }
 #pragma interrupt CS1Handler IPL1SOFT vector 2
 void CS1Handler(void){
@@ -193,7 +193,7 @@ void CS1Handler(void){
 	while(g_interrupt_flags){
 		for(i=0;i<NUM_INTERRUPT_TYPES;i++){
 			if (g_interrupt_flags & (1<<i)) {
-				if (g_int_vector[i]) BasicInt(g_int_vector[i]);
+				if (g_int_vector[i]) BasicInt(g_int_vector[i],(void*)(&g_var_mem[0]));
 				g_interrupt_flags &= (1<<i)^0xffff;
 			}
 		}