[m-rev.] trivial diff: s/memset/MR_memset/ etc

[Julien Fischer]

Estimated hours taken: 0
Branches: main

library/benchmarking.m:
runtime/mercury_accurate_gc.c:
runtime/mercury_engine.c:
runtime/mercury_make_type_info_body.h:
runtime/mercury_memory_zones.h:
trace/mercury_event_spec.c:
 	s/memset/MR_memset/
 	s/memcpy/MR_memcpy/

Julien.

Index: library/benchmarking.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/library/benchmarking.m,v
retrieving revision 1.73
diff -u -r1.73 benchmarking.m
--- library/benchmarking.m	2 Oct 2006 01:41:18 -0000	1.73
+++ library/benchmarking.m	1 Dec 2006 04:39:19 -0000
@@ -508,7 +508,7 @@
  #else
          memmove(&table[slot + 1], &table[slot],
              (table_size - slot - 1) * sizeof(*table));
-        memcpy(&table[slot], new_entry, sizeof(*table));
+        MR_memcpy(&table[slot], new_entry, sizeof(*table));
  #endif

          if (next_slot < table_size) {
Index: runtime/mercury_accurate_gc.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_accurate_gc.c,v
retrieving revision 1.43
diff -u -r1.43 mercury_accurate_gc.c
--- runtime/mercury_accurate_gc.c	29 Nov 2006 05:18:19 -0000	1.43
+++ runtime/mercury_accurate_gc.c	1 Dec 2006 04:32:44 -0000
@@ -990,7 +990,7 @@
              MR_realloc(MR_has_forwarding_pointer, num_bytes_for_bitmap);
          prev_num_bytes_for_bitmap = num_bytes_for_bitmap;
      }
-    memset(MR_has_forwarding_pointer, 0, num_bytes_for_bitmap);
+    MR_memset(MR_has_forwarding_pointer, 0, num_bytes_for_bitmap);
  }

  /*
Index: runtime/mercury_engine.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_engine.c,v
retrieving revision 1.53
diff -u -r1.53 mercury_engine.c
--- runtime/mercury_engine.c	1 Nov 2006 02:31:13 -0000	1.53
+++ runtime/mercury_engine.c	1 Dec 2006 04:32:54 -0000
@@ -435,7 +435,7 @@
      MR_global_pointer = locals;

  #ifdef MR_LOWLEVEL_DEBUG
-    memset((void *)locals, MAGIC_MARKER, LOCALS_SIZE);
+    MR_memset((void *)locals, MAGIC_MARKER, LOCALS_SIZE);
  #endif
      MR_debugmsg1("in `call_engine_inner', locals at %p\n", (void *)locals);

Index: runtime/mercury_make_type_info_body.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_make_type_info_body.h,v
retrieving revision 1.14
diff -u -r1.14 mercury_make_type_info_body.h
--- runtime/mercury_make_type_info_body.h	27 Sep 2005 06:20:51 -0000	1.14
+++ runtime/mercury_make_type_info_body.h	1 Dec 2006 04:36:02 -0000
@@ -131,7 +131,7 @@
                  ALLOCATE_WORDS(type_info_arena_word,
                      arity + start_region_size);
                  type_info_arena = (MR_Word *) type_info_arena_word;
-                memcpy(type_info_arena, (MR_Word *) pseudo_type_info,
+                MR_memcpy(type_info_arena, (MR_Word *) pseudo_type_info,
                      (arity + start_region_size) * sizeof(MR_Word));
              }

Index: runtime/mercury_memory_zones.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_memory_zones.h,v
retrieving revision 1.18
diff -u -r1.18 mercury_memory_zones.h
--- runtime/mercury_memory_zones.h	1 Nov 2006 02:31:14 -0000	1.18
+++ runtime/mercury_memory_zones.h	1 Dec 2006 04:35:16 -0000
@@ -146,7 +146,7 @@
  ** memory retention due to false hits in the conservative garbage collector.
  */
  #define MR_clear_zone_for_GC(zone, start_address) \
-	((void) memset((start_address), 0, \
+	((void) MR_memset((start_address), 0, \
  		(char*)((zone)->MR_zone_end) - (char *)(start_address)))

  /*
Index: runtime/mercury_wrapper.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_wrapper.c,v
retrieving revision 1.173
diff -u -r1.173 mercury_wrapper.c
--- runtime/mercury_wrapper.c	29 Nov 2006 05:18:27 -0000	1.173
+++ runtime/mercury_wrapper.c	1 Dec 2006 04:35:27 -0000
@@ -2071,7 +2071,7 @@
      */

      MR_global_pointer_2 = safety_buffer;    /* defeat optimization */
-    memset(safety_buffer, MAGIC_MARKER_2, SAFETY_BUFFER_SIZE);
+    MR_memset(safety_buffer, MAGIC_MARKER_2, SAFETY_BUFFER_SIZE);
  #endif

  #ifdef MR_LOWLEVEL_DEBUG
Index: trace/mercury_event_spec.c
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/trace/mercury_event_spec.c,v
retrieving revision 1.1
diff -u -r1.1 mercury_event_spec.c
--- trace/mercury_event_spec.c	24 Nov 2006 03:48:26 -0000	1.1
+++ trace/mercury_event_spec.c	1 Dec 2006 04:39:45 -0000
@@ -60,7 +60,7 @@
          num_copied = MR_event_spec_char_max - MR_event_spec_char_next;
      }

-    memcpy(buf, MR_event_spec_chars + MR_event_spec_char_next, num_copied);
+    MR_memcpy(buf, MR_event_spec_chars + MR_event_spec_char_next, num_copied);
      MR_event_spec_char_next += num_copied;

  #if 0

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------