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

exec

Browse Source
This commit is contained in:
Vitor Santos Costa 2019-04-22 12:18:22 +01:00
parent b1b6afe801
commit 71fc7238ff
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -215,3 +215,4 @@ cmake/docs/Doxyfile
*.stackdump *.stackdump
*.gz *.gz
.Rproj.user

4
C/exec.c
View File

@ -1628,8 +1628,8 @@ static bool exec_absmi(bool top, yap_reset_t reset_mode USES_REGS) {
pop_text_stack(i + 1); pop_text_stack(i + 1);
return out; return out;
} }
void Yap_PrepGoal(arity_t arity, CELL *pt, YAP_dogoalinfo *gip USES_REGS) { void Yap_PrepGoal(arity_t arity, CELL *pt, YAP_dogoalinfo *gip USES_REGS) {
/* create an initial pseudo environment so that when garbage /* create an initial pseudo environment so that when garbage
collection is going up in the environment chain it doesn't ge t collection is going up in the environment chain it doesn't ge t
confused */ confused */
@ -1652,7 +1652,7 @@ void Yap_PrepGoal(arity_t arity, CELL *pt, YAP_dogoalinfo *gip USES_REGS) {
/* keep a place where you can inform you had an exception */ /* keep a place where you can inform you had an exception */
if (pt) { if (pt) {
int i; int i;
for (i = 0; i < arity; i++) { for (i = 0; i < 3; i++) {
XREGS[i + 1] = *pt++; XREGS[i + 1] = *pt++;
} }
} }

7
CMakeLists.txt
View File

@ -1,4 +1,3 @@
# value of 3.4.0 or lower. # value of 3.4.0 or lower.
cmake_minimum_required(VERSION 3.4) cmake_minimum_required(VERSION 3.4)
@ -905,11 +904,7 @@ add_subDIRECTORY(packages/ProbLog)
endif() endif()
if (WITH_MINISAT) add_subDIRECTORY(packages/bee)
add_subDIRECTORY(packages/swi-minisat2)
endif()
if (WITH_CLPQR) if (WITH_CLPQR)

4
H/Yapproto.h
View File

@ -203,12 +203,12 @@ extern void Yap_fail_all(choiceptr bb USES_REGS);
extern Term Yap_ExecuteCallMetaCall(Term,Term); extern Term Yap_ExecuteCallMetaCall(Term,Term);
extern void Yap_InitExecFs(void); extern void Yap_InitExecFs(void);
extern bool Yap_JumpToEnv(void); extern bool Yap_JumpToEnv(void);
extern Term Yap_RunTopGoal(Term, bool); extern Term Yap_RunTopGoal(Term, YAP_dogoalinfo *gip,bool);
extern bool Yap_execute_goal(Term, int, Term, bool); extern bool Yap_execute_goal(Term, int, Term, bool);
extern bool Yap_exec_absmi(bool, yap_reset_t); extern bool Yap_exec_absmi(bool, yap_reset_t);
extern void Yap_trust_last(void); extern void Yap_trust_last(void);
extern void Yap_closeGoal(bool out, yamop *saved_p, yamop * saved_cp, Int saved_e, Int saved_b, yhandle_t hdl, bool pass_ex); extern void Yap_closeGoal(bool out, yamop *saved_p, yamop * saved_cp, Int saved_e, Int saved_b, yhandle_t hdl, bool pass_ex);
extern void Yap_PrepGoal(UInt, CELL *, choiceptr USES_REGS); extern void Yap_PrepGoal(arity_t arity, CELL *pt, YAP_dogoalinfo *gip USES_REGS);
extern bool Yap_execute_pred(struct pred_entry *ppe, CELL *pt, extern bool Yap_execute_pred(struct pred_entry *ppe, CELL *pt,
bool pass_exception USES_REGS); bool pass_exception USES_REGS);
extern int Yap_dogc(int extra_args, Term *tp USES_REGS); extern int Yap_dogc(int extra_args, Term *tp USES_REGS);

4
H/fields.h
View File

@ -34,7 +34,7 @@
#define HENVYOP(N, NAME, op, NEXTNAME, PFAIL) DEF NAME Yap_heap_regs->NAME##_ #define HENVYOP(N, NAME, op, NEXTNAME, PFAIL) DEF NAME Yap_heap_regs->NAME##_
#define HCPYOP(N, NAME, OP, FAILP) DEF NAME Yap_heap_regs->NAME##_ #define HCPYOP(N, NAME, OP, FAILP) DEF NAME Yap_heap_regs->NAME##_
#include "heap.h" #include "YapHeap.h"
#undef HM #undef HM
#undef HSPACE #undef HSPACE
@ -72,7 +72,7 @@
DEF GLOBAL_##NAME Yap_heap_regs->NAME##_ DEF GLOBAL_##NAME Yap_heap_regs->NAME##_
#define HCPYOP(N, NAME, OP, FAILP) DEF GLOBAL_##NAME Yap_heap_regs->NAME##_ #define HCPYOP(N, NAME, OP, FAILP) DEF GLOBAL_##NAME Yap_heap_regs->NAME##_
#include "heap.h" #include "YapHeap.h"
#undef LOC #undef LOC
#undef LOCL #undef LOCL

2
H/locals.h
View File

@ -3,7 +3,7 @@
// Macro support // Macro support
#ifndef LOCAL #ifndef LOCAL
#include "Yap.h" #include "Yap.h"
#include "heap.h" #include "YapHeap.h"
#define LOCAL(A, B) A B #define LOCAL(A, B) A B
#define LOCAL_INIT(A, B, C) \ #define LOCAL_INIT(A, B, C) \
A B; \ A B; \

2
pl/boot.yap
View File

@ -267,7 +267,7 @@ initialize_prolog :-
:- c_compile( 'protect.yap' ). :- c_compile( 'protect.yap' ).
:- ['absf.yap']. :- ['absf.yap'].
%:- stop_low_level_trace. %:- ..............................lp------------------------------------------------------------------.
:- use_module('error.yap'). :- use_module('error.yap').
:- [ :- [