* sim-core.c (sim_core_attach): Use xmalloc instead of zalloc.

	Use 0xa5 as initial value.
	(sim_core_map_detach): Use free instead of zfree.
Back out this change.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 18255bbbeab6d492f9b05057214f4d970445b088..1762b084a6c6f13ab2d784de0aae8fc2e586db54 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -9,10 +9,6 @@ Mon Mar  2 10:20:06 1998  Doug Evans  <devans@seba.cygnus.com>
        * Make-common.in (TAGS): Make smarter.
        * Makefile.in (TAGS): Ditto.
 
-       * sim-core.c (sim_core_attach): Use xmalloc instead of zalloc.
-       Use 0xa5 as initial value.
-       (sim_core_map_detach): Use free instead of zfree.
-
 Fri Feb 27 19:09:57 1998  Doug Evans  <devans@canuck.cygnus.com>
 
        * sim-module.c (*): Fix typos in assertion tests.

diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index d1f9de143589f9e3f3d1c48ae41f7702c21aaaef..f583c8e5ab24a9b0491e3285eff83ff7ccacde25 100644 (file)
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -22,7 +22,6 @@
 #ifndef _SIM_CORE_C_
 #define _SIM_CORE_C_
 
-#include "libiberty.h"
 #include "sim-main.h"
 #include "sim-assert.h"
 
@@ -341,10 +340,8 @@ sim_core_attach (SIM_DESC sd,
       if (optional_buffer == NULL)
        {
          int padding = (addr % sizeof (unsigned64));
-         unsigned int bytes = (modulo == 0 ? nr_bytes : modulo) + padding;
-         free_buffer = xmalloc (bytes);
-         /* #if WITH_DETERMINISTIC_SIMULATION? */
-         memset (free_buffer, 0xa5, bytes);
+         unsigned long bytes = (modulo == 0 ? nr_bytes : modulo) + padding;
+         free_buffer = zalloc (bytes);
          buffer = (char*) free_buffer + padding;
        }
       else
@@ -428,7 +425,7 @@ sim_core_map_detach (SIM_DESC sd,
          sim_core_mapping *dead = (*entry);
          (*entry) = dead->next;
          if (dead->free_buffer != NULL)
-           free (dead->free_buffer);
+           zfree (dead->free_buffer);
          zfree (dead);
          return;
        }