diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pruning to handle backtrackable C-predicates in a much nicer way.

Browse Source
This commit is contained in:
ubu32
2011-02-14 11:29:20 -08:00
parent 9691a0843d
commit 67d23051c2
12 changed files with 163 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
C/amasm.c
View File

@@ -672,18 +672,20 @@ a_vp(op_numbers opcodex, op_numbers opcodey, yamop *code_p, int pass_no, struct
if (is_y_var) {
if (pass_no) {
code_p->opc = emit_op(opcodey);
code_p->u.yp.y = emit_yreg(var_offset);
code_p->u.yp.p0 = clinfo->CurrentPred;
code_p->u.yps.y = emit_yreg(var_offset);
code_p->u.yps.p0 = clinfo->CurrentPred;
code_p->u.yps.s = -Signed(RealEnvSize) - CELLSIZE * cpc->rnd2;
}
GONEXT(yp);
GONEXT(yps);
}
else {
if (pass_no) {
code_p->opc = emit_op(opcodex);
code_p->u.xp.x = emit_xreg(var_offset);
code_p->u.xp.p0 = clinfo->CurrentPred;
code_p->u.xps.x = emit_xreg(var_offset);
code_p->u.xps.p0 = clinfo->CurrentPred;
code_p->u.xps.s = -Signed(RealEnvSize) - CELLSIZE * cpc->rnd2;
}
GONEXT(xp);
GONEXT(xps);
}
return code_p;
}
@@ -2536,7 +2538,7 @@ a_f2(cmp_op_info *cmp_info, yamop *code_p, int pass_no, struct intermediates *ci
code_p->opc = opcode(_p_db_ref_y);
break;
case _cut_by:
code_p->opc = opcode(_p_cut_by_y);
Yap_Error(INTERNAL_COMPILER_ERROR, TermNil, "internal assembler error: cut_by should be handled as ->");
break;
case _primitive:
code_p->opc = opcode(_p_primitive_y);
@@ -2578,7 +2580,7 @@ a_f2(cmp_op_info *cmp_info, yamop *code_p, int pass_no, struct intermediates *ci
code_p->opc = opcode(_p_db_ref_x);
break;
case _cut_by:
code_p->opc = opcode(_p_cut_by_x);
Yap_Error(INTERNAL_COMPILER_ERROR, TermNil, "internal assembler error: cut_by should be handled as ->");
break;
case _primitive:
code_p->opc = opcode(_p_primitive_x);