mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-12 18:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add nasm_zalloc() to nasmlib.c

Browse Source 
Add nasm_zalloc(), a wrapper around calloc(), to allocate
zero-initialized memory.  For large allocations, this is often far
more efficient than allocating and zeroing, since the operating system
tends to keep a pool of zero pages around.
This commit is contained in:
H. Peter Anvin 2007-09-25 14:27:34 -07:00
parent 3e1aaa9dd0
commit cfdf646e9a
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hashtbl.c
View File

@ -15,9 +15,7 @@
static struct hash_tbl_node *alloc_table(size_t newsize)
{
size_t bytes = newsize*sizeof(struct hash_tbl_node);
struct hash_tbl_node *newtbl = nasm_malloc(bytes);
memset(newtbl, 0, bytes);
struct hash_tbl_node *newtbl = nasm_zalloc(bytes);
return newtbl;
}

31
nasmlib.c
View File

@ -45,7 +45,24 @@ void *nasm_malloc(size_t size)
#ifdef LOGALLOC
else
fprintf(logfp, "%s %d malloc(%ld) returns %p\n",
file, line, (int32_t)size, p);
file, line, (long)size, p);
#endif
return p;
}
#ifdef LOGALLOC
void *nasm_zalloc_log(char *file, int line, size_t size)
#else
void *nasm_zalloc(size_t size)
#endif
{
void *p = calloc(size, 1);
if (!p)
nasm_malloc_error(ERR_FATAL | ERR_NOFILE, "out of memory");
#ifdef LOGALLOC
else
fprintf(logfp, "%s %d calloc(%ld, 1) returns %p\n",
file, line, (long)size, p);
#endif
return p;
}
@ -62,10 +79,10 @@ void *nasm_realloc(void *q, size_t size)
#ifdef LOGALLOC
else if (q)
fprintf(logfp, "%s %d realloc(%p,%ld) returns %p\n",
file, line, q, (int32_t)size, p);
file, line, q, (long)size, p);
else
fprintf(logfp, "%s %d malloc(%ld) returns %p\n",
file, line, (int32_t)size, p);
file, line, (long)size, p);
#endif
return p;
}
@ -99,7 +116,7 @@ char *nasm_strdup(const char *s)
#ifdef LOGALLOC
else
fprintf(logfp, "%s %d strdup(%ld) returns %p\n",
file, line, (int32_t)size, p);
file, line, (long)size, p);
#endif
strcpy(p, s);
return p;
@ -120,7 +137,7 @@ char *nasm_strndup(char *s, size_t len)
#ifdef LOGALLOC
else
fprintf(logfp, "%s %d strndup(%ld) returns %p\n",
file, line, (int32_t)size, p);
file, line, (long)size, p);
#endif
strncpy(p, s, len);
p[len] = '\0';
@ -377,9 +394,7 @@ static struct RAA *real_raa_init(int layers)
int i;
if (layers == 0) {
r = nasm_malloc(LEAFSIZ);
r->layers = 0;
memset(r->u.l.data, 0, sizeof(r->u.l.data));
r = nasm_zalloc(LEAFSIZ);
r->stepsize = 1L;
} else {
r = nasm_malloc(BRANCHSIZ);

3
nasmlib.h
View File

@ -74,17 +74,20 @@ typedef void (*efunc) (int severity, const char *fmt, ...);
void nasm_set_malloc_error(efunc);
#ifndef LOGALLOC
void *nasm_malloc(size_t);
void *nasm_zalloc(size_t);
void *nasm_realloc(void *, size_t);
void nasm_free(void *);
char *nasm_strdup(const char *);
char *nasm_strndup(char *, size_t);
#else
void *nasm_malloc_log(char *, int, size_t);
void *nasm_zalloc_log(char *, int, size_t);
void *nasm_realloc_log(char *, int, void *, size_t);
void nasm_free_log(char *, int, void *);
char *nasm_strdup_log(char *, int, const char *);
char *nasm_strndup_log(char *, int, char *, size_t);
#define nasm_malloc(x) nasm_malloc_log(__FILE__,__LINE__,x)
#define nasm_zalloc(x) nasm_malloc_log(__FILE__,__LINE__,x)
#define nasm_realloc(x,y) nasm_realloc_log(__FILE__,__LINE__,x,y)
#define nasm_free(x) nasm_free_log(__FILE__,__LINE__,x)
#define nasm_strdup(x) nasm_strdup_log(__FILE__,__LINE__,x)