Skip to content

Commit

Permalink
Account for 64-bit pointers on PowerPC
Browse files Browse the repository at this point in the history
  • Loading branch information
@pooler
pooler committed Nov 23, 2016
1 parent a0b83b5 commit 475771d
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 81 deletions.
106 changes: 53 additions & 53 deletions scrypt-ppc.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@

#endif

#if !(defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) || \
defined(__64BIT__) || defined(_LP64) || defined(__LP64__))
#define ld lwz
#define std stw
#define stdu stwu
#define stdux stwux
#endif


#ifdef __ALTIVEC__

Expand Down Expand Up @@ -146,11 +154,9 @@
#endif
scrypt_core:
_scrypt_core:
stwu r1, -4*4(r1)
mflr r0
stw r0, 5*4(r1)
stdu r1, -4*4(r1)
mfspr r0, 256
stw r0, 2*4(r1)
std r0, 2*4(r1)
oris r0, r0, 0xffff
ori r0, r0, 0xf000
mtspr 256, r0
Expand Down Expand Up @@ -362,10 +368,8 @@ scrypt_core_loop2:
stvx v14, r3, r11
stvx v15, r3, r12

lwz r0, 2*4(r1)
ld r0, 2*4(r1)
mtspr 256, r0
lwz r0, 5*4(r1)
mtlr r0
addi r1, r1, 4*4
blr

Expand Down Expand Up @@ -493,30 +497,28 @@ scrypt_core_loop2:
#endif
scrypt_core:
_scrypt_core:
stwu r1, -48*4(r1)
mflr r0
stw r0, 49*4(r1)
stdu r1, -68*4(r1)
stw r5, 2*4(r1)
stw r13, 3*4(r1)
stw r14, 4*4(r1)
stw r15, 5*4(r1)
stw r16, 6*4(r1)
stw r17, 7*4(r1)
stw r18, 8*4(r1)
stw r19, 9*4(r1)
stw r20, 10*4(r1)
stw r21, 11*4(r1)
stw r22, 12*4(r1)
stw r23, 13*4(r1)
stw r24, 14*4(r1)
stw r25, 15*4(r1)
stw r26, 16*4(r1)
stw r27, 17*4(r1)
stw r28, 18*4(r1)
stw r29, 19*4(r1)
stw r30, 20*4(r1)
stw r31, 21*4(r1)
stw r3, 22*4(r1)
std r13, 4*4(r1)
std r14, 6*4(r1)
std r15, 8*4(r1)
std r16, 10*4(r1)
std r17, 12*4(r1)
std r18, 14*4(r1)
std r19, 16*4(r1)
std r20, 18*4(r1)
std r21, 20*4(r1)
std r3, 22*4(r1)
std r22, 48*4(r1)
std r23, 50*4(r1)
std r24, 52*4(r1)
std r25, 54*4(r1)
std r26, 56*4(r1)
std r27, 58*4(r1)
std r28, 60*4(r1)
std r29, 62*4(r1)
std r30, 64*4(r1)
std r31, 66*4(r1)

lwz r16, 0*4(r3)
lwz r17, 1*4(r3)
Expand Down Expand Up @@ -1048,7 +1050,7 @@ scrypt_core_loop2:
stw r23, 47*4(r1)
bdnz scrypt_core_loop2

lwz r3, 22*4(r1)
ld r3, 22*4(r1)

lwz r16, 24*4(r1)
lwz r17, 25*4(r1)
Expand Down Expand Up @@ -1107,28 +1109,26 @@ scrypt_core_loop2:
stw r14, 30*4(r3)
stw r15, 31*4(r3)

lwz r13, 3*4(r1)
lwz r14, 4*4(r1)
lwz r15, 5*4(r1)
lwz r16, 6*4(r1)
lwz r17, 7*4(r1)
lwz r18, 8*4(r1)
lwz r19, 9*4(r1)
lwz r20, 10*4(r1)
lwz r21, 11*4(r1)
lwz r22, 12*4(r1)
lwz r23, 13*4(r1)
lwz r24, 14*4(r1)
lwz r25, 15*4(r1)
lwz r26, 16*4(r1)
lwz r27, 17*4(r1)
lwz r28, 18*4(r1)
lwz r29, 19*4(r1)
lwz r30, 20*4(r1)
lwz r31, 21*4(r1)
lwz r0, 49*4(r1)
mtlr r0
addi r1, r1, 48*4
ld r13, 4*4(r1)
ld r14, 6*4(r1)
ld r15, 8*4(r1)
ld r16, 10*4(r1)
ld r17, 12*4(r1)
ld r18, 14*4(r1)
ld r19, 16*4(r1)
ld r20, 18*4(r1)
ld r21, 20*4(r1)
ld r22, 48*4(r1)
ld r23, 50*4(r1)
ld r24, 52*4(r1)
ld r25, 54*4(r1)
ld r26, 56*4(r1)
ld r27, 58*4(r1)
ld r28, 60*4(r1)
ld r29, 62*4(r1)
ld r30, 64*4(r1)
ld r31, 66*4(r1)
addi r1, r1, 68*4
blr

