Skip to content

Commit 85d858c

Browse files
author
Evgeni Margolis
committed
Added compile time checks to skip vli_square() and muladd() functions when they are not used
1 parent 73db5bf commit 85d858c

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

asm_arm.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,7 @@ static void vli_mult(uint32_t *result, const uint32_t *left, const uint32_t *rig
12471247
#define asm_mult 1
12481248
#endif /* (uECC_WORDS == 8) */
12491249

1250+
#if uECC_SQUARE_FUNC
12501251
#if (uECC_WORDS == 5)
12511252
static void vli_square(uint32_t *result, const uint32_t *left) {
12521253
register uint32_t *r0 __asm__("r0") = result;
@@ -2030,6 +2031,7 @@ static void vli_square(uint32_t *result, const uint32_t *left) {
20302031
}
20312032
#define asm_square 1
20322033
#endif /* (uECC_WORDS == 8) */
2034+
#endif /* uECC_SQUARE_FUNC */
20332035

20342036
#endif /* (uECC_PLATFORM != uECC_arm_thumb) */
20352037
#endif /* (uECC_ASM == uECC_asm_fast) */

uECC.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ static uECC_word_t vli_sub(uECC_word_t *result, const uECC_word_t *left, const u
623623
}
624624
#endif
625625

626-
#if (!asm_mult || !asm_square || uECC_CURVE == uECC_secp256k1)
626+
#if (!asm_mult || (uECC_SQUARE_FUNC && !asm_square) || uECC_CURVE == uECC_secp256k1)
627627
static void muladd(uECC_word_t a,
628628
uECC_word_t b,
629629
uECC_word_t *r0,

0 commit comments

Comments
 (0)