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

debugger: fix bad uses of metacall.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@312 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2002-01-19 16:10:53 +00:00
parent d413b1906c
commit 71f276e5db
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
C/sysbits.c
View File

@ -27,6 +27,9 @@ static char SccsId[] = "%W% %G%";
* *
*/ */
#if _MSC_VER || defined(__MINGW32__)
#define _WIN32_WINNT 0x0400
#endif
#include "Yap.h" #include "Yap.h"
#include "yapio.h" #include "yapio.h"
#include "eval.h" #include "eval.h"
@ -68,8 +71,7 @@ static char SccsId[] = "%W% %G%";
#if HAVE_FCNTL_H #if HAVE_FCNTL_H
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#ifdef _WIN32 #if _MSC_VER || defined(__MINGW32__)
#define _WIN32_WINNT 0x0400
#include <windows.h> #include <windows.h>
/* required for DLL compatibility */ /* required for DLL compatibility */
#if HAVE_DIRECT_H #if HAVE_DIRECT_H
@ -1976,8 +1978,7 @@ p_alarm(void)
liDueTime.LowPart = (DWORD) ( due_time & 0xFFFFFFFF ); liDueTime.LowPart = (DWORD) ( due_time & 0xFFFFFFFF );
liDueTime.HighPart = (LONG) ( due_time >> 32 ); liDueTime.HighPart = (LONG) ( due_time >> 32 );
if (SetWaitableTimer(htimer, &liDueTime,0,HandleTimer,NULL,0) == 0) { if (SetWaitableTimer(htimer, &liDueTime,0,HandleTimer,NULL,0) == 0) {
Error(SYSTEM_ERROR, TermNil, WinError("trying to use alarm");
"alarm not available in this configuration");
return(FALSE); return(FALSE);
} }
} }

10
pl/debug.yap
View File

@ -491,7 +491,7 @@ debugging :-
CP is '$last_choice_pt', CP is '$last_choice_pt',
( (
'$fetch_clause'(G,M,Cl,Clause), '$fetch_clause'(G,M,Cl,Clause),
(Clause = true -> true ; '$call'(Clause,M,CP) ) (Clause = true -> true ; '$call'(Clause,CP,Clause,M) )
; ;
Next is Cl+1, '$set_value'(spy_cl,Next), fail Next is Cl+1, '$set_value'(spy_cl,Next), fail
). ).
@ -512,7 +512,7 @@ debugging :-
'$fetch_reference_from_index'(Index, Cl1, Ref), '$fetch_reference_from_index'(Index, Cl1, Ref),
instance(Ref, (G :- Clause)) instance(Ref, (G :- Clause))
), ),
(Clause = true -> true ; '$call'(Clause,M,CP) ) (Clause = true -> true ; '$call'(Clause,CP,Clause,M) )
; ;
Next is Cl+1, '$set_value'(spy_cl,Next), fail Next is Cl+1, '$set_value'(spy_cl,Next), fail
). ).
@ -531,7 +531,7 @@ debugging :-
( (
'$db_nb_to_ref'(Cl,M:G,Ref), '$db_nb_to_ref'(Cl,M:G,Ref),
instance(Ref, (G :- Clause)), instance(Ref, (G :- Clause)),
(Clause = true -> true ; '$call'(Clause,M,CP) ) (Clause = true -> true ; '$call'(Clause,CP,Clause,M) )
; ;
Next is Cl+1, '$set_value'(spy_cl,Next), fail Next is Cl+1, '$set_value'(spy_cl,Next), fail
). ).
@ -571,7 +571,7 @@ debugging :-
), ),
(Clause = true -> true ; (Clause = true -> true ;
% otherwise fast skip may try to interpret assembly builtins. % otherwise fast skip may try to interpret assembly builtins.
'$get_value'(spy_fs,1) -> '$call'(Clause,M,CP) ; '$get_value'(spy_fs,1) -> '$call'(Clause,CP,Clause,M) ;
'$creep_call'(Clause,M,CP) '$creep_call'(Clause,M,CP)
) )
; ;
@ -587,7 +587,7 @@ debugging :-
instance(Ref, (G :- Clause)), instance(Ref, (G :- Clause)),
(Clause = true -> true ; (Clause = true -> true ;
% otherwise fast skip may try to interpret assembly builtins. % otherwise fast skip may try to interpret assembly builtins.
'$get_value'(spy_fs,1) -> '$call'(Clause,M,CP) ; '$get_value'(spy_fs,1) -> '$call'(Clause,CP,Clause,M) ;
'$creep_call'(Clause,M,CP) '$creep_call'(Clause,M,CP)
) )
; ;