diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S index 2f1ae931..de78a0cb 100644 --- a/mpi/i386/mpih-add1.S +++ b/mpi/i386/mpih-add1.S @@ -1,159 +1,161 @@ /* i80386 add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. * * Copyright (C) 1992, 1994, 1995, 1998, * 2001, 2002 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * * Libgcrypt is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * Libgcrypt is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * Note: This code is heavily based on the GNU MP Library. * Actually it's the same code with only minor changes in the * way the data is stored; this is to support the abstraction * of an optional secure memory allocation which may be used * to avoid revealing of sensitive data due to paging etc. */ #include "sysdep.h" #include "asm-syntax.h" /******************* * mpi_limb_t * _gcry_mpih_add_n( mpi_ptr_t res_ptr, (sp + 4) * mpi_ptr_t s1_ptr, (sp + 8) * mpi_ptr_t s2_ptr, (sp + 12) * mpi_size_t size) (sp + 16) */ .text ALIGN (3) .globl C_SYMBOL_NAME(_gcry_mpih_add_n) C_SYMBOL_NAME(_gcry_mpih_add_n:) CFI_STARTPROC() pushl %edi CFI_PUSH(%edi) pushl %esi CFI_PUSH(%esi) movl 12(%esp),%edi /* res_ptr */ movl 16(%esp),%esi /* s1_ptr */ movl 20(%esp),%edx /* s2_ptr */ movl 24(%esp),%ecx /* size */ #if defined __CET__ && (__CET__ & 1) != 0 pushl %ebx CFI_PUSH(%ebx) #endif movl %ecx,%eax shrl $3,%ecx /* compute count for unrolled loop */ negl %eax andl $7,%eax /* get index where to start loop */ jz Loop /* necessary special case for 0 */ incl %ecx /* adjust loop count */ shll $2,%eax /* adjustment for pointers... */ subl %eax,%edi /* ... since they are offset ... */ subl %eax,%esi /* ... by a constant when we ... */ subl %eax,%edx /* ... enter the loop */ shrl $2,%eax /* restore previous value */ #if defined __CET__ && (__CET__ & 1) != 0 leal -4(,%eax,4),%ebx /* Count for 4-byte endbr32 */ #endif #ifdef PIC /* Calculate start address in loop for PIC. Due to limitations in some assemblers, Loop-L0-3 cannot be put into the leal */ call L0 + CFI_ADJUST_CFA_OFFSET(4) L0: leal (%eax,%eax,8),%eax addl (%esp),%eax addl $(Loop-L0-3),%eax addl $4,%esp + CFI_ADJUST_CFA_OFFSET(-4) #else /* Calculate start address in loop for non-PIC. */ leal (Loop - 3)(%eax,%eax,8),%eax #endif #if defined __CET__ && (__CET__ & 1) != 0 addl %ebx,%eax /* Adjust for endbr32 */ #endif jmp *%eax /* jump into loop */ ALIGN (3) Loop: movl (%esi),%eax adcl (%edx),%eax movl %eax,(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 4(%esi),%eax adcl 4(%edx),%eax movl %eax,4(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 8(%esi),%eax adcl 8(%edx),%eax movl %eax,8(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 12(%esi),%eax adcl 12(%edx),%eax movl %eax,12(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 16(%esi),%eax adcl 16(%edx),%eax movl %eax,16(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 20(%esi),%eax adcl 20(%edx),%eax movl %eax,20(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 24(%esi),%eax adcl 24(%edx),%eax movl %eax,24(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 28(%esi),%eax adcl 28(%edx),%eax movl %eax,28(%edi) leal 32(%edi),%edi leal 32(%esi),%esi leal 32(%edx),%edx decl %ecx jnz Loop sbbl %eax,%eax negl %eax #if defined __CET__ && (__CET__ & 1) != 0 popl %ebx CFI_POP(%ebx) #endif popl %esi CFI_POP(%esi) popl %edi CFI_POP(%edi) ret CFI_ENDPROC() diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S index 01e977e5..2bdc1438 100644 --- a/mpi/i386/mpih-sub1.S +++ b/mpi/i386/mpih-sub1.S @@ -1,160 +1,162 @@ /* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. * * Copyright (C) 1992, 1994, 1995, 1998, * 2001, 2002 Free Software Foundation, Inc. * * This file is part of Libgcrypt. * * Libgcrypt is free software; you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. * * Libgcrypt is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * Note: This code is heavily based on the GNU MP Library. * Actually it's the same code with only minor changes in the * way the data is stored; this is to support the abstraction * of an optional secure memory allocation which may be used * to avoid revealing of sensitive data due to paging etc. */ #include "sysdep.h" #include "asm-syntax.h" /******************* * mpi_limb_t * _gcry_mpih_sub_n( mpi_ptr_t res_ptr, (sp + 4) * mpi_ptr_t s1_ptr, (sp + 8) * mpi_ptr_t s2_ptr, (sp + 12) * mpi_size_t size) (sp + 16) */ .text ALIGN (3) .globl C_SYMBOL_NAME(_gcry_mpih_sub_n) C_SYMBOL_NAME(_gcry_mpih_sub_n:) CFI_STARTPROC() pushl %edi CFI_PUSH(%edi) pushl %esi CFI_PUSH(%esi) movl 12(%esp),%edi /* res_ptr */ movl 16(%esp),%esi /* s1_ptr */ movl 20(%esp),%edx /* s2_ptr */ movl 24(%esp),%ecx /* size */ #if defined __CET__ && (__CET__ & 1) != 0 pushl %ebx CFI_PUSH(%ebx) #endif movl %ecx,%eax shrl $3,%ecx /* compute count for unrolled loop */ negl %eax andl $7,%eax /* get index where to start loop */ jz Loop /* necessary special case for 0 */ incl %ecx /* adjust loop count */ shll $2,%eax /* adjustment for pointers... */ subl %eax,%edi /* ... since they are offset ... */ subl %eax,%esi /* ... by a constant when we ... */ subl %eax,%edx /* ... enter the loop */ shrl $2,%eax /* restore previous value */ #if defined __CET__ && (__CET__ & 1) != 0 leal -4(,%eax,4),%ebx /* Count for 4-byte endbr32 */ #endif #ifdef PIC /* Calculate start address in loop for PIC. Due to limitations in some assemblers, Loop-L0-3 cannot be put into the leal */ call L0 + CFI_ADJUST_CFA_OFFSET(4) L0: leal (%eax,%eax,8),%eax addl (%esp),%eax addl $(Loop-L0-3),%eax addl $4,%esp + CFI_ADJUST_CFA_OFFSET(-4) #else /* Calculate start address in loop for non-PIC. */ leal (Loop - 3)(%eax,%eax,8),%eax #endif #if defined __CET__ && (__CET__ & 1) != 0 addl %ebx,%eax /* Adjust for endbr32 */ #endif jmp *%eax /* jump into loop */ ALIGN (3) Loop: movl (%esi),%eax sbbl (%edx),%eax movl %eax,(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 4(%esi),%eax sbbl 4(%edx),%eax movl %eax,4(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 8(%esi),%eax sbbl 8(%edx),%eax movl %eax,8(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 12(%esi),%eax sbbl 12(%edx),%eax movl %eax,12(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 16(%esi),%eax sbbl 16(%edx),%eax movl %eax,16(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 20(%esi),%eax sbbl 20(%edx),%eax movl %eax,20(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 24(%esi),%eax sbbl 24(%edx),%eax movl %eax,24(%edi) #ifdef _CET_ENDBR _CET_ENDBR #endif movl 28(%esi),%eax sbbl 28(%edx),%eax movl %eax,28(%edi) leal 32(%edi),%edi leal 32(%esi),%esi leal 32(%edx),%edx decl %ecx jnz Loop sbbl %eax,%eax negl %eax #if defined __CET__ && (__CET__ & 1) != 0 popl %ebx CFI_POP(%ebx) #endif popl %esi CFI_POP(%esi) popl %edi CFI_POP(%edi) ret CFI_ENDPROC()