AuxSp and friends are not bound to GlobalBase when using SYSTEM_MALLOC
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@968 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
parent
1079391767
commit
a5b6a22f27
2
C/grow.c
2
C/grow.c
@ -120,8 +120,10 @@ SetHeapRegs(void)
|
|||||||
Yap_TrailTop = TrailAddrAdjust(Yap_TrailTop);
|
Yap_TrailTop = TrailAddrAdjust(Yap_TrailTop);
|
||||||
Yap_GlobalBase = DelayAddrAdjust(Yap_GlobalBase);
|
Yap_GlobalBase = DelayAddrAdjust(Yap_GlobalBase);
|
||||||
Yap_LocalBase = LocalAddrAdjust(Yap_LocalBase);
|
Yap_LocalBase = LocalAddrAdjust(Yap_LocalBase);
|
||||||
|
#if !USE_SYSTEM_MALLOC
|
||||||
AuxSp = PtoDelayAdjust(AuxSp);
|
AuxSp = PtoDelayAdjust(AuxSp);
|
||||||
AuxTop = (ADDR)PtoDelayAdjust((CELL *)AuxTop);
|
AuxTop = (ADDR)PtoDelayAdjust((CELL *)AuxTop);
|
||||||
|
#endif
|
||||||
HeapLim = DelayAddrAdjust(HeapLim);
|
HeapLim = DelayAddrAdjust(HeapLim);
|
||||||
/* The registers pointing to one of the stacks */
|
/* The registers pointing to one of the stacks */
|
||||||
ENV = PtoLocAdjust(ENV);
|
ENV = PtoLocAdjust(ENV);
|
||||||
|
@ -848,7 +848,6 @@ break :- get_value('$break',BL), NBL is BL+1,
|
|||||||
'$consult'(X),
|
'$consult'(X),
|
||||||
'$change_module'(M0).
|
'$change_module'(M0).
|
||||||
'$consult'(X) :-
|
'$consult'(X) :-
|
||||||
'$lock_system',
|
|
||||||
'$find_in_path'(X,Y,consult(X)),
|
'$find_in_path'(X,Y,consult(X)),
|
||||||
'$open'(Y,'$csult',Stream,0), !,
|
'$open'(Y,'$csult',Stream,0), !,
|
||||||
'$current_module'(OldModule),
|
'$current_module'(OldModule),
|
||||||
@ -875,7 +874,6 @@ break :- get_value('$break',BL), NBL is BL+1,
|
|||||||
get_value('$consulting',Old),
|
get_value('$consulting',Old),
|
||||||
set_value('$consulting',true),
|
set_value('$consulting',true),
|
||||||
recorda('$initialisation','$',_),
|
recorda('$initialisation','$',_),
|
||||||
'$unlock_system',
|
|
||||||
( '$undefined'('$print_message'(_,_),prolog) ->
|
( '$undefined'('$print_message'(_,_),prolog) ->
|
||||||
( get_value('$verbose',on) ->
|
( get_value('$verbose',on) ->
|
||||||
'$format'(user_error, "~*|[ consulting ~w... ]~n", [LC,F])
|
'$format'(user_error, "~*|[ consulting ~w... ]~n", [LC,F])
|
||||||
|
Reference in New Issue
Block a user