zuc: arm64 fix bug

This commit is contained in:
Sun Yimin 2022-07-07 14:20:09 +08:00 committed by GitHub
parent 80638ed2ae
commit 38db8cebd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -323,13 +323,12 @@ GLOBL mask_S1<>(SB), RODATA, $16
// func genKeywordAsm(s *zucState32) uint32 // func genKeywordAsm(s *zucState32) uint32
TEXT ·genKeywordAsm(SB),NOSPLIT,$0 TEXT ·genKeywordAsm(SB),NOSPLIT,$0
MOVD pState+0(FP), SI
LOAD_GLOBAL_DATA() LOAD_GLOBAL_DATA()
VEOR ZERO.B16, ZERO.B16, ZERO.B16 VEOR ZERO.B16, ZERO.B16, ZERO.B16
MOVD pState+0(FP), SI
LOAD_STATE(0(SI)) LOAD_STATE(0(SI))
/*
BITS_REORG(0) BITS_REORG(0)
NONLIN_FUN() NONLIN_FUN()
@ -339,7 +338,7 @@ TEXT ·genKeywordAsm(SB),NOSPLIT,$0
LFSR_UPDT(0) LFSR_UPDT(0)
SAVE_STATE(0(SI)) SAVE_STATE(0(SI))
RESTORE_LFSR_0() RESTORE_LFSR_0()
*/
RET RET
#define ONEROUND(idx) \ #define ONEROUND(idx) \
@ -361,13 +360,13 @@ TEXT ·genKeywordAsm(SB),NOSPLIT,$0
// func genKeyStreamAsm(keyStream []uint32, pState *zucState32) // func genKeyStreamAsm(keyStream []uint32, pState *zucState32)
TEXT ·genKeyStreamAsm(SB),NOSPLIT,$0 TEXT ·genKeyStreamAsm(SB),NOSPLIT,$0
LOAD_GLOBAL_DATA()
VEOR ZERO.B16, ZERO.B16, ZERO.B16
MOVD ks+0(FP), DI MOVD ks+0(FP), DI
MOVD ks_len+8(FP), BP MOVD ks_len+8(FP), BP
MOVD pState+24(FP), SI MOVD pState+24(FP), SI
LOAD_GLOBAL_DATA()
VEOR ZERO.B16, ZERO.B16, ZERO.B16
LOAD_STATE(0(SI)) LOAD_STATE(0(SI))
zucSixteens: zucSixteens:
@ -435,14 +434,14 @@ zucRet:
// func genKeyStreamRev32Asm(keyStream []byte, pState *zucState32) // func genKeyStreamRev32Asm(keyStream []byte, pState *zucState32)
TEXT ·genKeyStreamRev32Asm(SB),NOSPLIT,$0 TEXT ·genKeyStreamRev32Asm(SB),NOSPLIT,$0
LOAD_GLOBAL_DATA()
VEOR ZERO.B16, ZERO.B16, ZERO.B16
MOVD ks+0(FP), DI MOVD ks+0(FP), DI
MOVD ks_len+8(FP), BP MOVD ks_len+8(FP), BP
MOVD pState+24(FP), SI MOVD pState+24(FP), SI
LOAD_GLOBAL_DATA()
VEOR ZERO.B16, ZERO.B16, ZERO.B16
LSR $2, BP LSR $2, BP
LOAD_STATE(0(SI)) LOAD_STATE(0(SI))
zucSixteens: zucSixteens: