X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpAny.cpp;h=a50114acefe90e6602e9dc021f0f854d548e9866;hb=fcdefcf62cb71969b456a6f27688adbeb5890bb9;hp=8e120154e7b400c67e11f4388b9a47531bb04b14;hpb=85a36a57a816ac643ee5f982d774532a0ca4d58b;p=picodrive.git

diff --git a/cpu/Cyclone/OpAny.cpp b/cpu/Cyclone/OpAny.cpp
index 8e12015..a50114a 100644
--- a/cpu/Cyclone/OpAny.cpp
+++ b/cpu/Cyclone/OpAny.cpp
@@ -1,9 +1,11 @@
 
 #include "app.h"
 
+int opend_op_changes_cycles, opend_check_interrupt, opend_check_trace;
+
 static unsigned char OpData[16]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 
-static unsigned short CPU_CALL OpRead16(unsigned int a)
+static unsigned short OpRead16(unsigned int a)
 {
   return (unsigned short)( (OpData[a&15]<<8) | OpData[(a+1)&15] );
 }
@@ -25,35 +27,97 @@ void OpUse(int op,int use)
   ot(";@ ---------- [%.4x] %s uses Op%.4x ----------\n",op,text,use);
 }
 
-void OpStart(int op, int sea, int tea)
+void OpStart(int op, int sea, int tea, int op_changes_cycles, int supervisor_check)
 {
+  int last_op_count=arm_op_count;
+
   Cycles=0;
   OpUse(op,op); // This opcode obviously uses this handler
   ot("Op%.4x%s\n", op, ms?"":":");
-#if (MEMHANDLERS_NEED_PREV_PC || MEMHANDLERS_NEED_CYCLES)
-  if ((sea >= 0x10 && sea != 0x3c) || (tea >= 0x10 && tea != 0x3c)) {
+
+  if (supervisor_check)
+  {
+    // checks for supervisor bit, if not set, jumps to SuperEnd()
+    // also sets r11 to SR high value, SuperChange() uses this
+    ot("  ldr r11,[r7,#0x44] ;@ Get SR high\n");
+  }
+  if ((sea >= 0x10 && sea != 0x3c) || (tea >= 0x10 && tea != 0x3c))
+  {
 #if MEMHANDLERS_NEED_PREV_PC
     ot("  str r4,[r7,#0x50] ;@ Save prev PC + 2\n");
 #endif
 #if MEMHANDLERS_NEED_CYCLES
     ot("  str r5,[r7,#0x5c] ;@ Save Cycles\n");
 #endif
-    ot("\n");
   }
+  if (supervisor_check)
+  {
+    ot("  tst r11,#0x20 ;@ Check we are in supervisor mode\n");
+    ot("  beq WrongPrivilegeMode ;@ No\n");
+  }
+  if ((sea >= 0x10 && sea != 0x3c) || (tea >= 0x10 && tea != 0x3c)) {
+#if MEMHANDLERS_CHANGE_CYCLES
+    if (op_changes_cycles)
+      ot("  mov r5,#0\n");
 #endif
+  }
+  if (last_op_count!=arm_op_count)
+    ot("\n");
   pc_dirty = 1;
+  opend_op_changes_cycles = opend_check_interrupt = opend_check_trace = 0;
 }
 
 void OpEnd(int sea, int tea)
 {
+  int did_fetch=0;
+  opend_check_trace = opend_check_trace && EMULATE_TRACE;
 #if MEMHANDLERS_CHANGE_CYCLES
   if ((sea >= 0x10 && sea != 0x3c) || (tea >= 0x10 && tea != 0x3c))
-    ot("  ldr r5,[r7,#0x5c] ;@ Load Cycles\n");
+  {
+    if (opend_op_changes_cycles)
+    {
+      ot("  ldr r0,[r7,#0x5c] ;@ Load Cycles\n");
+      ot("  ldrh r8,[r4],#2 ;@ Fetch next opcode\n");
+      ot("  add r5,r0,r5\n");
+      did_fetch=1;
+    }
+    else
+    {
+      ot("  ldr r5,[r7,#0x5c] ;@ Load Cycles\n");
+    }
+  }
 #endif
-  ot("  ldrh r8,[r4],#2 ;@ Fetch next opcode\n");
+  if (!did_fetch)
+    ot("  ldrh r8,[r4],#2 ;@ Fetch next opcode\n");
+  if (opend_check_trace)
+    ot("  ldr r1,[r7,#0x44]\n");
   ot("  subs r5,r5,#%d ;@ Subtract cycles\n",Cycles);
-  ot("  ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");
-  ot("  b CycloneEnd\n");
+  if (opend_check_trace)
+  {
+    ot(";@ CheckTrace:\n");
+    ot("  tst r1,#0x80\n");
+    ot("  bne CycloneDoTraceWithChecks\n");
+    ot("  cmp r5,#0\n");
+  }
+  if (opend_check_interrupt)
+  {
+    ot("  blt CycloneEnd\n");
+    ot(";@ CheckInterrupt:\n");
+    if (!opend_check_trace)
+      ot("  ldr r1,[r7,#0x44]\n");
+    ot("  movs r0,r1,lsr #24 ;@ Get IRQ level\n"); // same as  ldrb r0,[r7,#0x47]
+    ot("  ldreq pc,[r6,r8,asl #2] ;@ Jump to next opcode handler\n");
+    ot("  cmp r0,#6 ;@ irq>6 ?\n");
+    ot("  andle r1,r1,#7 ;@ Get interrupt mask\n");
+    ot("  cmple r0,r1 ;@ irq<=6: Is irq<=mask ?\n");
+    ot("  ldrle pc,[r6,r8,asl #2] ;@ Jump to next opcode handler\n");
+    ot("  b CycloneDoInterruptGoBack\n");
+  }
+  else
+  {
+    ot("  ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");
+    ot("  b CycloneEnd\n");
+  }
   ot("\n");
 }
 
@@ -69,17 +133,17 @@ int OpBase(int op,int size,int sepa)
 // Get flags, trashes r2
 int OpGetFlags(int subtract,int xbit,int specialz)
 {
-  if (specialz) ot("  orr r2,r9,#0xb0000000 ;@ for old Z\n");
+  if (specialz) ot("  orr r2,r10,#0xb0000000 ;@ for old Z\n");
 
-  ot("  mrs r9,cpsr ;@ r9=flags\n");
+  ot("  mrs r10,cpsr ;@ r10=flags\n");
 
-  if (specialz) ot("  andeq r9,r9,r2 ;@ fix Z\n");
+  if (specialz) ot("  andeq r10,r10,r2 ;@ fix Z\n");
 
-  if (subtract) ot("  eor r9,r9,#0x20000000 ;@ Invert carry\n");
+  if (subtract) ot("  eor r10,r10,#0x20000000 ;@ Invert carry\n");
 
   if (xbit)
   {
-    ot("  str r9,[r7,#0x4c] ;@ Save X bit\n");
+    ot("  str r10,[r7,#0x4c] ;@ Save X bit\n");
   }
   return 0;
 }