Remove all #if-def'ed out code regarding mulusmall_loop_up/down.

[cln.git] / src / base / digitseq / cl_asm_arm_.cc

diff --git a/src/base/digitseq/cl_asm_arm_.cc b/src/base/digitseq/cl_asm_arm_.cc
index d333fdb73ab7141142cd7f3223e9c1ff532da940..00f9a09abbdc59236e1bd3264f088ba6d87549e5 100644 (file)
--- a/src/base/digitseq/cl_asm_arm_.cc
+++ b/src/base/digitseq/cl_asm_arm_.cc
@@ -1807,27 +1807,18 @@ LABEL(mulusmall_loop_down_l1)
         MOV     a1,a4                   // return carry
         LDMFD   sp!,{v1,pc}
 #else
-        STMFD   sp!,{v1-v2,lr}
+        STMFD   sp!,{v1-v4,lr}
 LABEL(mulusmall_loop_down_l1)
         LDR     ip,[a2,#-4]!
 
-//      BL      mulu32_64_vregs         // muluD(digit,*--ptr,hi=,lo=)
-// replaced by multiplication of a small x = a1 and a big y = ip :
-        MOV     v1,ip,LSR #16           // top half of y
-        BIC     ip,ip,v1,LSL #16        // bottom half of y
-        MUL     v2,a1,v1                // middle section of result
-        MUL     v1,a1,ip                // low section of result
-        MOV     ip,#0                   // high section of result
-        ADDS    v1,v1,v2,LSL #16        // bottom 32 bits of result
-        ADC     ip,ip,v2,LSR #16        // top 32 bits of result
-
+        BL      mulu32_64_vregs         // muluD(digit,*--ptr,hi=,lo=)
         ADDS    v1,v1,a4                // lo += carry
         ADC     a4,ip,#0                // if (lo<carry) { hi += 1 }; carry=hi
         STR     v1,[a2,#0]              // *ptr = lo
         SUBS    a3,a3,#1                // len--
         BNE     mulusmall_loop_down_l1  // until len==0
         MOV     a1,a4                   // return carry
-        LDMFD   sp!,{v1-v2,pc}
+        LDMFD   sp!,{v1-v4,pc}
 #endif
 
 // extern void mulu_loop_down (uintD digit, uintD* sourceptr, uintD* destptr, uintC len);
@@ -3284,19 +3275,7 @@ LABEL(mulusmall_loop_up_l1)
 LABEL(mulusmall_loop_up_l1)
         LDR     ip,[a2]
 
-#if 1
         BL      mulu32_64_vregs         // muluD(digit,*ptr,hi=,lo=)
-#else
-// this code requires that digit is small, but this condition is violated in
-// digits_to_I_baseN(const char * MSBptr, uintC len, uintD base)
-        MOV     v1,ip,LSR #16           // top half of y
-        BIC     ip,ip,v1,LSL #16        // bottom half of y
-        MUL     v2,a1,v1                // middle section of result
-        MUL     v1,a1,ip                // low section of result
-        MOV     ip,#0                   // high section of result
-        ADDS    v1,v1,v2,LSL #16        // bottom 32 bits of result
-        ADC     ip,ip,v2,LSR #16        // top 32 bits of result
-#endif
         ADDS    v1,v1,a4                // lo += carry
         ADC     a4,ip,#0                // if (lo<carry) { hi += 1 }; carry=hi
         STR     v1,[a2],#4              // *ptr++ = lo