change LOCALS macros.

2011-05-04 10:11:41 +01:00
parent 18ce4dd78b
commit dc3c54c164
47 changed files with 1448 additions and 1448 deletions
--- a/VC/include/Yap.h
+++ b/VC/include/Yap.h
@@ -931,7 +931,7 @@ typedef struct opcode_tab_entry {
 extern int      optimizer_on;

 /******************* the line for the current parse **********************/
-extern int      StartLine;
+extern int      LOCAL_StartLine;
 extern int      StartCh;
 extern int      CurFileNo;

--- a/VC/include/sshift.h
+++ b/VC/include/sshift.h
@@ -24,19 +24,19 @@


 /* The difference between the old stack pointers and the new ones */
-extern Int HDiff,
-  GDiff,
-  LDiff,
-  TrDiff,
-  XDiff,
-  DelayDiff;
+extern Int LOCAL_HDiff,
+  LOCAL_GDiff,
+  LOCAL_LDiff,
+  LOCAL_TrDiff,
+  LOCAL_XDiff,
+  LOCAL_DelayDiff;

 /* The old stack pointers */
-extern CELL    *OldASP, *OldLCL0;
-extern tr_fr_ptr OldTR;
-extern CELL    *OldGlobalBase, *OldH, *OldH0;
-extern ADDR     OldTrailBase, OldTrailTop;
-extern ADDR     OldHeapBase, OldHeapTop;
+extern CELL    *LOCAL_OldASP, *LOCAL_OldLCL0;
+extern tr_fr_ptr LOCAL_OldTR;
+extern CELL    *LOCAL_OldGlobalBase, *LOCAL_OldH, *LOCAL_OldH0;
+extern ADDR     LOCAL_OldTrailBase, LOCAL_OldTrailTop;
+extern ADDR     LOCAL_OldHeapBase, LOCAL_OldHeapTop;

 #define CharP(ptr)	((char *) (ptr))

@@ -56,7 +56,7 @@ inline EXTERN CELL * PtoGloAdjust(CELL *);

 inline EXTERN CELL * PtoGloAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + GDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_GDiff)) );
 }


@@ -65,7 +65,7 @@ inline EXTERN CELL * PtoDelayAdjust(CELL *);

 inline EXTERN CELL * PtoDelayAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + DelayDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_DelayDiff)) );
 }


@@ -74,7 +74,7 @@ inline EXTERN tr_fr_ptr PtoTRAdjust(tr_fr_ptr);

 inline EXTERN tr_fr_ptr PtoTRAdjust(tr_fr_ptr ptr)
 {
-	return (tr_fr_ptr) (((tr_fr_ptr)(CharP(ptr) + TrDiff)) );
+	return (tr_fr_ptr) (((tr_fr_ptr)(CharP(ptr) + LOCAL_TrDiff)) );
 }


@@ -83,7 +83,7 @@ inline EXTERN CELL * CellPtoTRAdjust(CELL *);

 inline EXTERN CELL * CellPtoTRAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + TrDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_TrDiff)) );
 }


@@ -92,7 +92,7 @@ inline EXTERN CELL * PtoLocAdjust(CELL *);

 inline EXTERN CELL * PtoLocAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + LDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_LDiff)) );
 }


@@ -101,7 +101,7 @@ inline EXTERN choiceptr ChoicePtrAdjust(choiceptr);

 inline EXTERN choiceptr ChoicePtrAdjust(choiceptr ptr)
 {
-	return (choiceptr) (((choiceptr)(CharP(ptr) + LDiff)) );
+	return (choiceptr) (((choiceptr)(CharP(ptr) + LOCAL_LDiff)) );
 }


@@ -111,7 +111,7 @@ inline EXTERN choiceptr ConsumerChoicePtrAdjust(choiceptr);

 inline EXTERN choiceptr ConsumerChoicePtrAdjust(choiceptr ptr)
 {
-	return (choiceptr) (((choiceptr)(CharP(ptr) + LDiff)) );
+	return (choiceptr) (((choiceptr)(CharP(ptr) + LOCAL_LDiff)) );
 }


@@ -120,7 +120,7 @@ inline EXTERN choiceptr GeneratorChoicePtrAdjust(choiceptr);

 inline EXTERN choiceptr GeneratorChoicePtrAdjust(choiceptr ptr)
 {
-	return (choiceptr) (((choiceptr)(CharP(ptr) + LDiff)) );
+	return (choiceptr) (((choiceptr)(CharP(ptr) + LOCAL_LDiff)) );
 }


