From b6409fc98060cccc0ec325d4820858a7af3c075f Mon Sep 17 00:00:00 2001
From: Vitor Santos Costa <vsc@dcc.fc.up.pt>
Date: Fri, 22 Aug 2008 03:54:10 +0100
Subject: [PATCH] fix weird instruction with tabling and new optypes; fix a
 stray ld.

---
 C/amasm.c      | 2 +-
 H/YapOpcodes.h | 2 ++
 misc/buildops  | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/C/amasm.c b/C/amasm.c
index 5924fa7dc..18e603fd8 100644
--- a/C/amasm.c
+++ b/C/amasm.c
@@ -2814,7 +2814,7 @@ do_pass(int pass_no, yamop **entry_codep, int assembling, int *clause_has_blobsp
     *entry_codep = code_p;
     if (tabled) {
 #if TABLING
-      code_p = a_try(_table_try_single, (CELL)NEXTOP(code_p,ld), IPredArity, code_p, pass_no, cip);
+      code_p = a_try(_table_try_single, (CELL)NEXTOP(code_p,apl), IPredArity, code_p, pass_no, cip);
 #endif
     }
     if (dynamic) {
diff --git a/H/YapOpcodes.h b/H/YapOpcodes.h
index 76d08cd8a..1f963342a 100644
--- a/H/YapOpcodes.h
+++ b/H/YapOpcodes.h
@@ -322,7 +322,9 @@
   OPCODE(sync                       ,apl),
 #endif
 #ifdef TABLING
+#ifdef TABLING_INNER_CUTS
   OPCODE(clause_with_cut            ,e),
+#endif
   OPCODE(table_load_answer          ,apl),
   OPCODE(table_try_answer           ,apl),
   OPCODE(table_try_single           ,apl),
diff --git a/misc/buildops b/misc/buildops
index 47e4d08f6..040c66c32 100644
--- a/misc/buildops
+++ b/misc/buildops
@@ -52,6 +52,7 @@ end_special(Name, W) :-
 	format(W,"#endif~n",[]).
 end_special(_, _).
 
+special_op("clause_with_cut","TABLING_INNER_CUTS").
 special_op("cut_c","CUT_C").
 special_op("cut_userc","CUT_C").
 special_op("run_eam","BEAM").