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

fixes for int =\= long

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@782 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-02-14 12:20:57 +00:00
parent a31c94e31a
commit bca74cd190
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/agc.c
View File

@ -33,7 +33,7 @@ STATIC_PROTO(void ConvDBList, (Term, char *,CELL));
static int agc_calls; static int agc_calls;
static Int agc_collected; static unsigned long int agc_collected;
static Int tot_agc_time = 0; /* total time spent in GC */ static Int tot_agc_time = 0; /* total time spent in GC */

8
C/heapgc.c
View File

@ -41,7 +41,7 @@ static Int tot_gc_time = 0; /* total time spent in GC */
static Int tot_gc_recovered = 0; /* number of heap objects in all garbage collections */ static Int tot_gc_recovered = 0; /* number of heap objects in all garbage collections */
/* in a single gc */ /* in a single gc */
static Int total_marked; /* number of heap objects marked */ static unsigned long int total_marked; /* number of heap objects marked */
struct gc_ma_h_entry *live_list; struct gc_ma_h_entry *live_list;
@ -1480,9 +1480,9 @@ mark_choicepoints(register choiceptr gc_B, tr_fr_ptr saved_TR, int very_verbose)
case _count_retry: case _count_retry:
{ {
Atom at; Atom at;
UInt arity; unsigned long int arity;
SMALLUNSGN mod; SMALLUNSGN mod;
if (Yap_PredForCode(gc_B->cp_ap, &at, &arity, &mod)) { if (Yap_PredForCode(gc_B->cp_ap, &at, (UInt *)(&arity), &mod)) {
if (arity) if (arity)
fprintf(Yap_stderr,"[GC] %s/%ld marked %ld (%s)\n", RepAtom(at)->StrOfAE, arity, total_marked, op_names[opnum]); fprintf(Yap_stderr,"[GC] %s/%ld marked %ld (%s)\n", RepAtom(at)->StrOfAE, arity, total_marked, op_names[opnum]);
else else
@ -2962,7 +2962,7 @@ compaction_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp, CELL *max)
#ifdef HYBRID_SCHEME #ifdef HYBRID_SCHEME
#ifdef DEBUG #ifdef DEBUG
if (total_marked != iptop-(CELL_PTR *)H && iptop < (CELL_PTR *)ASP -1024) if (total_marked != iptop-(CELL_PTR *)H && iptop < (CELL_PTR *)ASP -1024)
fprintf(Yap_stderr,"[GC] Oops on iptop-H (%ld) vs %ld\n", iptop-(CELL_PTR *)H, total_marked); fprintf(Yap_stderr,"[GC] Oops on iptop-H (%ld) vs %ld\n", (unsigned long int)(iptop-(CELL_PTR *)H), total_marked);
#endif #endif
if (iptop < (CELL_PTR *)ASP && 10*total_marked < H-H0) { if (iptop < (CELL_PTR *)ASP && 10*total_marked < H-H0) {
#ifdef INSTRUMENT_GC #ifdef INSTRUMENT_GC

11
H/Regs.h
View File

@ -10,7 +10,7 @@
* File: Regs.h * * File: Regs.h *
* mods: * * mods: *
* comments: YAP abstract machine registers * * comments: YAP abstract machine registers *
* version: $Id: Regs.h,v 1.19 2003-02-14 12:06:18 vsc Exp $ * * version: $Id: Regs.h,v 1.20 2003-02-14 12:20:57 vsc Exp $ *
*************************************************************************/ *************************************************************************/
@ -56,9 +56,6 @@ EXTERN void restore_H(void);
EXTERN void save_H(void); EXTERN void save_H(void);
EXTERN void restore_B(void); EXTERN void restore_B(void);
EXTERN void save_B(void); EXTERN void save_B(void);
EXTERN void restore_TR(void);
EXTERN void save_TR(void);
typedef struct typedef struct
{ {
@ -333,6 +330,9 @@ EXTERN inline void restore_B(void) {
#define RECOVER_B() save_B(); B = BK_B #define RECOVER_B() save_B(); B = BK_B
EXTERN void restore_TR(void);
EXTERN void save_TR(void);
EXTERN inline void save_TR(void) { EXTERN inline void save_TR(void) {
Yap_REGS.TR_ = TR; Yap_REGS.TR_ = TR;
} }
@ -485,6 +485,9 @@ EXTERN inline void restore_B(void) {
#define RECOVER_B() save_B(); B = BK_B #define RECOVER_B() save_B(); B = BK_B
EXTERN void restore_TR(void);
EXTERN void save_TR(void);
EXTERN inline void save_TR(void) { EXTERN inline void save_TR(void) {
Yap_REGS.TR_ = TR; Yap_REGS.TR_ = TR;
} }