jcs.org / openbsd-src
jcs's openbsd hax
openbsd
fork atom

Rename old assembly bn_sqr_words() to bn_sqr_word_wise().

bn_sqr_words() does not actually compute the square of the words, it only
computes the square of each individual word - rename it to reflect reality.

Discussed with tb@

jsing 4ff6eab4 33865b24

+27 -30
+1 -2
lib/libcrypto/bn/arch/i386/bn_arch.h
··· 1 - /* $OpenBSD: bn_arch.h,v 1.10 2025/08/30 07:54:27 jsing Exp $ */ 1 + /* $OpenBSD: bn_arch.h,v 1.11 2025/09/07 03:56:37 jsing Exp $ */ 2 2 /* 3 3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> 4 4 * ··· 33 33 34 34 #define HAVE_BN_SQR_COMBA4 35 35 #define HAVE_BN_SQR_COMBA8 36 - #define HAVE_BN_SQR_WORDS 37 36 38 37 #define HAVE_BN_SUB_WORDS 39 38
+1 -2
lib/libcrypto/bn/arch/mips64/bn_arch.h
··· 1 - /* $OpenBSD: bn_arch.h,v 1.8 2025/08/30 07:54:27 jsing Exp $ */ 1 + /* $OpenBSD: bn_arch.h,v 1.9 2025/09/07 03:56:37 jsing Exp $ */ 2 2 /* 3 3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> 4 4 * ··· 32 32 33 33 #define HAVE_BN_SQR_COMBA4 34 34 #define HAVE_BN_SQR_COMBA8 35 - #define HAVE_BN_SQR_WORDS 36 35 37 36 #define HAVE_BN_SUB_WORDS 38 37
+1 -2
lib/libcrypto/bn/arch/powerpc/bn_arch.h
··· 1 - /* $OpenBSD: bn_arch.h,v 1.7 2025/08/30 07:54:27 jsing Exp $ */ 1 + /* $OpenBSD: bn_arch.h,v 1.8 2025/09/07 03:56:37 jsing Exp $ */ 2 2 /* 3 3 * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> 4 4 * ··· 31 31 32 32 #define HAVE_BN_SQR_COMBA4 33 33 #define HAVE_BN_SQR_COMBA8 34 - #define HAVE_BN_SQR_WORDS 35 34 36 35 #define HAVE_BN_SUB_WORDS 37 36
+2 -2
lib/libcrypto/bn/asm/bn-586.pl
··· 12 12 13 13 &bn_mulw_add_words("bn_mulw_add_words"); 14 14 &bn_mulw_words("bn_mulw_words"); 15 - &bn_sqr_words("bn_sqr_words"); 15 + &bn_sqr_word_wise("bn_sqr_word_wise"); 16 16 &bn_div_words("bn_div_words"); 17 17 &bn_add_words("bn_add_words"); 18 18 &bn_sub_words("bn_sub_words"); ··· 318 318 &function_end($name); 319 319 } 320 320 321 - sub bn_sqr_words 321 + sub bn_sqr_word_wise 322 322 { 323 323 local($name)=@_; 324 324
+16 -16
lib/libcrypto/bn/asm/mips.pl
··· 397 397 .end bn_mulw_words_internal 398 398 399 399 .align 5 400 - .globl bn_sqr_words 401 - .ent bn_sqr_words 402 - bn_sqr_words: 400 + .globl bn_sqr_word_wise 401 + .ent bn_sqr_word_wise 402 + bn_sqr_word_wise: 403 403 .set noreorder 404 - bgtz $a2,bn_sqr_words_internal 404 + bgtz $a2,bn_sqr_word_wise_internal 405 405 move $v0,$zero 406 406 jr $ra 407 407 move $a0,$v0 408 - .end bn_sqr_words 408 + .end bn_sqr_word_wise 409 409 410 410 .align 5 411 - .ent bn_sqr_words_internal 412 - bn_sqr_words_internal: 411 + .ent bn_sqr_word_wise_internal 412 + bn_sqr_word_wise_internal: 413 413 ___ 414 414 $code.=<<___ if ($flavour =~ /nubi/i); 415 415 .frame $sp,6*$SZREG,$ra ··· 427 427 .set reorder 428 428 li $minus4,-4 429 429 and $ta0,$a2,$minus4 430 - beqz $ta0,.L_bn_sqr_words_tail 430 + beqz $ta0,.L_bn_sqr_word_wise_tail 431 431 432 - .L_bn_sqr_words_loop: 432 + .L_bn_sqr_word_wise_loop: 433 433 $LD $t0,0($a1) 434 434 $MULTU $t0,$t0 435 435 $LD $t2,$BNSZ($a1) ··· 463 463 $ST $ta3,-2*$BNSZ($a0) 464 464 465 465 .set noreorder 466 - bgtz $ta0,.L_bn_sqr_words_loop 466 + bgtz $ta0,.L_bn_sqr_word_wise_loop 467 467 $ST $ta2,-$BNSZ($a0) 468 468 469 - beqz $a2,.L_bn_sqr_words_return 469 + beqz $a2,.L_bn_sqr_word_wise_return 470 470 nop 471 471 472 - .L_bn_sqr_words_tail: 472 + .L_bn_sqr_word_wise_tail: 473 473 .set reorder 474 474 $LD $t0,0($a1) 475 475 $MULTU $t0,$t0 ··· 478 478 mfhi $t0 479 479 $ST $t1,0($a0) 480 480 $ST $t0,$BNSZ($a0) 481 - beqz $a2,.L_bn_sqr_words_return 481 + beqz $a2,.L_bn_sqr_word_wise_return 482 482 483 483 $LD $t0,$BNSZ($a1) 484 484 $MULTU $t0,$t0 ··· 487 487 mfhi $t0 488 488 $ST $t1,2*$BNSZ($a0) 489 489 $ST $t0,3*$BNSZ($a0) 490 - beqz $a2,.L_bn_sqr_words_return 490 + beqz $a2,.L_bn_sqr_word_wise_return 491 491 492 492 $LD $t0,2*$BNSZ($a1) 493 493 $MULTU $t0,$t0 ··· 496 496 $ST $t1,4*$BNSZ($a0) 497 497 $ST $t0,5*$BNSZ($a0) 498 498 499 - .L_bn_sqr_words_return: 499 + .L_bn_sqr_word_wise_return: 500 500 .set noreorder 501 501 ___ 502 502 $code.=<<___ if ($flavour =~ /nubi/i); ··· 511 511 jr $ra 512 512 move $a0,$v0 513 513 514 - .end bn_sqr_words_internal 514 + .end bn_sqr_word_wise_internal 515 515 516 516 .align 5 517 517 .globl bn_add_words
+6 -6
lib/libcrypto/bn/asm/ppc.pl
··· 204 204 # bn_sub_words 205 205 # bn_add_words 206 206 # bn_div_words 207 - # bn_sqr_words 207 + # bn_sqr_word_wise 208 208 # bn_mulw_words 209 209 # bn_mulw_add_words 210 210 # ··· 248 248 .globl .bn_sub_words 249 249 .globl .bn_add_words 250 250 .globl .bn_div_words 251 - .globl .bn_sqr_words 251 + .globl .bn_sqr_word_wise 252 252 .globl .bn_mulw_words 253 253 .globl .bn_mulw_add_words 254 254 ··· 1702 1702 1703 1703 # 1704 1704 # NOTE: The following label name should be changed to 1705 - # "bn_sqr_words" i.e. remove the first dot 1705 + # "bn_sqr_word_wise" i.e. remove the first dot 1706 1706 # for the gcc compiler. This should be automatically 1707 1707 # done in the build 1708 1708 # 1709 1709 .align 4 1710 - .bn_sqr_words: 1710 + .bn_sqr_word_wise: 1711 1711 # 1712 - # Optimized version of bn_sqr_words 1712 + # Optimized version of bn_sqr_word_wise 1713 1713 # 1714 - # void bn_sqr_words(BN_ULONG *r, BN_ULONG *a, int n) 1714 + # void bn_sqr_word_wise(BN_ULONG *r, BN_ULONG *a, int n) 1715 1715 # 1716 1716 # r3 = r 1717 1717 # r4 = a