Skip to content

Commit 8392ab4

Browse files
committed
intn: rename (u)int64 utils
Previous names, such as intn_2_digits_to_int64 were pretty cryptic. Signed-off-by: Davide Bettio <davide@uninstall.it>
1 parent 13a0a46 commit 8392ab4

File tree

3 files changed

+17
-18
lines changed

3 files changed

+17
-18
lines changed

src/libAtomVM/bif.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ static term make_bigint(Context *ctx, uint32_t fail_label, uint32_t live,
830830

831831
return bigres_term;
832832
} else {
833-
int64_t res64 = intn_2_digits_to_int64(bigres, count, sign);
833+
int64_t res64 = intn_to_int64(bigres, count, sign);
834834
#if BOXED_TERMS_REQUIRED_FOR_INT64 > 1
835835
return make_maybe_boxed_int64(ctx, fail_label, live, res64);
836836
#else
@@ -849,7 +849,7 @@ static void term_to_bigint(term arg1, intn_digit_t *tmp_buf1, const intn_digit_t
849849
*b1_sign = (intn_integer_sign_t) term_boxed_integer_sign(arg1);
850850
} else {
851851
avm_int64_t i64 = term_maybe_unbox_int64(arg1);
852-
int64_to_intn_2(i64, tmp_buf1, b1_sign);
852+
intn_from_int64(i64, tmp_buf1, b1_sign);
853853
*b1 = tmp_buf1;
854854
*b1_len = INTN_INT64_LEN;
855855
}
@@ -1063,7 +1063,7 @@ static term div_maybe_bigint(Context *ctx, uint32_t fail_label, uint32_t live, t
10631063
static term int64_max_plus_one(Context *ctx, uint32_t fail_label, uint32_t live)
10641064
{
10651065
intn_digit_t int_buf[INTN_UINT64_LEN];
1066-
intn_u64_to_digits(((uint64_t) INT64_MAX) + 1, int_buf);
1066+
intn_from_uint64(((uint64_t) INT64_MAX) + 1, int_buf);
10671067
return make_bigint(ctx, fail_label, live, int_buf, INTN_UINT64_LEN, IntNPositiveInteger);
10681068
}
10691069

src/libAtomVM/intn.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,10 @@ void intn_mul_int64(int64_t num1, int64_t num2, intn_digit_t *out, intn_integer_
192192
{
193193
intn_digit_t u[2];
194194
intn_integer_sign_t u_sign;
195-
int64_to_intn_2(num1, u, &u_sign);
195+
intn_from_int64(num1, u, &u_sign);
196196
intn_digit_t v[2];
197197
intn_integer_sign_t v_sign;
198-
int64_to_intn_2(num2, v, &v_sign);
198+
intn_from_int64(num2, v, &v_sign);
199199

200200
*out_sign = intn_muldiv_sign(u_sign, v_sign);
201201
intn_mulmnu(u, 2, v, 2, (uint32_t *) out);
@@ -539,10 +539,10 @@ size_t intn_add_int64(int64_t num1, int64_t num2, intn_digit_t *out, intn_intege
539539
{
540540
intn_digit_t u[2];
541541
intn_integer_sign_t u_sign;
542-
int64_to_intn_2(num1, u, &u_sign);
542+
intn_from_int64(num1, u, &u_sign);
543543
intn_digit_t v[2];
544544
intn_integer_sign_t v_sign;
545-
int64_to_intn_2(num2, v, &v_sign);
545+
intn_from_int64(num2, v, &v_sign);
546546

547547
return intn_addmn(u, 2, u_sign, v, 2, v_sign, out, out_sign);
548548
}
@@ -583,10 +583,10 @@ size_t intn_sub_int64(int64_t num1, int64_t num2, intn_digit_t *out, intn_intege
583583
{
584584
intn_digit_t u[2];
585585
intn_integer_sign_t u_sign;
586-
int64_to_intn_2(num1, u, &u_sign);
586+
intn_from_int64(num1, u, &u_sign);
587587
intn_digit_t v[2];
588588
intn_integer_sign_t v_sign;
589-
int64_to_intn_2(num2, v, &v_sign);
589+
intn_from_int64(num2, v, &v_sign);
590590

591591
return intn_submn(u, 2, u_sign, v, 2, v_sign, out, out_sign);
592592
}
@@ -1125,7 +1125,7 @@ int intn_parse(
11251125

11261126
intn_integer_sign_t ignored_sign;
11271127
intn_digit_t parsed_as_intn[2];
1128-
int64_to_intn_2(parsed_chunk, parsed_as_intn, &ignored_sign);
1128+
intn_from_int64(parsed_chunk, parsed_as_intn, &ignored_sign);
11291129

11301130
out_len = intn_addmnu(new_out, new_out_len, parsed_as_intn, 2, out);
11311131
if (UNLIKELY(out_len > INTN_MAX_IN_LEN)) {

src/libAtomVM/intn.h

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static inline void intn_copy(
178178
memset(out + num_len, 0, (extend_to - num_len) * sizeof(intn_digit_t));
179179
}
180180

181-
static inline void intn_u64_to_digits(uint64_t absu64, intn_digit_t out[])
181+
static inline void intn_from_uint64(uint64_t absu64, intn_digit_t out[])
182182
{
183183
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
184184
memcpy(out, &absu64, sizeof(absu64));
@@ -191,15 +191,15 @@ static inline void intn_u64_to_digits(uint64_t absu64, intn_digit_t out[])
191191
#endif
192192
}
193193

194-
static inline void int64_to_intn_2(int64_t i64, intn_digit_t out[], intn_integer_sign_t *out_sign)
194+
static inline void intn_from_int64(int64_t i64, intn_digit_t out[], intn_integer_sign_t *out_sign)
195195
{
196196
bool is_negative;
197197
uint64_t absu64 = int64_safe_unsigned_abs_set_flag(i64, &is_negative);
198198
*out_sign = is_negative ? IntNNegativeInteger : IntNPositiveInteger;
199-
intn_u64_to_digits(absu64, out);
199+
intn_from_uint64(absu64, out);
200200
}
201201

202-
static inline uint64_t intn_digits_to_u64(const intn_digit_t num[])
202+
static inline uint64_t intn_to_uint64(const intn_digit_t num[])
203203
{
204204
uint64_t utmp;
205205
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
@@ -213,16 +213,15 @@ static inline uint64_t intn_digits_to_u64(const intn_digit_t num[])
213213
return utmp;
214214
}
215215

216-
static inline int64_t intn_2_digits_to_int64(
217-
const intn_digit_t num[], size_t len, intn_integer_sign_t sign)
216+
static inline int64_t intn_to_int64(const intn_digit_t num[], size_t len, intn_integer_sign_t sign)
218217
{
219218
switch (len) {
220219
case 0:
221220
return 0;
222221
case 1:
223222
return int64_cond_neg_unsigned(sign == IntNNegativeInteger, num[0]);
224223
case 2: {
225-
uint64_t utmp = intn_digits_to_u64(num);
224+
uint64_t utmp = intn_to_uint64(num);
226225
return int64_cond_neg_unsigned(sign == IntNNegativeInteger, utmp);
227226
}
228227
default:
@@ -235,7 +234,7 @@ static inline bool intn_fits_int64(const intn_digit_t num[], size_t len, intn_in
235234
if (len < INTN_INT64_LEN) {
236235
return true;
237236
} else if (len == INTN_INT64_LEN) {
238-
uint64_t u64 = intn_digits_to_u64(num);
237+
uint64_t u64 = intn_to_uint64(num);
239238
return !uint64_does_overflow_int64(u64, sign == IntNNegativeInteger);
240239
}
241240
return false;

0 commit comments

Comments
 (0)