From: Andy Polyakov <appro@openssl.org>
Date: Fri, 2 Jul 2010 08:08:20 +0000 (+0000)
Subject: crypto/sparc*: elininate _sparcv9_rdwrasi [from HEAD].
X-Git-Tag: OpenSSL_1_0_0b~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d40f6d4a0232697b571c755d4c61df629069dbd3;p=oweals%2Fopenssl.git

crypto/sparc*: elininate _sparcv9_rdwrasi [from HEAD].
---

diff --git a/crypto/sparccpuid.S b/crypto/sparccpuid.S
index 1140b5c559..e53c7fad61 100644
--- a/crypto/sparccpuid.S
+++ b/crypto/sparccpuid.S
@@ -232,23 +232,13 @@ _sparcv9_rdtick:
 .type	_sparcv9_rdtick,#function
 .size	_sparcv9_rdtick,.-_sparcv9_rdtick
 
-.global	_sparcv9_rdwrasi
-.align	8
-_sparcv9_rdwrasi:
-	.word	0x9340c000	!rd	%asi,%o1
-	.word	0x87820000	!wr	%o0,%g0,%asi
-	retl
-	mov	%o1,%o0
-.type	_sparcv9_rdwrasi,#function
-.size	_sparcv9_rdwrasi,.-_sparcv9_rdwrasi
-
 .global	_sparcv9_vis1_probe
 .align	8
 _sparcv9_vis1_probe:
 	.word	0x81b00c20	!fzeros	%f0
-	.word	0xc19ba002+BIAS	!ldda	[%sp+BIAS+2]%asi,%f0
+	add	%sp,BIAS+2,%o0
 	retl
-	nop
+	.word	0xc19a1a40	!ldda	[%o0]ASI_FP16_P,%f0
 .type	_sparcv9_vis1_probe,#function
 .size	_sparcv9_vis1_probe,.-_sparcv9_vis1_probe
 
diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index 1d820f4c0a..6308036250 100644
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -27,7 +27,6 @@ int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp, const BN_U
 	}
 
 unsigned long	_sparcv9_rdtick(void);
-unsigned long	_sparcv9_rdwrasi(unsigned long);
 void		_sparcv9_vis1_probe(void);
 
 unsigned long OPENSSL_rdtsc(void)
@@ -150,7 +149,6 @@ void OPENSSL_cpuid_setup(void)
 	char *e;
 	struct sigaction	common_act,ill_oact,bus_oact;
 	sigset_t		all_masked,oset;
-	unsigned long		oasi;
 	int			sig;
  
 	if ((e=getenv("OPENSSL_sparcv9cap")))
@@ -179,7 +177,6 @@ void OPENSSL_cpuid_setup(void)
 
 	sigaction(SIGILL,&common_act,&ill_oact);
 	sigaction(SIGBUS,&common_act,&bus_oact);/* T1 fails 16-bit ldda */
-	oasi = _sparcv9_rdwrasi(0xD2);		/* ASI_FL16_P */
 	if ((sig=sigsetjmp(common_jmp,0)) == 0)
 		{
 		_sparcv9_vis1_probe();
@@ -193,7 +190,6 @@ void OPENSSL_cpuid_setup(void)
 		{
 		OPENSSL_sparcv9cap_P &= ~SPARCV9_VIS1;
 		}
-	_sparcv9_rdwrasi(oasi);
 	sigaction(SIGBUS,&bus_oact,NULL);
 	sigaction(SIGILL,&ill_oact,NULL);