Browse Source

Fix device memory allocation in 68hc11 simulator

binutils-2_11-branch
Stephane Carrez 26 years ago
parent
commit
6e73e7ed64
  1. 6
      sim/m68hc11/ChangeLog
  2. 2
      sim/m68hc11/dv-m68hc11eepr.c
  3. 6
      sim/m68hc11/dv-nvram.c

6
sim/m68hc11/ChangeLog

@ -1,3 +1,9 @@
2000-11-24 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* dv-m68hc11eepr.c (attach_m68hc11eepr_regs): Use hw_malloc.
* dv-nvram.c (attach_nvram_regs): Use hw_free and hw_malloc
instead of free and malloc.
2000-09-11 Stephane Carrez <Stephane.Carrez@worldnet.fr> 2000-09-11 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* Makefile.in: Was missing from initial patch. * Makefile.in: Was missing from initial patch.

2
sim/m68hc11/dv-m68hc11eepr.c

@ -218,7 +218,7 @@ attach_m68hc11eepr_regs (struct hw *me,
controller->attach_space = attach_space; controller->attach_space = attach_space;
controller->base_address = attach_address; controller->base_address = attach_address;
controller->eeprom = (char*) malloc (attach_size + 1); controller->eeprom = (char*) hw_malloc (me, attach_size + 1);
controller->eeprom_min_cycles = 10000; controller->eeprom_min_cycles = 10000;
controller->size = attach_size + 1; controller->size = attach_size + 1;
controller->mapped = 0; controller->mapped = 0;

6
sim/m68hc11/dv-nvram.c

@ -187,7 +187,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller)
case NVRAM_SAVE_MODIFIED: case NVRAM_SAVE_MODIFIED:
case NVRAM_SAVE_ALL: case NVRAM_SAVE_ALL:
controller->data = (char*) malloc (attach_size); controller->data = (char*) hw_malloc (me, attach_size);
if (controller->data == 0) if (controller->data == 0)
hw_abort (me, "Not enough memory, try to use the mode 'map'"); hw_abort (me, "Not enough memory, try to use the mode 'map'");
@ -204,7 +204,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller)
if (result != attach_size) if (result != attach_size)
{ {
oerrno = errno; oerrno = errno;
free (controller->data); hw_free (me, controller->data);
close (controller->fd); close (controller->fd);
errno = oerrno; errno = oerrno;
hw_abort (me, "Failed to save the ram content"); hw_abort (me, "Failed to save the ram content");
@ -216,7 +216,7 @@ attach_nvram_regs (struct hw *me, struct nvram *controller)
if (result != attach_size) if (result != attach_size)
{ {
oerrno = errno; oerrno = errno;
free (controller->data); hw_free (me, controller->data);
close (controller->fd); close (controller->fd);
errno = oerrno; errno = oerrno;
hw_abort (me, "Failed to load the ram content"); hw_abort (me, "Failed to load the ram content");

Loading…
Cancel
Save