Module Name: src
Committed By: mrg
Date: Wed Mar 13 09:23:59 UTC 2019
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S
Log Message:
regen for openssl 1.1.1b.
not 100% sure this is right but my build works now. here's what i did:
% cd crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc
% make regen
after checking that the openssl generator calling code had not change
(but the relevant .pl file had.)
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.11 Sun Jan 6 22:22:02 2019
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S Wed Mar 13 09:23:59 2019
@@ -102,10 +102,11 @@ OPENSSL_atomic_add:
.long 0
-.globl OPENSSL_rdtsc
-.type OPENSSL_rdtsc,@function
+.globl OPENSSL_rdtsc_mftb
+.type OPENSSL_rdtsc_mftb,@function
.align 4
-OPENSSL_rdtsc:
+OPENSSL_rdtsc_mftb:
+ mftb 3
mfspr 0,287
srwi 0,0,0x10
cmplwi 0,0x1
@@ -128,6 +129,16 @@ OPENSSL_rdtsc:
.byte 0,12,0x14,0,0,0,0,0
+.globl OPENSSL_rdtsc_mfspr268
+.type OPENSSL_rdtsc_mfspr268,@function
+.align 4
+OPENSSL_rdtsc_mfspr268:
+ mfspr 3,268
+ blr
+.long 0
+.byte 0,12,0x14,0,0,0,0,0
+
+
.globl OPENSSL_cleanse
.type OPENSSL_cleanse,@function
.align 4
@@ -188,10 +199,10 @@ CRYPTO_memcmp:
.byte 0,12,0x14,0,0,0,3,0
.long 0
-.globl OPENSSL_instrument_bus
-.type OPENSSL_instrument_bus,@function
+.globl OPENSSL_instrument_bus_mftb
+.type OPENSSL_instrument_bus_mftb,@function
.align 4
-OPENSSL_instrument_bus:
+OPENSSL_instrument_bus_mftb:
mtctr 4
mftb 7
@@ -221,10 +232,10 @@ OPENSSL_instrument_bus:
.long 0
-.globl OPENSSL_instrument_bus2
-.type OPENSSL_instrument_bus2,@function
+.globl OPENSSL_instrument_bus2_mftb
+.type OPENSSL_instrument_bus2_mftb,@function
.align 4
-OPENSSL_instrument_bus2:
+OPENSSL_instrument_bus2_mftb:
mr 0,4
slwi 4,4,2
@@ -273,3 +284,89 @@ OPENSSL_instrument_bus2:
.byte 0,12,0x14,0,0,0,3,0
.long 0
+
+.globl OPENSSL_instrument_bus_mfspr268
+.type OPENSSL_instrument_bus_mfspr268,@function
+.align 4
+OPENSSL_instrument_bus_mfspr268:
+ mtctr 4
+
+ mfspr 7,268
+ li 8,0
+
+ dcbf 0,3
+ lwarx 6,0,3
+ add 6,6,8
+ stwcx. 6,0,3
+ stwx 6,0,3
+
+.Loop3: mfspr 6,268
+ sub 8,6,7
+ mr 7,6
+ dcbf 0,3
+ lwarx 6,0,3
+ add 6,6,8
+ stwcx. 6,0,3
+ stwx 6,0,3
+ addi 3,3,4
+ bc 16,0,.Loop3
+
+ mr 3,4
+ blr
+.long 0
+.byte 0,12,0x14,0,0,0,2,0
+.long 0
+
+
+.globl OPENSSL_instrument_bus2_mfspr268
+.type OPENSSL_instrument_bus2_mfspr268,@function
+.align 4
+OPENSSL_instrument_bus2_mfspr268:
+ mr 0,4
+ slwi 4,4,2
+
+ mfspr 7,268
+ li 8,0
+
+ dcbf 0,3
+ lwarx 6,0,3
+ add 6,6,8
+ stwcx. 6,0,3
+ stwx 6,0,3
+
+ mfspr 6,268
+ sub 8,6,7
+ mr 7,6
+ mr 9,8
+.Loop4:
+ dcbf 0,3
+ lwarx 6,0,3
+ add 6,6,8
+ stwcx. 6,0,3
+ stwx 6,0,3
+
+ addic. 5,5,-1
+ beq .Ldone4
+
+ mfspr 6,268
+ sub 8,6,7
+ mr 7,6
+ .long 0x7f884840
+ mr 9,8
+
+ mfcr 6
+ not 6,6
+ rlwinm 6,6,1,29,29
+
+ sub. 4,4,6
+ add 3,3,6
+ bne .Loop4
+
+.Ldone4:
+ srwi 4,4,2
+ sub 3,0,4
+ blr
+.long 0
+.byte 0,12,0x14,0,0,0,3,0
+.long 0
+
