Fix sm3ss1 translation issue in sm3-armv8.pl

[openssl.git] / crypto / sm3 / asm / sm3-armv8.pl

diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
index bb71b2eade75dbf5d9333ed18642cd670a95e9c1..f0555fd3f2b8fba0105bf1738ab39de91211532b 100644 (file)
--- a/crypto/sm3/asm/sm3-armv8.pl
+++ b/crypto/sm3/asm/sm3-armv8.pl
@@ -109,7 +109,7 @@ ___
 
 $code=<<___;
 #include "arm_arch.h"
-.arch  armv8.2-a+sm4
+.arch  armv8.2-a
 .text
 ___
 
@@ -222,8 +222,8 @@ my %sm3partopcode = (
        "sm3partw1"         =>   0xce60C000,
         "sm3partw2"         =>   0xce60C400);
 
-my %sm3sslopcode = (
-       "sm3ssl"            =>   0xce400000);
+my %sm3ss1opcode = (
+       "sm3ss1"            =>   0xce400000);
 
 my %sm3ttopcode = (
        "sm3tt1a"           =>   0xce408000,
@@ -241,14 +241,13 @@ sub unsm3part {
                        $mnemonic,$arg;
 }
 
-sub unsm3ssl {
+sub unsm3ss1 {
        my ($mnemonic,$arg)=@_;
 
-       $arg=~ m/[qv](\d+)[^,]*,\s*[qv](\d+)[^,]*,\s*[qv](\d+)[^,]*,
-                \s*[qv](\d+)/o
+       $arg=~ m/[qv](\d+)[^,]*,\s*[qv](\d+)[^,]*,\s*[qv](\d+)[^,]*,\s*[qv](\d+)/o
        &&
        sprintf ".inst\t0x%08x\t//%s %s",
-                       $sm3sslopcode{$mnemonic}|$1|($2<<5)|($3<<16)|($4<<10),
+                       $sm3ss1opcode{$mnemonic}|$1|($2<<5)|($3<<16)|($4<<10),
                        $mnemonic,$arg;
 }
 
@@ -274,7 +273,7 @@ foreach(split("\n",$code)) {
        s/\`([^\`]*)\`/eval($1)/ge;
 
        s/\b(sm3partw[1-2])\s+([qv].*)/unsm3part($1,$2)/ge;
-       s/\b(sm3ssl)\s+([qv].*)/unsm3ssl($1,$2)/ge;
+       s/\b(sm3ss1)\s+([qv].*)/unsm3ss1($1,$2)/ge;
        s/\b(sm3tt[1-2][a-b])\s+([qv].*)/unsm3tt($1,$2)/ge;
        print $_,"\n";
 }