From: Andy Polyakov <appro@openssl.org>
Date: Fri, 13 Nov 2015 23:16:37 +0000 (+0100)
Subject: crpyto/ppccpuid.pl: add FPU probe and fix OPENSSL_rdtsc.
X-Git-Tag: OpenSSL_1_1_0-pre2~231
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81eae077ce679c1d7d29e19991bf055e4888a2fc;p=oweals%2Fopenssl.git

crpyto/ppccpuid.pl: add FPU probe and fix OPENSSL_rdtsc.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
---

diff --git a/crypto/ppccpuid.pl b/crypto/ppccpuid.pl
index 56cc851c1d..4c2530d147 100755
--- a/crypto/ppccpuid.pl
+++ b/crypto/ppccpuid.pl
@@ -23,6 +23,14 @@ $code=<<___;
 .machine	"any"
 .text
 
+.globl	.OPENSSL_fpu_probe
+.align	4
+.OPENSSL_fpu_probe:
+	fmr	f0,f0
+	blr
+	.long	0
+	.byte	0,12,0x14,0,0,0,0,0
+.size	.OPENSSL_fpu_probe,.-.OPENSSL_fpu_probe
 .globl	.OPENSSL_ppc64_probe
 .align	4
 .OPENSSL_ppc64_probe:
@@ -102,8 +110,19 @@ Ladd:	lwarx	r5,0,r3
 .globl	.OPENSSL_rdtsc
 .align	4
 .OPENSSL_rdtsc:
+___
+$code.=<<___	if ($flavour =~ /64/);
+	mftb	r3
+___
+$code.=<<___	if ($flavour !~ /64/);
+Loop_rdtsc:
+	mftbu	r5
 	mftb	r3
 	mftbu	r4
+	cmplw	r4,r5
+	bne	Loop_rdtsc
+___
+$code.=<<___;
 	blr
 	.long	0
 	.byte	0,12,0x14,0,0,0,0,0