more MAME fixes, some optimization

[picodrive.git] / cpu / Cyclone / Main.cpp

diff --git a/cpu/Cyclone/Main.cpp b/cpu/Cyclone/Main.cpp
index 9bcf205..80bbfd8 100644 (file)
--- a/cpu/Cyclone/Main.cpp
+++ b/cpu/Cyclone/Main.cpp
@@ -3,12 +3,13 @@
 \r
 static FILE *AsmFile=NULL;\r
 \r
-static int CycloneVer=0x0086; // Version number of library\r
+static int CycloneVer=0x0087; // Version number of library\r
 int *CyJump=NULL; // Jump table\r
 int ms=USE_MS_SYNTAX; // If non-zero, output in Microsoft ARMASM format\r
 char *Narm[4]={ "b", "h","",""}; // Normal ARM Extensions for operand sizes 0,1,2\r
 char *Sarm[4]={"sb","sh","",""}; // Sign-extend ARM Extensions for operand sizes 0,1,2\r
 int Cycles; // Current cycles for opcode\r
+int pc_dirty; // something changed PC during processing\r
 \r
 \r
 void ot(const char *format, ...)\r
@@ -142,6 +143,15 @@ void CheckInterrupt(int op)
   ot("\n");\r
 }\r
 \r
+void FlushPC(void)\r
+{\r
+#if MEMHANDLERS_NEED_PC\r
+  if (pc_dirty)\r
+    ot("  str r4,[r7,#0x40] ;@ Save PC\n");\r
+#endif\r
+  pc_dirty = 0;\r
+}\r
+\r
 static void PrintFramework()\r
 {\r
   ot(";@ --------------------------- Framework --------------------------\n");\r
@@ -367,7 +377,6 @@ static void PrintFramework()
   ot("\n");\r
   \r
   ot("Exception%s\n", ms?"":":");\r
-  ot("\n");\r
   ot("  stmdb sp!,{lr} ;@ Preserve ARM return address\n");\r
   PrintException(0);\r
   ot("  ldmia sp!,{pc} ;@ Return\n");\r
@@ -377,7 +386,7 @@ static void PrintFramework()
 // ---------------------------------------------------------------------------\r
 // Call Read(r0), Write(r0,r1) or Fetch(r0)\r
 // Trashes r0-r3,r12,lr\r
-int MemHandler(int type,int size)\r
+int MemHandler(int type,int size,int addrreg)\r
 {\r
   int func=0;\r
   func=0x68+type*0xc+(size<<2); // Find correct offset\r
@@ -386,19 +395,26 @@ int MemHandler(int type,int size)
   ot("  mov r3,r9,lsr #28\n");\r
   ot("  strb r3,[r7,#0x46] ;@ Save Flags (NZCV)\n");\r
 #endif\r
+  FlushPC();\r
 \r
 #if (MEMHANDLERS_ADDR_MASK & 0xff000000)\r
-  ot("  bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0xff000000);\r
+  ot("  bic r0,r%i,#0x%08x\n", addrreg, MEMHANDLERS_ADDR_MASK & 0xff000000);\r
+  addrreg=0;\r
 #endif\r
 #if (MEMHANDLERS_ADDR_MASK & 0x00ff0000)\r
-  ot("  bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x00ff0000);\r
+  ot("  bic r0,r%i,#0x%08x\n", addrreg, MEMHANDLERS_ADDR_MASK & 0x00ff0000);\r
+  addrreg=0;\r
 #endif\r
 #if (MEMHANDLERS_ADDR_MASK & 0x0000ff00)\r
-  ot("  bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x0000ff00);\r
+  ot("  bic r0,r%i,#0x%08x\n", addrreg, MEMHANDLERS_ADDR_MASK & 0x0000ff00);\r
+  addrreg=0;\r
 #endif\r
 #if (MEMHANDLERS_ADDR_MASK & 0x000000ff)\r
-  ot("  bic r0,r0,#0x%08x\n", MEMHANDLERS_ADDR_MASK & 0x000000ff);\r
+  ot("  bic r0,r%i,#0x%08x\n", addrreg, MEMHANDLERS_ADDR_MASK & 0x000000ff);\r
+  addrreg=0;\r
 #endif\r
+  if (addrreg != 0)\r
+    ot("  mov r0,r%i\n", addrreg);\r
   ot("  mov lr,pc\n");\r
   ot("  ldr pc,[r7,#0x%x] ;@ Call ",func);\r
 \r
@@ -411,9 +427,6 @@ int MemHandler(int type,int size)
   else         ot("%d(r0)",   8<<size);\r
   ot(" handler\n");\r
 \r
-#if MEMHANDLERS_CHANGE_CYCLES\r
-  ot("  ldr r5,[r7,#0x5c] ;@ Load Cycles\n");\r
-#endif\r
 #if MEMHANDLERS_CHANGE_FLAGS\r
   ot("  ldrb r9,[r7,#0x46] ;@ r9 = Load Flags (NZCV)\n");\r
   ot("  mov r9,r9,lsl #28\n");\r