From d79fe0d64301cbe37e2ad0e25a051f8607f08807 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 14 Feb 2011 05:14:28 +0000 Subject: sim: punt zfree() The sim keeps track of which allocations are zero-ed internally (via zalloc) and then calls a helper "zfree" function rather than "free". But this "zfree" function simply calls "free" itself. Since I can see no point in this and it is simply useless overhead, punt it. The only real change is in hw-alloc.c where we remove the zalloc_p tracking, and sim-utils.c where zfree is delete. The rest of the changes are a simple `sed` from "zfree" to "free". Signed-off-by: Mike Frysinger --- sim/common/hw-alloc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'sim/common/hw-alloc.c') diff --git a/sim/common/hw-alloc.c b/sim/common/hw-alloc.c index cb9a52fb703..7244baa4dfb 100644 --- a/sim/common/hw-alloc.c +++ b/sim/common/hw-alloc.c @@ -29,7 +29,6 @@ along with this program. If not, see . */ struct hw_alloc_data { void *alloc; - int zalloc_p; struct hw_alloc_data *next; }; @@ -55,7 +54,6 @@ hw_zalloc (struct hw *me, unsigned long size) { struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data); memory->alloc = zalloc (size); - memory->zalloc_p = 1; memory->next = me->alloc_of_hw; me->alloc_of_hw = memory; return memory->alloc; @@ -66,7 +64,6 @@ hw_malloc (struct hw *me, unsigned long size) { struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data); memory->alloc = zalloc (size); - memory->zalloc_p = 0; memory->next = me->alloc_of_hw; me->alloc_of_hw = memory; return memory->alloc; @@ -85,11 +82,8 @@ hw_free (struct hw *me, { struct hw_alloc_data *die = (*memory); (*memory) = die->next; - if (die->zalloc_p) - zfree (die->alloc); - else - free (die->alloc); - zfree (die); + free (die->alloc); + free (die); return; } } -- cgit v1.2.1