d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better naming for uint256 type functions

Browse Source
This commit is contained in:
Alexandre Paillier
2022-06-06 16:40:01 +02:00
parent 25b9caf2d5
commit f458fcd6ac
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src_common/uint256.c
View File

@@ -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, &copyd)) {
minus128(&resMod, &copyd, &resMod);
sub128(&resMod, &copyd, &resMod);
or128(&resDiv, &adder, &resDiv);
}
shiftr128(&copyd, 1, &copyd);
@@ -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, &copyd)) {
minus256(&resMod, &copyd, &resMod);
sub256(&resMod, &copyd, &resMod);
or256(&resDiv, &adder, &resDiv);
}
shiftr256(&copyd, 1, &copyd);

4
src_common/uint256.h
View File

@@ -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);