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

ia64: Pass all tests for variadic jit functions

Browse source 
* lib/jit_ia64-cpu.c: Search backward for the last output
	register used, otherwise would stop too early if a float
	argument used the slot.
	Correct offset of first va_list argument, and use proper
	va_list abi.

	* lib/jit_ia64-fpu.c: Add new functions to move a gpr
	to a fpr register, to counterpart the ones that move a
	fpr to a gpr. These are required to properly implement
	jit_getarg*_{f,d} on complex prototypes, or variadic
	jit functions.

	* lib/jit_ia64-sz.c: Update for support to jit variadic
	functions.

	* lib/jit_ia64.c: Implement proper abi for variadic
	jit functions.
This commit is contained in:
Paulo Andrade 2015-06-06 22:28:20 -03:00
parent d0a5bd8d3d
commit c6b8fb2a74
5 changed files with 324 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,23 @@
2015-06-06 Paulo Andrade <pcpa@gnu.org>
* lib/jit_ia64-cpu.c: Search backward for the last output
register used, otherwise would stop too early if a float
argument used the slot.
Correct offset of first va_list argument, and use proper
va_list abi.
* lib/jit_ia64-fpu.c: Add new functions to move a gpr
to a fpr register, to counterpart the ones that move a
fpr to a gpr. These are required to properly implement
jit_getarg*_{f,d} on complex prototypes, or variadic
jit functions.
* lib/jit_ia64-sz.c: Update for support to jit variadic
functions.
* lib/jit_ia64.c: Implement proper abi for variadic
jit functions.
2015-06-04 Paulo Andrade <pcpa@gnu.org> 2015-06-04 Paulo Andrade <pcpa@gnu.org>
* lib/jit_rewind.c: New file implementing generic functions * lib/jit_rewind.c: New file implementing generic functions

42
lib/jit_ia64-cpu.c
View file

