diff options
author | Andy Polyakov <appro@openssl.org> | 2010-07-09 12:11:12 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2010-07-09 12:11:12 +0000 |
commit | 1cbdca7bf2d09d7fcae26cf05050e8644a253d9a (patch) | |
tree | 3987e07e8a3e47e656bcaed525d6258694e05fbf /crypto | |
parent | e216cd6ee91f88ca22d7b12b73c3784faf763c5b (diff) |
Harmonize s390x assembler modules with "catch-all" rules from commit#19749.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/aes/asm/aes-s390x.pl | 4 | ||||
-rw-r--r-- | crypto/bn/asm/s390x-mont.pl | 3 | ||||
-rw-r--r-- | crypto/sha/asm/sha1-s390x.pl | 2 | ||||
-rw-r--r-- | crypto/sha/asm/sha512-s390x.pl | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl index 7e01889298..1fd91ca1b8 100644 --- a/crypto/aes/asm/aes-s390x.pl +++ b/crypto/aes/asm/aes-s390x.pl @@ -50,6 +50,9 @@ # it was measured to be ~6.6x. It's less than previously mentioned 8x, # because software implementation was optimized. +while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +open STDOUT,">$output"; + $softonly=0; # allow hardware support $t0="%r0"; $mask="%r0"; @@ -1337,3 +1340,4 @@ ___ $code =~ s/\`([^\`]*)\`/eval $1/gem; print $code; +close STDOUT; # force flush diff --git a/crypto/bn/asm/s390x-mont.pl b/crypto/bn/asm/s390x-mont.pl index d23251033b..502fa2e01f 100644 --- a/crypto/bn/asm/s390x-mont.pl +++ b/crypto/bn/asm/s390x-mont.pl @@ -32,6 +32,9 @@ # Reschedule to minimize/avoid Address Generation Interlock hazard, # make inner loops counter-based. +while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} +open STDOUT,">$output"; + $mn0="%r0"; $num="%r1"; diff --git a/crypto/sha/asm/sha1-s390x.pl b/crypto/sha/asm/sha1-s390x.pl index 4b17848287..659afffc08 100644 --- a/crypto/sha/asm/sha1-s390x.pl +++ b/crypto/sha/asm/sha1-s390x.pl @@ -23,7 +23,7 @@ $kimdfunc=1; # magic function code for kimd instruction -$output=shift; +while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; $K_00_39="%r0"; $K=$K_00_39; diff --git a/crypto/sha/asm/sha512-s390x.pl b/crypto/sha/asm/sha512-s390x.pl index e7ef2d5a9f..9d68215e2b 100644 --- a/crypto/sha/asm/sha512-s390x.pl +++ b/crypto/sha/asm/sha512-s390x.pl @@ -44,7 +44,7 @@ $tbl="%r13"; $T1="%r14"; $sp="%r15"; -$output=shift; +while (($output=shift) && ($output!~/^\w[\w\-]*\.\w+$/)) {} open STDOUT,">$output"; if ($output =~ /512/) { |