Author: petdance
Date: Fri Jun 1 18:53:40 2007
New Revision: 18749
Modified:
trunk/src/gc/memory.c
trunk/src/gc/resources.c
trunk/src/gc/smallobject.c
trunk/src/headers.c
trunk/src/inter_create.c
trunk/src/objects.c
trunk/src/pic.c
Log:
Removed all the calls to SET_NULL and SET_NULL_P
Modified: trunk/src/gc/memory.c
==============================================================================
--- trunk/src/gc/memory.c (original)
+++ trunk/src/gc/memory.c Fri Jun 1 18:53:40 2007
@@ -186,7 +186,7 @@
mem_setup_allocator(Interp *interp)
{
interp->arena_base = mem_allocate_zeroed_typed(Arenas);
- SET_NULL(interp->arena_base->sized_header_pools);
+ interp->arena_base->sized_header_pools = NULL;
#if PARROT_GC_MS
Parrot_gc_ms_init(interp);
Modified: trunk/src/gc/resources.c
==============================================================================
--- trunk/src/gc/resources.c (original)
+++ trunk/src/gc/resources.c Fri Jun 1 18:53:40 2007
@@ -71,7 +71,7 @@
new_block->free = alloc_size;
new_block->size = alloc_size;
- SET_NULL(new_block->next);
+ new_block->next = NULL;
new_block->start = (char *)new_block + sizeof (Memory_Block);
new_block->top = new_block->start;
Modified: trunk/src/gc/smallobject.c
==============================================================================
--- trunk/src/gc/smallobject.c (original)
+++ trunk/src/gc/smallobject.c Fri Jun 1 18:53:40 2007
@@ -304,9 +304,9 @@
(Small_Object_Pool *)mem_internal_allocate_zeroed(
sizeof (Small_Object_Pool));
- SET_NULL(pool->last_Arena);
- SET_NULL(pool->free_list);
- SET_NULL(pool->mem_pool);
+ pool->last_Arena = NULL;
+ pool->free_list = NULL;
+ pool->mem_pool = NULL;
pool->object_size = object_size;
pool->objects_per_alloc = objects_per_alloc;
Modified: trunk/src/headers.c
==============================================================================
--- trunk/src/headers.c (original)
+++ trunk/src/headers.c Fri Jun 1 18:53:40 2007
@@ -349,7 +349,7 @@
? interp->arena_base->constant_string_header_pool
: interp->arena_base->string_header_pool);
PObj_get_FLAGS(string) |= flags | PObj_is_string_FLAG|PObj_is_COWable_FLAG;
- SET_NULL(string->strstart);
+ string->strstart = NULL;
return string;
}
Modified: trunk/src/inter_create.c
==============================================================================
--- trunk/src/inter_create.c (original)
+++ trunk/src/inter_create.c Fri Jun 1 18:53:40 2007
@@ -108,12 +108,12 @@
* the last interpreter (w/o) parent has to cleanup globals
* so remember parent if any
*/
- SET_NULL(interp->lo_var_ptr);
+ interp->lo_var_ptr = NULL;
if (parent) {
interp->parent_interpreter = parent;
}
else {
- SET_NULL(interp->parent_interpreter);
+ interp->parent_interpreter = NULL;
/*
* we need a global mutex to protect the interpreter array
*/
@@ -130,7 +130,7 @@
interp->flags = flags;
/* PANIC will fail until this is done */
- SET_NULL(interp->piodata);
+ interp->piodata = NULL;
PIO_init(interp);
if (is_env_var_set("PARROT_GC_DEBUG")) {
@@ -163,7 +163,7 @@
init_object_cache(interp);
/* initialize classes - this needs mmd func table */
- SET_NULL(interp->HLL_info);
+ interp->HLL_info = NULL;
Parrot_init(interp);
/* context data */
@@ -193,24 +193,24 @@
interp->dynamic_env = new_stack(interp, "DynamicEnv");
/* clear context introspection vars */
- SET_NULL_P(CONTEXT(interp->ctx)->current_sub, PMC*);
- SET_NULL_P(CONTEXT(interp->ctx)->current_cont, PMC*);
- SET_NULL_P(CONTEXT(interp->ctx)->current_object, PMC*);
+ CONTEXT(interp->ctx)->current_sub = NULL;
+ CONTEXT(interp->ctx)->current_cont = NULL;
+ CONTEXT(interp->ctx)->current_object = NULL;
/* Load the core op func and info tables */
interp->op_lib = PARROT_CORE_OPLIB_INIT(1);
interp->op_count = interp->op_lib->op_count;
interp->op_func_table = interp->op_lib->op_func_table;
interp->op_info_table = interp->op_lib->op_info_table;
- SET_NULL_P(interp->all_op_libs, op_lib_t **);
- SET_NULL_P(interp->evc_func_table, op_func_t *);
- SET_NULL_P(interp->save_func_table, op_func_t *);
+ interp->all_op_libs = NULL;
+ interp->evc_func_table = NULL;
+ interp->save_func_table = NULL;
- SET_NULL_P(interp->code, PackFile *);
- SET_NULL_P(interp->profile, ProfData *);
+ interp->code = NULL;
+ interp->profile = NULL;
/* null out the root set registry */
- SET_NULL_P(interp->DOD_registry, PMC *);
+ interp->DOD_registry = NULL;
/* create exceptions list */
interp->current_runloop_level = 0;
@@ -239,8 +239,8 @@
/* all sys running, init the event and signal stuff
* the first or "master" interpreter is handling events and signals
*/
- SET_NULL_P(interp->task_queue, QUEUE*);
- SET_NULL_P(interp->thread_data, _Thread_data *);
+ interp->task_queue = NULL;
+ interp->thread_data = NULL;
Parrot_init_events(interp);
Modified: trunk/src/objects.c
==============================================================================
--- trunk/src/objects.c (original)
+++ trunk/src/objects.c Fri Jun 1 18:53:40 2007
@@ -1236,7 +1236,7 @@
void
init_object_cache(Interp *interp) {
Caches * const mc = interp->caches = mem_allocate_zeroed_typed(Caches);
- SET_NULL(mc->idx);
+ mc->idx = NULL;
}
void
Modified: trunk/src/pic.c
==============================================================================
--- trunk/src/pic.c (original)
+++ trunk/src/pic.c Fri Jun 1 18:53:40 2007
@@ -138,7 +138,7 @@
size = n * sizeof (Parrot_MIC) + poly + sizeof (Parrot_PIC_store);
store = (Parrot_PIC_store *)mem_sys_allocate_zeroed(size);
- SET_NULL_P(store->prev, Parrot_PIC_store*);
+ store->prev = NULL;
cs->pic_store = store;
store->pic = (Parrot_PIC*)((char *)store + size);
