pre-processor controls cleanup. It doesn't mean that it no longer
works on UltraSPARC, only that it doesn't utilize sparcv9-specific
features like branch prediction hints and load in little-endian byte
order anymore. This "costs" ~3% in EDE3 performance regression on
UltraSPARC.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
# define STPTR stx
# define ARG0 128
# define ARGSZ 8
# define STPTR stx
# define ARG0 128
# define ARGSZ 8
-# ifndef OPENSSL_SYS_ULTRASPARC
-# define OPENSSL_SYS_ULTRASPARC
-# endif
#else
# define FRAME -96
# define BIAS 0
#else
# define FRAME -96
# define BIAS 0
xor $2, local1, $2 ! 1 finished
xor $2, local2, $2 ! 3 finished
xor $2, local1, $2 ! 1 finished
xor $2, local2, $2 ! 3 finished
-#ifdef OPENSSL_SYS_ULTRASPARC
- bne,pt %icc, $4
-#else
and local4, 252, local1 ! sbox 1 next round
! two rounds more:
and local4, 252, local1 ! sbox 1 next round
! two rounds more:
! first in memory to rightmost in register
! first in memory to rightmost in register
-#ifdef OPENSSL_SYS_ULTRASPARC
- andcc $1, 3, global0
- bne,pn %icc, $5
- nop
-
- lda [$1] 0x88, $2
- add $1, 4, $4
-
- ba,pt %icc, $5a
- lda [$4] 0x88, $3
-#endif
-
! first in memory to rightmost in register
! first in memory to rightmost in register
-#ifdef OPENSSL_SYS_ULTRASPARC
- andcc $1, 3, global0
- bne,pn %icc, $5
- nop
-
- lda [$1] 0x88, $2
- add $1, 4, $1
-
- lda [$1] 0x88, $3
- ba,pt %icc, $5a
- add $1, 4, $1
-#endif
-
! rightmost in register to first in memory
! rightmost in register to first in memory
-#ifdef OPENSSL_SYS_ULTRASPARC
- andcc $1, 3, global0
- bne,pn %icc, $5
- nop
-
- sta $2, [$1] 0x88
- add $1, 4, $4
-
- ba,pt %icc, $5a
- sta $3, [$4] 0x88
-#endif
-
$5:
and $2, 255, $4
stub $4, [$1+0]
$5:
and $2, 255, $4
stub $4, [$1+0]
ld [in0], in5 ! left
cmp in2, 0 ! enc
ld [in0], in5 ! left
cmp in2, 0 ! enc
-#ifdef OPENSSL_SYS_ULTRASPARC
- be,pn %icc, .encrypt.dec ! enc/dec
-#else
ld [in0+4], out5 ! right
! parameter 6 1/2 for include encryption/decryption
ld [in0+4], out5 ! right
! parameter 6 1/2 for include encryption/decryption
! we use our own stackframe
! we use our own stackframe
-#ifdef OPENSSL_SYS_ULTRASPARC
- be,pn %icc, .encrypt2.dec ! decryption
-#else
STPTR in0, [%sp+BIAS+ARG0+0*ARGSZ]
ld [in3], out0 ! key 7531 first round
STPTR in0, [%sp+BIAS+ARG0+0*ARGSZ]
ld [in3], out0 ! key 7531 first round
-#ifdef OPENSSL_SYS_ULTRASPARC
- be,pn %icc, .ncbc.dec
-#else
STPTR in4, IVEC
! addr left right temp label
STPTR in4, IVEC
! addr left right temp label
addcc in2, -8, in2 ! bytes missing when first block done
addcc in2, -8, in2 ! bytes missing when first block done
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ncbc.enc.seven.or.less
-#else
bl .ncbc.enc.seven.or.less
bl .ncbc.enc.seven.or.less
mov in3, in4 ! schedule
.ncbc.enc.next.block:
mov in3, in4 ! schedule
.ncbc.enc.next.block:
rounds_macro(in5, out5, 1, .ncbc.enc.1, in3, in4) ! include encryption ks in3
rounds_macro(in5, out5, 1, .ncbc.enc.1, in3, in4) ! include encryption ks in3
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ncbc.enc.next.block_fp
-#else
bl .ncbc.enc.next.block_fp
bl .ncbc.enc.next.block_fp
add in0, 8, in0 ! input address
! If 8 or more bytes are to be encrypted after this block,
add in0, 8, in0 ! input address
! If 8 or more bytes are to be encrypted after this block,
addcc in2, -8, in2 ! bytes missing when next block done
addcc in2, -8, in2 ! bytes missing when next block done
-#ifdef OPENSSL_SYS_ULTRASPARC
- bpos,pt %icc, .ncbc.enc.next.block ! also jumps if 0
-#else
bpos .ncbc.enc.next.block
bpos .ncbc.enc.next.block
add in1, 8, in1
.ncbc.enc.seven.or.less:
cmp in2, -8
add in1, 8, in1
.ncbc.enc.seven.or.less:
cmp in2, -8
-#ifdef OPENSSL_SYS_ULTRASPARC
- ble,pt %icc, .ncbc.enc.finish
-#else
nop
add in2, 8, local1 ! bytes to load
nop
add in2, 8, local1 ! bytes to load
add in3, 120, in3
LDPTR IVEC, local7 ! ivec
add in3, 120, in3
LDPTR IVEC, local7 ! ivec
-#ifdef OPENSSL_SYS_ULTRASPARC
- ble,pn %icc, .ncbc.dec.finish
-#else
mov in3, in4 ! schedule
STPTR in1, OUTPUT
mov in3, in4 ! schedule
STPTR in1, OUTPUT
! in2 is compared to 8 in the rounds
xor out5, in0, out4 ! iv xor
! in2 is compared to 8 in the rounds
xor out5, in0, out4 ! iv xor
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ncbc.dec.seven.or.less
-#else
bl .ncbc.dec.seven.or.less
bl .ncbc.dec.seven.or.less
xor in5, in1, global4 ! iv xor
! Load ivec next block now, since input and output address might be the same.
xor in5, in1, global4 ! iv xor
! Load ivec next block now, since input and output address might be the same.
add local7, 8, local7
addcc in2, -8, in2
add local7, 8, local7
addcc in2, -8, in2
-#ifdef OPENSSL_SYS_ULTRASPARC
- bg,pt %icc, .ncbc.dec.next.block
-#else
LDPTR [%fp+BIAS+ARG0+6*ARGSZ], local4 ! ivec
cmp local3, 0 ! enc
LDPTR [%fp+BIAS+ARG0+6*ARGSZ], local4 ! ivec
cmp local3, 0 ! enc
-#ifdef OPENSSL_SYS_ULTRASPARC
- be,pn %icc, .ede3.dec
-#else
- be .ede3.dec
-#endif
STPTR in4, KS2
STPTR in5, KS3
STPTR in4, KS2
STPTR in5, KS3
addcc in2, -8, in2 ! bytes missing after next block
addcc in2, -8, in2 ! bytes missing after next block
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ede3.enc.seven.or.less
-#else
bl .ede3.enc.seven.or.less
bl .ede3.enc.seven.or.less
STPTR in3, KS1
.ede3.enc.next.block:
STPTR in3, KS1
.ede3.enc.next.block:
call .des_enc ! ks3 in3 compares in2 to 8
nop
call .des_enc ! ks3 in3 compares in2 to 8
nop
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ede3.enc.next.block_fp
-#else
bl .ede3.enc.next.block_fp
bl .ede3.enc.next.block_fp
add in0, 8, in0
! If 8 or more bytes are to be encrypted after this block,
add in0, 8, in0
! If 8 or more bytes are to be encrypted after this block,
addcc in2, -8, in2 ! bytes missing when next block done
addcc in2, -8, in2 ! bytes missing when next block done
-#ifdef OPENSSL_SYS_ULTRASPARC
- bpos,pt %icc, .ede3.enc.next.block
-#else
bpos .ede3.enc.next.block
bpos .ede3.enc.next.block
add in1, 8, in1
.ede3.enc.seven.or.less:
cmp in2, -8
add in1, 8, in1
.ede3.enc.seven.or.less:
cmp in2, -8
-#ifdef OPENSSL_SYS_ULTRASPARC
- ble,pt %icc, .ede3.enc.finish
-#else
nop
add in2, 8, local1 ! bytes to load
nop
add in2, 8, local1 ! bytes to load
STPTR in3, KS1
cmp in2, 0
STPTR in3, KS1
cmp in2, 0
-#ifdef OPENSSL_SYS_ULTRASPARC
- ble %icc, .ede3.dec.finish
-#else
STPTR in5, KS3
LDPTR [%fp+BIAS+ARG0+6*ARGSZ], local7 ! iv
STPTR in5, KS3
LDPTR [%fp+BIAS+ARG0+6*ARGSZ], local7 ! iv
! in2 is compared to 8 in the rounds
xor out5, in0, out4
! in2 is compared to 8 in the rounds
xor out5, in0, out4
-#ifdef OPENSSL_SYS_ULTRASPARC
- bl,pn %icc, .ede3.dec.seven.or.less
-#else
bl .ede3.dec.seven.or.less
bl .ede3.dec.seven.or.less
xor in5, in1, global4
load_little_endian_inc(local5, in0, in1, local3, .LLE10) ! iv next block
xor in5, in1, global4
load_little_endian_inc(local5, in0, in1, local3, .LLE10) ! iv next block
addcc in2, -8, in2
add local7, 8, local7
addcc in2, -8, in2
add local7, 8, local7
-#ifdef OPENSSL_SYS_ULTRASPARC
- bg,pt %icc, .ede3.dec.next.block
-#else
STPTR local7, OUTPUT
.ede3.dec.store.iv:
STPTR local7, OUTPUT
.ede3.dec.store.iv: