Attachment #351740 for bug #474486

View | Details | Raw Unified | Return to bug 474486
Collapse All | Expand All




                "movdqa 0x90(%%esi), %%xmm1\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xa0(%%esi), %%xmm1\n\t"
                "cmpl $10, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xb0(%%esi), %%xmm1\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xc0(%%esi), %%xmm1\n\t"
                "cmpl $12, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xd0(%%esi), %%xmm1\n\t"

                "movdqu %[src], %%xmm1\n\t"      /* Save input.  */
                "pxor %%xmm1, %%xmm0\n\t"        /* xmm0 = input ^ IV  */

                "cmpl $1, %[decrypt]\n\t"
                "jz .Ldecrypt_%=\n\t"
                "movdqa %%xmm0, %[iv]\n\t"       /* [encrypt] Store IV.  */
                "jmp .Lleave_%=\n"

                "movdqa 0x90(%%esi), %%xmm1\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xa0(%%esi), %%xmm1\n\t"
                "cmpl $10, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xb0(%%esi), %%xmm1\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xc0(%%esi), %%xmm1\n\t"
                "cmpl $12, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                "movdqa 0xd0(%%esi), %%xmm1\n\t"

                aesenc_xmm1_xmm3
                aesenc_xmm1_xmm4
                "movdqa 0xa0(%%esi), %%xmm1\n\t"
                "cmpl $10, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                aesenc_xmm1_xmm2

                aesenc_xmm1_xmm3
                aesenc_xmm1_xmm4
                "movdqa 0xc0(%%esi), %%xmm1\n\t"
                "cmpl $12, %[rounds]\n\t"
                "jz .Lenclast%=\n\t"
                aesenc_xmm1_xmm0
                aesenc_xmm1_xmm2

Lines 437-444 Link Here