#endif /* __ALTIVEC__ */
Expand Down
64 changes: 36 additions & 28 deletions sha2-ppc.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@
#define v31 31
#endif

#endif

#if !(defined(__powerpc64__) || defined(__ppc64__) || defined(__PPC64__) || \
defined(__64BIT__) || defined(_LP64) || defined(__LP64__))
#define ld lwz
#define std stw
#define stdu stwu
#define stdux stwux
#endif


Expand Down Expand Up @@ -201,12 +209,12 @@ sha256_k:
#endif
sha256_transform:
_sha256_transform:
stwu r1, -72*4(r1)
stdu r1, -76*4(r1)
cmpwi 0, r5, 0
stw r13, 2*4(r1)
stw r14, 3*4(r1)
stw r15, 4*4(r1)
stw r16, 5*4(r1)
std r13, 2*4(r1)
std r14, 4*4(r1)
std r15, 6*4(r1)
std r16, 72*4(r1)

bne 0, sha256_transform_swap

Expand Down Expand Up @@ -364,11 +372,11 @@ sha256_transform_extend:
stw r10, 6*4(r3)
stw r11, 7*4(r3)

lwz r13, 2*4(r1)
lwz r14, 3*4(r1)
lwz r15, 4*4(r1)
lwz r16, 5*4(r1)
addi r1, r1, 72*4
ld r13, 2*4(r1)
ld r14, 4*4(r1)
ld r15, 6*4(r1)
ld r16, 72*4(r1)
addi r1, r1, 76*4
blr


Expand All @@ -381,13 +389,13 @@ sha256_transform_extend:
#endif
sha256d_ms:
_sha256d_ms:
stwu r1, -72*4(r1)
stw r13, 2*4(r1)
stw r14, 3*4(r1)
stw r15, 4*4(r1)
stw r16, 5*4(r1)
stw r17, 6*4(r1)
stw r18, 7*4(r1)
stdu r1, -80*4(r1)
std r13, 2*4(r1)
std r14, 4*4(r1)
std r15, 6*4(r1)
std r16, 72*4(r1)
std r17, 74*4(r1)
std r18, 76*4(r1)

mr r17, r4
mr r18, r5
Expand Down Expand Up @@ -883,13 +891,13 @@ _sha256d_ms:
add r11, r11, r5
stw r11, 7*4(r3)

lwz r13, 2*4(r1)
lwz r14, 3*4(r1)
lwz r15, 4*4(r1)
lwz r16, 5*4(r1)
lwz r17, 6*4(r1)
lwz r18, 7*4(r1)
addi r1, r1, 72*4
ld r13, 2*4(r1)
ld r14, 4*4(r1)
ld r15, 6*4(r1)
ld r16, 72*4(r1)
ld r17, 74*4(r1)
ld r18, 76*4(r1)
addi r1, r1, 80*4
blr


Expand Down Expand Up @@ -1146,7 +1154,7 @@ _sha256_transform_4way:
cmpwi 0, r5, 0
li r7, -(4*4+64*16)
subf r6, r6, r7
stwux r1, r1, r6
stdux r1, r1, r6

li r7, 1*16
li r8, 2*16
Expand Down Expand Up @@ -1336,7 +1344,7 @@ sha256_transform_4way_extend:
stvx v10, r11, r8
stvx v11, r11, r9

lwz r1, 0(r1)
ld r1, 0(r1)
mtspr 256, r0
blr

Expand All @@ -1358,7 +1366,7 @@ _sha256d_ms_4way:
andi. r12, r1, 15
li r11, -(4*4+64*16)
subf r12, r12, r11
stwux r1, r1, r12
stdux r1, r1, r12

li r7, 1*16
li r8, 2*16
Expand Down Expand Up @@ -1897,7 +1905,7 @@ _sha256d_ms_4way:
vadduwm v11, v11, v19
stvx v11, r3, r12

lwz r1, 0(r1)
ld r1, 0(r1)
mtspr 256, r0
blr

Expand Down

0 comments on commit 475771d

Please sign in to comment.