Alter bigint_madd2 and bigint_madd3 to take only 3 (4, resp) arguments,

with the last one being both one of the input values and the output carry
register, since almost always they were in fact the same variable.

Also update the x86 and x86-64 modules.

1 files changed, 6 insertions, 6 deletions

diff --git a/include/mp_asm.h b/include/mp_asm.h
index 88229b386..64694492a 100644
--- a/include/mp_asm.h
+++ b/include/mp_asm.h
@@ -27,20 +27,20 @@ extern "C" {
 /*************************************************
 * Word Multiply/Add                              *
 *************************************************/
-inline word word_madd2(word a, word b, word c, word* carry)
+inline word word_madd2(word a, word b, word* c)
    {
-   dword z = (dword)a * b + c;
-   *carry = (word)(z >> BOTAN_MP_WORD_BITS);
+   dword z = (dword)a * b + *c;
+   *c = (word)(z >> BOTAN_MP_WORD_BITS);
    return (word)z;
    }
 
 /*************************************************
 * Word Multiply/Add                              *
 *************************************************/
-inline word word_madd3(word a, word b, word c, word d, word* carry)
+inline word word_madd3(word a, word b, word c, word* d)
    {
-   dword z = (dword)a * b + c + d;
-   *carry = (word)(z >> BOTAN_MP_WORD_BITS);
+   dword z = (dword)a * b + c + *d;
+   *d = (word)(z >> BOTAN_MP_WORD_BITS);
    return (word)z;
    }