Commit: a8f2a2fb367957f62d9732be551206575fe1d26f - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• Revision: a8f2a2fb367957f62d9732be551206575fe1d26f (tree)
• Zeit: 2019-04-07 08:07:34
• Autor: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Avoid exception when interrupt in case using $s5 in function.

Ändern Zusammenfassung

• modified: mips/zoea/debug.c
• modified: mips/zoea/exception.c
• modified: mips/zoea/timer.c

Diff

--- a/mips/zoea/debug.c
+++ b/mips/zoea/debug.c
@@ -275,18 +275,19 @@ 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("b label1");
-	asm volatile("lui $v1,0x1234");
-	asm volatile("ori $v1,$v1,0x5678");
-	asm volatile("sw $v0,0($v1)");
-	asm volatile("label1:");
-	asm volatile("sw $zero,0x1234($v1)");
-	asm volatile("sw $zero,0x1234($gp)");
 	asm volatile("nop");
-	int i;
-	for2(i,1,10){
-		asm volatile("nop");
-	}
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	asm volatile("nop");
+	a2&=0xFFFFFFFC;
 	return a2+a3;
 }
 

--- a/mips/zoea/exception.c
+++ b/mips/zoea/exception.c
@@ -44,7 +44,12 @@ void dumpMemory(){
 void dumpMemory(){}
 #endif //ifdef DUMPFILE
 
+void _general_exception_handler_main (void);
 void _general_exception_handler (void){
+	asm volatile("la $sp,%0"::"i"(&RAM[RAMSIZE-4]));
+	asm volatile("j _general_exception_handler_main");
+}
+void _general_exception_handler_main (void){
 	int i;
 	// $v1 is g_ex_data
 	asm volatile("la $v1,%0"::"i"(&g_ex_data[0]));
@@ -79,7 +84,9 @@ void _general_exception_handler (void){
 			if((readbuttons()&(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE))
 				!=(KEYUP|KEYDOWN|KEYLEFT|KEYRIGHT|KEYSTART|KEYFIRE)) i=0;
 		}
-		asm volatile("j SoftReset");
+		RCONbits.POR=0;
+		RCONbits.EXTR=0;
+		asm volatile("j 0x9FC00000");
 	#endif
 }
 

--- a/mips/zoea/timer.c
+++ b/mips/zoea/timer.c
@@ -167,14 +167,30 @@ char* timer_function(){
 */
 
 void BasicInt(int addr){
-	// $a0 is the address in BASIC code
+	// Note that $s0-$s7 values must be set again here.
 	asm volatile(".set noreorder");
+	// 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
 	asm volatile("jr $a0");
 	asm volatile("nop");
 }
 #pragma interrupt CS1Handler IPL1SOFT vector 2
 void CS1Handler(void){
 	int i;
+	// Store s0-s7, fp, and ra in stacks
+	asm volatile("#":::"s0");
+	asm volatile("#":::"s1");
+	asm volatile("#":::"s2");
+	asm volatile("#":::"s3");
+	asm volatile("#":::"s4");
+	asm volatile("#":::"s5");
+	asm volatile("#":::"s6");
+	asm volatile("#":::"s7");
+	asm volatile("#":::"fp");
+	asm volatile("#":::"ra");
 	while(g_interrupt_flags){
 		for(i=0;i<NUM_INTERRUPT_TYPES;i++){
 			if (g_interrupt_flags & (1<<i)) {