Finalize muluint/mulsint and mululong/mulslong merging

[fw/sdcc] / device / lib / gbz80 / mul.s

diff --git a/device/lib/gbz80/mul.s b/device/lib/gbz80/mul.s
index 453dfefa4491ff250a6718c1e4d21420a81379c7..69484a175b9fa3097a90751051fc2731436f0927 100644 (file)
--- a/device/lib/gbz80/mul.s
+++ b/device/lib/gbz80/mul.s
@@ -41,13 +41,12 @@ __muluchar_rrx_s::
         ld      d,a
         ld      b,a
         
-        jp      .mulu16
-        
-__mulsint_rrx_s::
-__muluint_rrx_s::
+        jp      .mul16
+
+__mulint_rrx_s::
         ld      hl,#2
         add     hl,sp
-        
+
         ld      e,(hl)
         inc     hl
         ld      d,(hl)
@@ -58,27 +57,25 @@ __muluint_rrx_s::
         ld      l,a
 
         ;; Fall through
-        
+
 __muluchar_rrx_hds::
-__mulsint_rrx_hds::
-__muluint_rrx_hds::
+__mulint_rrx_hds::
        ;; Parameters:
        ;;      HL, DE (left, right irrelivent)
        ld      b,h
        ld      c,l
-       
+
        ;; 16-bit multiplication
-       ;; 
+       ;;
        ;; Entry conditions
        ;;   BC = multiplicand
        ;;   DE = multiplier
-       ;; 
+       ;;
        ;; Exit conditions
        ;;   DE = less significant word of product
        ;;
        ;; Register used: AF,BC,DE,HL
 .mul16:
-.mulu16:
         ld      hl,#0
         ld      a,b
         ; ld c,c
@@ -88,7 +85,7 @@ __muluint_rrx_hds::
         ;; less.  This is often the case with support address calls.
         or      a
         jp      nz,1$
-        
+
         ld      b,#8
         ld      a,c
 1$:
@@ -106,5 +103,5 @@ __muluint_rrx_hds::
         ;; Return in DE
         ld      e,l
         ld      d,h
-        
+
         ret