Skip to content

Commit 35d6d46

Browse files
committed
Small performance improvement of mbedtls_mpi_div_mpi():
1. don't use dynamic allocator for fixed size T2; 2. move T2 initialization out of the inner loop.
1 parent ccde952 commit 35d6d46

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

library/bignum.c

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,14 +1632,19 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A,
16321632
int ret;
16331633
size_t i, n, t, k;
16341634
mbedtls_mpi X, Y, Z, T1, T2;
1635+
mbedtls_mpi_uint __tp2[3];
16351636
MPI_VALIDATE_RET( A != NULL );
16361637
MPI_VALIDATE_RET( B != NULL );
16371638

16381639
if( mbedtls_mpi_cmp_int( B, 0 ) == 0 )
16391640
return( MBEDTLS_ERR_MPI_DIVISION_BY_ZERO );
16401641

16411642
mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &Z );
1642-
mbedtls_mpi_init( &T1 ); mbedtls_mpi_init( &T2 );
1643+
mbedtls_mpi_init( &T1 );
1644+
/* Avoid dynamic memory allocations for constant-size T2. */
1645+
T2.s = 1;
1646+
T2.n = 3;
1647+
T2.p = __tp2;
16431648

16441649
if( mbedtls_mpi_cmp_abs( A, B ) < 0 )
16451650
{
@@ -1655,7 +1660,6 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A,
16551660
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &Z, A->n + 2 ) );
16561661
MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &Z, 0 ) );
16571662
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T1, 2 ) );
1658-
MBEDTLS_MPI_CHK( mbedtls_mpi_grow( &T2, 3 ) );
16591663

16601664
k = mbedtls_mpi_bitlen( &Y ) % biL;
16611665
if( k < biL - 1 )
@@ -1687,6 +1691,10 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A,
16871691
Y.p[t], NULL);
16881692
}
16891693

1694+
T2.p[0] = ( i < 2 ) ? 0 : X.p[i - 2];
1695+
T2.p[1] = ( i < 1 ) ? 0 : X.p[i - 1];
1696+
T2.p[2] = X.p[i];
1697+
16901698
Z.p[i - t - 1]++;
16911699
do
16921700
{
@@ -1696,11 +1704,6 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A,
16961704
T1.p[0] = ( t < 1 ) ? 0 : Y.p[t - 1];
16971705
T1.p[1] = Y.p[t];
16981706
MBEDTLS_MPI_CHK( mbedtls_mpi_mul_int( &T1, &T1, Z.p[i - t - 1] ) );
1699-
1700-
MBEDTLS_MPI_CHK( mbedtls_mpi_lset( &T2, 0 ) );
1701-
T2.p[0] = ( i < 2 ) ? 0 : X.p[i - 2];
1702-
T2.p[1] = ( i < 1 ) ? 0 : X.p[i - 1];
1703-
T2.p[2] = X.p[i];
17041707
}
17051708
while( mbedtls_mpi_cmp_mpi( &T1, &T2 ) > 0 );
17061709

@@ -1736,7 +1739,7 @@ int mbedtls_mpi_div_mpi( mbedtls_mpi *Q, mbedtls_mpi *R, const mbedtls_mpi *A,
17361739
cleanup:
17371740

17381741
mbedtls_mpi_free( &X ); mbedtls_mpi_free( &Y ); mbedtls_mpi_free( &Z );
1739-
mbedtls_mpi_free( &T1 ); mbedtls_mpi_free( &T2 );
1742+
mbedtls_mpi_free( &T1 );
17401743

17411744
return( ret );
17421745
}

0 commit comments

Comments
 (0)