Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
接近 2 年 前同步成功

通知 12
Star 18
Fork 1
T
Third Party Openssl
提交 f7dc4a3b 编写于 作者: A Andy Polyakov
浏览文件
操作

MIPS assembly pack: fix MIPS64 assembler warnings. 

Reviewed-by: NRichard Levitte <levitte@openssl.org>
上级 39199fb3
隐藏空白更改
内联 并排
Showing with 13 addition and 9 deletion
crypto/aes/asm/aes-mips.pl
浏览文件 @ f7dc4a3b
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
$flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64 $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
if ($flavour =~ /64|n32/i) { if ($flavour =~ /64|n32/i) {
$PTR_LA="dla";
$PTR_ADD="dadd"; # incidentally works even on n32 $PTR_ADD="dadd"; # incidentally works even on n32
$PTR_SUB="dsub"; # incidentally works even on n32 $PTR_SUB="dsub"; # incidentally works even on n32
$PTR_INS="dins"; $PTR_INS="dins";
...@@ -65,6 +66,7 @@ if ($flavour =~ /64|n32/i) { ...@@ -65,6 +66,7 @@ if ($flavour =~ /64|n32/i) {
$PTR_SLL="dsll"; # incidentally works even on n32 $PTR_SLL="dsll"; # incidentally works even on n32
$SZREG=8; $SZREG=8;
} else { } else {
$PTR_LA="la";
$PTR_ADD="add"; $PTR_ADD="add";
$PTR_SUB="sub"; $PTR_SUB="sub";
$PTR_INS="ins"; $PTR_INS="ins";
...@@ -110,7 +112,7 @@ ___ ...@@ -110,7 +112,7 @@ ___
{{{ {{{
my $FRAMESIZE=16*$SZREG; my $FRAMESIZE=16*$SZREG;
my $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; my $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
my ($inp,$out,$key,$Tbl,$s0,$s1,$s2,$s3)=($a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7); my ($inp,$out,$key,$Tbl,$s0,$s1,$s2,$s3)=($a0,$a1,$a2,$a3,$a4,$a5,$a6,$a7);
my ($i0,$i1,$i2,$i3)=($at,$t0,$t1,$t2); my ($i0,$i1,$i2,$i3)=($at,$t0,$t1,$t2);
...@@ -646,7 +648,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification ...@@ -646,7 +648,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
___ ___
$code.=<<___; $code.=<<___;
.set reorder .set reorder
la $Tbl,AES_Te # PIC-ified 'load address' $PTR_LA $Tbl,AES_Te # PIC-ified 'load address'
lwl $s0,0+$MSB($inp) lwl $s0,0+$MSB($inp)
lwl $s1,4+$MSB($inp) lwl $s1,4+$MSB($inp)
...@@ -1217,7 +1219,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification ...@@ -1217,7 +1219,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
___ ___
$code.=<<___; $code.=<<___;
.set reorder .set reorder
la $Tbl,AES_Td # PIC-ified 'load address' $PTR_LA $Tbl,AES_Td # PIC-ified 'load address'
lwl $s0,0+$MSB($inp) lwl $s0,0+$MSB($inp)
lwl $s1,4+$MSB($inp) lwl $s1,4+$MSB($inp)
...@@ -1267,7 +1269,7 @@ ___ ...@@ -1267,7 +1269,7 @@ ___
{{{ {{{
my $FRAMESIZE=8*$SZREG; my $FRAMESIZE=8*$SZREG;
my $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc000f008 : 0xc0000000; my $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc000f008" : "0xc0000000";
my ($inp,$bits,$key,$Tbl)=($a0,$a1,$a2,$a3); my ($inp,$bits,$key,$Tbl)=($a0,$a1,$a2,$a3);
my ($rk0,$rk1,$rk2,$rk3,$rk4,$rk5,$rk6,$rk7)=($a4,$a5,$a6,$a7,$s0,$s1,$s2,$s3); my ($rk0,$rk1,$rk2,$rk3,$rk4,$rk5,$rk6,$rk7)=($a4,$a5,$a6,$a7,$s0,$s1,$s2,$s3);
...@@ -1556,7 +1558,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification ...@@ -1556,7 +1558,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
___ ___
$code.=<<___; $code.=<<___;
.set reorder .set reorder
la $Tbl,AES_Te4 # PIC-ified 'load address' $PTR_LA $Tbl,AES_Te4 # PIC-ified 'load address'
bal _mips_AES_set_encrypt_key bal _mips_AES_set_encrypt_key
...@@ -1611,7 +1613,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification ...@@ -1611,7 +1613,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
___ ___
$code.=<<___; $code.=<<___;
.set reorder .set reorder
la $Tbl,AES_Te4 # PIC-ified 'load address' $PTR_LA $Tbl,AES_Te4 # PIC-ified 'load address'
bal _mips_AES_set_encrypt_key bal _mips_AES_set_encrypt_key
......
crypto/sha/asm/sha1-mips.pl
浏览文件 @ f7dc4a3b
...@@ -326,7 +326,7 @@ ___ ...@@ -326,7 +326,7 @@ ___
} }
$FRAMESIZE=16; # large enough to accommodate NUBI saved registers $FRAMESIZE=16; # large enough to accommodate NUBI saved registers
$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
$code=<<___; $code=<<___;
#ifdef OPENSSL_FIPSCANISTER #ifdef OPENSSL_FIPSCANISTER
......
crypto/sha/asm/sha512-mips.pl
浏览文件 @ f7dc4a3b
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
$flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64 $flavour = shift || "o32"; # supported flavours are o32,n32,64,nubi32,nubi64
if ($flavour =~ /64|n32/i) { if ($flavour =~ /64|n32/i) {
$PTR_LA="dla";
$PTR_ADD="dadd"; # incidentally works even on n32 $PTR_ADD="dadd"; # incidentally works even on n32
$PTR_SUB="dsub"; # incidentally works even on n32 $PTR_SUB="dsub"; # incidentally works even on n32
$REG_S="sd"; $REG_S="sd";
...@@ -59,6 +60,7 @@ if ($flavour =~ /64|n32/i) { ...@@ -59,6 +60,7 @@ if ($flavour =~ /64|n32/i) {
$PTR_SLL="dsll"; # incidentally works even on n32 $PTR_SLL="dsll"; # incidentally works even on n32
$SZREG=8; $SZREG=8;
} else { } else {
$PTR_LA="la";
$PTR_ADD="add"; $PTR_ADD="add";
$PTR_SUB="sub"; $PTR_SUB="sub";
$REG_S="sw"; $REG_S="sw";
...@@ -286,7 +288,7 @@ ___ ...@@ -286,7 +288,7 @@ ___
} }
$FRAMESIZE=16*$SZ+16*$SZREG; $FRAMESIZE=16*$SZ+16*$SZREG;
$SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? 0xc0fff008 : 0xc0ff0000; $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
$code.=<<___; $code.=<<___;
#ifdef OPENSSL_FIPSCANISTER #ifdef OPENSSL_FIPSCANISTER
...@@ -343,7 +345,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification ...@@ -343,7 +345,7 @@ $code.=<<___ if ($flavour !~ /o32/i); # non-o32 PIC-ification
___ ___
$code.=<<___; $code.=<<___;
.set reorder .set reorder
la $Ktbl,K${label} # PIC-ified 'load address' $PTR_LA $Ktbl,K${label} # PIC-ified 'load address'
$LD $A,0*$SZ($ctx) # load context $LD $A,0*$SZ($ctx) # load context
$LD $B,1*$SZ($ctx) $LD $B,1*$SZ($ctx)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或