From 13c1807041c9e2a502ee9af418f723bbf135e24c Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 22 Feb 2015 17:43:11 +0100 Subject: [PATCH] Fix crash in SPARC T4 XTS. Reviewed-by: Tim Hudson (cherry picked from commit 775b669de3ba84d8dce16ff5e2bdffe263c05c4b) --- crypto/aes/Makefile | 2 +- crypto/camellia/Makefile | 2 +- crypto/perlasm/sparcv9_modes.pl | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/aes/Makefile b/crypto/aes/Makefile index 709b1af39b..b94ca72a41 100644 --- a/crypto/aes/Makefile +++ b/crypto/aes/Makefile @@ -72,7 +72,7 @@ aesni-mb-x86_64.s: asm/aesni-mb-x86_64.pl aes-sparcv9.s: asm/aes-sparcv9.pl $(PERL) asm/aes-sparcv9.pl $(CFLAGS) > $@ -aest4-sparcv9.s: asm/aest4-sparcv9.pl +aest4-sparcv9.s: asm/aest4-sparcv9.pl ../perlasm/sparcv9_modes.pl $(PERL) asm/aest4-sparcv9.pl $(CFLAGS) > $@ aes-ppc.s: asm/aes-ppc.pl diff --git a/crypto/camellia/Makefile b/crypto/camellia/Makefile index 88535f963a..60e896054f 100644 --- a/crypto/camellia/Makefile +++ b/crypto/camellia/Makefile @@ -48,7 +48,7 @@ cmll-x86.s: asm/cmll-x86.pl ../perlasm/x86asm.pl $(PERL) asm/cmll-x86.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ cmll-x86_64.s: asm/cmll-x86_64.pl $(PERL) asm/cmll-x86_64.pl $(PERLASM_SCHEME) > $@ -cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl +cmllt4-sparcv9.s: asm/cmllt4-sparcv9.pl ../perlasm/sparcv9_modes.pl $(PERL) asm/cmllt4-sparcv9.pl $(CFLAGS) > $@ files: diff --git a/crypto/perlasm/sparcv9_modes.pl b/crypto/perlasm/sparcv9_modes.pl index dc55b34e41..eb267a57ed 100644 --- a/crypto/perlasm/sparcv9_modes.pl +++ b/crypto/perlasm/sparcv9_modes.pl @@ -1249,6 +1249,7 @@ $code.=<<___; fxor %f8, %f4, %f4 fxor %f10, %f6, %f6 + subcc $len, 2, $len stda %f0, [$out]0xe2 ! ASI_BLK_INIT, T4-specific add $out, 8, $out stda %f2, [$out]0xe2 ! ASI_BLK_INIT, T4-specific -- 2.34.1