@@ -131,7 +131,7 @@ inline EXTERN CELL GlobalAdjust(CELL);

 inline EXTERN CELL GlobalAdjust(CELL val)
 {
-	return (CELL) ((val+GDiff) );
+	return (CELL) ((val+LOCAL_GDiff) );
 }


@@ -140,7 +140,7 @@ inline EXTERN CELL DelayAdjust(CELL);

 inline EXTERN CELL DelayAdjust(CELL val)
 {
-	return (CELL) ((val+DelayDiff) );
+	return (CELL) ((val+LOCAL_DelayDiff) );
 }


@@ -149,7 +149,7 @@ inline EXTERN ADDR GlobalAddrAdjust(ADDR);

 inline EXTERN ADDR GlobalAddrAdjust(ADDR ptr)
 {
-	return (ADDR) ((ptr+GDiff) );
+	return (ADDR) ((ptr+LOCAL_GDiff) );
 }


@@ -158,7 +158,7 @@ inline EXTERN ADDR DelayAddrAdjust(ADDR);

 inline EXTERN ADDR DelayAddrAdjust(ADDR ptr)
 {
-	return (ADDR) ((ptr+DelayDiff) );
+	return (ADDR) ((ptr+LOCAL_DelayDiff) );
 }


@@ -167,7 +167,7 @@ inline EXTERN CELL LocalAdjust(CELL);

 inline EXTERN CELL LocalAdjust(CELL val)
 {
-	return (CELL) ((val+LDiff) );
+	return (CELL) ((val+LOCAL_LDiff) );
 }


@@ -176,7 +176,7 @@ inline EXTERN ADDR LocalAddrAdjust(ADDR);

 inline EXTERN ADDR LocalAddrAdjust(ADDR ptr)
 {
-	return (ADDR) ((ptr+LDiff) );
+	return (ADDR) ((ptr+LOCAL_LDiff) );
 }


@@ -185,7 +185,7 @@ inline EXTERN CELL TrailAdjust(CELL);

 inline EXTERN CELL TrailAdjust(CELL val)
 {
-	return (CELL) ((val+TrDiff) );
+	return (CELL) ((val+LOCAL_TrDiff) );
 }


@@ -194,7 +194,7 @@ inline EXTERN ADDR TrailAddrAdjust(ADDR);

 inline EXTERN ADDR TrailAddrAdjust(ADDR ptr)
 {
-	return (ADDR) ((ptr+TrDiff) );
+	return (ADDR) ((ptr+LOCAL_TrDiff) );
 }


@@ -204,7 +204,7 @@ inline EXTERN Functor FuncAdjust(Functor);

 inline EXTERN Functor FuncAdjust(Functor f)
 {
-	return (Functor) ((Functor)(CharP(f)+HDiff) );
+	return (Functor) ((Functor)(CharP(f)+LOCAL_HDiff) );
 }


@@ -213,7 +213,7 @@ inline EXTERN CELL * CellPtoHeapAdjust(CELL *);

 inline EXTERN CELL * CellPtoHeapAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + HDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_HDiff)) );
 }


@@ -242,7 +242,7 @@ inline EXTERN Atom AtomAdjust(Atom);

 inline EXTERN Atom AtomAdjust(Atom at)
 {
-	return (Atom) ((at == NULL ? (at) : (Atom)(CharP(at)+HDiff) ));
+	return (Atom) ((at == NULL ? (at) : (Atom)(CharP(at)+LOCAL_HDiff) ));
 }


@@ -251,7 +251,7 @@ inline EXTERN Prop PropAdjust(Prop);

 inline EXTERN Prop PropAdjust(Prop p)
 {
-	return (Prop) ((p == NULL ? (p) : (Prop)(CharP(p)+HDiff)) );
+	return (Prop) ((p == NULL ? (p) : (Prop)(CharP(p)+LOCAL_HDiff)) );
 }


@@ -271,7 +271,7 @@ inline EXTERN Term BlobTermAdjust(Term);

 inline EXTERN Term BlobTermAdjust(Term t)
 {
-	return (Term) ((t-HDiff) );
+	return (Term) ((t-LOCAL_HDiff) );
 }


@@ -281,7 +281,7 @@ inline EXTERN Term BlobTermAdjust(Term);

 inline EXTERN Term BlobTermAdjust(Term t)
 {
-	return (Term) ((t+HDiff) );
+	return (Term) ((t+LOCAL_HDiff) );
 }


