X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=device%2Flib%2Fgbz80%2Fshift.s;h=b6f012e4055e4ace29145e7cde6a6037bb82e616;hb=12a13c467cb444adb9317ffca8f4899f5076de3f;hp=f09de38279fce11e097f5be6a7d459217888004a;hpb=59176244d45b896b8212ce19c1c438eeafd29478;p=fw%2Fsdcc

diff --git a/device/lib/gbz80/shift.s b/device/lib/gbz80/shift.s
index f09de382..b6f012e4 100644
--- a/device/lib/gbz80/shift.s
+++ b/device/lib/gbz80/shift.s
@@ -1,85 +1,85 @@
         ;;
 __rrulong_rrx_s::                
-        ld      hl,#2+4
+        ld      hl,#2
         add     hl,sp
-                
-        ld      c,(hl)
-        dec     hl
-        ld      d,(hl)
-        dec     hl
+
         ld      e,(hl)
-        dec     hl
+        inc     hl
+        ld      d,(hl)
+        inc     hl
+        ld      c,(hl)
+        inc     hl
+        ld      b,(hl)
+        inc     hl
         ld      a,(hl)
-        dec     hl
-        ld      l,(hl)
-        ld      h,a
 
-        ld      a,c
+        ld      l,c
+        ld      h,b
 1$:
         or      a,a
         ret     z
 
-        rr      d
-        rr      e
         rr      h
         rr      l
+        rr      d
+        rr      e
 
         dec     a
         jp      1$
 
 __rrslong_rrx_s::        
-        ld      hl,#2+4
+        ld      hl,#2
         add     hl,sp
                 
-        ld      c,(hl)
-        dec     hl
-        ld      d,(hl)
-        dec     hl
         ld      e,(hl)
-        dec     hl
+        inc     hl
+        ld      d,(hl)
+        inc     hl
+        ld      c,(hl)
+        inc     hl
+        ld      b,(hl)
+        inc     hl
         ld      a,(hl)
-        dec     hl
-        ld      l,(hl)
-        ld      h,a
 
-        ld      a,c
+        ld      l,c
+        ld      h,b
 1$:
         or      a,a
         ret     z
 
-        sra     d
-        rr      e
-        rr      h
+        sra     h
         rr      l
+        rr      d
+        rr      e
 
         dec     a
         jp      1$
         
 __rlslong_rrx_s::                
 __rlulong_rrx_s::                
-        ld      hl,#2+4
+        ld      hl,#2
         add     hl,sp
         
-        ld      c,(hl)
-        dec     hl
-        ld      d,(hl)
-        dec     hl
         ld      e,(hl)
-        dec     hl
+        inc     hl
+        ld      d,(hl)
+        inc     hl
+        ld      c,(hl)
+        inc     hl
+        ld      b,(hl)
+        inc     hl
         ld      a,(hl)
-        dec     hl
-        ld      l,(hl)
-        ld      h,a
 
-        ld      a,c
+        ld      l,c
+        ld      h,b
 1$:
         or      a,a
         ret     z
 
-        rl      l
-        rl      h
         rl      e
         rl      d
+        rl      l
+        rl      h
 
         dec     a        
         jp      1$