diff --git a/src_common/uint256.c b/src_common/uint256.c index 22b738e..5accf5e 100644 --- a/src_common/uint256.c +++ b/src_common/uint256.c @@ -249,23 +249,23 @@ void add256(uint256_t *number1, uint256_t *number2, uint256_t *target) { add128(&LOWER_P(number1), &LOWER_P(number2), &LOWER_P(target)); } -void minus128(uint128_t *number1, uint128_t *number2, uint128_t *target) { +void sub128(uint128_t *number1, uint128_t *number2, uint128_t *target) { UPPER_P(target) = UPPER_P(number1) - UPPER_P(number2) - ((LOWER_P(number1) - LOWER_P(number2)) > LOWER_P(number1)); LOWER_P(target) = LOWER_P(number1) - LOWER_P(number2); } -void minus256(uint256_t *number1, uint256_t *number2, uint256_t *target) { +void sub256(uint256_t *number1, uint256_t *number2, uint256_t *target) { uint128_t tmp; - minus128(&UPPER_P(number1), &UPPER_P(number2), &UPPER_P(target)); - minus128(&LOWER_P(number1), &LOWER_P(number2), &tmp); + sub128(&UPPER_P(number1), &UPPER_P(number2), &UPPER_P(target)); + sub128(&LOWER_P(number1), &LOWER_P(number2), &tmp); if (gt128(&tmp, &LOWER_P(number1))) { uint128_t one; UPPER(one) = 0; LOWER(one) = 1; - minus128(&UPPER_P(target), &one, &UPPER_P(target)); + sub128(&UPPER_P(target), &one, &UPPER_P(target)); } - minus128(&LOWER_P(number1), &LOWER_P(number2), &LOWER_P(target)); + sub128(&LOWER_P(number1), &LOWER_P(number2), &LOWER_P(target)); } void or128(uint128_t *number1, uint128_t *number2, uint128_t *target) { @@ -379,7 +379,7 @@ void divmod128(uint128_t *l, uint128_t *r, uint128_t *retDiv, uint128_t *retMod) } while (gte128(&resMod, r)) { if (gte128(&resMod, ©d)) { - minus128(&resMod, ©d, &resMod); + sub128(&resMod, ©d, &resMod); or128(&resDiv, &adder, &resDiv); } shiftr128(©d, 1, ©d); @@ -411,7 +411,7 @@ void divmod256(uint256_t *l, uint256_t *r, uint256_t *retDiv, uint256_t *retMod) } while (gte256(&resMod, r)) { if (gte256(&resMod, ©d)) { - minus256(&resMod, ©d, &resMod); + sub256(&resMod, ©d, &resMod); or256(&resDiv, &adder, &resDiv); } shiftr256(©d, 1, ©d); diff --git a/src_common/uint256.h b/src_common/uint256.h index 5683c3e..ebf6da3 100644 --- a/src_common/uint256.h +++ b/src_common/uint256.h @@ -62,8 +62,8 @@ bool gte128(uint128_t *number1, uint128_t *number2); bool gte256(uint256_t *number1, uint256_t *number2); void add128(uint128_t *number1, uint128_t *number2, uint128_t *target); void add256(uint256_t *number1, uint256_t *number2, uint256_t *target); -void minus128(uint128_t *number1, uint128_t *number2, uint128_t *target); -void minus256(uint256_t *number1, uint256_t *number2, uint256_t *target); +void sub128(uint128_t *number1, uint128_t *number2, uint128_t *target); +void sub256(uint256_t *number1, uint256_t *number2, uint256_t *target); void or128(uint128_t *number1, uint128_t *number2, uint128_t *target); void or256(uint256_t *number1, uint256_t *number2, uint256_t *target); void mul128(uint128_t *number1, uint128_t *number2, uint128_t *target);