aarch64: Remove some flavour conditionals

This change is expected to be a non-functional change.

Original request:
https://boringssl-review.googlesource.com/c/boringssl/+/42084

Change-Id: Ifbf85eb6cafebabf0cf063b7dd147417d01c280c
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/43584
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
chromium-5359
Tamas Petz 4 years ago committed by CQ bot account: commit-bot@chromium.org
parent c583dbea70
commit b67732a163
  1. 4
      crypto/fipsmodule/aes/asm/aesv8-armx.pl
  2. 10
      crypto/fipsmodule/modes/asm/ghashv8-armx.pl

@ -340,11 +340,7 @@ $code.=<<___;
.type ${prefix}_${dir}crypt,%function .type ${prefix}_${dir}crypt,%function
.align 5 .align 5
${prefix}_${dir}crypt: ${prefix}_${dir}crypt:
___
$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET AARCH64_VALID_CALL_TARGET
___
$code.=<<___;
ldr $rounds,[$key,#240] ldr $rounds,[$key,#240]
vld1.32 {$rndkey0},[$key],#16 vld1.32 {$rndkey0},[$key],#16
vld1.8 {$inout},[$inp] vld1.8 {$inout},[$inp]

@ -86,11 +86,7 @@ $code.=<<___;
.type gcm_init_v8,%function .type gcm_init_v8,%function
.align 4 .align 4
gcm_init_v8: gcm_init_v8:
___
$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET AARCH64_VALID_CALL_TARGET
___
$code.=<<___;
vld1.64 {$t1},[x1] @ load input H vld1.64 {$t1},[x1] @ load input H
vmov.i8 $xC2,#0xe1 vmov.i8 $xC2,#0xe1
vshl.i64 $xC2,$xC2,#57 @ 0xc2.0 vshl.i64 $xC2,$xC2,#57 @ 0xc2.0
@ -150,11 +146,7 @@ $code.=<<___;
.type gcm_gmult_v8,%function .type gcm_gmult_v8,%function
.align 4 .align 4
gcm_gmult_v8: gcm_gmult_v8:
___
$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET AARCH64_VALID_CALL_TARGET
___
$code.=<<___;
vld1.64 {$t1},[$Xi] @ load Xi vld1.64 {$t1},[$Xi] @ load Xi
vmov.i8 $xC2,#0xe1 vmov.i8 $xC2,#0xe1
vld1.64 {$H-$Hhl},[$Htbl] @ load twisted H, ... vld1.64 {$H-$Hhl},[$Htbl] @ load twisted H, ...
@ -207,8 +199,6 @@ $code.=<<___;
.type gcm_ghash_v8,%function .type gcm_ghash_v8,%function
.align 4 .align 4
gcm_ghash_v8: gcm_ghash_v8:
___
$code.=<<___ if ($flavour =~ /64/);
AARCH64_VALID_CALL_TARGET AARCH64_VALID_CALL_TARGET
___ ___
$code.=<<___ if ($flavour !~ /64/); $code.=<<___ if ($flavour !~ /64/);

Loading…
Cancel
Save