(-)./mpi/longlong.h.orig (-8 / +8 lines)
437	#define add_ssaaaa(sh, sl, ah, al, bh, bl) \	437	#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
438	__asm__ ("addl %5,%1\n" \	438	__asm__ ("addl %5,%1\n" \
439	"adcl %3,%0" \	439	"adcl %3,%0" \
440	: "=r" ((USItype)(sh)), \	440	: "=r" (sh), \
441	"=&r" ((USItype)(sl)) \	441	"=&r" (sl) \
442	: "%0" ((USItype)(ah)), \	442	: "%0" ((USItype)(ah)), \
443	"g" ((USItype)(bh)), \	443	"g" ((USItype)(bh)), \
444	"%1" ((USItype)(al)), \	444	"%1" ((USItype)(al)), \
Lines 446-467 Link Here
446	#define sub_ddmmss(sh, sl, ah, al, bh, bl) \	446	#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
447	__asm__ ("subl %5,%1\n" \	447	__asm__ ("subl %5,%1\n" \
448	"sbbl %3,%0" \	448	"sbbl %3,%0" \
449	: "=r" ((USItype)(sh)), \	449	: "=r" (sh), \
450	"=&r" ((USItype)(sl)) \	450	"=&r" (sl) \
451	: "0" ((USItype)(ah)), \	451	: "0" ((USItype)(ah)), \
452	"g" ((USItype)(bh)), \	452	"g" ((USItype)(bh)), \
453	"1" ((USItype)(al)), \	453	"1" ((USItype)(al)), \
454	"g" ((USItype)(bl)))	454	"g" ((USItype)(bl)))
455	#define umul_ppmm(w1, w0, u, v) \	455	#define umul_ppmm(w1, w0, u, v) \
456	__asm__ ("mull %3" \	456	__asm__ ("mull %3" \
457	: "=a" ((USItype)(w0)), \	457	: "=a" (w0), \
458	"=d" ((USItype)(w1)) \	458	"=d" (w1) \
459	: "%0" ((USItype)(u)), \	459	: "%0" ((USItype)(u)), \
460	"rm" ((USItype)(v)))	460	"rm" ((USItype)(v)))
461	#define udiv_qrnnd(q, r, n1, n0, d) \	461	#define udiv_qrnnd(q, r, n1, n0, d) \
462	__asm__ ("divl %4" \	462	__asm__ ("divl %4" \
463	: "=a" ((USItype)(q)), \	463	: "=a" (q), \
464	"=d" ((USItype)(r)) \	464	"=d" (r) \
465	: "0" ((USItype)(n0)), \	465	: "0" ((USItype)(n0)), \
466	"1" ((USItype)(n1)), \	466	"1" ((USItype)(n1)), \
467	"rm" ((USItype)(d)))	467	"rm" ((USItype)(d)))

Return to bug 474486

Lines 844-856 do_aesni_cfb (const RIJNDAEL_context *ct Link Here

(-)cipher/rijndael.c.orig (-7 / +7 lines)
844	"movdqa 0x90(%%esi), %%xmm1\n\t"	844	"movdqa 0x90(%%esi), %%xmm1\n\t"
845	aesenc_xmm1_xmm0	845	aesenc_xmm1_xmm0
846	"movdqa 0xa0(%%esi), %%xmm1\n\t"	846	"movdqa 0xa0(%%esi), %%xmm1\n\t"
847	"cmp $10, %[rounds]\n\t"	847	"cmpl $10, %[rounds]\n\t"
848	"jz .Lenclast%=\n\t"	848	"jz .Lenclast%=\n\t"
849	aesenc_xmm1_xmm0	849	aesenc_xmm1_xmm0
850	"movdqa 0xb0(%%esi), %%xmm1\n\t"	850	"movdqa 0xb0(%%esi), %%xmm1\n\t"
851	aesenc_xmm1_xmm0	851	aesenc_xmm1_xmm0
852	"movdqa 0xc0(%%esi), %%xmm1\n\t"	852	"movdqa 0xc0(%%esi), %%xmm1\n\t"
853	"cmp $12, %[rounds]\n\t"	853	"cmpl $12, %[rounds]\n\t"
854	"jz .Lenclast%=\n\t"	854	"jz .Lenclast%=\n\t"
855	aesenc_xmm1_xmm0	855	aesenc_xmm1_xmm0
856	"movdqa 0xd0(%%esi), %%xmm1\n\t"	856	"movdqa 0xd0(%%esi), %%xmm1\n\t"
Lines 862-868 do_aesni_cfb (const RIJNDAEL_context *ct Link Here
862	"movdqu %[src], %%xmm1\n\t" /* Save input. */	862	"movdqu %[src], %%xmm1\n\t" /* Save input. */
863	"pxor %%xmm1, %%xmm0\n\t" /* xmm0 = input ^ IV */	863	"pxor %%xmm1, %%xmm0\n\t" /* xmm0 = input ^ IV */
864		864
865	"cmp $1, %[decrypt]\n\t"	865	"cmpl $1, %[decrypt]\n\t"
866	"jz .Ldecrypt_%=\n\t"	866	"jz .Ldecrypt_%=\n\t"
867	"movdqa %%xmm0, %[iv]\n\t" /* [encrypt] Store IV. */	867	"movdqa %%xmm0, %[iv]\n\t" /* [encrypt] Store IV. */
868	"jmp .Lleave_%=\n"	868	"jmp .Lleave_%=\n"
Lines 923-935 do_aesni_ctr (const RIJNDAEL_context *ct Link Here
923	"movdqa 0x90(%%esi), %%xmm1\n\t"	923	"movdqa 0x90(%%esi), %%xmm1\n\t"
924	aesenc_xmm1_xmm0	924	aesenc_xmm1_xmm0
925	"movdqa 0xa0(%%esi), %%xmm1\n\t"	925	"movdqa 0xa0(%%esi), %%xmm1\n\t"
926	"cmp $10, %[rounds]\n\t"	926	"cmpl $10, %[rounds]\n\t"
927	"jz .Lenclast%=\n\t"	927	"jz .Lenclast%=\n\t"
928	aesenc_xmm1_xmm0	928	aesenc_xmm1_xmm0
929	"movdqa 0xb0(%%esi), %%xmm1\n\t"	929	"movdqa 0xb0(%%esi), %%xmm1\n\t"
930	aesenc_xmm1_xmm0	930	aesenc_xmm1_xmm0
931	"movdqa 0xc0(%%esi), %%xmm1\n\t"	931	"movdqa 0xc0(%%esi), %%xmm1\n\t"
932	"cmp $12, %[rounds]\n\t"	932	"cmpl $12, %[rounds]\n\t"
933	"jz .Lenclast%=\n\t"	933	"jz .Lenclast%=\n\t"
934	aesenc_xmm1_xmm0	934	aesenc_xmm1_xmm0
935	"movdqa 0xd0(%%esi), %%xmm1\n\t"	935	"movdqa 0xd0(%%esi), %%xmm1\n\t"
Lines 1050-1056 do_aesni_ctr_4 (const RIJNDAEL_context * Link Here
1050	aesenc_xmm1_xmm3	1050	aesenc_xmm1_xmm3
1051	aesenc_xmm1_xmm4	1051	aesenc_xmm1_xmm4
1052	"movdqa 0xa0(%%esi), %%xmm1\n\t"	1052	"movdqa 0xa0(%%esi), %%xmm1\n\t"
1053	"cmp $10, %[rounds]\n\t"	1053	"cmpl $10, %[rounds]\n\t"
1054	"jz .Lenclast%=\n\t"	1054	"jz .Lenclast%=\n\t"
1055	aesenc_xmm1_xmm0	1055	aesenc_xmm1_xmm0
1056	aesenc_xmm1_xmm2	1056	aesenc_xmm1_xmm2
Lines 1062-1068 do_aesni_ctr_4 (const RIJNDAEL_context * Link Here
1062	aesenc_xmm1_xmm3	1062	aesenc_xmm1_xmm3
1063	aesenc_xmm1_xmm4	1063	aesenc_xmm1_xmm4
1064	"movdqa 0xc0(%%esi), %%xmm1\n\t"	1064	"movdqa 0xc0(%%esi), %%xmm1\n\t"
1065	"cmp $12, %[rounds]\n\t"	1065	"cmpl $12, %[rounds]\n\t"
1066	"jz .Lenclast%=\n\t"	1066	"jz .Lenclast%=\n\t"
1067	aesenc_xmm1_xmm0	1067	aesenc_xmm1_xmm0
1068	aesenc_xmm1_xmm2	1068	aesenc_xmm1_xmm2