@@ -681,7 +681,7 @@ static void secp256k1_scalar_reduce_512(secp256k1_scalar *r, const uint64_t *l)
681681 secp256k1_scalar_reduce (r , c + secp256k1_scalar_check_overflow (r ));
682682}
683683
684- static void secp256k1_scalar_mul_512 (uint64_t l [ 8 ] , const secp256k1_scalar * a , const secp256k1_scalar * b ) {
684+ static void secp256k1_scalar_mul_512 (uint64_t * l8 , const secp256k1_scalar * a , const secp256k1_scalar * b ) {
685685#ifdef USE_ASM_X86_64
686686 const uint64_t * pb = b -> d ;
687687 __asm__ __volatile__(
@@ -696,7 +696,7 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
696696 /* (rax,rdx) = a0 * b0 */
697697 "movq %%r15, %%rax\n"
698698 "mulq %%r11\n"
699- /* Extract l0 */
699+ /* Extract l8[0] */
700700 "movq %%rax, 0(%%rsi)\n"
701701 /* (r8,r9,r10) = (rdx) */
702702 "movq %%rdx, %%r8\n"
@@ -714,7 +714,7 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
714714 "addq %%rax, %%r8\n"
715715 "adcq %%rdx, %%r9\n"
716716 "adcq $0, %%r10\n"
717- /* Extract l1 */
717+ /* Extract l8[1] */
718718 "movq %%r8, 8(%%rsi)\n"
719719 "xorq %%r8, %%r8\n"
720720 /* (r9,r10,r8) += a0 * b2 */
@@ -735,7 +735,7 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
735735 "addq %%rax, %%r9\n"
736736 "adcq %%rdx, %%r10\n"
737737 "adcq $0, %%r8\n"
738- /* Extract l2 */
738+ /* Extract l8[2] */
739739 "movq %%r9, 16(%%rsi)\n"
740740 "xorq %%r9, %%r9\n"
741741 /* (r10,r8,r9) += a0 * b3 */
@@ -764,7 +764,7 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
764764 "addq %%rax, %%r10\n"
765765 "adcq %%rdx, %%r8\n"
766766 "adcq $0, %%r9\n"
767- /* Extract l3 */
767+ /* Extract l8[3] */
768768 "movq %%r10, 24(%%rsi)\n"
769769 "xorq %%r10, %%r10\n"
770770 /* (r8,r9,r10) += a1 * b3 */
@@ -785,7 +785,7 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
785785 "addq %%rax, %%r8\n"
786786 "adcq %%rdx, %%r9\n"
787787 "adcq $0, %%r10\n"
788- /* Extract l4 */
788+ /* Extract l8[4] */
789789 "movq %%r8, 32(%%rsi)\n"
790790 "xorq %%r8, %%r8\n"
791791 /* (r9,r10,r8) += a2 * b3 */
@@ -800,51 +800,51 @@ static void secp256k1_scalar_mul_512(uint64_t l[8], const secp256k1_scalar *a, c
800800 "addq %%rax, %%r9\n"
801801 "adcq %%rdx, %%r10\n"
802802 "adcq $0, %%r8\n"
803- /* Extract l5 */
803+ /* Extract l8[5] */
804804 "movq %%r9, 40(%%rsi)\n"
805805 /* (r10,r8) += a3 * b3 */
806806 "movq %%r15, %%rax\n"
807807 "mulq %%r14\n"
808808 "addq %%rax, %%r10\n"
809809 "adcq %%rdx, %%r8\n"
810- /* Extract l6 */
810+ /* Extract l8[6] */
811811 "movq %%r10, 48(%%rsi)\n"
812- /* Extract l7 */
812+ /* Extract l8[7] */
813813 "movq %%r8, 56(%%rsi)\n"
814814 : "+d" (pb )
815- : "S" (l ), "D" (a -> d )
815+ : "S" (l8 ), "D" (a -> d )
816816 : "rax" , "rbx" , "rcx" , "r8" , "r9" , "r10" , "r11" , "r12" , "r13" , "r14" , "r15" , "cc" , "memory" );
817817#else
818818 /* 160 bit accumulator. */
819819 uint64_t c0 = 0 , c1 = 0 ;
820820 uint32_t c2 = 0 ;
821821
822- /* l [0..7] = a[0..3] * b[0..3]. */
822+ /* l8 [0..7] = a[0..3] * b[0..3]. */
823823 muladd_fast (a -> d [0 ], b -> d [0 ]);
824- extract_fast (l [0 ]);
824+ extract_fast (l8 [0 ]);
825825 muladd (a -> d [0 ], b -> d [1 ]);
826826 muladd (a -> d [1 ], b -> d [0 ]);
827- extract (l [1 ]);
827+ extract (l8 [1 ]);
828828 muladd (a -> d [0 ], b -> d [2 ]);
829829 muladd (a -> d [1 ], b -> d [1 ]);
830830 muladd (a -> d [2 ], b -> d [0 ]);
831- extract (l [2 ]);
831+ extract (l8 [2 ]);
832832 muladd (a -> d [0 ], b -> d [3 ]);
833833 muladd (a -> d [1 ], b -> d [2 ]);
834834 muladd (a -> d [2 ], b -> d [1 ]);
835835 muladd (a -> d [3 ], b -> d [0 ]);
836- extract (l [3 ]);
836+ extract (l8 [3 ]);
837837 muladd (a -> d [1 ], b -> d [3 ]);
838838 muladd (a -> d [2 ], b -> d [2 ]);
839839 muladd (a -> d [3 ], b -> d [1 ]);
840- extract (l [4 ]);
840+ extract (l8 [4 ]);
841841 muladd (a -> d [2 ], b -> d [3 ]);
842842 muladd (a -> d [3 ], b -> d [2 ]);
843- extract (l [5 ]);
843+ extract (l8 [5 ]);
844844 muladd_fast (a -> d [3 ], b -> d [3 ]);
845- extract_fast (l [6 ]);
845+ extract_fast (l8 [6 ]);
846846 VERIFY_CHECK (c1 == 0 );
847- l [7 ] = c0 ;
847+ l8 [7 ] = c0 ;
848848#endif
849849}
850850
0 commit comments