@@ -291,7 +291,7 @@ inline EXTERN AtomEntry * AtomEntryAdjust(AtomEntry *);

 inline EXTERN AtomEntry * AtomEntryAdjust(AtomEntry * at)
 {
-	return (AtomEntry *) ((AtomEntry *)(CharP(at)+HDiff) );
+	return (AtomEntry *) ((AtomEntry *)(CharP(at)+LOCAL_HDiff) );
 }


@@ -300,7 +300,7 @@ inline EXTERN union CONSULT_OBJ * ConsultObjAdjust(union CONSULT_OBJ *);

 inline EXTERN union CONSULT_OBJ * ConsultObjAdjust(union CONSULT_OBJ * co)
 {
-	return (union CONSULT_OBJ *) ((union CONSULT_OBJ *)(CharP(co)+HDiff) );
+	return (union CONSULT_OBJ *) ((union CONSULT_OBJ *)(CharP(co)+LOCAL_HDiff) );
 }


@@ -309,7 +309,7 @@ inline EXTERN DBRef DBRefAdjust(DBRef);

 inline EXTERN DBRef DBRefAdjust(DBRef dbr)
 {
-	return (DBRef) ((DBRef)(CharP(dbr)+HDiff) );
+	return (DBRef) ((DBRef)(CharP(dbr)+LOCAL_HDiff) );
 }


@@ -318,7 +318,7 @@ inline EXTERN Term CodeAdjust(Term);

 inline EXTERN Term CodeAdjust(Term dbr)
 {
-	return (Term) (((Term)(dbr)+HDiff) );
+	return (Term) (((Term)(dbr)+LOCAL_HDiff) );
 }


@@ -327,7 +327,7 @@ inline EXTERN ADDR AddrAdjust(ADDR);

 inline EXTERN ADDR AddrAdjust(ADDR addr)
 {
-	return (ADDR) ((ADDR)(CharP(addr)+HDiff) );
+	return (ADDR) ((ADDR)(CharP(addr)+LOCAL_HDiff) );
 }


@@ -336,7 +336,7 @@ inline EXTERN CODEADDR CodeAddrAdjust(CODEADDR);

 inline EXTERN CODEADDR CodeAddrAdjust(CODEADDR addr)
 {
-	return (CODEADDR) ((CODEADDR)(CharP(addr)+HDiff) );
+	return (CODEADDR) ((CODEADDR)(CharP(addr)+LOCAL_HDiff) );
 }


@@ -345,7 +345,7 @@ inline EXTERN BlockHeader * BlockAdjust(BlockHeader *);

 inline EXTERN BlockHeader * BlockAdjust(BlockHeader * addr)
 {
-	return (BlockHeader *) ((BlockHeader *)(CharP(addr)+HDiff) );
+	return (BlockHeader *) ((BlockHeader *)(CharP(addr)+LOCAL_HDiff) );
 }


@@ -354,7 +354,7 @@ inline EXTERN yamop * PtoOpAdjust(yamop *);

 inline EXTERN yamop * PtoOpAdjust(yamop * ptr)
 {
-	return (yamop *) (((yamop *)(CharP(ptr) + HDiff)) );
+	return (yamop *) (((yamop *)(CharP(ptr) + LOCAL_HDiff)) );
 }


@@ -363,7 +363,7 @@ inline EXTERN CELL * PtoHeapCellAdjust(CELL *);

 inline EXTERN CELL * PtoHeapCellAdjust(CELL * ptr)
 {
-	return (CELL *) (((CELL *)(CharP(ptr) + HDiff)) );
+	return (CELL *) (((CELL *)(CharP(ptr) + LOCAL_HDiff)) );
 }


@@ -372,7 +372,7 @@ inline EXTERN PredEntry * PtoPredAdjust(PredEntry *);

 inline EXTERN PredEntry * PtoPredAdjust(PredEntry * ptr)
 {
-	return (PredEntry *) (((PredEntry *)(CharP(ptr) + HDiff)) );
+	return (PredEntry *) (((PredEntry *)(CharP(ptr) + LOCAL_HDiff)) );
 }


@@ -381,7 +381,7 @@ inline EXTERN ArrayEntry * PtoArrayEAdjust(ArrayEntry *);

 inline EXTERN ArrayEntry * PtoArrayEAdjust(ArrayEntry * ptr)
 {
-	return (ArrayEntry *) (((ArrayEntry *)(CharP(ptr) + HDiff)) );
+	return (ArrayEntry *) (((ArrayEntry *)(CharP(ptr) + LOCAL_HDiff)) );
 }


