X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightning%2Flib%2Fjit_ppc.c;h=9f98176e9990f745c2b25655a14e4507300b66b9;hb=1fec8a9574a8128c9b64f79a5c1f72bbd86ac2bf;hp=e94d1a5ef977e564b31d4aaf1335b8d66fa69411;hpb=437b1e617808119c3a24a72c77cd2fa86a5d3220;p=pcsx_rearmed.git diff --git a/deps/lightning/lib/jit_ppc.c b/deps/lightning/lib/jit_ppc.c index e94d1a5e..9f98176e 100644 --- a/deps/lightning/lib/jit_ppc.c +++ b/deps/lightning/lib/jit_ppc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2019 Free Software Foundation, Inc. + * Copyright (C) 2012-2023 Free Software Foundation, Inc. * * This file is part of GNU lightning. * @@ -47,6 +47,15 @@ # define I_DISP (__WORDSIZE >> 3) - sizeof(jit_int32_t) # define F_DISP (__WORDSIZE >> 3) - sizeof(jit_float32_t) #endif +#define CVT_OFFSET _jitc->function->cvt_offset +#define CHECK_CVT_OFFSET() \ + do { \ + if (!_jitc->function->cvt_offset) { \ + _jitc->again = 1; \ + _jitc->function->cvt_offset = \ + jit_allocai(sizeof(jit_float64_t)); \ + } \ + } while (0) /* * Types @@ -97,6 +106,7 @@ extern void __clear_cache(void *, void *); #define PROTO 1 # include "jit_ppc-cpu.c" # include "jit_ppc-fpu.c" +# include "jit_fallback.c" #undef PROTO /* @@ -178,6 +188,15 @@ jit_register_t _rvs[] = { { _NOREG, "" }, }; +static jit_int32_t iregs[] = { + _R14, _R15, _R16, _R17, _R18, _R19, _R20, _R21, _R22, + _R23, _R24, _R25, _R26, _R27, _R28, _R29, _R30 +}; + +static jit_int32_t fregs[] = { + _F14, _F15, _F16, _F17, _F18, _F19, _F20, _F21, +}; + /* * Implementation */ @@ -213,6 +232,7 @@ _jit_prolog(jit_state_t *_jit) _jitc->function->self.argi = _jitc->function->self.argf = _jitc->function->self.alen = 0; /* float conversion */ + _jitc->function->cvt_offset = 0; _jitc->function->self.aoff = alloca_offset - 8; _jitc->function->self.call = jit_call_default; jit_alloc((jit_pointer_t *)&_jitc->function->regoff, @@ -239,6 +259,7 @@ jit_int32_t _jit_allocai(jit_state_t *_jit, jit_int32_t length) { assert(_jitc->function); + jit_check_frame(); switch (length) { case 0: case 1: break; case 2: _jitc->function->self.aoff &= -2; break; @@ -291,20 +312,18 @@ _jit_ret(jit_state_t *_jit) } void -_jit_retr(jit_state_t *_jit, jit_int32_t u) +_jit_retr(jit_state_t *_jit, jit_int32_t u, jit_code_t code) { - jit_inc_synth_w(retr, u); - if (JIT_RET != u) - jit_movr(JIT_RET, u); - jit_live(JIT_RET); + jit_code_inc_synth_w(code, u); + jit_movr(JIT_RET, u); jit_ret(); jit_dec_synth(); } void -_jit_reti(jit_state_t *_jit, jit_word_t u) +_jit_reti(jit_state_t *_jit, jit_word_t u, jit_code_t code) { - jit_inc_synth_w(reti, u); + jit_code_inc_synth_w(code, u); jit_movi(JIT_RET, u); jit_ret(); jit_dec_synth(); @@ -364,7 +383,7 @@ _jit_epilog(jit_state_t *_jit) jit_bool_t _jit_arg_register_p(jit_state_t *_jit, jit_node_t *u) { - if (u->code == jit_code_arg) + if (u->code >= jit_code_arg_c && u->code <= jit_code_arg) return (jit_arg_reg_p(u->u.w)); assert(u->code == jit_code_arg_f || u->code == jit_code_arg_d); return (jit_arg_f_reg_p(u->u.w)); @@ -404,12 +423,16 @@ _jit_va_push(jit_state_t *_jit, jit_int32_t u) } jit_node_t * -_jit_arg(jit_state_t *_jit) +_jit_arg(jit_state_t *_jit, jit_code_t code) { jit_node_t *node; jit_int32_t offset; jit_bool_t incr = 1; assert(_jitc->function); + assert(!(_jitc->function->self.call & jit_call_varargs)); +#if STRONG_TYPE_CHECKING + assert(code >= jit_code_arg_c && code <= jit_code_arg); +#endif if (jit_arg_reg_p(_jitc->function->self.argi)) { offset = _jitc->function->self.argi++; #if _CALL_SYSV @@ -420,7 +443,7 @@ _jit_arg(jit_state_t *_jit) offset = _jitc->function->self.size; if (incr) _jitc->function->self.size += sizeof(jit_word_t); - node = jit_new_node_ww(jit_code_arg, offset, + node = jit_new_node_ww(code, offset, ++_jitc->function->self.argn); jit_link_prolog(); return (node); @@ -498,55 +521,63 @@ _jit_arg_d(jit_state_t *_jit) void _jit_getarg_c(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_c); jit_inc_synth_wp(getarg_c, u, v); if (jit_arg_reg_p(v->u.w)) jit_extr_c(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_c(u, JIT_FP, v->u.w + C_DISP); + } jit_dec_synth(); } void _jit_getarg_uc(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_c); jit_inc_synth_wp(getarg_uc, u, v); if (jit_arg_reg_p(v->u.w)) jit_extr_uc(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_uc(u, JIT_FP, v->u.w + C_DISP); + } jit_dec_synth(); } void _jit_getarg_s(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_s); jit_inc_synth_wp(getarg_s, u, v); if (jit_arg_reg_p(v->u.w)) jit_extr_s(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_s(u, JIT_FP, v->u.w + S_DISP); + } jit_dec_synth(); } void _jit_getarg_us(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_s); jit_inc_synth_wp(getarg_us, u, v); if (jit_arg_reg_p(v->u.w)) jit_extr_us(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_us(u, JIT_FP, v->u.w + S_DISP); + } jit_dec_synth(); } void _jit_getarg_i(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_i); jit_inc_synth_wp(getarg_i, u, v); if (jit_arg_reg_p(v->u.w)) { #if __WORDSIZE == 32 @@ -555,8 +586,10 @@ _jit_getarg_i(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) jit_extr_i(u, JIT_RA0 - v->u.w); #endif } - else + else { + jit_check_frame(); jit_ldxi_i(u, JIT_FP, v->u.w + I_DISP); + } jit_dec_synth(); } @@ -564,49 +597,56 @@ _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) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_i); jit_inc_synth_wp(getarg_ui, u, v); if (jit_arg_reg_p(v->u.w)) jit_extr_ui(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_ui(u, JIT_FP, v->u.w + I_DISP); + } jit_dec_synth(); } void _jit_getarg_l(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) { - assert(v->code == jit_code_arg); + assert_arg_type(v->code, jit_code_arg_l); jit_inc_synth_wp(getarg_l, u, v); if (jit_arg_reg_p(v->u.w)) jit_movr(u, JIT_RA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_l(u, JIT_FP, v->u.w); + } jit_dec_synth(); } #endif void -_jit_putargr(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) +_jit_putargr(jit_state_t *_jit, jit_int32_t u, jit_node_t *v, jit_code_t code) { - assert(v->code == jit_code_arg); - jit_inc_synth_wp(putargr, u, v); + assert_putarg_type(code, v->code); + jit_code_inc_synth_wp(code, u, v); if (jit_arg_reg_p(v->u.w)) jit_movr(JIT_RA0 - v->u.w, u); - else + else { + jit_check_frame(); jit_stxi(v->u.w, JIT_FP, u); + } jit_dec_synth(); } void -_jit_putargi(jit_state_t *_jit, jit_word_t u, jit_node_t *v) +_jit_putargi(jit_state_t *_jit, jit_word_t u, jit_node_t *v, jit_code_t code) { jit_int32_t regno; - jit_inc_synth_wp(putargi, u, v); - assert(v->code == jit_code_arg); + assert_putarg_type(code, v->code); + jit_code_inc_synth_wp(code, u, v); if (jit_arg_reg_p(v->u.w)) jit_movi(JIT_RA0 - v->u.w, u); else { + jit_check_frame(); regno = jit_get_reg(jit_class_gpr); jit_movi(regno, u); jit_stxi(v->u.w, JIT_FP, regno); @@ -622,8 +662,10 @@ _jit_getarg_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) jit_inc_synth_wp(getarg_f, u, v); if (jit_arg_f_reg_p(v->u.w)) jit_movr_d(u, JIT_FA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_f(u, JIT_FP, v->u.w); + } jit_dec_synth(); } @@ -634,8 +676,10 @@ _jit_putargr_f(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) jit_inc_synth_wp(putargr_f, u, v); if (jit_arg_f_reg_p(v->u.w)) jit_movr_d(JIT_FA0 - v->u.w, u); - else + else { + jit_check_frame(); jit_stxi_f(v->u.w, JIT_FP, u); + } jit_dec_synth(); } @@ -648,6 +692,7 @@ _jit_putargi_f(jit_state_t *_jit, jit_float32_t u, jit_node_t *v) if (jit_arg_f_reg_p(v->u.w)) jit_movi_d(JIT_FA0 - v->u.w, u); else { + jit_check_frame(); regno = jit_get_reg(jit_class_fpr); jit_movi_d(regno, u); jit_stxi_f(v->u.w, JIT_FP, regno); @@ -663,8 +708,10 @@ _jit_getarg_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) jit_inc_synth_wp(getarg_d, u, v); if (jit_arg_f_reg_p(v->u.w)) jit_movr_d(u, JIT_FA0 - v->u.w); - else + else { + jit_check_frame(); jit_ldxi_d(u, JIT_FP, v->u.w); + } jit_dec_synth(); } @@ -675,8 +722,10 @@ _jit_putargr_d(jit_state_t *_jit, jit_int32_t u, jit_node_t *v) jit_inc_synth_wp(putargr_d, u, v); if (jit_arg_f_reg_p(v->u.w)) jit_movr_d(JIT_FA0 - v->u.w, u); - else + else { + jit_check_frame(); jit_stxi_d(v->u.w, JIT_FP, u); + } jit_dec_synth(); } @@ -689,6 +738,7 @@ _jit_putargi_d(jit_state_t *_jit, jit_float64_t u, jit_node_t *v) if (jit_arg_f_reg_p(v->u.w)) jit_movi_d(JIT_FA0 - v->u.w, u); else { + jit_check_frame(); regno = jit_get_reg(jit_class_fpr); jit_movi_d(regno, u); jit_stxi_d(v->u.w, JIT_FP, regno); @@ -698,11 +748,11 @@ _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, jit_int32_t u, jit_code_t code) { jit_bool_t incr = 1; assert(_jitc->function); - jit_inc_synth_w(pushargr, u); + jit_code_inc_synth_w(code, u); jit_link_prepare(); if (jit_arg_reg_p(_jitc->function->call.argi)) { jit_movr(JIT_RA0 - _jitc->function->call.argi, u); @@ -719,12 +769,12 @@ _jit_pushargr(jit_state_t *_jit, jit_int32_t u) } void -_jit_pushargi(jit_state_t *_jit, jit_word_t u) +_jit_pushargi(jit_state_t *_jit, jit_word_t u, jit_code_t code) { jit_int32_t regno; jit_bool_t incr = 1; assert(_jitc->function); - jit_inc_synth_w(pushargi, u); + jit_code_inc_synth_w(code, u); jit_link_prepare(); if (jit_arg_reg_p(_jitc->function->call.argi)) { jit_movi(JIT_RA0 - _jitc->function->call.argi, u); @@ -779,14 +829,14 @@ _jit_pushargr_f(jit_state_t *_jit, jit_int32_t u) + 1 # endif )) { - /* use reserved 8 bytes area */ - jit_stxi_d(alloca_offset - 8, JIT_FP, u); - jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 8); + CHECK_CVT_OFFSET(); + jit_check_frame(); + jit_stxi_d(CVT_OFFSET, JIT_FP, u); + jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, CVT_OFFSET); _jitc->function->call.argi++; # if __WORDSIZE == 32 jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 4); + CVT_OFFSET + 4); _jitc->function->call.argi++; # endif } @@ -836,14 +886,15 @@ _jit_pushargi_f(jit_state_t *_jit, jit_float32_t u) + 1 # endif )) { - /* use reserved 8 bytes area */ - jit_stxi_d(alloca_offset - 8, JIT_FP, regno); + CHECK_CVT_OFFSET(); + jit_check_frame(); + jit_stxi_d(CVT_OFFSET, JIT_FP, regno); jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 8); + CVT_OFFSET); _jitc->function->call.argi++; # if __WORDSIZE == 32 jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 4); + CVT_OFFSET + 4); _jitc->function->call.argi++; # endif } @@ -891,14 +942,13 @@ _jit_pushargr_d(jit_state_t *_jit, jit_int32_t u) + 1 # endif )) { - /* use reserved 8 bytes area */ - jit_stxi_d(alloca_offset - 8, JIT_FP, u); - jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 8); + CHECK_CVT_OFFSET(); + jit_check_frame(); + jit_stxi_d(CVT_OFFSET, JIT_FP, u); + jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, CVT_OFFSET); _jitc->function->call.argi++; # if __WORDSIZE == 32 - jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 4); + jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, CVT_OFFSET + 4); _jitc->function->call.argi++; # endif } @@ -962,14 +1012,15 @@ _jit_pushargi_d(jit_state_t *_jit, jit_float64_t u) + 1 # endif )) { - /* use reserved 8 bytes area */ - jit_stxi_d(alloca_offset - 8, JIT_FP, regno); + CHECK_CVT_OFFSET(); + jit_check_frame(); + jit_stxi_d(CVT_OFFSET, JIT_FP, regno); jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 8); + CVT_OFFSET); _jitc->function->call.argi++; # if __WORDSIZE == 32 jit_ldxi(JIT_RA0 - _jitc->function->call.argi, JIT_FP, - alloca_offset - 4); + CVT_OFFSET + 4); _jitc->function->call.argi++; # endif } @@ -1148,9 +1199,12 @@ _emit_code(jit_state_t *_jit) jit_word_t word; jit_int32_t value; jit_int32_t offset; + jit_bool_t no_flag = 0; /* Set if previous instruction is + * *not* a jump target. */ struct { jit_node_t *node; jit_word_t word; + jit_function_t func; #if DEVEL_DISASSEMBLER jit_word_t prevw; #endif @@ -1213,6 +1267,12 @@ _emit_code(jit_state_t *_jit) name##r##type(rn(node->u.q.l), rn(node->u.q.h), \ rn(node->v.w), rn(node->w.w)); \ break +#define case_rqr(name, type) \ + case jit_code_##name##r##type: \ + name##r##type(rn(node->u.w), rn(node->v.q.l), \ + rn(node->v.q.h), rn(node->w.w)); \ + case jit_code_##name##i##type: \ + break; #define case_rrw(name, type) \ case jit_code_##name##i##type: \ name##i##type(rn(node->u.w), rn(node->v.w), node->w.w); \ @@ -1286,11 +1346,13 @@ _emit_code(jit_state_t *_jit) jit_regarg_set(node, value); switch (node->code) { case jit_code_align: - assert(!(node->u.w & (node->u.w - 1)) && - node->u.w <= sizeof(jit_word_t)); - if (node->u.w == sizeof(jit_word_t) && - (word = _jit->pc.w & (sizeof(jit_word_t) - 1))) - nop(sizeof(jit_word_t) - word); + /* Must align to a power of two */ + assert(!(node->u.w & (node->u.w - 1))); + if ((word = _jit->pc.w & (node->u.w - 1))) + nop(node->u.w - word); + break; + case jit_code_skip: + nop((node->u.w + 3) & ~3); break; case jit_code_note: case jit_code_name: node->u.w = _jit->pc.w; @@ -1315,6 +1377,10 @@ _emit_code(jit_state_t *_jit) case_rrw(rsb,); case_rrr(mul,); case_rrw(mul,); + case_rrr(hmul,); + case_rrw(hmul,); + case_rrr(hmul, _u); + case_rrw(hmul, _u); case_rrrr(qmul,); case_rrrw(qmul,); case_rrrr(qmul, _u); @@ -1339,10 +1405,34 @@ _emit_code(jit_state_t *_jit) case_rrw(xor,); case_rrr(lsh,); case_rrw(lsh,); + case_rrrr(qlsh,); + case_rrrw(qlsh,); + case_rrrr(qlsh, _u); + case_rrrw(qlsh, _u); case_rrr(rsh,); case_rrw(rsh,); case_rrr(rsh, _u); case_rrw(rsh, _u); + case_rrrr(qrsh,); + case_rrrw(qrsh,); + case_rrrr(qrsh, _u); + case_rrrw(qrsh, _u); + case_rrr(lrot,); + case_rrw(lrot,); + case_rrr(rrot,); + case_rrw(rrot,); + case jit_code_extr: + extr(rn(node->u.w), rn(node->v.w), node->w.q.l, node->w.q.h); + break; + case jit_code_extr_u: + extr_u(rn(node->u.w), rn(node->v.w), node->w.q.l, node->w.q.h); + break; + case jit_code_depr: + depr(rn(node->u.w), rn(node->v.w), node->w.q.l, node->w.q.h); + break; + case jit_code_depi: + depi(rn(node->u.w), node->v.w, node->w.q.l, node->w.q.h); + break; case_rr(ext, _c); case_rr(ext, _uc); case_rr(ext, _s); @@ -1356,13 +1446,32 @@ _emit_code(jit_state_t *_jit) # if __WORDSIZE == 64 case_rr(hton, _ul); # endif - case_rr(bswap, _us); - case_rr(bswap, _ui); + case jit_code_bswapr_us: + bswapr_us_lh(rn(node->u.w), rn(node->v.w), no_flag); + break; + case jit_code_bswapr_ui: + bswapr_ui_lw(rn(node->u.w), rn(node->v.w), no_flag); + break; # if __WORDSIZE == 64 case_rr(bswap, _ul); # endif case_rr(neg,); case_rr(com,); + case_rr(clo,); + case_rr(clz,); + case_rr(cto,); + case_rr(ctz,); +#define rbitr(r0, r1) fallback_rbit(r0, r1) + case_rr(rbit,); + case_rr(popcnt,); + case jit_code_casr: + casr(rn(node->u.w), rn(node->v.w), + rn(node->w.q.l), rn(node->w.q.h)); + break; + case jit_code_casi: + casi(rn(node->u.w), node->v.w, + rn(node->w.q.l), rn(node->w.q.h)); + break; case_rrr(movn,); case_rrr(movz,); case_rr(mov,); @@ -1479,6 +1588,22 @@ _emit_code(jit_state_t *_jit) case_rrr(ldx, _l); case_rrw(ldx, _l); #endif +#define unldr(r0, r1, i0) fallback_unldr(r0, r1, i0) + case jit_code_unldr: + unldr(rn(node->u.w), rn(node->v.w), node->w.w); + break; +#define unldi(r0, i0, i1) fallback_unldi(r0, i0, i1) + case jit_code_unldi: + unldi(rn(node->u.w), node->v.w, node->w.w); + break; +#define unldr_u(r0, r1, i0) fallback_unldr_u(r0, r1, i0) + case jit_code_unldr_u: + unldr_u(rn(node->u.w), rn(node->v.w), node->w.w); + break; +#define unldi_u(r0, i0, i1) fallback_unldi_u(r0, i0, i1) + case jit_code_unldi_u: + unldi_u(rn(node->u.w), node->v.w, node->w.w); + break; case_rr(st, _c); case_wr(st, _c); case_rrr(stx, _c); @@ -1497,6 +1622,14 @@ _emit_code(jit_state_t *_jit) case_rrr(stx, _l); case_wrr(stx, _l); #endif +#define unstr(r0, r1, i0) fallback_unstr(r0, r1, i0) + case jit_code_unstr: + unstr(rn(node->u.w), rn(node->v.w), node->w.w); + break; +#define unsti(i0, r0, i1) fallback_unsti(i0, r0, i1) + case jit_code_unsti: + unsti(node->u.w, rn(node->v.w), node->w.w); + break; case_rr(mov, _f); case jit_code_movi_f: assert(node->flag & jit_flag_data); @@ -1507,6 +1640,10 @@ _emit_code(jit_state_t *_jit) case_rr(abs, _f); case_rr(neg, _f); case_rr(sqrt, _f); + case_rqr(fma, _f); + case_rqr(fms, _f); + case_rqr(fnma, _f); + case_rqr(fnms, _f); case_rrr(add, _f); case_rrf(add, _f, 32); case_rrr(sub, _f); @@ -1576,10 +1713,26 @@ _emit_code(jit_state_t *_jit) case_rw(ld, _f); case_rrr(ldx, _f); case_rrw(ldx, _f); +#define unldr_x(r0, r1, i0) fallback_unldr_x(r0, r1, i0) + case jit_code_unldr_x: + unldr_x(rn(node->u.w), rn(node->v.w), node->w.w); + break; +#define unldi_x(r0, i0, i1) fallback_unldi_x(r0, i0, i1) + case jit_code_unldi_x: + unldi_x(rn(node->u.w), node->v.w, node->w.w); + break; case_rr(st, _f); case_wr(st, _f); case_rrr(stx, _f); case_wrr(stx, _f); +#define unstr_x(r0, r1, i0) fallback_unstr_x(r0, r1, i0) + case jit_code_unstr_x: + unstr_x(rn(node->u.w), rn(node->v.w), node->w.w); + break; +#define unsti_x(i0, r0, i1) fallback_unsti_x(i0, r0, i1) + case jit_code_unsti_x: + unsti_x(node->u.w, rn(node->v.w), node->w.w); + break; case_rr(mov, _d); case jit_code_movi_d: assert(node->flag & jit_flag_data); @@ -1590,6 +1743,10 @@ _emit_code(jit_state_t *_jit) case_rr(abs, _d); case_rr(neg, _d); case_rr(sqrt, _d); + case_rqr(fma, _d); + case_rqr(fms, _d); + case_rqr(fnma, _d); + case_rqr(fnms, _d); case_rrr(add, _d); case_rrf(add, _d, 64); case_rrr(sub, _d); @@ -1664,6 +1821,7 @@ _emit_code(jit_state_t *_jit) case_rrr(stx, _d); case_wrr(stx, _d); case jit_code_jmpr: + jit_check_frame(); jmpr(rn(node->u.w)); break; case jit_code_jmpi: @@ -1678,44 +1836,64 @@ _emit_code(jit_state_t *_jit) if (temp->flag & jit_flag_patch) jmpi(temp->u.w); else { - word = jmpi(_jit->pc.w); + word = _jit->code.length - + (_jit->pc.uc - _jit->code.ptr); + if (can_sign_extend_jump_p(word)) + word = jmpi(_jit->pc.w); + else + word = jmpi_p(_jit->pc.w); patch(word, node); } } - else - (void)jmpi_p(node->u.w); + else { + jit_check_frame(); + jmpi(node->u.w); + } break; case jit_code_callr: - callr(rn(node->u.w) #if _CALL_SYSV - , !!(node->flag & jit_flag_varargs) +# define xcallr(u, v) callr(u, v) +# define xcalli_p(u, v) calli_p(u, v) +# define xcalli(u, v) calli(u, v) +#else +# define xcallr(u, v) callr(u) +# define xcalli_p(u, v) calli_p(u) +# define xcalli(u, v) calli(u) #endif - ); + jit_check_frame(); + xcallr(rn(node->u.w), !!(node->flag & jit_flag_varargs)); break; case jit_code_calli: + value = !!(node->flag & jit_flag_varargs); if (node->flag & jit_flag_node) { + _jitc->function->need_return = 1; temp = node->u.n; assert(temp->code == jit_code_label || temp->code == jit_code_epilog); - word = calli_p(temp->u.w + if (temp->flag & jit_flag_patch) + xcalli(temp->u.w, value); + else { + word = _jit->code.length - + (_jit->pc.uc - _jit->code.ptr); #if _CALL_SYSV - , !!(node->flag & jit_flag_varargs) + if (can_sign_extend_jump_p(word + value * 4)) + word = xcalli(_jit->pc.w, value); + else #endif - ); - if (!(temp->flag & jit_flag_patch)) + word = xcalli_p(_jit->pc.w, value); patch(word, node); + } + } + else { + jit_check_frame(); + xcalli(node->u.w, value); } - else - calli(node->u.w -#if _CALL_SYSV - , !!(node->flag & jit_flag_varargs) -#endif - ); break; case jit_code_prolog: _jitc->function = _jitc->functions.ptr + node->w.w; undo.node = node; undo.word = _jit->pc.w; + memcpy(&undo.func, _jitc->function, sizeof(undo.func)); #if DEVEL_DISASSEMBLER undo.prevw = prevw; #endif @@ -1759,6 +1937,21 @@ _emit_code(jit_state_t *_jit) temp->flag &= ~jit_flag_patch; node = undo.node; _jit->pc.w = undo.word; + /* undo.func.self.aoff and undo.func.regset should not + * be undone, as they will be further updated, and are + * the reason of the undo. */ + undo.func.self.aoff = _jitc->function->frame + + _jitc->function->self.aoff; + undo.func.need_frame = _jitc->function->need_frame; + undo.func.need_stack = _jitc->function->need_stack; + undo.func.need_return = _jitc->function->need_return; + jit_regset_set(&undo.func.regset, &_jitc->function->regset); + /* allocar information also does not need to be undone */ + undo.func.aoffoff = _jitc->function->aoffoff; + undo.func.allocar = _jitc->function->allocar; + /* cvt_offset must also not be undone */ + undo.func.cvt_offset = _jitc->function->cvt_offset; + memcpy(_jitc->function, &undo.func, sizeof(undo.func)); #if DEVEL_DISASSEMBLER prevw = undo.prevw; #endif @@ -1774,6 +1967,49 @@ _emit_code(jit_state_t *_jit) epilog(node); _jitc->function = NULL; 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: + movr_f_w(rn(node->u.w), rn(node->v.w)); + break; + case jit_code_movi_f_w: + assert(node->flag & jit_flag_data); + movi_f_w(rn(node->u.w), *(jit_float32_t *)node->v.n->u.w); + break; + case jit_code_movi_w_f: + movi_w_f(rn(node->u.w), node->v.w); + break; +#if __WORDSIZE == 64 + case jit_code_movr_d_w: + movr_d_w(rn(node->u.w), rn(node->v.w)); + break; + case jit_code_movi_d_w: + assert(node->flag & jit_flag_data); + movi_d_w(rn(node->u.w), *(jit_float64_t *)node->v.n->u.w); + break; + case jit_code_movr_w_d: + movr_w_d(rn(node->u.w), rn(node->v.w)); + break; + case jit_code_movi_w_d: + movi_w_d(rn(node->u.w), node->v.w); + break; +#else + case jit_code_movr_ww_d: + movr_ww_d(rn(node->u.w), rn(node->v.w), rn(node->w.w)); + break; + case jit_code_movr_d_ww: + movr_d_ww(rn(node->u.w), rn(node->v.w), rn(node->w.w)); + break; + case jit_code_movi_d_ww: + assert(node->flag & jit_flag_data); + movi_d_ww(rn(node->u.w), rn(node->v.w), + *(jit_float64_t *)node->w.n->u.w); + break; + case jit_code_movi_ww_d: + movi_ww_d(rn(node->u.w), node->v.w, node->w.w); + break; +#endif case jit_code_va_start: vastart(rn(node->u.w)); break; @@ -1783,14 +2019,26 @@ _emit_code(jit_state_t *_jit) case jit_code_va_arg_d: vaarg_d(rn(node->u.w), rn(node->v.w)); break; - case jit_code_live: - case jit_code_arg: case jit_code_ellipsis: + case jit_code_live: case jit_code_ellipsis: case jit_code_va_push: case jit_code_allocai: case jit_code_allocar: + case jit_code_arg_c: case jit_code_arg_s: + case jit_code_arg_i: +# if __WORDSIZE == 64 + case jit_code_arg_l: +# endif case jit_code_arg_f: case jit_code_arg_d: case jit_code_va_end: case jit_code_ret: - case jit_code_retr: case jit_code_reti: + case jit_code_retr_c: case jit_code_reti_c: + case jit_code_retr_uc: case jit_code_reti_uc: + case jit_code_retr_s: case jit_code_reti_s: + case jit_code_retr_us: case jit_code_reti_us: + case jit_code_retr_i: case jit_code_reti_i: +#if __WORDSIZE == 64 + case jit_code_retr_ui: case jit_code_reti_ui: + case jit_code_retr_l: case jit_code_reti_l: +#endif case jit_code_retr_f: case jit_code_reti_f: case jit_code_retr_d: case jit_code_reti_d: case jit_code_getarg_c: case jit_code_getarg_uc: @@ -1800,10 +2048,26 @@ _emit_code(jit_state_t *_jit) case jit_code_getarg_ui: case jit_code_getarg_l: #endif case jit_code_getarg_f: case jit_code_getarg_d: - case jit_code_putargr: case jit_code_putargi: + case jit_code_putargr_c: case jit_code_putargi_c: + case jit_code_putargr_uc: case jit_code_putargi_uc: + case jit_code_putargr_s: case jit_code_putargi_s: + case jit_code_putargr_us: case jit_code_putargi_us: + case jit_code_putargr_i: case jit_code_putargi_i: +#if __WORDSIZE == 64 + case jit_code_putargr_ui: case jit_code_putargi_ui: + case jit_code_putargr_l: case jit_code_putargi_l: +#endif case jit_code_putargr_f: case jit_code_putargi_f: case jit_code_putargr_d: case jit_code_putargi_d: - case jit_code_pushargr: case jit_code_pushargi: + case jit_code_pushargr_c: case jit_code_pushargi_c: + case jit_code_pushargr_uc: case jit_code_pushargi_uc: + case jit_code_pushargr_s: case jit_code_pushargi_s: + case jit_code_pushargr_us: case jit_code_pushargi_us: + case jit_code_pushargr_i: case jit_code_pushargi_i: +#if __WORDSIZE == 64 + case jit_code_pushargr_ui: case jit_code_pushargi_ui: + case jit_code_pushargr_l: case jit_code_pushargi_l: +#endif case jit_code_pushargr_f: case jit_code_pushargi_f: case jit_code_pushargr_d: case jit_code_pushargi_d: case jit_code_retval_c: case jit_code_retval_uc: @@ -1815,6 +2079,77 @@ _emit_code(jit_state_t *_jit) case jit_code_retval_f: case jit_code_retval_d: case jit_code_prepare: case jit_code_finishr: case jit_code_finishi: + case jit_code_negi_f: case jit_code_absi_f: + case jit_code_sqrti_f: case jit_code_negi_d: + case jit_code_absi_d: case jit_code_sqrti_d: + break; + case jit_code_negi: + negi(rn(node->u.w), node->v.w); + break; + case jit_code_comi: + comi(rn(node->u.w), node->v.w); + break; + case jit_code_exti_c: + exti_c(rn(node->u.w), node->v.w); + break; + case jit_code_exti_uc: + exti_uc(rn(node->u.w), node->v.w); + break; + case jit_code_exti_s: + exti_s(rn(node->u.w), node->v.w); + break; + case jit_code_exti_us: + exti_us(rn(node->u.w), node->v.w); + break; + case jit_code_bswapi_us: + bswapi_us(rn(node->u.w), node->v.w); + break; + case jit_code_bswapi_ui: + bswapi_ui(rn(node->u.w), node->v.w); + break; + case jit_code_htoni_us: + htoni_us(rn(node->u.w), node->v.w); + break; + case jit_code_htoni_ui: + htoni_ui(rn(node->u.w), node->v.w); + break; +#if __WORDSIZE == 64 + case jit_code_exti_i: + exti_i(rn(node->u.w), node->v.w); + break; + case jit_code_exti_ui: + exti_ui(rn(node->u.w), node->v.w); + break; + case jit_code_bswapi_ul: + bswapi_ul(rn(node->u.w), node->v.w); + break; + case jit_code_htoni_ul: + htoni_ul(rn(node->u.w), node->v.w); + break; +#endif + case jit_code_cloi: + cloi(rn(node->u.w), node->v.w); + break; + case jit_code_clzi: + clzi(rn(node->u.w), node->v.w); + break; + case jit_code_ctoi: + ctoi(rn(node->u.w), node->v.w); + break; + case jit_code_ctzi: + ctzi(rn(node->u.w), node->v.w); + break; + case jit_code_rbiti: + rbiti(rn(node->u.w), node->v.w); + break; + case jit_code_popcnti: + popcnti(rn(node->u.w), node->v.w); + break; + case jit_code_exti: + exti(rn(node->u.w), node->v.w, node->w.q.l, node->w.q.h); + break; + case jit_code_exti_u: + exti_u(rn(node->u.w), node->v.w, node->w.q.l, node->w.q.h); break; default: abort(); @@ -1823,6 +2158,8 @@ _emit_code(jit_state_t *_jit) assert(_jitc->regarg == 0 && _jitc->synth == 0); /* update register live state */ jit_reglive(node); + + no_flag = !(node->flag & jit_flag_patch); } #undef case_brf #undef case_brw @@ -1849,6 +2186,7 @@ _emit_code(jit_state_t *_jit) #define CODE 1 # include "jit_ppc-cpu.c" # include "jit_ppc-fpu.c" +# include "jit_fallback.c" #undef CODE void