Cyclone: group some often used handlers + minor optimization.

Seems to help CD games with many cache misses.

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@749 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/cpu/Cyclone/Main.cpp b/cpu/Cyclone/Main.cpp
index 2c87ea0..1093160 100644 (file)
--- a/cpu/Cyclone/Main.cpp
+++ b/cpu/Cyclone/Main.cpp
@@ -12,6 +12,68 @@ int Cycles; // Current cycles for opcode
 int pc_dirty; // something changed PC during processing\r
 int arm_op_count;\r
 \r
+// opcodes often used by games\r
+static const unsigned short hot_opcodes[] = {\r
+  0x6701, // beq     $3\r
+  0x6601, // bne     $3\r
+  0x51c8, // dbra    Dn, $2\r
+  0x4a38, // tst.b   $0.w\r
+  0xd040, // add.w   Dn, Dn\r
+  0x4a79, // tst.w   $0.l\r
+  0x0240, // andi.w  #$0, D0\r
+  0x2038, // move.l  $0.w, D0\r
+  0xb0b8, // cmp.l   $0.w, D0\r
+  0x6001, // bra     $3\r
+  0x30c0, // move.w  D0, (A0)+\r
+  0x3028, // move.w  ($0,A0), D0\r
+  0x0c40, // cmpi.w  #$0, D0\r
+  0x0c79, // cmpi.w  #$0, $0.l\r
+  0x4e75, // rts\r
+  0x4e71, // nop\r
+  0x3000, // move.w  D0, D0\r
+  0x0839, // btst    #$0, $0.l\r
+  0x7000, // moveq   #$0, D0\r
+  0x3040, // movea.w D0, A0\r
+  0x0838, // btst    #$0, $0.w\r
+  0x4a39, // tst.b   $0.l\r
+  0x33d8, // move.w  (A0)+, $0.l\r
+  0x6700, // beq     $2\r
+  0xb038, // cmp.b   $0.w, D0\r
+  0x3039, // move.w  $0.l, D0\r
+  0x4840, // swap    D0\r
+  0x6101, // bsr     $3\r
+  0x6100, // bsr     $2\r
+  0x5e40, // addq.w  #7, D0\r
+  0x1039, // move.b  $0.l, D0\r
+  0x20c0, // move.l  D0, (A0)+\r
+  0x1018, // move.b  (A0)+, D0\r
+  0x30d0, // move.w  (A0), (A0)+\r
+  0x3080, // move.w  D0, (A0)\r
+  0x3018, // move.w  (A0)+, D0\r
+  0xc040, // and.w   D0, D0\r
+  0x3180, // move.w  D0, (A0,D0.w)\r
+  0x1198, // move.b  (A0)+, (A0,D0.w)\r
+  0x6501, // bcs     $3\r
+  0x6500, // bcs     $2\r
+  0x6401, // bcc     $3\r
+  0x6a01, // bpl     $3\r
+  0x41f0, // lea     (A0,D0.w), A0\r
+  0x4a28, // tst.b   ($0,A0)\r
+  0x0828, // btst    #$0, ($0,A0)\r
+  0x0640, // addi.w  #$0, D0\r
+  0x10c0, // move.b  D0, (A0)+\r
+  0x10d8, // move.b  (A0)+, (A0)+\r
+};\r
+#define hot_opcode_count (int)(sizeof(hot_opcodes) / sizeof(hot_opcodes[0]))\r
+\r
+static int is_op_hot(int op)\r
+{\r
+  int i;\r
+  for (i = 0; i < hot_opcode_count; i++)\r
+    if (op == hot_opcodes[i])\r
+      return 1;\r
+  return 0;\r
+}\r
 \r
 void ot(const char *format, ...)\r
 {\r
@@ -957,11 +1019,15 @@ static void PrintOpcodes()
   OpEnd();\r
 \r
 \r
+  for (op=0;op<hot_opcode_count;op++)\r
+    OpAny(hot_opcodes[op]);\r
+\r
   for (op=0;op<0x10000;op++)\r
   {\r
     if ((op&0xfff)==0) { printf("%x",op>>12); fflush(stdout); } // Update progress\r
 \r
-    OpAny(op);\r
+    if (!is_op_hot(op))\r
+      OpAny(op);\r
   }\r
 \r
   ot("\n");\r

diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp
index 061fe01..804aa91 100644 (file)
--- a/cpu/Cyclone/OpBranch.cpp
+++ b/cpu/Cyclone/OpBranch.cpp
@@ -500,7 +500,7 @@ int OpBranch(int op)
   OpEnd(size?0x10:0);\r
 \r
   // since all "DontBranch" code is same for every size, output only once\r
-  if (cc>=2&&(op&0xff00)==0x6200)\r
+  if (cc>=2&&(op&0xff00)==0x6700)\r
   {\r
     ot("BccDontBranch%i%s\n", 8<<size, ms?"":":");\r
     if (size) ot("  add r4,r4,#%d\n",1<<size);\r

diff --git a/cpu/Cyclone/OpMove.cpp b/cpu/Cyclone/OpMove.cpp
index 9c0bfa0..78adae5 100644 (file)
--- a/cpu/Cyclone/OpMove.cpp
+++ b/cpu/Cyclone/OpMove.cpp
@@ -121,16 +121,18 @@ int OpMove(int op)
 \r
   OpStart(op,sea,tea); Cycles=4;\r
 \r
-  EaCalcRead(-1,1,sea,size,0x003f);\r
-\r
   if (movea==0)\r
   {\r
-    ot("  adds r1,r1,#0 ;@ Defines NZ, clears CV\n");\r
+    EaCalcRead(-1,0,sea,size,0x003f);\r
+    ot("  adds r1,r0,#0 ;@ Defines NZ, clears CV\n");\r
     ot("  mrs r10,cpsr ;@ r10=NZCV flags\n");\r
     ot("\n");\r
   }\r
-\r
-  if (movea) size=2; // movea always expands to 32-bits\r
+  else\r
+  {\r
+    EaCalcRead(-1,1,sea,size,0x003f);\r
+    size=2; // movea always expands to 32-bits\r
+  }\r
 \r
   eawrite_check_addrerr=1;\r
 #if SPLIT_MOVEL_PD\r