@@ -391,7 +391,7 @@ inline EXTERN AREG XAdjust(AREG);

 inline EXTERN AREG XAdjust(AREG reg)
 {
-	return (AREG) ((AREG)((reg)+XDiff) );
+	return (AREG) ((AREG)((reg)+LOCAL_XDiff) );
 }


@@ -421,7 +421,7 @@ inline EXTERN int IsOldLocal(CELL);

 inline EXTERN int IsOldLocal(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldASP, reg, OldLCL0));
+	return (int) (IN_BETWEEN(LOCAL_OldASP, reg, LOCAL_OldLCL0));
 }


@@ -432,7 +432,7 @@ inline EXTERN int IsOldLocalInTR(CELL);

 inline EXTERN int IsOldLocalInTR(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldH, reg, OldLCL0) );
+	return (int) (IN_BETWEEN(LOCAL_OldH, reg, LOCAL_OldLCL0) );
 }


@@ -441,7 +441,7 @@ inline EXTERN int IsOldLocalInTRPtr(CELL *);

 inline EXTERN int IsOldLocalInTRPtr(CELL * ptr)
 {
-	return (int) (IN_BETWEEN(OldH, ptr, OldLCL0) );
+	return (int) (IN_BETWEEN(LOCAL_OldH, ptr, LOCAL_OldLCL0) );
 }


@@ -451,7 +451,7 @@ inline EXTERN int IsOldH(CELL);

 inline EXTERN int IsOldH(CELL reg)
 {
-	return (int) (( CharP(reg) == CharP(OldH) ) );
+	return (int) (( CharP(reg) == CharP(LOCAL_OldH) ) );
 }


@@ -462,7 +462,7 @@ inline EXTERN int IsOldGlobal(CELL);

 inline EXTERN int IsOldGlobal(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldH0, reg, OldH) );
+	return (int) (IN_BETWEEN(LOCAL_OldH0, reg, LOCAL_OldH) );
 }


@@ -471,7 +471,7 @@ inline EXTERN int IsOldGlobalPtr(CELL *);

 inline EXTERN int IsOldGlobalPtr(CELL * ptr)
 {
-	return (int) (IN_BETWEEN( OldH0, ptr, OldH) );
+	return (int) (IN_BETWEEN( LOCAL_OldH0, ptr, LOCAL_OldH) );
 }


@@ -480,7 +480,7 @@ inline EXTERN int IsOldDelay(CELL);

 inline EXTERN int IsOldDelay(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldGlobalBase, reg, OldH0) );
+	return (int) (IN_BETWEEN(LOCAL_OldGlobalBase, reg, LOCAL_OldH0) );
 }


@@ -489,7 +489,7 @@ inline EXTERN int IsOldDelayPtr(CELL *);

 inline EXTERN int IsOldDelayPtr(CELL * ptr)
 {
-	return (int) (IN_BETWEEN( OldGlobalBase, ptr, OldH0) );
+	return (int) (IN_BETWEEN( LOCAL_OldGlobalBase, ptr, LOCAL_OldH0) );
 }


@@ -498,7 +498,7 @@ inline EXTERN int IsOldTrail(CELL);

 inline EXTERN int IsOldTrail(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldTrailBase, reg, OldTR) );
+	return (int) (IN_BETWEEN(LOCAL_OldTrailBase, reg, LOCAL_OldTR) );
 }


@@ -507,7 +507,7 @@ inline EXTERN int IsOldTrailPtr(CELL *);

 inline EXTERN int IsOldTrailPtr(CELL * ptr)
 {
-	return (int) (IN_BETWEEN(OldTrailBase, ptr, OldTR) );
+	return (int) (IN_BETWEEN(LOCAL_OldTrailBase, ptr, LOCAL_OldTR) );
 }


@@ -516,7 +516,7 @@ inline EXTERN int IsOldCode(CELL);

 inline EXTERN int IsOldCode(CELL reg)
 {
-	return (int) (IN_BETWEEN(OldHeapBase, reg, OldHeapTop) );
+	return (int) (IN_BETWEEN(LOCAL_OldHeapBase, reg, LOCAL_OldHeapTop) );
 }


@@ -525,7 +525,7 @@ inline EXTERN int IsOldCodeCellPtr(CELL *);

 inline EXTERN int IsOldCodeCellPtr(CELL * ptr)
 {
-	return (int) (IN_BETWEEN(OldHeapBase, ptr, OldHeapTop) );
+	return (int) (IN_BETWEEN(LOCAL_OldHeapBase, ptr, LOCAL_OldHeapTop) );
 }