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

@ -73,11 +73,11 @@ type = struct __va_list_tag {
* Prototypes
*/
#define jit_get_reg_pair() _jit_get_reg_pair(_jit)
static jit_int32_t _jit_get_reg_pair(jit_state_t*);
static int32_t _jit_get_reg_pair(jit_state_t*);
#define jit_unget_reg_pair(regno) _jit_unget_reg_pair(_jit,regno)
static void _jit_unget_reg_pair(jit_state_t*,jit_int32_t);
static void _jit_unget_reg_pair(jit_state_t*,int32_t);
#define jit_get_reg_but_zero(flags) _jit_get_reg_but_zero(_jit,flags)
static jit_int32_t _jit_get_reg_but_zero(jit_state_t*,jit_int32_t);
static int32_t _jit_get_reg_but_zero(jit_state_t*,jit_int32_t);
#define jit_unget_reg_but_zero(reg) jit_unget_reg(reg)
#define patch(instr, node) _patch(_jit, instr, node)
static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
@ -147,7 +147,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();
@ -169,7 +169,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:
@ -188,8 +188,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);
switch (length) {
@ -207,13 +207,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);
@ -344,7 +344,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);
@ -355,7 +355,7 @@ jit_node_t *
_jit_arg(jit_state_t *_jit)
{
jit_node_t *node;
jit_int32_t offset;
int32_t offset;
assert(_jitc->function);
if (jit_arg_reg_p(_jitc->function->self.argi))
offset = _jitc->function->self.argi++;
@ -373,7 +373,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);
if (jit_arg_f_reg_p(_jitc->function->self.argf))
offset = _jitc->function->self.argf++;
@ -391,7 +391,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 (jit_arg_f_reg_p(_jitc->function->self.argf))
offset = _jitc->function->self.argf++;
@ -406,7 +406,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);
@ -414,12 +414,12 @@ _jit_getarg_c(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
jit_extr_c(u, _R2 - v->u.w);
else
jit_ldxi_c(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_int8_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(int8_t));
jit_dec_synth();
}
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);
@ -427,12 +427,12 @@ _jit_getarg_uc(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
jit_extr_uc(u, _R2 - v->u.w);
else
jit_ldxi_uc(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_uint8_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(uint8_t));
jit_dec_synth();
}
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);
@ -440,12 +440,12 @@ _jit_getarg_s(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
jit_extr_s(u, _R2 - v->u.w);
else
jit_ldxi_s(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_int16_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(int16_t));
jit_dec_synth();
}
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);
@ -453,12 +453,12 @@ _jit_getarg_us(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
jit_extr_us(u, _R2 - v->u.w);
else
jit_ldxi_us(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_uint16_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(uint16_t));
jit_dec_synth();
}
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);
@ -471,13 +471,13 @@ _jit_getarg_i(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
}
else
jit_ldxi_i(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_int32_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(int32_t));
jit_dec_synth();
}
#if __WORDSIZE == 64
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);
@ -485,12 +485,12 @@ _jit_getarg_ui(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
jit_extr_ui(u, _R2 - v->u.w);
else
jit_ldxi_ui(u, JIT_FP,
v->u.w + (__WORDSIZE >> 3) - sizeof(jit_uint32_t));
v->u.w + (__WORDSIZE >> 3) - sizeof(uint32_t));
jit_dec_synth();
}
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);
@ -503,7 +503,7 @@ _jit_getarg_l(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
#endif
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);
@ -517,7 +517,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))
@ -532,7 +532,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);
@ -549,7 +549,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);
@ -567,7 +567,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))
@ -586,7 +586,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);
@ -598,7 +598,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);
@ -612,7 +612,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))
@ -627,7 +627,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);
@ -646,7 +646,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();
@ -665,7 +665,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);
@ -688,7 +688,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();
@ -711,7 +711,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);
@ -730,7 +730,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();
@ -749,9 +749,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) {
regno = _R2 - regno;
@ -767,7 +767,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);
@ -802,7 +802,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);
@ -810,7 +810,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);
@ -818,7 +818,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);
@ -826,7 +826,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);
@ -834,7 +834,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);
#if __WORDSIZE == 64
@ -847,7 +847,7 @@ _jit_retval_i(jit_state_t *_jit, jit_int32_t r0)
#if __WORDSIZE == 64
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);
@ -855,7 +855,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);
jit_movr(r0, JIT_RET);
@ -864,7 +864,7 @@ _jit_retval_l(jit_state_t *_jit, jit_int32_t r0)
#endif
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);
@ -872,7 +872,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);
@ -885,15 +885,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;
@ -1590,10 +1590,10 @@ _emit_stxi_d(jit_state_t *_jit, jit_word_t i0, jit_gpr_t r0, jit_fpr_t r1)
stxi_d(i0, rn(r0), rn(r1));
}
static jit_int32_t
static int32_t
_jit_get_reg_pair(jit_state_t *_jit)
{
jit_int32_t r1, r2;
int32_t r1, r2;
/* Try to find a register pair for use with operations that
* require a odd based register pair. Search for the best
* match to avoid spills or at least a valid operation.
@ -1638,9 +1638,9 @@ _jit_get_reg_pair(jit_state_t *_jit)
}
static void
_jit_unget_reg_pair(jit_state_t *_jit, jit_int32_t reg)
_jit_unget_reg_pair(jit_state_t *_jit, int32_t reg)
{
jit_int32_t r1, r2;
int32_t r1, r2;
r1 = reg;
switch (r1) {
case _R0: r2 = _R1; break;
@ -1655,10 +1655,10 @@ _jit_unget_reg_pair(jit_state_t *_jit, jit_int32_t reg)
jit_unget_reg(r2);
}
static jit_int32_t
_jit_get_reg_but_zero(jit_state_t *_jit, jit_int32_t flags)
static int32_t
_jit_get_reg_but_zero(jit_state_t *_jit, int32_t flags)
{
jit_int32_t reg;
int32_t reg;
reg = jit_get_reg(jit_class_gpr);
if (reg == _R0) {
reg = jit_get_reg(jit_class_gpr|flags);
@ -1670,7 +1670,7 @@ _jit_get_reg_but_zero(jit_state_t *_jit, jit_int32_t flags)
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)