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

make new code work in 32 bit Linux.

Browse Source
This commit is contained in:
ubu32 2011-03-07 08:34:20 -08:00
parent bef041a268
commit e98ba46ccb
7 changed files with 45 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C/cdmgr.c
View File

@ -957,10 +957,10 @@ split_megaclause(PredEntry *ap)
static void
IPred(PredEntry *ap, UInt NSlots, yamop *next_pc)
{
CACHE_REGS
yamop *BaseAddr;
#ifdef DEBUG
CACHE_REGS
if (Yap_Option['i' - 'a' + 1]) {
Term tmod = ap->ModuleOfPred;
if (!tmod)

1
C/grow.c
View File

@ -243,6 +243,7 @@ IncrementalCopyStacksFromWorker( USES_REGS1 )
static CELL
worker_p_binding(int worker_p, CELL *aux_ptr)
{
CACHE_REGS
if (aux_ptr > H) {
CELL reg = FOREIGN_ThreadHandle(worker_p).current_yaam_regs->LCL0_[aux_ptr-LCL0];
reg = AdjustGlobTerm(reg PASS_REGS);

8
C/heapgc.c
View File

@ -51,7 +51,7 @@ STATIC_PROTO(int is_gc_verbose, (void));
STATIC_PROTO(int is_gc_very_verbose, (void));
STATIC_PROTO(void LeaveGCMode, ( CACHE_TYPE1 ));
#ifdef EASY_SHUNTING
STATIC_PROTO(void set_conditionals, (tr_fr_ptr));
STATIC_PROTO(void set_conditionals, (tr_fr_ptr CACHE_TYPE));
#endif /* EASY_SHUNTING */
#include "heapgc.h"
@ -159,7 +159,7 @@ gc_growtrail(int committed, tr_fr_ptr begsTR, cont *old_cont_top0 USES_REGS)
sTR += 2;
}
}
set_conditionals(sTR);
set_conditionals(sTR PASS_REGS);
#endif
/* could not find more trail */
save_machine_regs();
@ -3582,7 +3582,7 @@ icompact_heap( USES_REGS1 )
#ifdef EASY_SHUNTING
static void
set_conditionals(tr_fr_ptr str) {
set_conditionals(tr_fr_ptr str USES_REGS) {
while (str != sTR0) {
CELL *cptr;
str -= 2;
@ -3624,7 +3624,7 @@ marking_phase(tr_fr_ptr old_TR, CELL *current_env, yamop *curp USES_REGS)
mark_environments(current_env, EnvSize(curp), EnvBMap(curp) PASS_REGS);
mark_choicepoints(B, old_TR, is_gc_very_verbose() PASS_REGS); /* choicepoints, and environs */
#ifdef EASY_SHUNTING
set_conditionals(sTR);
set_conditionals(sTR PASS_REGS);
#endif
}

5
H/TermExt.h
View File

@ -196,7 +196,7 @@ CpFloatUnaligned(CELL *ptr)
#if SIZEOF_DOUBLE == 2*SIZEOF_LONG_INT
inline EXTERN void STD_PROTO (AlignGlobalForDouble, (void));
inline EXTERN void STD_PROTO (AlignGlobalForDouble, ( USES_REGS1 ));
#define DOUBLE_ALIGNED(ADDR) ((CELL)(ADDR) & 0x4)
@ -229,7 +229,8 @@ inline EXTERN Term MkFloatTerm (Float);
inline EXTERN Term
MkFloatTerm (Float dbl)
{
return (Term) ((AlignGlobalForDouble (), H[0] =
CACHE_REGS
return (Term) ((AlignGlobalForDouble ( PASS_REGS1 ), H[0] =
(CELL) FunctorDouble, *(Float *) (H + 1) = dbl, H[3] =
EndSpecials, H +=
4, AbsAppl (H - 4)));

2
H/amiops.h
View File

@ -117,7 +117,7 @@ A contains the address of the variable that is to be trailed
#if SIZEOF_DOUBLE == 2*SIZEOF_LONG_INT
EXTERN inline void
AlignGlobalForDouble(void)
AlignGlobalForDouble( USES_REGS1 )
{
/* Force Alignment for floats. Note that garbage collector may
break the alignment; */

48
H/rheap.h
View File

@ -247,6 +247,22 @@ static char SccsId[] = "@(#)rheap.c 1.3 3/15/90";
#define RestoreDBErasedMarker() RestoreDBErasedMarker__( PASS_REGS1 )
#define RestoreLogDBErasedMarker() RestoreLogDBErasedMarker__( PASS_REGS1 )
#define RestoreForeignCode() RestoreForeignCode__( PASS_REGS1 )
#define RestoreAtoms() RestoreAtoms__( PASS_REGS1 )
#define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 )
#define RestoreInvisibleAtoms() RestoreInvisibleAtoms__( PASS_REGS1 )
#define RestorePredHash() RestorePredHash__( PASS_REGS1 )
#define RestoreDBTermsList() RestoreDBTermsList__( PASS_REGS1 )
#define RestoreExpandList() RestoreExpandList__( PASS_REGS1 )
#define RestoreIntKeys() RestoreIntKeys__( PASS_REGS1 )
#define RestoreIntLUKeys() RestoreIntLUKeys__( PASS_REGS1 )
#define RestoreIntBBKeys() RestoreIntBBKeys__( PASS_REGS1 )
#define RestoreDeadStaticClauses() RestoreDeadStaticClauses__( PASS_REGS1 )
#define RestoreDeadMegaClauses() RestoreDeadMegaClauses__( PASS_REGS1 )
#define RestoreDeadStaticIndices() RestoreDeadStaticIndices__( PASS_REGS1 )
#define RestoreDBErasedList() RestoreDBErasedList__( PASS_REGS1 )
#define RestoreDBErasedIList() RestoreDBErasedIList__( PASS_REGS1 )
#define RestoreYapRecords() RestoreYapRecords__( PASS_REGS1 )
#define RestoreSWIAtoms() RestoreSWIAtoms__( PASS_REGS1 )
static Term
ConstantTermAdjust__ (Term t USES_REGS)
{
@ -398,7 +414,7 @@ STATIC_PROTO(void RestoreAtom, (AtomEntry * CACHE_TYPE));
STATIC_PROTO(void RestoreHashPreds, ( CACHE_TYPE1 ));
static void
RestoreAtoms( USES_REGS1 )
RestoreAtoms__( USES_REGS1 )
{
AtomHashEntry *HashPtr;
register int i;
@ -414,7 +430,7 @@ RestoreAtoms( USES_REGS1 )
}
static void
RestoreWideAtoms( USES_REGS1 )
RestoreWideAtoms__( USES_REGS1 )
{
AtomHashEntry *HashPtr;
register int i;
@ -430,7 +446,7 @@ RestoreWideAtoms( USES_REGS1 )
}
static void
RestoreInvisibleAtoms( USES_REGS1 )
RestoreInvisibleAtoms__( USES_REGS1 )
{
INVISIBLECHAIN.Entry = AtomAdjust(INVISIBLECHAIN.Entry);
RestoreAtomList(INVISIBLECHAIN.Entry PASS_REGS);
@ -672,7 +688,7 @@ CleanSIndex(StaticIndex *idx, int recurse USES_REGS)
}
static void
RestoreSWIAtoms( USES_REGS1 )
RestoreSWIAtoms__( USES_REGS1 )
{
int i, j;
for (i=0; i < N_SWI_ATOMS; i++) {
@ -695,7 +711,7 @@ RestoreSWIBlobs(void)
}
static void
RestorePredHash( USES_REGS1 )
RestorePredHash__( USES_REGS1 )
{
PredHash = PtoPtoPredAdjust(PredHash);
if (PredHash == NULL) {
@ -738,7 +754,7 @@ RestoreOtaplInst__(yamop start[1], OPCODE opc, PredEntry *pe USES_REGS)
}
static void
RestoreDBTermsList( USES_REGS1 )
RestoreDBTermsList__( USES_REGS1 )
{
if (Yap_heap_regs->dbterms_list) {
struct dbterm_list *dbl = PtoDBTLAdjust(Yap_heap_regs->dbterms_list);
@ -751,7 +767,7 @@ RestoreDBTermsList( USES_REGS1 )
}
static void
RestoreExpandList( USES_REGS1 )
RestoreExpandList__( USES_REGS1 )
{
if (Yap_heap_regs->expand_clauses_first)
Yap_heap_regs->expand_clauses_first = PtoOpAdjust(Yap_heap_regs->expand_clauses_first);
@ -776,7 +792,7 @@ RestoreUdiControlBlocks(void)
}
static void
RestoreIntKeys( USES_REGS1 )
RestoreIntKeys__( USES_REGS1 )
{
if (Yap_heap_regs->IntKeys != NULL) {
Yap_heap_regs->IntKeys = (Prop *)AddrAdjust((ADDR)(Yap_heap_regs->IntKeys));
@ -793,7 +809,7 @@ RestoreIntKeys( USES_REGS1 )
}
static void
RestoreIntLUKeys( USES_REGS1 )
RestoreIntLUKeys__( USES_REGS1 )
{
if (Yap_heap_regs->IntLUKeys != NULL) {
Yap_heap_regs->IntLUKeys = (Prop *)AddrAdjust((ADDR)(Yap_heap_regs->IntLUKeys));
@ -818,7 +834,7 @@ RestoreIntLUKeys( USES_REGS1 )
}
static void
RestoreIntBBKeys( USES_REGS1 )
RestoreIntBBKeys__( USES_REGS1 )
{
if (Yap_heap_regs->IntBBKeys != NULL) {
Yap_heap_regs->IntBBKeys = (Prop *)AddrAdjust((ADDR)(Yap_heap_regs->IntBBKeys));
@ -865,7 +881,7 @@ RestoreLogDBErasedMarker__( USES_REGS1 )
}
static void
RestoreDeadStaticClauses( USES_REGS1 )
RestoreDeadStaticClauses__( USES_REGS1 )
{
if (Yap_heap_regs->dead_static_clauses) {
StaticClause *sc = PtoStCAdjust(Yap_heap_regs->dead_static_clauses);
@ -878,7 +894,7 @@ RestoreDeadStaticClauses( USES_REGS1 )
}
static void
RestoreDeadMegaClauses( USES_REGS1 )
RestoreDeadMegaClauses__( USES_REGS1 )
{
if (Yap_heap_regs->dead_mega_clauses) {
MegaClause *mc = (MegaClause *)AddrAdjust((ADDR)(Yap_heap_regs->dead_mega_clauses));
@ -891,7 +907,7 @@ RestoreDeadMegaClauses( USES_REGS1 )
}
static void
RestoreDeadStaticIndices( USES_REGS1 )
RestoreDeadStaticIndices__( USES_REGS1 )
{
if (Yap_heap_regs->dead_static_indices) {
StaticIndex *si = (StaticIndex *)AddrAdjust((ADDR)(Yap_heap_regs->dead_static_indices));
@ -904,7 +920,7 @@ RestoreDeadStaticIndices( USES_REGS1 )
}
static void
RestoreDBErasedList( USES_REGS1 )
RestoreDBErasedList__( USES_REGS1 )
{
if (Yap_heap_regs->db_erased_list) {
LogUpdClause *lcl = Yap_heap_regs->db_erased_list =
@ -917,7 +933,7 @@ RestoreDBErasedList( USES_REGS1 )
}
static void
RestoreDBErasedIList( USES_REGS1 )
RestoreDBErasedIList__( USES_REGS1 )
{
if (Yap_heap_regs->db_erased_ilist) {
LogUpdIndex *icl = Yap_heap_regs->db_erased_ilist =
@ -978,7 +994,7 @@ RestoreForeignCode__( USES_REGS1 )
}
static void
RestoreYapRecords( USES_REGS1 )
RestoreYapRecords__( USES_REGS1 )
{
struct record_list *ptr;

6
packages/PLStream/pl-yap.c
View File

@ -870,11 +870,11 @@ int PL_unify_atom__LD(term_t t, atom_t at ARG_LD)
/* SWI: int PL_unify_integer(term_t ?t, long n)
YAP long int unify(YAP_Term* a, Term* b) */
int PL_unify_integer__LD(term_t t, long n ARG_LD)
int PL_unify_integer__LD(term_t t, intptr_t i ARG_LD)
{
CACHE_REGS
Term iterm = MkIntegerTerm(n);
return Yap_unify(Yap_GetFromSlot(t PASS_REGS),iterm);
Term iterm = MkIntegerTerm(i);
return Yap_unify(Yap_GetFromSlot(i PASS_REGS),iterm);
}
extern int Yap_getInputStream(term_t t, IOSTREAM **s);