1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-21 03:00:19 +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

@ -141,7 +141,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();
@ -161,7 +161,7 @@ _jit_prolog(jit_state_t *_jit)
_jitc->function->self.aoff = alloca_offset;
_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:
@ -180,10 +180,10 @@ _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)
{
jit_int32_t offset;
int32_t offset;
assert(_jitc->function);
switch (length) {
case 0: case 1:
@ -208,13 +208,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);
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);
@ -240,7 +240,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);
jit_movr(JIT_RET, u);
@ -258,7 +258,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);
jit_movr_f(JIT_FRET, u);
@ -276,7 +276,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);
jit_movr_d(JIT_FRET, u);
@ -330,7 +330,7 @@ _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_inc_synth_w(va_push, u);
jit_pushargr(u);
@ -341,7 +341,7 @@ jit_node_t *
_jit_arg(jit_state_t *_jit)
{
jit_node_t *node;
jit_int32_t offset;
int32_t offset;
assert(_jitc->function);
_jitc->function->self.size -= sizeof(jit_word_t);
if (jit_arg_reg_p(_jitc->function->self.argi))
@ -358,7 +358,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);
_jitc->function->self.size -= sizeof(jit_word_t);
if (jit_arg_reg_p(_jitc->function->self.argi))
@ -375,7 +375,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);
if (_jitc->function->self.argi & 1) {
++_jitc->function->self.argi;
@ -399,7 +399,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);
@ -411,7 +411,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);
@ -423,7 +423,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);
@ -435,7 +435,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);
@ -447,7 +447,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);
@ -459,7 +459,7 @@ _jit_getarg_i(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);
@ -473,7 +473,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 (v->u.w >= 0)
@ -488,7 +488,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);
@ -500,7 +500,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);
@ -514,7 +514,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 (v->u.w >= 0)
@ -529,7 +529,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);
@ -541,7 +541,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);
@ -555,7 +555,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 (v->u.w >= 0)
@ -570,7 +570,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);
jit_inc_synth_w(pushargr, u);
@ -588,7 +588,7 @@ _jit_pushargr(jit_state_t *_jit, jit_int32_t u)
void
_jit_pushargi(jit_state_t *_jit, jit_word_t u)
{
jit_int32_t regno;
int32_t regno;
assert(_jitc->function);
jit_inc_synth_w(pushargi, u);
jit_link_prepare();
@ -607,7 +607,7 @@ _jit_pushargi(jit_state_t *_jit, jit_word_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);
jit_inc_synth_w(pushargr_f, u);
@ -634,7 +634,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);
jit_inc_synth_f(pushargi_f, u);
jit_link_prepare();
@ -663,7 +663,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);
jit_inc_synth_w(pushargr_d, u);
@ -700,7 +700,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);
jit_inc_synth_d(pushargi_d, u);
jit_link_prepare();
@ -737,9 +737,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) {
if (spec & jit_class_gpr) {
@ -757,7 +757,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);
@ -788,7 +788,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);
@ -796,7 +796,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);
@ -804,7 +804,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);
@ -812,7 +812,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);
@ -820,7 +820,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_movr(r0, JIT_RET);
@ -828,7 +828,7 @@ _jit_retval_i(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);
jit_movr_f(r0, JIT_FRET);
@ -836,7 +836,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);
jit_movr_d(r0, JIT_FRET);
@ -849,15 +849,15 @@ _emit_code(jit_state_t *_jit)
jit_node_t *node;
jit_node_t *temp;
jit_word_t word;
jit_int32_t value;
jit_int32_t offset;
int32_t value;
int32_t offset;
struct {
jit_node_t *node;
jit_word_t word;
#if DEVEL_DISASSEMBLER
jit_word_t prevw;
#endif
jit_int32_t patch_offset;
int32_t patch_offset;
} undo;
#if DEVEL_DISASSEMBLER
jit_word_t prevw;
@ -1565,7 +1565,7 @@ _emit_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_gpr_t r0, jit_fpr_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)