X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Faes%2Fasm%2Faes-ia64.S;h=7f5432f6569551fa01f2d46d0bb1b2f82a8e9bba;hp=b4252a9c26d2b2eca1ad8c22bbbedcf4788c5d26;hb=f1ce306f301dc4214a9def53b079dfbcf8dcb299;hpb=51ce5230cdd5b6b9bbeeba994f12e27ed9554c19

diff --git a/crypto/aes/asm/aes-ia64.S b/crypto/aes/asm/aes-ia64.S
index b4252a9c26..7f5432f656 100644
--- a/crypto/aes/asm/aes-ia64.S
+++ b/crypto/aes/asm/aes-ia64.S
@@ -1,3 +1,9 @@
+// ====================================================================
+// Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
+// project. Rights for redistribution and usage in source and binary
+// forms are granted according to the OpenSSL license.
+// ====================================================================
+//
 // What's wrong with compiler generated code? Compiler never uses
 // variable 'shr' which is pairable with 'extr'/'dep' instructions.
 // Then it uses 'zxt' which is an I-type, but can be replaced with
@@ -65,20 +71,19 @@ AES_encrypt:
 	mov	prsave=pr	};;
 
 	.body
-{ .mib;	and	r40=3,r32
-	mov	pr.rot=7<<16
-	brp.exit.imp	.Le_rounds_cexit,.Le_cexit_insn
-				};;
+{ .mmi;	and	r40=3,r32
+	ADDP	r32=0,r32
+	mov	pr.rot=7<<16	};;
 #if defined(_HPUX_SOURCE)	// HPUX is big-endian, cut 15 cycles...
 { .mib; cmp.ne	p6,p0=r40,r0
-	ADDP	r41=4,r32		// 1st arg, borrow teN
+	add	r41=4,r32		// 1st arg, borrow teN
 (p6)	br.dpnt.many	.Le_unaligned	};;
 
 { .mmi;	ld4	r19=[r32],8
 	mov	r44=r33			// save 2nd arg
 	mov	twenty4=24	}
 { .mmi;	ld4	r23=[r41],8
-	addl	te0=@ltoff(Te0#),gp
+	addl	te0=@ltoff(AES_Te#),gp
 	ADDP	r35=KSZ*60,r34	};;	// &AES_KEY->rounds, borrow s1
 { .mmi;	ld8	te0=[te0]
 	ld4	r35=[r35]		// AES_KEY->rounds
@@ -125,7 +130,7 @@ AES_encrypt:
 	mov	maskff=0xff	}//;;
 { .mmi;	ld1	r30=[r42]
 	ld1	r31=[r43]
-	addl	te0=@ltoff(Te0#),gp	};;	// that was close...
+	addl	te0=@ltoff(AES_Te#),gp	};;	// that was close...
 
 { .mii;	ld8	te0=[te0]
 	dep	r19=r16,r19,24,8	//;;
@@ -150,8 +155,9 @@ AES_encrypt:
 	add	te2=2048,te0	}
 .Le_common:
 { .mib; add	te3=3072,te0
-	add	r35=-3,r35	};;
-
+	add	r35=-3,r35
+	brp.exit.imp	.Le_rounds_cexit,.Le_cexit_insn
+				};;
 { .mii;	mov	ar.lc=r35		// borrowed s1
 	mov	ar.ec=3		};;
 
@@ -333,7 +339,7 @@ while(<>) {
 
 	s/AES_encrypt/AES_decrypt/g;
 	s/\.Le_/.Ld_/g;
-	s/Te0#/Td0#/g;
+	s/AES_Te#/AES_Td#/g;
 
 	print;
 
@@ -356,20 +362,19 @@ AES_decrypt:
 	mov	prsave=pr	};;
 
 	.body
-{ .mib;	and	r40=3,r32
-	mov	pr.rot=7<<16
-	brp.exit.imp	.Ld_rounds_cexit,.Ld_cexit_insn
-				};;
+{ .mmi;	and	r40=3,r32
+	ADDP	r32=0,r32
+	mov	pr.rot=7<<16	};;
 #if defined(_HPUX_SOURCE)	// HPUX is big-endian, cut 15 cycles...
 { .mib; cmp.ne	p6,p0=r40,r0
-	ADDP	r41=4,r32		// 1st arg, borrow teN
+	add	r41=4,r32		// 1st arg, borrow teN
 (p6)	br.dpnt.many	.Ld_unaligned	};;
 
 { .mmi;	ld4	r19=[r32],8
 	mov	r44=r33			// save 2nd arg
 	mov	twenty4=24	}
 { .mmi;	ld4	r23=[r41],8
-	addl	te0=@ltoff(Td0#),gp
+	addl	te0=@ltoff(AES_Td#),gp
 	ADDP	r35=KSZ*60,r34	};;	// &AES_KEY->rounds, borrow s1
 { .mmi;	ld8	te0=[te0]
 	ld4	r35=[r35]		// AES_KEY->rounds
@@ -416,7 +421,7 @@ AES_decrypt:
 	mov	maskff=0xff	}//;;
 { .mmi;	ld1	r30=[r42]
 	ld1	r31=[r43]
-	addl	te0=@ltoff(Td0#),gp	};;	// that was close...
+	addl	te0=@ltoff(AES_Td#),gp	};;	// that was close...
 
 { .mii;	ld8	te0=[te0]
 	dep	r19=r16,r19,24,8	//;;
@@ -441,8 +446,9 @@ AES_decrypt:
 	add	te2=2048,te0	}
 .Ld_common:
 { .mib; add	te3=3072,te0
-	add	r35=-3,r35	};;
-
+	add	r35=-3,r35
+	brp.exit.imp	.Ld_rounds_cexit,.Ld_cexit_insn
+				};;
 { .mii;	mov	ar.lc=r35		// borrowed s1
 	mov	ar.ec=3		};;
 
@@ -592,8 +598,9 @@ AES_decrypt:
 
 // leave it in .text segment...
 .align	64
-.type	Te0#,@object
-Te0:	data4	0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d
+.global	AES_Te#
+.type	AES_Te#,@object
+AES_Te:	data4	0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d
 	data4	0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554
 	data4	0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d
 	data4	0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a
@@ -917,11 +924,12 @@ Te0:	data4	0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d
 	data4	0xbfbfbfbf, 0xe6e6e6e6, 0x42424242, 0x68686868
 	data4	0x41414141, 0x99999999, 0x2d2d2d2d, 0x0f0f0f0f
 	data4	0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616
-.size	Te0#,5*256*4	// HP-UX assembler fails to ".-Te0#"
+.size	AES_Te#,5*256*4	// HP-UX assembler fails to ".-AES_Te#"
 
 .align	64
-.type	Td0#,@object
-Td0:	data4	0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96
+.global	AES_Td#
+.type	AES_Td#,@object
+AES_Td:	data4	0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96
 	data4	0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393
 	data4	0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25
 	data4	0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f
@@ -1245,4 +1253,4 @@ Td0:	data4	0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96
 	data4	0xbabababa, 0x77777777, 0xd6d6d6d6, 0x26262626
 	data4	0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363
 	data4	0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d
-.size	Td0#,5*256*4	// HP-UX assembler fails to ".-Td0#"
+.size	AES_Td#,5*256*4	// HP-UX assembler fails to ".-AES_Td#"