[m-rev.] diff: add misssing MR_zone prefixes

Julien Fischer juliensf at cs.mu.OZ.AU
Thu Dec 15 21:37:12 AEDT 2005


Estimated hours taken: 0.1
Branches: main

runtime/mercury_memory_handlers.c:
	Add missing `MR_zone' prefixes to some field names.

Julien.

Index: mercury_memory_handlers.c
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_memory_handlers.c,v
retrieving revision 1.29
diff -u -r1.29 mercury_memory_handlers.c
--- mercury_memory_handlers.c	13 Sep 2005 08:25:38 -0000	1.29
+++ mercury_memory_handlers.c	15 Dec 2005 10:27:49 -0000
@@ -709,33 +709,33 @@
                 fprintf(stderr,
                         "\n***    Checking zone %s#%d: "
                         "0x%08lx - 0x%08lx - 0x%08lx",
-                        zone->name, zone->id,
-                        (unsigned long) zone->bottom,
-                        (unsigned long) zone->redzone,
-                        (unsigned long) zone->top);
+                        zone->MR_zone_name, zone->MR_zone_id,
+                        (unsigned long) zone->MR_zone_bottom,
+                        (unsigned long) zone->MR_zone_redzone,
+                        (unsigned long) zone->MR_zone_top);

-                if ((zone->redzone <= address) &&
-                        (address <= zone->top))
+                if ((zone->MR_zone_redzone <= address) &&
+                        (address <= zone->MR_zone_top))
                 {
                     fprintf(stderr,
                         "\n***     Address is within"
                         " redzone of "
                         "%s#%d (!!zone overflowed!!)\n",
-                        zone->name, zone->id);
-                } else if ((zone->bottom <= address) &&
-                        (address <= zone->top))
+                        zone->MR_zone_name, zone->MR_zone_id);
+                } else if ((zone->MR_zone_bottom <= address) &&
+                        (address <= zone->MR_zone_top))
                 {
                     fprintf(stderr, "\n***     Address is"
                             " within zone %s#%d\n",
-                            zone->name, zone->id);
+                            zone->MR_zone_name, zone->MR_zone_id);
                 }
                 /*
                 ** Don't need to call handler, because it
                 ** has much less information than we do.
                 */
-                /* return zone->handler(fault_addr,
+                /* return zone->MR_zone_handler(fault_addr,
                         zone, rec); */
-                zone = zone->next;
+                zone = zone->MR_zone_next;
             }
         }
         return;

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list