remove optimised arithmetic instructions. They made the emulator even bigger than
usual, and they were not performing.
This commit is contained in:
266
C/amasm.c
266
C/amasm.c
@@ -660,113 +660,6 @@ a_fil(op_numbers opcodex, op_numbers opcodey, yamop *code_p, int pass_no, struct
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_sdll(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc, UInt lab1, UInt lab2, struct intermediates *cip)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.sdll.s = cpc->rnd2;
|
||||
code_p->u.sdll.d[0] = (CELL)FunctorDouble;
|
||||
code_p->u.sdll.d[1] = RepAppl(cpc->rnd1)[1];
|
||||
#if SIZEOF_DOUBLE == 2*SIZEOF_INT_P
|
||||
code_p->u.sdll.d[2] = RepAppl(cpc->rnd1)[2];
|
||||
#endif
|
||||
if (lab1)
|
||||
code_p->u.sdll.T = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab1]);
|
||||
else
|
||||
code_p->u.sdll.T = emit_a(Unsigned(NEXTOP(code_p,sdll)));
|
||||
if (lab2)
|
||||
code_p->u.sdll.F = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab2]);
|
||||
else
|
||||
code_p->u.sdll.F = FAILCODE;
|
||||
}
|
||||
GONEXT(sdll);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_snll(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc, UInt lab1, UInt lab2, struct intermediates *cip)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.snll.s = cpc->rnd2;
|
||||
code_p->u.snll.I = IntegerOfTerm(cpc->rnd1);
|
||||
if (lab1)
|
||||
code_p->u.snll.T = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab1]);
|
||||
else
|
||||
code_p->u.snll.T = emit_a(Unsigned(NEXTOP(code_p,snll)));
|
||||
if (lab2)
|
||||
code_p->u.snll.F = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab2]);
|
||||
else
|
||||
code_p->u.snll.F = FAILCODE;
|
||||
}
|
||||
GONEXT(snll);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_ssll(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc, UInt lab1, UInt lab2, struct intermediates *cip)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.ssll.s1 = cpc->rnd1;
|
||||
code_p->u.ssll.s2 = cpc->rnd2;
|
||||
if (lab1)
|
||||
code_p->u.ssll.T = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab1]);
|
||||
else
|
||||
code_p->u.ssll.T = emit_a(Unsigned(NEXTOP(code_p,ssll)));
|
||||
if (lab2)
|
||||
code_p->u.ssll.F = emit_a(Unsigned(cip->code_addr) + cip->label_offset[lab2]);
|
||||
else
|
||||
code_p->u.ssll.F = FAILCODE;
|
||||
}
|
||||
GONEXT(ssll);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_ssd(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.ssd.s0 = IntegerOfTerm(cpc->rnd1);
|
||||
code_p->u.ssd.s1 = IntegerOfTerm(cpc->rnd2);
|
||||
code_p->u.ssd.d[0] = (CELL)FunctorDouble;
|
||||
code_p->u.ssd.d[1] = RepAppl(cpc->rnd3)[1];
|
||||
#if SIZEOF_DOUBLE == 2*SIZEOF_INT_P
|
||||
code_p->u.ssd.d[2] = RepAppl(cpc->rnd3)[2];
|
||||
#endif
|
||||
}
|
||||
GONEXT(ssd);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_ssn(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.ssn.s0 = IntegerOfTerm(cpc->rnd1);
|
||||
code_p->u.ssn.s1 = IntegerOfTerm(cpc->rnd2);
|
||||
code_p->u.ssn.n = IntegerOfTerm(cpc->rnd3);
|
||||
}
|
||||
GONEXT(ssn);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
static yamop *
|
||||
a_sss(op_numbers opcode, yamop *code_p, int pass_no, struct PSEUDO *cpc)
|
||||
{
|
||||
if (pass_no) {
|
||||
code_p->opc = emit_op(opcode);
|
||||
code_p->u.sss.s0 = IntegerOfTerm(cpc->rnd1);
|
||||
code_p->u.sss.s1 = IntegerOfTerm(cpc->rnd2);
|
||||
code_p->u.sss.s2 = IntegerOfTerm(cpc->rnd3);
|
||||
}
|
||||
GONEXT(sss);
|
||||
return code_p;
|
||||
}
|
||||
|
||||
inline static yamop *
|
||||
a_vp(op_numbers opcodex, op_numbers opcodey, yamop *code_p, int pass_no, struct PSEUDO *cpc, clause_info *clinfo)
|
||||
{
|
||||
@@ -3312,165 +3205,6 @@ do_pass(int pass_no, yamop **entry_codep, int assembling, int *clause_has_blobsp
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_rd(_get_float, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case get_fi_op:
|
||||
code_p = a_fi(_get_fi_x, _get_fi_y, code_p, pass_no, cip->cpc, cip->exception_handler, cip);
|
||||
break;
|
||||
case get_f_op:
|
||||
code_p = a_fi(_get_f_x, _get_f_y, code_p, pass_no, cip->cpc, cip->exception_handler, cip);
|
||||
break;
|
||||
case get_i_op:
|
||||
code_p = a_fi(_get_i_x, _get_i_y, code_p, pass_no, cip->cpc, cip->exception_handler, cip);
|
||||
break;
|
||||
case put_fi_var_op:
|
||||
code_p = a_fi(_put_fi_var_x, _put_fi_var_y, code_p, pass_no, cip->cpc, cip->success_handler, cip);
|
||||
break;
|
||||
case put_f_var_op:
|
||||
code_p = a_fi(_put_f_var_x, _put_f_var_y, code_p, pass_no, cip->cpc, cip->success_handler, cip);
|
||||
break;
|
||||
case put_i_var_op:
|
||||
code_p = a_fi(_put_i_var_x, _put_i_var_y, code_p, pass_no, cip->cpc, cip->success_handler, cip);
|
||||
break;
|
||||
case put_fi_val_op:
|
||||
code_p = a_fil(_put_fi_val_x, _put_fi_val_y, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case put_f_val_op:
|
||||
code_p = a_fil(_put_f_val_x, _put_f_val_y, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case put_i_val_op:
|
||||
code_p = a_fil(_put_i_val_x, _put_i_val_y, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case a_eqc_float_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_sdll(_a_eqc_float, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case a_eqc_int_op:
|
||||
code_p = a_snll(_a_eqc_int, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case a_eq_op:
|
||||
code_p = a_ssll(_a_eq, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case ltc_float_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_sdll(_ltc_float, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case ltc_int_op:
|
||||
code_p = a_snll(_ltc_int, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case lt_op:
|
||||
code_p = a_ssll(_lt, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case gtc_float_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_sdll(_gtc_float, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case gtc_int_op:
|
||||
code_p = a_snll(_gtc_int, code_p, pass_no, cip->cpc, cip->success_handler, cip->failure_handler, cip);
|
||||
break;
|
||||
case add_float_c_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_ssd(_add_float_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case add_int_c_op:
|
||||
code_p = a_ssn(_add_int_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case add_op:
|
||||
code_p = a_sss(_add, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sub_float_c_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_ssd(_sub_float_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sub_int_c_op:
|
||||
code_p = a_ssn(_sub_int_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sub_op:
|
||||
code_p = a_sss(_sub, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mul_float_c_op:
|
||||
*clause_has_blobsp = TRUE;
|
||||
code_p = a_ssd(_mul_float_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mul_int_c_op:
|
||||
code_p = a_ssn(_mul_int_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mul_op:
|
||||
code_p = a_sss(_mul, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sr_c1_op:
|
||||
code_p = a_ssn(_sr_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sr_c2_op:
|
||||
code_p = a_ssn(_sr_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sr_op:
|
||||
code_p = a_sss(_sr, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sl_c1_op:
|
||||
code_p = a_ssn(_sl_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sl_c2_op:
|
||||
code_p = a_ssn(_sl_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case sl_op:
|
||||
code_p = a_sss(_sl, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case rem_c1_op:
|
||||
code_p = a_ssn(_rem_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case rem_c2_op:
|
||||
code_p = a_ssn(_rem_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case rem_op:
|
||||
code_p = a_sss(_rem, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mod_c1_op:
|
||||
code_p = a_ssn(_mod_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mod_c2_op:
|
||||
code_p = a_ssn(_mod_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case mod_op:
|
||||
code_p = a_sss(_mod, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case idiv_c1_op:
|
||||
code_p = a_ssn(_idiv_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case idiv_c2_op:
|
||||
code_p = a_ssn(_idiv_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case idiv_op:
|
||||
code_p = a_sss(_idiv, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case fdiv_c1_op:
|
||||
code_p = a_ssd(_fdiv_c1, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case fdiv_c2_op:
|
||||
code_p = a_ssd(_fdiv_c2, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case fdiv_op:
|
||||
code_p = a_sss(_fdiv, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case a_and_c_op:
|
||||
code_p = a_ssn(_a_and_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case a_and_op:
|
||||
code_p = a_sss(_a_and, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case a_or_c_op:
|
||||
code_p = a_ssn(_a_or_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case a_or_op:
|
||||
code_p = a_sss(_a_or, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case xor_c_op:
|
||||
code_p = a_ssn(_xor_c, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case xor_op:
|
||||
code_p = a_sss(_xor, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case uminus_op:
|
||||
code_p = a_sss(_uminus, code_p, pass_no, cip->cpc);
|
||||
break;
|
||||
case label_ctl_op:
|
||||
code_p = a_special_label(code_p, pass_no, cip);
|
||||
break;
|
||||
|
||||
175
C/compiler.c
175
C/compiler.c
@@ -1865,157 +1865,9 @@ c_goal(Term Goal, int mod, compiler_struct *cglobs)
|
||||
#endif
|
||||
}
|
||||
return;
|
||||
} else if (op >= _p_put_fi && op <= _p_label_ctl) {
|
||||
switch(op) {
|
||||
/* one should never get a new variable here */
|
||||
case _p_get_fi:
|
||||
c_p_put(Goal, get_fi_op, get_fi_op, cglobs);
|
||||
return;
|
||||
case _p_get_i:
|
||||
c_p_put(Goal, get_i_op, get_i_op, cglobs);
|
||||
return;
|
||||
case _p_get_f:
|
||||
c_p_put(Goal, get_f_op, get_f_op, cglobs);
|
||||
return;
|
||||
case _p_put_fi:
|
||||
c_p_put(Goal, put_fi_var_op, put_fi_val_op, cglobs);
|
||||
return;
|
||||
case _p_put_i:
|
||||
c_p_put(Goal, put_i_var_op, put_i_val_op, cglobs);
|
||||
return;
|
||||
case _p_put_f:
|
||||
c_p_put(Goal, put_f_var_op, put_f_val_op, cglobs);
|
||||
return;
|
||||
case _p_a_eq_float:
|
||||
Yap_emit(a_eqc_float_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_a_eq_int:
|
||||
Yap_emit(a_eqc_int_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_a_eq:
|
||||
Yap_emit(a_eq_op, IntOfTerm(ArgOfTerm(1, Goal)), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_ltc_float:
|
||||
Yap_emit(ltc_float_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_ltc_int:
|
||||
Yap_emit(ltc_int_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_lt:
|
||||
Yap_emit(lt_op, IntOfTerm(ArgOfTerm(1, Goal)), IntOfTerm(ArgOfTerm(2, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_gtc_float:
|
||||
Yap_emit(gtc_float_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_gtc_int:
|
||||
Yap_emit(gtc_int_op, ArgOfTerm(2, Goal), IntOfTerm(ArgOfTerm(1, Goal)), &cglobs->cint);
|
||||
return;
|
||||
case _p_add_float_c:
|
||||
Yap_emit_3ops(add_float_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_add_int_c:
|
||||
Yap_emit_3ops(add_int_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_add:
|
||||
Yap_emit_3ops(add_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sub_float_c:
|
||||
Yap_emit_3ops(sub_float_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sub_int_c:
|
||||
Yap_emit_3ops(sub_int_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sub:
|
||||
Yap_emit_3ops(sub_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mul_float_c:
|
||||
Yap_emit_3ops(mul_float_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mul_int_c:
|
||||
Yap_emit_3ops(mul_int_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mul:
|
||||
Yap_emit_3ops(mul_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_fdiv_c1:
|
||||
Yap_emit_3ops(fdiv_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_fdiv_c2:
|
||||
Yap_emit_3ops(fdiv_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_fdiv:
|
||||
Yap_emit_3ops(fdiv_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_idiv_c1:
|
||||
Yap_emit_3ops(idiv_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_idiv_c2:
|
||||
Yap_emit_3ops(idiv_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_idiv:
|
||||
Yap_emit_3ops(idiv_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mod_c1:
|
||||
Yap_emit_3ops(mod_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mod_c2:
|
||||
Yap_emit_3ops(mod_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_mod:
|
||||
Yap_emit_3ops(mod_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_rem_c1:
|
||||
Yap_emit_3ops(rem_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_rem_c2:
|
||||
Yap_emit_3ops(rem_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_rem:
|
||||
Yap_emit_3ops(rem_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_land_c:
|
||||
Yap_emit_3ops(a_and_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_land:
|
||||
Yap_emit_3ops(a_and_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_lor_c:
|
||||
Yap_emit_3ops(a_or_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_lor:
|
||||
Yap_emit_3ops(a_or_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_xor_c:
|
||||
Yap_emit_3ops(xor_c_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_xor:
|
||||
Yap_emit_3ops(xor_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_uminus:
|
||||
Yap_emit(uminus_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sr_c1:
|
||||
Yap_emit_3ops(sr_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sr_c2:
|
||||
Yap_emit_3ops(sr_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sr:
|
||||
Yap_emit_3ops(sr_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sl_c1:
|
||||
Yap_emit_3ops(sl_c1_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sl_c2:
|
||||
Yap_emit_3ops(sl_c2_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_sl:
|
||||
Yap_emit_3ops(sl_op, ArgOfTerm(1,Goal), ArgOfTerm(2,Goal), ArgOfTerm(3,Goal), &cglobs->cint);
|
||||
return;
|
||||
case _p_label_ctl:
|
||||
emit_special_label(Goal, cglobs);
|
||||
return;
|
||||
}
|
||||
} else if (op == _p_label_ctl) {
|
||||
emit_special_label(Goal, cglobs);
|
||||
return;
|
||||
} else {
|
||||
c_args(Goal, 0, cglobs);
|
||||
}
|
||||
@@ -2278,15 +2130,6 @@ usesvar(compiler_vm_op ic)
|
||||
case f_var_op:
|
||||
case fetch_args_for_bccall:
|
||||
case bccall_op:
|
||||
case get_fi_op:
|
||||
case get_i_op:
|
||||
case get_f_op:
|
||||
case put_fi_var_op:
|
||||
case put_i_var_op:
|
||||
case put_f_var_op:
|
||||
case put_fi_val_op:
|
||||
case put_i_val_op:
|
||||
case put_f_val_op:
|
||||
return TRUE;
|
||||
default:
|
||||
break;
|
||||
@@ -2581,9 +2424,6 @@ CheckUnsafe(PInstr *pc, compiler_struct *cglobs)
|
||||
case save_appl_op:
|
||||
case save_pair_op:
|
||||
case f_var_op:
|
||||
case put_fi_var_op:
|
||||
case put_i_var_op:
|
||||
case put_f_var_op:
|
||||
{
|
||||
Ventry *v = (Ventry *) (pc->rnd1);
|
||||
|
||||
@@ -3041,15 +2881,6 @@ c_layout(compiler_struct *cglobs)
|
||||
#endif
|
||||
case fetch_args_for_bccall:
|
||||
case bccall_op:
|
||||
case get_fi_op:
|
||||
case get_f_op:
|
||||
case get_i_op:
|
||||
case put_fi_var_op:
|
||||
case put_f_var_op:
|
||||
case put_i_var_op:
|
||||
case put_fi_val_op:
|
||||
case put_f_val_op:
|
||||
case put_i_val_op:
|
||||
checktemp(arg, rn, ic, cglobs);
|
||||
break;
|
||||
case get_atom_op:
|
||||
|
||||
@@ -740,57 +740,6 @@ static char *opformat[] =
|
||||
"fetch_args_for_bccall\t%v",
|
||||
"binary_cfunc\t\t%v,%P",
|
||||
"blob\t%O",
|
||||
"get_number\t",
|
||||
"get_integer\t",
|
||||
"get_float\t",
|
||||
"put_number_on_var\t",
|
||||
"put_float_on_var\t",
|
||||
"put_integer_on_var\t",
|
||||
"put_number_on_val\t",
|
||||
"put_float_on_val\t",
|
||||
"put_integer_on_val\t",
|
||||
"equal_floats\t",
|
||||
"equal_ints\t",
|
||||
"equal_numbers\t",
|
||||
"lt_floats\t",
|
||||
"lt_ints\t",
|
||||
"lt_numbers\t",
|
||||
"gt_floats\t",
|
||||
"gt_ints\t",
|
||||
"add_float\t",
|
||||
"add_int\t",
|
||||
"add\t",
|
||||
"sub_float\t",
|
||||
"sub_int\t",
|
||||
"sub\t",
|
||||
"mul_float\t",
|
||||
"mul_int\t",
|
||||
"mul\t",
|
||||
"shift_right_constant\t",
|
||||
"shift_right_by_constant\t",
|
||||
"shift_right\t",
|
||||
"shift_left_constant\t",
|
||||
"shift_left_by_constant\t",
|
||||
"shift_left\t",
|
||||
"divide_constant\t",
|
||||
"divide_by_constant\t",
|
||||
"divide\t",
|
||||
"integer_divide_constant\t",
|
||||
"integer_divide_by_constant\t",
|
||||
"integer_divide\t",
|
||||
"mod_constant\t",
|
||||
"mod_by_constant\t",
|
||||
"mod\t",
|
||||
"rem_constant\t",
|
||||
"rem_by_constant\t",
|
||||
"rem\t",
|
||||
"and_constant\t",
|
||||
"and\t",
|
||||
"or_constant\t",
|
||||
"or\t",
|
||||
"xor_constant\t",
|
||||
"xor\t",
|
||||
"uminus\t",
|
||||
"label_control\t"
|
||||
#ifdef SFUNC
|
||||
,
|
||||
|
||||
59
C/grow.c
59
C/grow.c
@@ -939,51 +939,8 @@ fix_compiler_instructions(PInstr *pcpc)
|
||||
case fetch_args_vv_op:
|
||||
case fetch_args_cv_op:
|
||||
case fetch_args_vc_op:
|
||||
case get_fi_op:
|
||||
case get_f_op:
|
||||
case get_i_op:
|
||||
case put_fi_var_op:
|
||||
case put_f_var_op:
|
||||
case put_i_var_op:
|
||||
case put_fi_val_op:
|
||||
case put_f_val_op:
|
||||
case put_i_val_op:
|
||||
pcpc->rnd1 = GlobalAdjust(pcpc->rnd1);
|
||||
break;
|
||||
case a_eqc_float_op:
|
||||
case a_eqc_int_op:
|
||||
case ltc_float_op:
|
||||
case ltc_int_op:
|
||||
case gtc_float_op:
|
||||
case gtc_int_op:
|
||||
case add_float_c_op:
|
||||
case sub_float_c_op:
|
||||
case mul_float_c_op:
|
||||
case fdiv_c1_op:
|
||||
case fdiv_c2_op:
|
||||
/* floats might be in the global */
|
||||
pcpc->rnd1 = AdjustAppl(pcpc->rnd1);
|
||||
break;
|
||||
case add_int_c_op:
|
||||
case sub_int_c_op:
|
||||
case mul_int_c_op:
|
||||
case sr_c1_op:
|
||||
case sr_c2_op:
|
||||
case sl_c1_op:
|
||||
case sl_c2_op:
|
||||
case idiv_c1_op:
|
||||
case idiv_c2_op:
|
||||
case rem_c1_op:
|
||||
case rem_c2_op:
|
||||
case mod_c1_op:
|
||||
case mod_c2_op:
|
||||
case a_and_c_op:
|
||||
case a_or_c_op:
|
||||
case xor_c_op:
|
||||
/* floats might be in the global */
|
||||
if (!IsIntTerm(pcpc->rnd1))
|
||||
pcpc->rnd1 = AdjustAppl(pcpc->rnd1);
|
||||
break;
|
||||
case get_float_op:
|
||||
case put_float_op:
|
||||
case get_longint_op:
|
||||
@@ -1088,22 +1045,8 @@ fix_compiler_instructions(PInstr *pcpc)
|
||||
case blob_op:
|
||||
case fetch_args_vi_op:
|
||||
case fetch_args_iv_op:
|
||||
case a_eq_op:
|
||||
case lt_op:
|
||||
case add_op:
|
||||
case sub_op:
|
||||
case mul_op:
|
||||
case fdiv_op:
|
||||
case idiv_op:
|
||||
case mod_op:
|
||||
case rem_op:
|
||||
case a_and_op:
|
||||
case a_or_op:
|
||||
case xor_op:
|
||||
case uminus_op:
|
||||
case sr_op:
|
||||
case sl_op:
|
||||
case label_ctl_op:
|
||||
case f_0_op:
|
||||
#ifdef TABLING
|
||||
case table_new_answer_op:
|
||||
case table_try_single_op:
|
||||
|
||||
Reference in New Issue
Block a user