From 34010ba45a4d6c61004ff991dff151003847aea3 Mon Sep 17 00:00:00 2001 From: vsc Date: Mon, 24 Sep 2001 14:35:58 +0000 Subject: [PATCH] should be TrailTop, nao LCL0 git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@164 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- C/alloc.c | 6 +++++- C/heapgc.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/C/alloc.c b/C/alloc.c index 3b062b7b1..23ffa9be2 100644 --- a/C/alloc.c +++ b/C/alloc.c @@ -12,7 +12,7 @@ * Last rev: * * mods: * * comments: allocating space * -* version:$Id: alloc.c,v 1.8 2001-06-08 13:39:07 vsc Exp $ * +* version:$Id: alloc.c,v 1.9 2001-09-24 14:35:58 vsc Exp $ * *************************************************************************/ #ifdef SCCS static char SccsId[] = "%W% %G%"; @@ -852,6 +852,10 @@ ExtendWorkSpace(Int s) Error(SYSTEM_ERROR, TermNil, "could not expand contiguous stacks %d bytes", s); return(FALSE); } + if ((CELL)ptr & MBIT) { + Error(SYSTEM_ERROR, TermNil, "memory at %p conflicts with MBIT %lx", ptr, NMBIT); + return(FALSE); + } return TRUE; } diff --git a/C/heapgc.c b/C/heapgc.c index 5b12b69a0..53cd15f0d 100644 --- a/C/heapgc.c +++ b/C/heapgc.c @@ -2608,7 +2608,7 @@ do_gc(Int predarity, CELL *current_env, yamop *nextop) if ((CELL)TrailTop & (MBIT|RBIT)) { /* oops, we can't */ if (gc_verbose) { - YP_fprintf(YP_stderr, "[GC] LCLO at %p clashes with gc bits: %lx\n", LCL0, (MBIT|RBIT)); + YP_fprintf(YP_stderr, "[GC] TrailTop at %p clashes with gc bits: %lx\n", TrailTop, (MBIT|RBIT)); YP_fprintf(YP_stderr, "[GC] garbage collection disallowed\n"); } return(0);