NOT setting upper bits on PUSH PC, minor adjustments

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

diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp
index da76306..d1c2391 100644 (file)
--- a/cpu/Cyclone/OpBranch.cpp
+++ b/cpu/Cyclone/OpBranch.cpp
@@ -243,10 +243,10 @@ int OpJsr(int op)
   else\r
   {\r
     ot(";@ Jsr - Push old PC first\n");\r
-    ot("  sub r1,r4,r10 ;@ r1 = Old PC\n");\r
-    ot("  mov r1,r1,lsl #8\n");\r
     ot("  ldr r0,[r7,#0x3c]\n");\r
-    ot("  mov r1,r1,asr #8\n");\r
+    ot("  sub r1,r4,r10 ;@ r1 = Old PC\n");\r
+//    ot("  mov r1,r1,lsl #8\n");\r
+//    ot("  mov r1,r1,asr #8\n");\r
     ot(";@ Push r1 onto stack\n");\r
     ot("  sub r0,r0,#4 ;@ Predecrement A7\n");\r
     ot("  str r0,[r7,#0x3c] ;@ Save A7\n");\r
@@ -438,11 +438,11 @@ int OpBranch(int op)
   if (cc==1)\r
   {\r
     ot(";@ Bsr - remember old PC\n");\r
+    ot("  ldr r2,[r7,#0x3c]\n");\r
     ot("  sub r1,r4,r10 ;@ r1 = Old PC\n");\r
     if (size) ot("  add r1,r1,#%d\n",1<<size);\r
-    ot("  mov r1,r1, lsl #8\n");\r
-    ot("  ldr r2,[r7,#0x3c]\n");\r
-    ot("  mov r1,r1, asr #8\n");\r
+//    ot("  mov r1,r1, lsl #8\n");\r
+//    ot("  mov r1,r1, asr #8\n");\r
     ot("\n");\r
     ot(";@ Push r1 onto stack\n");\r
     ot("  sub r0,r2,#4 ;@ Predecrement A7\n");\r