diff options
author | 2010-01-08 06:05:29 +0000 | |
---|---|---|
committer | 2010-01-08 06:05:29 +0000 | |
commit | 91a1b8d634131714ec89a07496606880ea487ece (patch) | |
tree | be1623ecd9688f97d426efe03688289e4a25f6b5 /src/emu/debug/debugcmd.c | |
parent | 26ef6355153f38264122c168438d09d1811b9530 (diff) |
NOTE: This change requires two new osd functions: osd_malloc() and
osd_free(). They take the same parameters as malloc() and free().
Renamed mamecore.h -> emucore.h.
New C++-aware memory manager, implemented in emualloc.*. This is a
simple manager that allows you to add any type of object to a
resource pool. Most commonly, allocated objects are added, and so
a set of allocation macros is provided to allow you to manage
objects in a particular pool:
pool_alloc(p, t) = allocate object of type 't' and add to pool 'p'
pool_alloc_clear(p, t) = same as above, but clear the memory first
pool_alloc_array(p, t, c) = allocate an array of 'c' objects of type
't' and add to pool 'p'
pool_alloc_array_clear(p, t, c) = same, but with clearing
pool_free(p, v) = free object 'v' and remove it from the pool
Note that pool_alloc[_clear] is roughly equivalent to "new t" and
pool_alloc_array[_clear] is roughly equivalent to "new t[c]". Also
note that pool_free works for single objects and arrays.
There is a single global_resource_pool defined which should be used
for any global allocations. It has equivalent macros to the pool_*
macros above that automatically target the global pool.
In addition, the memory module defines global new/delete overrides
that access file and line number parameters so that allocations can
be tracked. Currently this tracking is only done if MAME_DEBUG is
enabled. In debug builds, any unfreed memory will be printed at
the end of the session.
emualloc.h also has #defines to disable malloc/free/realloc/calloc.
Since emualloc.h is included by emucore.h, this means pretty much
all code within the emulator is forced to use the new allocators.
Although straight new/delete do work, their use is discouraged, as
any allocations made with them will not be tracked.
Changed the familar auto_alloc_* macros to map to the resource pool
model described above. The running_machine is now a class and contains
a resource pool which is automatically destructed upon deletion. If
you are a driver writer, all your allocations should be done with
auto_alloc_*.
Changed all drivers and files in the core using malloc/realloc or the
old alloc_*_or_die macros to use (preferably) the auto_alloc_* macros
instead, or the global_alloc_* macros if necessary.
Added simple C++ wrappers for astring and bitmap_t, as these need
proper constructors/destructors to be used for auto_alloc_astring and
auto_alloc_bitmap.
Removed references to the winalloc prefix file. Most of its
functionality has moved into the core, save for the guard page
allocations, which are now implemented in osd_alloc and osd_free.
Diffstat (limited to 'src/emu/debug/debugcmd.c')
-rw-r--r-- | src/emu/debug/debugcmd.c | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index bc661c1a10e..56dd599d1f0 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -396,7 +396,7 @@ static void debug_command_exit(running_machine *machine) debug_cpu_trace(cpu, NULL, 0, NULL); if (cheat.length) - free(cheat.cheatmap); + auto_free(machine, cheat.cheatmap); } @@ -1831,13 +1831,8 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con { /* initialize new cheat system */ if (cheat.cheatmap != NULL) - free(cheat.cheatmap); - cheat.cheatmap = (cheat_map *)malloc(real_length * sizeof(cheat_map)); - if (cheat.cheatmap == NULL) - { - debug_console_printf(machine, "Unable of allocate the necessary memory\n"); - return; - } + auto_free(machine, cheat.cheatmap); + cheat.cheatmap = auto_alloc_array(machine, cheat_map, real_length); cheat.length = real_length; cheat.undo = 0; @@ -1846,8 +1841,6 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con else { /* add range to cheat system */ - cheat_map * cheatmap_bak = cheat.cheatmap; - if (cheat.cpu == 0) { debug_console_printf(machine, "Use cheatinit before cheatrange\n"); @@ -1857,13 +1850,11 @@ static void execute_cheatinit(running_machine *machine, int ref, int params, con if (!debug_command_parameter_cpu_space(machine, &cheat.cpu, ADDRESS_SPACE_PROGRAM, &space)) return; - cheat.cheatmap = (cheat_map *)realloc(cheat.cheatmap, (cheat.length + real_length) * sizeof(cheat_map)); - if (cheat.cheatmap == NULL) - { - cheat.cheatmap = cheatmap_bak; - debug_console_printf(machine, "Unable of allocate the necessary memory\n"); - return; - } + cheat_map *newmap = auto_alloc_array(machine, cheat_map, cheat.length + real_length); + for (int item = 0; item < cheat.length; item++) + newmap[item] = cheat.cheatmap[item]; + auto_free(machine, cheat.cheatmap); + cheat.cheatmap = newmap; active_cheat = cheat.length; cheat.length += real_length; |