1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-27 21:40:34 +02:00

Replace jit_int32_t, etc with stdint types

This commit is contained in:
Andy Wingo 2018-10-30 13:48:57 +01:00
parent d567faf657
commit f3f71941ac
39 changed files with 6885 additions and 6885 deletions

View file

@ -25,9 +25,9 @@
# define I_DISP 0
# define F_DISP 0
#else
# define C_DISP 8 - sizeof(jit_int8_t)
# define S_DISP 8 - sizeof(jit_int16_t)
# define I_DISP 8 - sizeof(jit_int32_t)
# define C_DISP 8 - sizeof(int8_t)
# define S_DISP 8 - sizeof(int16_t)
# define I_DISP 8 - sizeof(int32_t)
# define F_DISP 8 - sizeof(jit_float32_t)
#endif
@ -155,7 +155,7 @@ _jit_init(jit_state_t *_jit)
void
_jit_prolog(jit_state_t *_jit)
{
jit_int32_t offset;
int32_t offset;
if (_jitc->function)
jit_epilog();
@ -175,7 +175,7 @@ _jit_prolog(jit_state_t *_jit)
_jitc->function->self.aoff = -8;
_jitc->function->self.call = jit_call_default;
jit_alloc((jit_pointer_t *)&_jitc->function->regoff,
_jitc->reglen * sizeof(jit_int32_t));
_jitc->reglen * sizeof(int32_t));
/* _no_link here does not mean the jit_link() call can be removed
* by rewriting as:
@ -194,8 +194,8 @@ _jit_prolog(jit_state_t *_jit)
jit_regset_new(&_jitc->function->regset);
}
jit_int32_t
_jit_allocai(jit_state_t *_jit, jit_int32_t length)
int32_t
_jit_allocai(jit_state_t *_jit, int32_t length)
{
assert(_jitc->function != NULL);
switch (length) {
@ -213,13 +213,13 @@ _jit_allocai(jit_state_t *_jit, jit_int32_t length)
}
void
_jit_allocar(jit_state_t *_jit, jit_int32_t u, jit_int32_t v)
_jit_allocar(jit_state_t *_jit, int32_t u, jit_int32_t v)
{
jit_int32_t reg;
int32_t reg;
assert(_jitc->function != NULL);
jit_inc_synth_ww(allocar, u, v);
if (!_jitc->function->allocar) {
_jitc->function->aoffoff = jit_allocai(sizeof(jit_int32_t));
_jitc->function->aoffoff = jit_allocai(sizeof(int32_t));
_jitc->function->allocar = 1;
}
reg = jit_get_reg(jit_class_gpr);
@ -246,7 +246,7 @@ _jit_ret(jit_state_t *_jit)
}
void
_jit_retr(jit_state_t *_jit, jit_int32_t u)
_jit_retr(jit_state_t *_jit, int32_t u)
{
jit_inc_synth_w(retr, u);
if (JIT_RET != u)
@ -266,7 +266,7 @@ _jit_reti(jit_state_t *_jit, jit_word_t u)
}
void
_jit_retr_f(jit_state_t *_jit, jit_int32_t u)
_jit_retr_f(jit_state_t *_jit, int32_t u)
{
jit_inc_synth_w(retr_f, u);
if (u != JIT_FRET)
@ -287,7 +287,7 @@ _jit_reti_f(jit_state_t *_jit, jit_float32_t u)
}
void
_jit_retr_d(jit_state_t *_jit, jit_int32_t u)
_jit_retr_d(jit_state_t *_jit, int32_t u)
{
jit_inc_synth_w(retr_d, u);
if (u != JIT_FRET)
@ -347,9 +347,9 @@ _jit_ellipsis(jit_state_t *_jit)
}
void
_jit_va_push(jit_state_t *_jit, jit_int32_t u)
_jit_va_push(jit_state_t *_jit, int32_t u)
{
jit_int32_t reg;
int32_t reg;
jit_inc_synth_w(va_push, u);
reg = jit_get_reg(jit_class_gpr);
jit_ldxi(reg, u, offsetof(jit_va_list_t, base));
@ -364,7 +364,7 @@ jit_node_t *
_jit_arg(jit_state_t *_jit)
{
jit_node_t *node;
jit_int32_t offset;
int32_t offset;
assert(_jitc->function != NULL);
if (jit_arg_reg_p(_jitc->function->self.argi))
offset = _jitc->function->self.argi++;
@ -382,7 +382,7 @@ jit_node_t *
_jit_arg_f(jit_state_t *_jit)
{
jit_node_t *node;
jit_int32_t offset;
int32_t offset;
assert(_jitc->function != NULL);
if (jit_arg_f_reg_p(_jitc->function->self.argi))
offset = _jitc->function->self.argi++;
@ -400,7 +400,7 @@ jit_node_t *
_jit_arg_d(jit_state_t *_jit)
{
jit_node_t *node;
jit_int32_t offset;
int32_t offset;
assert(_jitc->function != NULL);
if (jit_arg_f_reg_p(_jitc->function->self.argi))
offset = _jitc->function->self.argi++;
@ -415,7 +415,7 @@ _jit_arg_d(jit_state_t *_jit)
}
void
_jit_getarg_c(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_c(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_c, u, v);
@ -427,7 +427,7 @@ _jit_getarg_c(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_uc(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_uc(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_uc, u, v);
@ -439,7 +439,7 @@ _jit_getarg_uc(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_s(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_s(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_s, u, v);
@ -451,7 +451,7 @@ _jit_getarg_s(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_us(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_us(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_us, u, v);
@ -463,7 +463,7 @@ _jit_getarg_us(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_i(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_i(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_i, u, v);
@ -475,7 +475,7 @@ _jit_getarg_i(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_ui(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_ui(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_ui, u, v);
@ -487,7 +487,7 @@ _jit_getarg_ui(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_getarg_l(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_l(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(getarg_l, u, v);
@ -499,7 +499,7 @@ _jit_getarg_l(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_putargr(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_putargr(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg);
jit_inc_synth_wp(putargr, u, v);
@ -513,7 +513,7 @@ _jit_putargr(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
void
_jit_putargi(jit_state_t *_jit, jit_word_t u, jit_node_t *v)
{
jit_int32_t regno;
int32_t regno;
assert(v->code == jit_code_arg);
jit_inc_synth_wp(putargi, u, v);
if (jit_arg_reg_p(v->u.w))
@ -528,7 +528,7 @@ _jit_putargi(jit_state_t *_jit, jit_word_t u, jit_node_t *v)
}
void
_jit_getarg_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_f(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg_f);
jit_inc_synth_wp(getarg_f, u, v);
@ -540,7 +540,7 @@ _jit_getarg_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_putargr_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_putargr_f(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg_f);
jit_inc_synth_wp(putargr_f, u, v);
@ -554,7 +554,7 @@ _jit_putargr_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
void
_jit_putargi_f(jit_state_t *_jit, jit_float32_t u, jit_node_t *v)
{
jit_int32_t regno;
int32_t regno;
assert(v->code == jit_code_arg_f);
jit_inc_synth_fp(putargi_f, u, v);
if (jit_arg_f_reg_p(v->u.w))
@ -569,7 +569,7 @@ _jit_putargi_f(jit_state_t *_jit, jit_float32_t u, jit_node_t *v)
}
void
_jit_getarg_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_getarg_d(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg_d);
jit_inc_synth_wp(getarg_d, u, v);
@ -581,7 +581,7 @@ _jit_getarg_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
void
_jit_putargr_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
_jit_putargr_d(jit_state_t *_jit, int32_t u, jit_node_t *v)
{
assert(v->code == jit_code_arg_d);
jit_inc_synth_wp(putargr_d, u, v);
@ -595,7 +595,7 @@ _jit_putargr_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
void
_jit_putargi_d(jit_state_t *_jit, jit_float64_t u, jit_node_t *v)
{
jit_int32_t regno;
int32_t regno;
assert(v->code == jit_code_arg_d);
jit_inc_synth_dp(putargi_d, u, v);
if (jit_arg_f_reg_p(v->u.w))
@ -610,7 +610,7 @@ _jit_putargi_d(jit_state_t *_jit, jit_float64_t u, jit_node_t *v)
}
void
_jit_pushargr(jit_state_t *_jit, jit_int32_t u)
_jit_pushargr(jit_state_t *_jit, int32_t u)
{
assert(_jitc->function != NULL);
jit_inc_synth_w(pushargr, u);
@ -627,9 +627,9 @@ _jit_pushargr(jit_state_t *_jit, jit_int32_t u)
}
void
_jit_pushargi(jit_state_t *_jit, jit_int64_t u)
_jit_pushargi(jit_state_t *_jit, int64_t u)
{
jit_int32_t regno;
int32_t regno;
assert(_jitc->function != NULL);
jit_inc_synth_w(pushargi, u);
jit_link_prepare();
@ -648,7 +648,7 @@ _jit_pushargi(jit_state_t *_jit, jit_int64_t u)
}
void
_jit_pushargr_f(jit_state_t *_jit, jit_int32_t u)
_jit_pushargr_f(jit_state_t *_jit, int32_t u)
{
assert(_jitc->function != NULL);
jit_inc_synth_w(pushargr_f, u);
@ -667,7 +667,7 @@ _jit_pushargr_f(jit_state_t *_jit, jit_int32_t u)
void
_jit_pushargi_f(jit_state_t *_jit, jit_float32_t u)
{
jit_int32_t regno;
int32_t regno;
assert(_jitc->function != NULL);
jit_inc_synth_f(pushargi_f, u);
jit_link_prepare();
@ -686,7 +686,7 @@ _jit_pushargi_f(jit_state_t *_jit, jit_float32_t u)
}
void
_jit_pushargr_d(jit_state_t *_jit, jit_int32_t u)
_jit_pushargr_d(jit_state_t *_jit, int32_t u)
{
assert(_jitc->function != NULL);
jit_inc_synth_w(pushargr_d, u);
@ -705,7 +705,7 @@ _jit_pushargr_d(jit_state_t *_jit, jit_int32_t u)
void
_jit_pushargi_d(jit_state_t *_jit, jit_float64_t u)
{
jit_int32_t regno;
int32_t regno;
assert(_jitc->function != NULL);
jit_inc_synth_d(pushargi_d, u);
jit_link_prepare();
@ -724,9 +724,9 @@ _jit_pushargi_d(jit_state_t *_jit, jit_float64_t u)
}
jit_bool_t
_jit_regarg_p(jit_state_t *_jit, jit_node_t *node, jit_int32_t regno)
_jit_regarg_p(jit_state_t *_jit, jit_node_t *node, int32_t regno)
{
jit_int32_t spec;
int32_t spec;
spec = jit_class(_rvs[regno].spec);
if (spec & jit_class_arg) {
@ -746,7 +746,7 @@ _jit_regarg_p(jit_state_t *_jit, jit_node_t *node, jit_int32_t regno)
}
void
_jit_finishr(jit_state_t *_jit, jit_int32_t r0)
_jit_finishr(jit_state_t *_jit, int32_t r0)
{
jit_node_t *call;
assert(_jitc->function != NULL);
@ -777,7 +777,7 @@ _jit_finishi(jit_state_t *_jit, jit_pointer_t i0)
}
void
_jit_retval_c(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_c(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_c, r0);
jit_extr_c(r0, JIT_RET);
@ -785,7 +785,7 @@ _jit_retval_c(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_uc(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_uc(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_uc, r0);
jit_extr_uc(r0, JIT_RET);
@ -793,7 +793,7 @@ _jit_retval_uc(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_s(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_s(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_s, r0);
jit_extr_s(r0, JIT_RET);
@ -801,7 +801,7 @@ _jit_retval_s(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_us(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_us(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_us, r0);
jit_extr_us(r0, JIT_RET);
@ -809,7 +809,7 @@ _jit_retval_us(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_i(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_i(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_i, r0);
jit_extr_i(r0, JIT_RET);
@ -817,7 +817,7 @@ _jit_retval_i(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_ui(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_ui(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_ui, r0);
jit_extr_ui(r0, JIT_RET);
@ -825,7 +825,7 @@ _jit_retval_ui(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_l(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_l(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_l, r0);
if (r0 != JIT_RET)
@ -834,7 +834,7 @@ _jit_retval_l(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_f(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_f(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_f, r0);
if (r0 != JIT_FRET)
@ -843,7 +843,7 @@ _jit_retval_f(jit_state_t *_jit, jit_int32_t r0)
}
void
_jit_retval_d(jit_state_t *_jit, jit_int32_t r0)
_jit_retval_d(jit_state_t *_jit, int32_t r0)
{
jit_inc_synth_w(retval_d, r0);
if (r0 != JIT_FRET)
@ -858,16 +858,16 @@ _emit_code(jit_state_t *_jit)
jit_node_t *temp;
jit_word_t word;
jit_word_t value;
jit_int32_t offset;
int32_t offset;
struct {
jit_node_t *node;
jit_uint8_t *data;
uint8_t *data;
jit_word_t word;
#if DEVEL_DISASSEMBLER
jit_word_t prevw;
#endif
jit_int32_t const_offset;
jit_int32_t patch_offset;
int32_t const_offset;
int32_t patch_offset;
} undo;
#if DEVEL_DISASSEMBLER
jit_word_t prevw;
@ -1505,25 +1505,25 @@ jit_flush(void *fptr, void *tptr)
}
void
_emit_ldxi(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)
_emit_ldxi(jit_state_t *_jit, int32_t r0, jit_int32_t r1, jit_word_t i0)
{
ldxi(rn(r0), rn(r1), i0);
}
void
_emit_stxi(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)
_emit_stxi(jit_state_t *_jit, jit_word_t i0, int32_t r0, jit_int32_t r1)
{
stxi(i0, rn(r0), rn(r1));
}
void
_emit_ldxi_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_word_t i0)
_emit_ldxi_d(jit_state_t *_jit, int32_t r0, jit_int32_t r1, jit_word_t i0)
{
ldxi_d(rn(r0), rn(r1), i0);
}
void
_emit_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)
_emit_stxi_d(jit_state_t *_jit, jit_word_t i0, int32_t r0, jit_int32_t r1)
{
stxi_d(i0, rn(r0), rn(r1));
}
@ -1531,7 +1531,7 @@ _emit_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_int32_t r0, jit_int32_t r1)
static void
_patch(jit_state_t *_jit, jit_word_t instr, jit_node_t *node)
{
jit_int32_t flag;
int32_t flag;
assert(node->flag & jit_flag_node);
if (node->code == jit_code_movi)