fix compatibility with ancient gas

[cyclone68000.git] / OpMove.cpp

diff --git a/OpMove.cpp b/OpMove.cpp
index 3d893de..8022da1 100644 (file)
--- a/OpMove.cpp
+++ b/OpMove.cpp
@@ -96,6 +96,7 @@ void SuperChange(int op,int srh_reg)
 // Emit a Move opcode, 00xxdddd ddssssss\r
 int OpMove(int op)\r
 {\r
+  EaRWType eatype;\r
   int sea=0,tea=0;\r
   int size=0,use=0;\r
   int movea=0;\r
@@ -133,13 +134,25 @@ int OpMove(int op)
 \r
   if (movea==0)\r
   {\r
-    EaCalcRead(-1,1,sea,size,0x003f,earwt_sign_extend,1);\r
-    OpGetFlagsNZ(1);\r
+    if (sea < 0x10 && size < 2)\r
+    {\r
+      eatype = earwt_zero_extend;\r
+      EaCalcRead(-1,1,sea,size,0x003f,eatype);\r
+      ot("  movs r2,r1,lsl #%d\n",size?16:24);\r
+      OpGetFlagsNZ(2);\r
+    }\r
+    else\r
+    {\r
+      eatype = earwt_shifted_up;\r
+      EaCalcRead(-1,1,sea,size,0x003f,eatype,1);\r
+      OpGetFlagsNZ(1);\r
+    }\r
     ot("\n");\r
   }\r
   else\r
   {\r
-    EaCalcRead(-1,1,sea,size,0x003f,earwt_sign_extend);\r
+    eatype = earwt_sign_extend;\r
+    EaCalcRead(-1,1,sea,size,0x003f,eatype);\r
     size=2; // movea always expands to 32-bits\r
   }\r
 \r
@@ -155,8 +168,8 @@ int OpMove(int op)
   else\r
 #endif\r
   {\r
-    EaCalc (0,0x0e00,tea,size,earwt_msb_dont_care);\r
-    EaWrite(0,     1,tea,size,0x0e00,earwt_msb_dont_care);\r
+    EaCalc (0,0x0e00,tea,size,eatype);\r
+    EaWrite(0,     1,tea,size,0x0e00,eatype);\r
   }\r
 \r
 #if CYCLONE_FOR_GENESIS && !MEMHANDLERS_CHANGE_CYCLES\r
@@ -392,10 +405,8 @@ int OpMovem(int op)
   ot(";@ Get the address into r6:\n");\r
   EaCalc(6,0x003f,cea,size);\r
 \r
-#if !MEMHANDLERS_NEED_PREV_PC\r
   // must save PC, need a spare register\r
-  ot("  str r4,[r7,#0x40] ;@ Save PC\n");\r
-#endif\r
+  FlushPC(1);\r
 \r
   ot(";@ r4=Register Index*4:\n");\r
   if (decr) ot("  mov r4,#0x40 ;@ order reversed for -(An)\n");\r
@@ -423,14 +434,14 @@ int OpMovem(int op)
 \r
   if (dir)\r
   {\r
-    ot("  ;@ Copy memory to register:\n",1<<size);\r
+    ot("  ;@ Copy memory to register:\n");\r
     earead_check_addrerr=0; // already checked\r
     EaRead (6,0,ea,size,0x003f);\r
     ot("  str r0,[r7,r4] ;@ Save value into Dn/An\n");\r
   }\r
   else\r
   {\r
-    ot("  ;@ Copy register to memory:\n",1<<size);\r
+    ot("  ;@ Copy register to memory:\n");\r
     ot("  ldr r1,[r7,r4] ;@ Load value from Dn/An\n");\r
 #if SPLIT_MOVEL_PD\r
     if (decr && size==2) { // -(An)\r