Applied patch #2762516

[fw/sdcc] / device / lib / z80 / mulchar.s

diff --git a/device/lib/z80/mulchar.s b/device/lib/z80/mulchar.s
index 7217dd88d3eb0a8edc26f95f5444516d20932ae3..b77abcb8b53acf3f7207393ad066593691594776 100644 (file)
--- a/device/lib/z80/mulchar.s
+++ b/device/lib/z80/mulchar.s
@@ -7,12 +7,12 @@
 ; still called from some asm files in this directory.
 __muluchar_rrx_s::
         ld      hl, #2+1
+        ld      d, h
         add     hl, sp
         ld      e, (hl)
         dec     hl
         ld      h, (hl)
-        ld      l, #0
-        ld      d, l
+        ld      l, d
         ld      b, #8
 muluchar_rrx_s_loop:
         add     hl, hl
@@ -26,22 +26,22 @@ muluchar_rrx_s_noadd:
 
 __mulsuchar_rrx_s::
         ld      hl,#2+1
+        ld      b, h
         add     hl,sp
 
         ld      e,(hl)
         dec     hl
         ld      c,(hl)
-        ld      b, #0
         jr      signexte
 
 __muluschar_rrx_s::
-        ld      hl,#2+1
+        ld      hl,#2
+        ld      b, h
         add     hl,sp
 
-        ld      c,(hl)
-        ld      b, #0
-        dec     hl
         ld      e,(hl)
+        inc     hl
+        ld      c,(hl)
         jr      signexte
 
 ;; Originally from GBDK by Pascal Felber.