Commit bd227733 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

C64x+ assembly pack: make it work with older toolchain.

parent 9250a306

crypto/aes/asm/aes-c64xplus.pl

+22 −18
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ open STDOUT,">$output"; 


$code=<<___;

	.text



	.if	.ASSEMBLER_VERSION<7000000

	.asg	0,__TI_EABI__

	.endif

	.if	__TI_EABI__

	.nocmp

	.asg	AES_encrypt,_AES_encrypt
@@ -85,18 +89,18 @@ _AES_encrypt: 
__encrypt:

	.if	__TI_EABI__

   [B2]	LDNDW	*INP++,A9:A8			; load input

||	MVKL	\$PCR_OFFSET(AES_Te,_AES_encrypt),$TEA

||	ADDKPC	_AES_encrypt,B0

||	MVKL	\$PCR_OFFSET(AES_Te,__encrypt),$TEA

||	ADDKPC	__encrypt,B0

   [B2]	LDNDW	*INP++,B9:B8

||	MVKH	\$PCR_OFFSET(AES_Te,_AES_encrypt),$TEA

||	MVKH	\$PCR_OFFSET(AES_Te,__encrypt),$TEA

||	ADD	0,KEY,$KPA

||	ADD	4,KEY,$KPB

	.else

   [B2]	LDNDW	*INP++,A9:A8			; load input

||	MVKL	(AES_Te-_AES_encrypt),$TEA

||	ADDKPC	_AES_encrypt,B0

||	MVKL	(AES_Te-__encrypt),$TEA

||	ADDKPC	__encrypt,B0

   [B2]	LDNDW	*INP++,B9:B8

||	MVKH	(AES_Te-_AES_encrypt),$TEA

||	MVKH	(AES_Te-__encrypt),$TEA

||	ADD	0,KEY,$KPA

||	ADD	4,KEY,$KPB

	.endif
@@ -297,18 +301,18 @@ _AES_decrypt: 
__decrypt:

	.if	__TI_EABI__

   [B2]	LDNDW	*INP++,A9:A8			; load input

||	MVKL	\$PCR_OFFSET(AES_Td,_AES_decrypt),$TEA

||	ADDKPC	_AES_decrypt,B0

||	MVKL	\$PCR_OFFSET(AES_Td,__decrypt),$TEA

||	ADDKPC	__decrypt,B0

   [B2]	LDNDW	*INP++,B9:B8

||	MVKH	\$PCR_OFFSET(AES_Td,_AES_decrypt),$TEA

||	MVKH	\$PCR_OFFSET(AES_Td,__decrypt),$TEA

||	ADD	0,KEY,$KPA

||	ADD	4,KEY,$KPB

	.else

   [B2]	LDNDW	*INP++,A9:A8			; load input

||	MVKL	(AES_Td-_AES_decrypt),$TEA

||	ADDKPC	_AES_decrypt,B0

||	MVKL	(AES_Td-__decrypt),$TEA

||	ADDKPC	__decrypt,B0

   [B2]	LDNDW	*INP++,B9:B8

||	MVKH	(AES_Td-_AES_decrypt),$TEA

||	MVKH	(AES_Td-__decrypt),$TEA

||	ADD	0,KEY,$KPA

||	ADD	4,KEY,$KPB

	.endif
@@ -546,16 +550,16 @@ __set_encrypt_key: 
	.if	__TI_EABI__

   [A0]	ADD	0,KEY,$KPA

|| [A0]	ADD	4,KEY,$KPB

|| [A0]	MVKL	\$PCR_OFFSET(AES_Te4,_AES_set_encrypt_key),$TEA

|| [A0]	ADDKPC	_AES_set_encrypt_key,B6

   [A0]	MVKH	\$PCR_OFFSET(AES_Te4,_AES_set_encrypt_key),$TEA

|| [A0]	MVKL	\$PCR_OFFSET(AES_Te4,__set_encrypt_key),$TEA

|| [A0]	ADDKPC	__set_encrypt_key,B6

   [A0]	MVKH	\$PCR_OFFSET(AES_Te4,__set_encrypt_key),$TEA

   [A0]	ADD	B6,$TEA,$TEA			; AES_Te4

	.else

   [A0]	ADD	0,KEY,$KPA

|| [A0]	ADD	4,KEY,$KPB

|| [A0]	MVKL	(AES_Te4-_AES_set_encrypt_key),$TEA

|| [A0]	ADDKPC	_AES_set_encrypt_key,B6

   [A0]	MVKH	(AES_Te4-_AES_set_encrypt_key),$TEA

|| [A0]	MVKL	(AES_Te4-__set_encrypt_key),$TEA

|| [A0]	ADDKPC	__set_encrypt_key,B6

   [A0]	MVKH	(AES_Te4-__set_encrypt_key),$TEA

   [A0]	ADD	B6,$TEA,$TEA			; AES_Te4

	.endif

	NOP

crypto/bn/asm/bn-c64xplus.asm

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ 
;; SPLOOPs spin at ... 2*n cycles [plus epilogue].

;;====================================================================

	.text



	.if	.ASSEMBLER_VERSION<7000000

	.asg	0,__TI_EABI__

	.endif

	.if	__TI_EABI__

	.asg	bn_mul_add_words,_bn_mul_add_words

	.asg	bn_mul_words,_bn_mul_words

crypto/bn/asm/c64xplus-gf2m.pl

+4 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ ___ 
}

$code.=<<___;

	.text



	.if	.ASSEMBLER_VERSION<7000000

	.asg	0,__TI_EABI__

	.endif

	.if	__TI_EABI__

	.asg	bn_GF2m_mul_2x2,_bn_GF2m_mul_2x2

	.endif

crypto/c64xpluscpuid.pl

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ open STDOUT,">$output"; 


$code.=<<___;

	.text



	.if	.ASSEMBLER_VERSION<7000000

	.asg	0,__TI_EABI__

	.endif

	.if	__TI_EABI__

	.asg	OPENSSL_rdtsc,_OPENSSL_rdtsc

	.asg	OPENSSL_cleanse,_OPENSSL_cleanse

crypto/modes/asm/ghash-c64xplus.pl

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ open STDOUT,">$output"; 


$code.=<<___;

	.text



	.if	.ASSEMBLER_VERSION<7000000

	.asg	0,__TI_EABI__

	.endif

	.if	__TI_EABI__

	.asg	gcm_gmult_1bit,_gcm_gmult_1bit

	.asg	gcm_gmult_4bit,_gcm_gmult_4bit