[m-rev.] diff: fix missing field prefixes for none grade

[Peter Ross]

Hi,


===================================================================


Estimated hours taken: 0.25
Branches: main

runtime/mercury_context.h:
runtime/mercury_engine.c:
    Add some missing prefixes to references to fields in the engine and
    context structures when not using the conservative gc.


Index: mercury_context.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_context.h,v
retrieving revision 1.17
diff -u -r1.17 mercury_context.h
--- mercury_context.h	2001/05/31 06:00:11	1.17
+++ mercury_context.h	2001/06/08 08:20:27
@@ -295,21 +295,21 @@
   ** furthest back that we can backtrack is the same as it was last time we
   ** were executing.
   */
-  #define MR_set_min_heap_reclamation_point(ctxt)		\
-	do {							\
-		if (MR_hp != (ctxt)->MR_ctxt_hp 		\
-			|| (ctxt)->MR_ctxt_hp == NULL)	{	\
-			MR_min_hp_rec = MR_hp;			\
-			(ctxt)->min_hp_rec = MR_hp;		\
-		} else {					\
-			MR_min_hp_rec =	(ctxt)->min_hp_rec;	\
-		}						\
+  #define MR_set_min_heap_reclamation_point(ctxt)			\
+	do {								\
+		if (MR_hp != (ctxt)->MR_ctxt_hp 			\
+			|| (ctxt)->MR_ctxt_hp == NULL)	{		\
+			MR_min_hp_rec = MR_hp;				\
+			(ctxt)->MR_ctxt_min_hp_rec = MR_hp;		\
+		} else {						\
+			MR_min_hp_rec =	(ctxt)->MR_ctxt_min_hp_rec;	\
+			}						\
 	} while (0)
 
   #define MR_save_hp_in_context(ctxt)				\
   	do {							\
 		(ctxt)->MR_ctxt_hp = MR_hp;			\
-		(ctxt)->min_hp_rec = MR_min_hp_rec;		\
+		(ctxt)->MR_ctxt_min_hp_rec = MR_min_hp_rec;	\
 	} while (0)
 
 #else
Index: mercury_engine.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_engine.c,v
retrieving revision 1.34
diff -u -r1.34 mercury_engine.c
--- mercury_engine.c	2001/05/31 06:00:13	1.34
+++ mercury_engine.c	2001/06/08 08:20:27
@@ -78,7 +78,7 @@
 	eng->MR_eng_heap_zone = MR_create_zone("heap", 1, MR_heap_size,
 			MR_next_offset(), MR_heap_zone_size,
 			MR_default_handler);
-	eng->MR_eng_hp = eng->heap_zone->min;
+	eng->MR_eng_hp = eng->MR_eng_heap_zone->min;
 
 #ifdef	NATIVE_GC
 	eng->MR_eng_heap_zone2 = MR_create_zone("heap2", 1, MR_heap_size,
@@ -95,12 +95,12 @@
 	eng->MR_eng_solutions_heap_zone = MR_create_zone("solutions_heap", 1,
 			MR_solutions_heap_size, MR_next_offset(),
 			MR_solutions_heap_zone_size, MR_default_handler);
-	eng->MR_eng_sol_hp = eng->solutions_heap_zone->min;
+	eng->MR_eng_sol_hp = eng->MR_eng_solutions_heap_zone->min;
 
 	eng->MR_eng_global_heap_zone = MR_create_zone("global_heap", 1,
 			MR_global_heap_size, MR_next_offset(),
 			MR_global_heap_zone_size, MR_default_handler);
-	eng->MR_eng_global_hp = eng->global_heap_zone->min;
+	eng->MR_eng_global_hp = eng->MR_eng_global_heap_zone->min;
 #endif
 
 #ifdef	MR_THREAD_SAFE

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------