removing macro SEQUENTIAL_IS_DEFAULT

This commit is contained in:
Ricardo Rocha 2011-06-21 15:43:50 +01:00
parent 0929dc4fc0
commit 7c6b4bf489
6 changed files with 2 additions and 17 deletions

View File

@ -1627,11 +1627,6 @@ retract_all(PredEntry *p, int in_use)
p->PredFlags |= CountPredFlag; p->PredFlags |= CountPredFlag;
} else } else
p->PredFlags &= ~CountPredFlag; p->PredFlags &= ~CountPredFlag;
#ifdef YAPOR
if (SEQUENTIAL_IS_DEFAULT) {
p->PredFlags |= SequentialPredFlag;
}
#endif /* YAPOR */
Yap_PutValue(AtomAbol, MkAtomTerm(AtomTrue)); Yap_PutValue(AtomAbol, MkAtomTerm(AtomTrue));
} }
@ -1647,11 +1642,6 @@ add_first_static(PredEntry *p, yamop *cp, int spy_flag)
Yap_InitComma(); Yap_InitComma();
} }
} else { } else {
#ifdef YAPOR
if (SEQUENTIAL_IS_DEFAULT) {
p->PredFlags |= SequentialPredFlag;
}
#endif /* YAPOR */
#ifdef TABLING #ifdef TABLING
if (is_tabled(p)) { if (is_tabled(p)) {
p->OpcodeOfPred = INDEX_OPCODE; p->OpcodeOfPred = INDEX_OPCODE;

View File

@ -170,7 +170,6 @@
#define BEAM_RETRY_CODE Yap_heap_regs->beam_retry_code #define BEAM_RETRY_CODE Yap_heap_regs->beam_retry_code
#endif /* BEAM */ #endif /* BEAM */
#ifdef YAPOR #ifdef YAPOR
#define SEQUENTIAL_IS_DEFAULT Yap_heap_regs->seq_def
#define GETWORK Yap_heap_regs->getwork_code #define GETWORK Yap_heap_regs->getwork_code
#define GETWORK_SEQ Yap_heap_regs->getwork_seq_code #define GETWORK_SEQ Yap_heap_regs->getwork_seq_code
#define GETWORK_FIRST_TIME Yap_heap_regs->getwork_first_time #define GETWORK_FIRST_TIME Yap_heap_regs->getwork_first_time

View File

@ -170,7 +170,6 @@
yamop beam_retry_code[1]; yamop beam_retry_code[1];
#endif /* BEAM */ #endif /* BEAM */
#ifdef YAPOR #ifdef YAPOR
int seq_def;
yamop getwork_code[1]; yamop getwork_code[1];
yamop getwork_seq_code[1]; yamop getwork_seq_code[1];
yamop getwork_first_time[1]; yamop getwork_first_time[1];

View File

@ -170,7 +170,6 @@
BEAM_RETRY_CODE->opc = Yap_opcode(_beam_retry_code); BEAM_RETRY_CODE->opc = Yap_opcode(_beam_retry_code);
#endif /* BEAM */ #endif /* BEAM */
#ifdef YAPOR #ifdef YAPOR
SEQUENTIAL_IS_DEFAULT = FALSE;
InitOtaplInst(GETWORK,_getwork,PredGetwork); InitOtaplInst(GETWORK,_getwork,PredGetwork);
InitOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq); InitOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq);
GETWORK_FIRST_TIME->opc = Yap_opcode(_getwork_first_time); GETWORK_FIRST_TIME->opc = Yap_opcode(_getwork_first_time);

View File

@ -170,7 +170,6 @@
BEAM_RETRY_CODE->opc = Yap_opcode(_beam_retry_code); BEAM_RETRY_CODE->opc = Yap_opcode(_beam_retry_code);
#endif /* BEAM */ #endif /* BEAM */
#ifdef YAPOR #ifdef YAPOR
RestoreOtaplInst(GETWORK,_getwork,PredGetwork); RestoreOtaplInst(GETWORK,_getwork,PredGetwork);
RestoreOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq); RestoreOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq);
GETWORK_FIRST_TIME->opc = Yap_opcode(_getwork_first_time); GETWORK_FIRST_TIME->opc = Yap_opcode(_getwork_first_time);

View File

@ -184,9 +184,8 @@ yamop *yescode YESCODE void
yamop beam_retry_code[1] BEAM_RETRY_CODE MkInstE _beam_retry_code yamop beam_retry_code[1] BEAM_RETRY_CODE MkInstE _beam_retry_code
#endif /* BEAM */ #endif /* BEAM */
#ifdef YAPOR #ifdef YAPOR
int seq_def SEQUENTIAL_IS_DEFAULT =FALSE void yamop getwork_code[1] GETWORK InitOtaplInst(GETWORK,_getwork,PredGetwork) RestoreOtaplInst(GETWORK,_getwork,PredGetwork)
yamop getwork_code[1] GETWORK InitOtaplInst(GETWORK,_getwork,PredGetwork) RestoreOtaplInst(GETWORK,_getwork,PredGetwork) yamop getwork_seq_code[1] GETWORK_SEQ InitOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq) RestoreOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq)
yamop getwork_seq_code[1] GETWORK_SEQ InitOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq) RestoreOtaplInst(GETWORK_SEQ,_getwork_seq,PredGetworkSeq)
yamop getwork_first_time[1] GETWORK_FIRST_TIME MkInstE _getwork_first_time yamop getwork_first_time[1] GETWORK_FIRST_TIME MkInstE _getwork_first_time
#endif /* YAPOR */ #endif /* YAPOR */
#ifdef TABLING #ifdef TABLING