@ -5210,11 +5210,11 @@ _prolog(jit_state_t *_jit, jit_node_t *node)
/* How many out argument registers required? */ /* How many out argument registers required? */
if (!_jitc->function->define_frame) { if (!_jitc->function->define_frame) {
for (reg = _OUT0; reg <= _OUT7; reg++) { for (reg = _OUT7; reg >= _OUT0; --reg) {
if (!jit_regset_tstbit(&_jitc->function->regset, reg)) if (jit_regset_tstbit(&_jitc->function->regset, reg))
break; break;
} }
rout = reg - _OUT0; rout = (reg + 1) - _OUT0;
} }
else else
rout = 8; rout = 8;
@ -5269,7 +5269,7 @@ _prolog(jit_state_t *_jit, jit_node_t *node)
if (_jitc->function->self.call & jit_call_varargs) { if (_jitc->function->self.call & jit_call_varargs) {
for (reg = _jitc->function->vagp; reg < 8; ++reg) for (reg = _jitc->function->vagp; reg < 8; ++reg)
stxi(96 + reg * 8, GR_4, GR_32 + reg); stxi(112 + reg * 8, GR_4, GR_32 + reg);
} }
} }
@ -5314,40 +5314,22 @@ _epilog(jit_state_t *_jit, jit_node_t *node)
static void static void
_vastart(jit_state_t *_jit, jit_int32_t r0) _vastart(jit_state_t *_jit, jit_int32_t r0)
{ {
jit_int32_t reg;
assert(_jitc->function->self.call & jit_call_varargs); assert(_jitc->function->self.call & jit_call_varargs);
/* Initialize va_list to the first stack argument. */
/* Return jit_va_list_t in the register argument */ if (_jitc->function->vagp < 8)
addi(r0, GR_4, _jitc->function->vaoff); addi(r0, GR_4, 112 + _jitc->function->vagp * 8);
reg = jit_get_reg(jit_class_gpr); else
addi(r0, GR_4, _jitc->function->self.size);
/* Initialize stack pointer to the first stack argument. */
addi(rn(reg), GR_4, 96 + _jitc->function->vagp * 8);
stxi(offsetof(jit_va_list_t, stack), r0, rn(reg));
jit_unget_reg(reg);
} }
static void static void
_vaarg(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) _vaarg(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{ {
jit_int32_t reg;
assert(_jitc->function->self.call & jit_call_varargs); assert(_jitc->function->self.call & jit_call_varargs);
reg = jit_get_reg(jit_class_gpr);
/* Load varargs stack pointer. */
ldxi(rn(reg), r1, offsetof(jit_va_list_t, stack));
/* Load argument. */ /* Load argument. */
ldr(r0, rn(reg)); ldr(r0, r1);
/* Update va_list. */
/* Update vararg stack pointer. */ addi(r1, r1, 8);
addi(rn(reg), rn(reg), 8);
stxi(offsetof(jit_va_list_t, stack), r1, rn(reg));
jit_unget_reg(reg);
} }
static void static void

39
lib/jit_ia64-fpu.c
View file

@ -435,8 +435,12 @@ static void F16_(jit_state_t*,jit_word_t,
static void _movi_f(jit_state_t*,jit_int32_t,jit_float32_t*); static void _movi_f(jit_state_t*,jit_int32_t,jit_float32_t*);
#define movi_d(r0,i0) _movi_d(_jit,r0,i0) #define movi_d(r0,i0) _movi_d(_jit,r0,i0)
static void _movi_d(jit_state_t*,jit_int32_t,jit_float64_t*); static void _movi_d(jit_state_t*,jit_int32_t,jit_float64_t*);
#define movr_w_f(r0,r1) _movr_w_f(_jit,r0,r1)
static void _movr_w_f(jit_state_t*,jit_int32_t,jit_int32_t);
#define movr_f_w(r0,r1) _movr_f_w(_jit,r0,r1) #define movr_f_w(r0,r1) _movr_f_w(_jit,r0,r1)
static void _movr_f_w(jit_state_t*,jit_int32_t,jit_int32_t); static void _movr_f_w(jit_state_t*,jit_int32_t,jit_int32_t);
#define movr_w_d(r0,r1) _movr_w_d(_jit,r0,r1)
static void _movr_w_d(jit_state_t*,jit_int32_t,jit_int32_t);
#define movr_d_w(r0,r1) _movr_d_w(_jit,r0,r1) #define movr_d_w(r0,r1) _movr_d_w(_jit,r0,r1)
static void _movr_d_w(jit_state_t*,jit_int32_t,jit_int32_t); static void _movr_d_w(jit_state_t*,jit_int32_t,jit_int32_t);
#define movi_f_w(r0,i0) _movi_f_w(_jit,r0,i0) #define movi_f_w(r0,i0) _movi_f_w(_jit,r0,i0)
@ -1049,6 +1053,15 @@ _movi_d(jit_state_t *_jit, jit_int32_t r0, jit_float64_t *i0)
ldi_d(r0, (jit_word_t)i0); ldi_d(r0, (jit_word_t)i0);
} }
static void
_movr_w_f(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{
/* Should be used only in this case (with out0 == 120) */
if (r1 >= 120)
r1 = _jitc->rout + (r1 - 120);
SETF_S(r0, r1);
}
static void static void
_movr_f_w(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) _movr_f_w(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{ {
@ -1074,6 +1087,15 @@ _movi_f_w(jit_state_t *_jit, jit_int32_t r0, jit_float32_t *i0)
ldi_i(r0, (jit_word_t)i0); ldi_i(r0, (jit_word_t)i0);
} }
static void
_movr_w_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{
/* Should be used only in this case (with out0 == 120) */
if (r1 >= 120)
r1 = _jitc->rout + (r1 - 120);
SETF_D(r0, r1);
}
static void static void
_movr_d_w(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) _movr_d_w(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{ {
@ -1731,21 +1753,10 @@ dbopi(unord)
static void static void
_vaarg_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1) _vaarg_d(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1)
{ {
jit_int32_t reg;
assert(_jitc->function->self.call & jit_call_varargs); assert(_jitc->function->self.call & jit_call_varargs);
reg = jit_get_reg(jit_class_gpr);
/* Load varargs stack pointer. */
ldxi(rn(reg), r1, offsetof(jit_va_list_t, stack));
/* Load argument. */ /* Load argument. */
ldr_d(r0, rn(reg)); ldr_d(r0, r1);
/* Update va_list. */
/* Update vararg stack pointer. */ addi(r1, r1, 8);
addi(rn(reg), rn(reg), 8);
stxi(offsetof(jit_va_list_t, stack), r1, rn(reg));
jit_unget_reg(reg);
} }
#endif #endif

398
lib/jit_ia64-sz.c
View file

@ -1,15 +1,15 @@
#if __WORDSIZE == 64 #if __WORDSIZE == 64
#define JIT_INSTR_MAX 144 #define JIT_INSTR_MAX 224
0, /* data */ 0, /* data */
0, /* live */ 0, /* live */
0, /* align */ 0, /* align */
0, /* save */ 0, /* save */
0, /* load */ 0, /* load */
16, /* #name */ 0, /* #name */
16, /* #note */ 0, /* #note */
48, /* label */ 0, /* label */
128, /* prolog */ 224, /* prolog */
0, /* ellipsis */ 0, /* ellipsis */
0, /* allocai */ 0, /* allocai */
0, /* allocar */ 0, /* allocar */
@ -23,41 +23,41 @@
0, /* getarg_l */ 0, /* getarg_l */
0, /* putargr */ 0, /* putargr */
0, /* putargi */ 0, /* putargi */
0, /* va_start */ 16, /* va_start */
0, /* va_arg */ 32, /* va_arg */
0, /* va_arg_d */ 32, /* va_arg_d */
0, /* va_end */ 0, /* va_end */
16, /* addr */ 16, /* addr */
32, /* addi */ 32, /* addi */
48, /* addcr */ 32, /* addcr */
48, /* addci */ 48, /* addci */
64, /* addxr */ 64, /* addxr */
64, /* addxi */ 64, /* addxi */
16, /* subr */ 16, /* subr */
32, /* subi */ 32, /* subi */
48, /* subcr */ 32, /* subcr */
48, /* subci */ 48, /* subci */
64, /* subxr */ 64, /* subxr */
64, /* subxi */ 64, /* subxi */
48, /* rsbi */ 32, /* rsbi */
32, /* mulr */ 48, /* mulr */
48, /* muli */ 64, /* muli */
96, /* qmulr */ 112, /* qmulr */
80, /* qmuli */ 112, /* qmuli */
96, /* qmulr_u */ 112, /* qmulr_u */
80, /* qmuli_u */ 112, /* qmuli_u */
64, /* divr */ 80, /* divr */
80, /* divi */ 96, /* divi */
64, /* divr_u */ 80, /* divr_u */
80, /* divi_u */ 96, /* divi_u */
128, /* qdivr */ 144, /* qdivr */
112, /* qdivi */ 144, /* qdivi */
128, /* qdivr_u */ 144, /* qdivr_u */
112, /* qdivi_u */ 144, /* qdivi_u */
64, /* remr */ 80, /* remr */
80, /* remi */ 96, /* remi */
64, /* remr_u */ 80, /* remr_u */
80, /* remi_u */ 96, /* remi_u */
16, /* andr */ 16, /* andr */
32, /* andi */ 32, /* andi */
16, /* orr */ 16, /* orr */
@ -71,52 +71,52 @@
16, /* rshr_u */ 16, /* rshr_u */
16, /* rshi_u */ 16, /* rshi_u */
16, /* negr */ 16, /* negr */
0, /* comr */ 16, /* comr */
16, /* ltr */ 32, /* ltr */
16, /* lti */ 32, /* lti */
16, /* ltr_u */ 32, /* ltr_u */
16, /* lti_u */ 32, /* lti_u */
16, /* ler */ 32, /* ler */
16, /* lei */ 32, /* lei */
16, /* ler_u */ 32, /* ler_u */
16, /* lei_u */ 32, /* lei_u */
16, /* eqr */ 32, /* eqr */
16, /* eqi */ 32, /* eqi */
16, /* ger */ 32, /* ger */
16, /* gei */ 32, /* gei */
16, /* ger_u */ 32, /* ger_u */
16, /* gei_u */ 32, /* gei_u */
16, /* gtr */ 32, /* gtr */
16, /* gti */ 32, /* gti */
16, /* gtr_u */ 32, /* gtr_u */
16, /* gti_u */ 32, /* gti_u */
16, /* ner */ 32, /* ner */
16, /* nei */ 32, /* nei */
16, /* movr */ 16, /* movr */
32, /* movi */ 16, /* movi */
16, /* extr_c */ 16, /* extr_c */
16, /* extr_uc */ 16, /* extr_uc */
16, /* extr_s */ 16, /* extr_s */
16, /* extr_us */ 16, /* extr_us */
16, /* extr_i */ 16, /* extr_i */
16, /* extr_ui */ 16, /* extr_ui */
16, /* htonr_us */ 64, /* htonr_us */
16, /* htonr_ui */ 160, /* htonr_ui */
16, /* htonr_ul */ 16, /* htonr_ul */
16, /* ldr_c */ 16, /* ldr_c */
32, /* ldi_c */ 32, /* ldi_c */
0, /* ldr_uc */ 16, /* ldr_uc */
16, /* ldi_uc */ 32, /* ldi_uc */
16, /* ldr_s */ 16, /* ldr_s */
32, /* ldi_s */ 32, /* ldi_s */
0, /* ldr_us */ 16, /* ldr_us */
16, /* ldi_us */ 32, /* ldi_us */
16, /* ldr_i */ 16, /* ldr_i */
32, /* ldi_i */ 32, /* ldi_i */
0, /* ldr_ui */ 16, /* ldr_ui */
16, /* ldi_ui */ 32, /* ldi_ui */
16, /* ldr_l */ 16, /* ldr_l */
16, /* ldi_l */ 32, /* ldi_l */
32, /* ldxr_c */ 32, /* ldxr_c */
48, /* ldxi_c */ 48, /* ldxi_c */
16, /* ldxr_uc */ 16, /* ldxr_uc */
@ -133,49 +133,49 @@
32, /* ldxi_l */ 32, /* ldxi_l */
16, /* str_c */ 16, /* str_c */
32, /* sti_c */ 32, /* sti_c */
0, /* str_s */ 16, /* str_s */
32, /* sti_s */ 32, /* sti_s */
16, /* str_i */ 16, /* str_i */
32, /* sti_i */ 32, /* sti_i */
0, /* str_l */ 16, /* str_l */
32, /* sti_l */ 32, /* sti_l */
16, /* stxr_c */ 16, /* stxr_c */
16, /* stxi_c */ 32, /* stxi_c */
32, /* stxr_s */ 16, /* stxr_s */
16, /* stxi_s */ 32, /* stxi_s */
16, /* stxr_i */ 16, /* stxr_i */
16, /* stxi_i */ 32, /* stxi_i */
32, /* stxr_l */ 16, /* stxr_l */
16, /* stxi_l */ 32, /* stxi_l */
16, /* bltr */ 32, /* bltr */
16, /* blti */ 32, /* blti */
16, /* bltr_u */ 32, /* bltr_u */
32, /* blti_u */ 32, /* blti_u */
32, /* bler */ 32, /* bler */
32, /* blei */ 32, /* blei */
32, /* bler_u */ 32, /* bler_u */
16, /* blei_u */ 32, /* blei_u */
64, /* beqr */ 32, /* beqr */
64, /* beqi */ 48, /* beqi */
32, /* bger */ 32, /* bger */
48, /* bgei */ 32, /* bgei */
32, /* bger_u */ 32, /* bger_u */
16, /* bgei_u */ 32, /* bgei_u */
16, /* bgtr */ 32, /* bgtr */
16, /* bgti */ 32, /* bgti */
16, /* bgtr_u */ 32, /* bgtr_u */
16, /* bgti_u */ 32, /* bgti_u */
64, /* bner */ 32, /* bner */
64, /* bnei */ 48, /* bnei */
32, /* bmsr */ 32, /* bmsr */
32, /* bmsi */ 48, /* bmsi */
32, /* bmcr */ 32, /* bmcr */
32, /* bmci */ 48, /* bmci */
112, /* boaddr */ 96, /* boaddr */
112, /* boaddi */ 112, /* boaddi */
64, /* boaddr_u */ 64, /* boaddr_u */
64, /* boaddi_u */ 64, /* boaddi_u */
112, /* bxaddr */ 96, /* bxaddr */
112, /* bxaddi */ 112, /* bxaddi */
64, /* bxaddr_u */ 64, /* bxaddr_u */
64, /* bxaddi_u */ 64, /* bxaddi_u */
@ -187,10 +187,10 @@
112, /* bxsubi */ 112, /* bxsubi */
64, /* bxsubr_u */ 64, /* bxsubr_u */
64, /* bxsubi_u */ 64, /* bxsubi_u */
0, /* jmpr */ 16, /* jmpr */
48, /* jmpi */ 16, /* jmpi */
32, /* callr */ 32, /* callr */
64, /* calli */ 48, /* calli */
0, /* prepare */ 0, /* prepare */
0, /* pushargr */ 0, /* pushargr */
0, /* pushargi */ 0, /* pushargi */
@ -206,90 +206,90 @@
0, /* retval_i */ 0, /* retval_i */
0, /* retval_ui */ 0, /* retval_ui */
0, /* retval_l */ 0, /* retval_l */
144, /* epilog */ 128, /* epilog */
0, /* arg_f */ 0, /* arg_f */
0, /* getarg_f */ 0, /* getarg_f */
0, /* putargr_f */ 0, /* putargr_f */
0, /* putargi_f */ 0, /* putargi_f */
0, /* addr_f */ 16, /* addr_f */
32, /* addi_f */ 48, /* addi_f */
16, /* subr_f */ 16, /* subr_f */
16, /* subi_f */ 48, /* subi_f */
16, /* rsbi_f */ 48, /* rsbi_f */
0, /* mulr_f */ 16, /* mulr_f */
16, /* muli_f */ 48, /* muli_f */
144, /* divr_f */ 160, /* divr_f */
144, /* divi_f */ 192, /* divi_f */
16, /* negr_f */ 16, /* negr_f */
16, /* absr_f */ 16, /* absr_f */
80, /* sqrtr_f */ 80, /* sqrtr_f */
16, /* ltr_f */ 32, /* ltr_f */
48, /* lti_f */ 64, /* lti_f */
16, /* ler_f */ 32, /* ler_f */
48, /* lei_f */ 64, /* lei_f */
16, /* eqr_f */ 32, /* eqr_f */
48, /* eqi_f */ 64, /* eqi_f */
16, /* ger_f */ 32, /* ger_f */
48, /* gei_f */ 64, /* gei_f */
16, /* gtr_f */ 32, /* gtr_f */
48, /* gti_f */ 64, /* gti_f */
16, /* ner_f */ 32, /* ner_f */
48, /* nei_f */ 64, /* nei_f */
16, /* unltr_f */ 32, /* unltr_f */
48, /* unlti_f */ 64, /* unlti_f */
16, /* unler_f */ 32, /* unler_f */
48, /* unlei_f */ 64, /* unlei_f */
48, /* uneqr_f */ 48, /* uneqr_f */
80, /* uneqi_f */ 96, /* uneqi_f */
16, /* unger_f */ 32, /* unger_f */
48, /* ungei_f */ 64, /* ungei_f */
16, /* ungtr_f */ 32, /* ungtr_f */
48, /* ungti_f */ 64, /* ungti_f */
48, /* ltgtr_f */ 48, /* ltgtr_f */
80, /* ltgti_f */ 96, /* ltgti_f */
16, /* ordr_f */ 32, /* ordr_f */
48, /* ordi_f */ 64, /* ordi_f */
16, /* unordr_f */ 32, /* unordr_f */
48, /* unordi_f */ 64, /* unordi_f */
32, /* truncr_f_i */ 32, /* truncr_f_i */
32, /* truncr_f_l */ 32, /* truncr_f_l */
32, /* extr_f */ 48, /* extr_f */
16, /* extr_d_f */ 16, /* extr_d_f */
16, /* movr_f */ 16, /* movr_f */
48, /* movi_f */ 32, /* movi_f */
16, /* ldr_f */ 16, /* ldr_f */
16, /* ldi_f */ 32, /* ldi_f */
0, /* ldxr_f */ 16, /* ldxr_f */
32, /* ldxi_f */ 32, /* ldxi_f */
16, /* str_f */ 16, /* str_f */
16, /* sti_f */ 32, /* sti_f */
16, /* stxr_f */ 16, /* stxr_f */
16, /* stxi_f */ 32, /* stxi_f */
32, /* bltr_f */ 32, /* bltr_f */
64, /* blti_f */ 64, /* blti_f */
48, /* bler_f */ 32, /* bler_f */
64, /* blei_f */ 64, /* blei_f */
64, /* beqr_f */ 32, /* beqr_f */
96, /* beqi_f */ 64, /* beqi_f */
48, /* bger_f */ 32, /* bger_f */
64, /* bgei_f */ 64, /* bgei_f */
32, /* bgtr_f */ 32, /* bgtr_f */
64, /* bgti_f */ 64, /* bgti_f */
48, /* bner_f */ 32, /* bner_f */
64, /* bnei_f */ 64, /* bnei_f */
48, /* bunltr_f */ 32, /* bunltr_f */
64, /* bunlti_f */ 64, /* bunlti_f */
48, /* bunler_f */ 32, /* bunler_f */
64, /* bunlei_f */ 64, /* bunlei_f */
112, /* buneqr_f */ 80, /* buneqr_f */
144, /* buneqi_f */ 112, /* buneqi_f */
48, /* bunger_f */ 32, /* bunger_f */
64, /* bungei_f */ 64, /* bungei_f */
48, /* bungtr_f */ 32, /* bungtr_f */
64, /* bungti_f */ 64, /* bungti_f */
96, /* bltgtr_f */ 80, /* bltgtr_f */
128, /* bltgti_f */ 112, /* bltgti_f */
48, /* bordr_f */ 32, /* bordr_f */
64, /* bordi_f */ 64, /* bordi_f */
32, /* bunordr_f */ 32, /* bunordr_f */
64, /* bunordi_f */ 64, /* bunordi_f */
@ -302,85 +302,85 @@
0, /* getarg_d */ 0, /* getarg_d */
0, /* putargr_d */ 0, /* putargr_d */
0, /* putargi_d */ 0, /* putargi_d */
0, /* addr_d */ 16, /* addr_d */
32, /* addi_d */ 48, /* addi_d */
16, /* subr_d */ 16, /* subr_d */
16, /* subi_d */ 48, /* subi_d */
16, /* rsbi_d */ 48, /* rsbi_d */
0, /* mulr_d */ 16, /* mulr_d */
16, /* muli_d */ 48, /* muli_d */
128, /* divr_d */ 160, /* divr_d */
144, /* divi_d */ 192, /* divi_d */
16, /* negr_d */ 16, /* negr_d */
16, /* absr_d */ 16, /* absr_d */
80, /* sqrtr_d */ 80, /* sqrtr_d */
16, /* ltr_d */ 32, /* ltr_d */
48, /* lti_d */ 64, /* lti_d */
16, /* ler_d */ 32, /* ler_d */
48, /* lei_d */ 64, /* lei_d */
16, /* eqr_d */ 32, /* eqr_d */
48, /* eqi_d */ 64, /* eqi_d */
16, /* ger_d */ 32, /* ger_d */
48, /* gei_d */ 64, /* gei_d */
16, /* gtr_d */ 32, /* gtr_d */
48, /* gti_d */ 64, /* gti_d */
16, /* ner_d */ 32, /* ner_d */
48, /* nei_d */ 64, /* nei_d */
16, /* unltr_d */ 32, /* unltr_d */
48, /* unlti_d */ 64, /* unlti_d */
16, /* unler_d */ 32, /* unler_d */
48, /* unlei_d */ 64, /* unlei_d */
48, /* uneqr_d */ 48, /* uneqr_d */
80, /* uneqi_d */ 96, /* uneqi_d */
16, /* unger_d */ 32, /* unger_d */
48, /* ungei_d */ 64, /* ungei_d */
16, /* ungtr_d */ 32, /* ungtr_d */
48, /* ungti_d */ 64, /* ungti_d */
48, /* ltgtr_d */ 48, /* ltgtr_d */
80, /* ltgti_d */ 96, /* ltgti_d */
16, /* ordr_d */ 32, /* ordr_d */
48, /* ordi_d */ 64, /* ordi_d */
16, /* unordr_d */ 32, /* unordr_d */
48, /* unordi_d */ 64, /* unordi_d */
32, /* truncr_d_i */ 32, /* truncr_d_i */
32, /* truncr_d_l */ 32, /* truncr_d_l */
32, /* extr_d */ 48, /* extr_d */
16, /* extr_f_d */ 16, /* extr_f_d */
16, /* movr_d */ 16, /* movr_d */
48, /* movi_d */ 32, /* movi_d */
16, /* ldr_d */ 16, /* ldr_d */
16, /* ldi_d */ 32, /* ldi_d */
0, /* ldxr_d */ 16, /* ldxr_d */
32, /* ldxi_d */ 32, /* ldxi_d */
16, /* str_d */ 16, /* str_d */
16, /* sti_d */ 32, /* sti_d */
16, /* stxr_d */ 16, /* stxr_d */
16, /* stxi_d */ 32, /* stxi_d */
32, /* bltr_d */ 32, /* bltr_d */
64, /* blti_d */ 64, /* blti_d */
48, /* bler_d */ 32, /* bler_d */
64, /* blei_d */ 64, /* blei_d */
64, /* beqr_d */ 32, /* beqr_d */
96, /* beqi_d */ 64, /* beqi_d */
48, /* bger_d */ 32, /* bger_d */
80, /* bgei_d */ 64, /* bgei_d */
32, /* bgtr_d */ 32, /* bgtr_d */
64, /* bgti_d */ 64, /* bgti_d */
48, /* bner_d */ 32, /* bner_d */
64, /* bnei_d */ 64, /* bnei_d */
48, /* bunltr_d */ 32, /* bunltr_d */
64, /* bunlti_d */ 64, /* bunlti_d */
48, /* bunler_d */ 32, /* bunler_d */
64, /* bunlei_d */ 64, /* bunlei_d */
112, /* buneqr_d */ 80, /* buneqr_d */
144, /* buneqi_d */ 112, /* buneqi_d */
48, /* bunger_d */ 32, /* bunger_d */
64, /* bungei_d */ 64, /* bungei_d */
48, /* bungtr_d */ 32, /* bungtr_d */
64, /* bungti_d */ 64, /* bungti_d */
96, /* bltgtr_d */ 80, /* bltgtr_d */
128, /* bltgti_d */ 112, /* bltgti_d */
48, /* bordr_d */ 32, /* bordr_d */
64, /* bordi_d */ 64, /* bordi_d */
32, /* bunordr_d */ 32, /* bunordr_d */
64, /* bunordi_d */ 64, /* bunordi_d */

96
lib/jit_ia64.c
View file

@ -36,9 +36,7 @@
/* /*
* Types * Types
*/ */
typedef struct jit_va_list { typedef jit_pointer_t jit_va_list_t;
jit_pointer_t stack;
} jit_va_list_t;
/* /*
* Prototypes * Prototypes
@ -421,19 +419,15 @@ _jit_ellipsis(jit_state_t *_jit)
{ {
jit_inc_synth(ellipsis); jit_inc_synth(ellipsis);
if (_jitc->prepare) { if (_jitc->prepare) {
jit_link_prepare();
assert(!(_jitc->function->call.call & jit_call_varargs)); assert(!(_jitc->function->call.call & jit_call_varargs));
_jitc->function->call.call |= jit_call_varargs; _jitc->function->call.call |= jit_call_varargs;
jit_link_prepare();
} }
else { else {
jit_link_prolog();
assert(!(_jitc->function->self.call & jit_call_varargs)); assert(!(_jitc->function->self.call & jit_call_varargs));
_jitc->function->self.call |= jit_call_varargs; _jitc->function->self.call |= jit_call_varargs;
/* Allocate va_list like object in the stack. */
_jitc->function->vaoff = jit_allocai(sizeof(jit_va_list_t));
_jitc->function->vagp = _jitc->function->self.argi; _jitc->function->vagp = _jitc->function->self.argi;
jit_link_prolog();
} }
jit_dec_synth(); jit_dec_synth();
} }
@ -462,8 +456,13 @@ _jit_arg_f(jit_state_t *_jit)
jit_node_t *node; jit_node_t *node;
jit_int32_t offset; jit_int32_t offset;
assert(_jitc->function); assert(_jitc->function);
if (jit_arg_reg_p(_jitc->function->self.argi)) if (jit_arg_reg_p(_jitc->function->self.argi)) {
offset = _jitc->function->self.argi++; if (!(_jitc->function->self.call & jit_call_varargs))
offset = 8 + _jitc->function->self.argf++;
else
offset = _jitc->function->self.argi;
++_jitc->function->self.argi;
}
else { else {
offset = _jitc->function->self.size; offset = _jitc->function->self.size;
_jitc->function->self.size += sizeof(jit_word_t); _jitc->function->self.size += sizeof(jit_word_t);
@ -480,11 +479,16 @@ _jit_arg_d(jit_state_t *_jit)
jit_node_t *node; jit_node_t *node;
jit_int32_t offset; jit_int32_t offset;
assert(_jitc->function); assert(_jitc->function);
if (jit_arg_reg_p(_jitc->function->self.argi)) if (jit_arg_reg_p(_jitc->function->self.argi)) {
offset = _jitc->function->self.argi++; if (!(_jitc->function->self.call & jit_call_varargs))
offset = 8 + _jitc->function->self.argf++;
else
offset = _jitc->function->self.argi;
++_jitc->function->self.argi;
}
else { else {
offset = _jitc->function->self.size; offset = _jitc->function->self.size;
_jitc->function->self.size += sizeof(jit_word_t); _jitc->function->self.size += sizeof(jit_float64_t);
} }
node = jit_new_node_ww(jit_code_arg_d, offset, node = jit_new_node_ww(jit_code_arg_d, offset,
++_jitc->function->self.argn); ++_jitc->function->self.argn);
@ -611,7 +615,9 @@ _jit_getarg_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
assert(v->code == jit_code_arg_f); assert(v->code == jit_code_arg_f);
jit_inc_synth_wp(getarg_f, u, v); jit_inc_synth_wp(getarg_f, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movr_f(u, _F8 + v->u.w); jit_movr_w_f(u, _OUT0 + v->u.w);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movr_f(u, _F8 + (v->u.w - 8));
else else
jit_ldxi_f(u, JIT_FP, v->u.w + F_DISP); jit_ldxi_f(u, JIT_FP, v->u.w + F_DISP);
jit_dec_synth(); jit_dec_synth();
@ -623,7 +629,9 @@ _jit_putargr_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
assert(v->code == jit_code_arg_f); assert(v->code == jit_code_arg_f);
jit_inc_synth_wp(putargr_f, u, v); jit_inc_synth_wp(putargr_f, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movr_f(_F8 + v->u.w, u); jit_movr_f_w(_OUT0 + v->u.w, u);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movr_f(_F8 + (v->u.w - 8), u);
else else
jit_stxi_f(v->u.w, JIT_FP, u + F_DISP); jit_stxi_f(v->u.w, JIT_FP, u + F_DISP);
jit_dec_synth(); jit_dec_synth();
@ -636,7 +644,9 @@ _jit_putargi_f(jit_state_t *_jit, jit_float32_t u, jit_node_t *v)
assert(v->code == jit_code_arg_f); assert(v->code == jit_code_arg_f);
jit_inc_synth_fp(putargi_f, u, v); jit_inc_synth_fp(putargi_f, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movi_f(_F8 + v->u.w, u); jit_movi_f_w(_OUT0 + v->u.w, u);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movi_f(_F8 + (v->u.w - 8), u);
else { else {
regno = jit_get_reg(jit_class_fpr); regno = jit_get_reg(jit_class_fpr);
jit_movi_f(regno, u); jit_movi_f(regno, u);
@ -652,7 +662,9 @@ _jit_getarg_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
assert(v->code == jit_code_arg_d); assert(v->code == jit_code_arg_d);
jit_inc_synth_wp(getarg_d, u, v); jit_inc_synth_wp(getarg_d, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movr_d(u, _F8 + v->u.w); jit_movr_w_d(u, _OUT0 + v->u.w);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movr_d(u, _F8 + (v->u.w - 8));
else else
jit_ldxi_d(u, JIT_FP, v->u.w); jit_ldxi_d(u, JIT_FP, v->u.w);
jit_dec_synth(); jit_dec_synth();
@ -664,7 +676,9 @@ _jit_putargr_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v)
assert(v->code == jit_code_arg_d); assert(v->code == jit_code_arg_d);
jit_inc_synth_wp(putargr_d, u, v); jit_inc_synth_wp(putargr_d, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movr_d(_F8 + v->u.w, u); jit_movr_d_w(_OUT0 + v->u.w, u);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movr_d(_F8 + (v->u.w - 8), u);
else else
jit_stxi_d(v->u.w, JIT_FP, u); jit_stxi_d(v->u.w, JIT_FP, u);
jit_dec_synth(); jit_dec_synth();
@ -677,7 +691,9 @@ _jit_putargi_d(jit_state_t *_jit, jit_float64_t u, jit_node_t *v)
assert(v->code == jit_code_arg_d); assert(v->code == jit_code_arg_d);
jit_inc_synth_dp(putargi_d, u, v); jit_inc_synth_dp(putargi_d, u, v);
if (jit_arg_reg_p(v->u.w)) if (jit_arg_reg_p(v->u.w))
jit_movi_d(_F8 + v->u.w, u); jit_movi_d_w(_OUT0 + v->u.w, u);
else if (jit_arg_reg_p(v->u.w - 8))
jit_movi_d(_F8 + (v->u.w - 8), u);
else { else {
regno = jit_get_reg(jit_class_fpr); regno = jit_get_reg(jit_class_fpr);
jit_movi_d(regno, u); jit_movi_d(regno, u);
@ -732,8 +748,10 @@ _jit_pushargr_f(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(pushargr_f, u); jit_inc_synth_w(pushargr_f, u);
jit_link_prepare(); jit_link_prepare();
if (jit_arg_reg_p(_jitc->function->call.argi)) { if (jit_arg_reg_p(_jitc->function->call.argi)) {
if (!(_jitc->function->call.call & jit_call_varargs)) if (!(_jitc->function->call.call & jit_call_varargs)) {
jit_movr_f(_F8 + _jitc->function->call.argi, u); jit_movr_f(_F8 + _jitc->function->call.argf, u);
++_jitc->function->call.argf;
}
else else
jit_movr_f_w(_OUT0 + _jitc->function->call.argi, u); jit_movr_f_w(_OUT0 + _jitc->function->call.argi, u);
++_jitc->function->call.argi; ++_jitc->function->call.argi;
@ -754,8 +772,10 @@ _jit_pushargi_f(jit_state_t *_jit, jit_float32_t u)
jit_inc_synth_f(pushargi_f, u); jit_inc_synth_f(pushargi_f, u);
jit_link_prepare(); jit_link_prepare();
if (jit_arg_reg_p(_jitc->function->call.argi)) { if (jit_arg_reg_p(_jitc->function->call.argi)) {
if (!(_jitc->function->call.call & jit_call_varargs)) if (!(_jitc->function->call.call & jit_call_varargs)) {
jit_movi_f(_F8 + _jitc->function->call.argi, u); jit_movi_f(_F8 + _jitc->function->call.argf, u);
++_jitc->function->call.argf;
}
else else
jit_movi_f_w(_OUT0 + _jitc->function->call.argi, u); jit_movi_f_w(_OUT0 + _jitc->function->call.argi, u);
++_jitc->function->call.argi; ++_jitc->function->call.argi;
@ -778,15 +798,17 @@ _jit_pushargr_d(jit_state_t *_jit, jit_int32_t u)
jit_inc_synth_w(pushargr_d, u); jit_inc_synth_w(pushargr_d, u);
jit_link_prepare(); jit_link_prepare();
if (jit_arg_reg_p(_jitc->function->call.argi)) { if (jit_arg_reg_p(_jitc->function->call.argi)) {
if (!(_jitc->function->call.call & jit_call_varargs)) if (!(_jitc->function->call.call & jit_call_varargs)) {
jit_movr_d(_F8 + _jitc->function->call.argi, u); jit_movr_d(_F8 + _jitc->function->call.argf, u);
++_jitc->function->call.argf;
}
else else
jit_movr_d_w(_OUT0 + _jitc->function->call.argi, u); jit_movr_d_w(_OUT0 + _jitc->function->call.argi, u);
++_jitc->function->call.argi; ++_jitc->function->call.argi;
} }
else { else {
jit_stxi_d(_jitc->function->call.size + params_offset, JIT_SP, u); jit_stxi_d(_jitc->function->call.size + params_offset, JIT_SP, u);
_jitc->function->call.size += sizeof(jit_word_t); _jitc->function->call.size += sizeof(jit_float64_t);
} }
jit_dec_synth(); jit_dec_synth();
} }
@ -799,8 +821,10 @@ _jit_pushargi_d(jit_state_t *_jit, jit_float64_t u)
jit_inc_synth_d(pushargi_d, u); jit_inc_synth_d(pushargi_d, u);
jit_link_prepare(); jit_link_prepare();
if (jit_arg_reg_p(_jitc->function->call.argi)) { if (jit_arg_reg_p(_jitc->function->call.argi)) {
if (!(_jitc->function->call.call & jit_call_varargs)) if (!(_jitc->function->call.call & jit_call_varargs)) {
jit_movi_d(_F8 + _jitc->function->call.argi, u); jit_movi_d(_F8 + _jitc->function->call.argf, u);
++_jitc->function->call.argf;
}
else else
jit_movi_d_w(_OUT0 + _jitc->function->call.argi, u); jit_movi_d_w(_OUT0 + _jitc->function->call.argi, u);
++_jitc->function->call.argi; ++_jitc->function->call.argi;
@ -809,7 +833,7 @@ _jit_pushargi_d(jit_state_t *_jit, jit_float64_t u)
regno = jit_get_reg(jit_class_fpr); regno = jit_get_reg(jit_class_fpr);
jit_movi_d(regno, u); jit_movi_d(regno, u);
jit_stxi_d(_jitc->function->call.size + params_offset, JIT_SP, regno); jit_stxi_d(_jitc->function->call.size + params_offset, JIT_SP, regno);
_jitc->function->call.size += sizeof(jit_word_t); _jitc->function->call.size += sizeof(jit_float64_t);
jit_unget_reg(regno); jit_unget_reg(regno);
} }
jit_dec_synth(); jit_dec_synth();
@ -1071,7 +1095,13 @@ _emit_code(jit_state_t *_jit)
sync(); sync();
#endif #endif
#if DEVEL_DISASSEMBLER #if DEVEL_DISASSEMBLER
/* FIXME DEVEL_DISASSEMBLER should become DISASSEMBLER,
* but a "real" DEVEL_DISASSEMBLER should be required
* to turn the below "#if 0" into "#if 1" */
# if 0 /* Since disassembly outputs 3 instructions at a time,
* make it "#if 1" for more clear debug output. */
sync(); sync();
# endif
node->offset = (jit_uword_t)_jit->pc.w - (jit_uword_t)prevw; node->offset = (jit_uword_t)_jit->pc.w - (jit_uword_t)prevw;
prevw = _jit->pc.w; prevw = _jit->pc.w;
#endif #endif
@ -1574,9 +1604,15 @@ _emit_code(jit_state_t *_jit)
case jit_code_prepare: case jit_code_prepare:
case jit_code_finishr: case jit_code_finishi: case jit_code_finishr: case jit_code_finishi:
break; break;
case jit_code_movr_w_f:
movr_w_f(rn(node->u.w), rn(node->v.w));
break;
case jit_code_movr_f_w: case jit_code_movr_f_w:
movr_f_w(rn(node->u.w), rn(node->v.w)); movr_f_w(rn(node->u.w), rn(node->v.w));
break; break;
case jit_code_movr_w_d:
movr_w_d(rn(node->u.w), rn(node->v.w));
break;
case jit_code_movr_d_w: case jit_code_movr_d_w:
movr_d_w(rn(node->u.w), rn(node->v.w)); movr_d_w(rn(node->u.w), rn(node->v.w));
break; break;