|
|
Author: Whiteknight
Date: Wed Jul 30 17:58:29 2008
New Revision: 29895
Modified:
branches/gsoc_pdd09/compilers/imcc/cfg.c
branches/gsoc_pdd09/compilers/imcc/cfg.h
branches/gsoc_pdd09/compilers/imcc/instructions.h
branches/gsoc_pdd09/compilers/imcc/symreg.h
branches/gsoc_pdd09/include/parrot/dod.h
branches/gsoc_pdd09/src/gc/gc_it.c
branches/gsoc_pdd09/src/hash.c
Log:
[gsoc_pdd09] fix all my function prototypes with make headerizer
Modified: branches/gsoc_pdd09/compilers/imcc/cfg.c
==============================================================================
--- branches/gsoc_pdd09/compilers/imcc/cfg.c (original)
+++ branches/gsoc_pdd09/compilers/imcc/cfg.c Wed Jul 30 17:58:29 2008
@@ -88,7 +88,7 @@
PARROT_WARN_UNUSED_RESULT
static int check_invoke_type(PARROT_INTERP,
- ARGIN(const IMC_Unit * unit),
+ ARGIN(const IMC_Unit *unit),
ARGIN(const Instruction *ins))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
@@ -118,11 +118,11 @@
PARROT_WARN_UNUSED_RESULT
static Basic_block* make_basic_block(
ARGMOD(IMC_Unit *unit),
- ARGMOD(Instruction* ins))
+ ARGMOD(Instruction *ins))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit)
- FUNC_MODIFIES(* ins);
+ FUNC_MODIFIES(*ins);
static void mark_loop(PARROT_INTERP,
ARGMOD(IMC_Unit *unit),
@@ -134,7 +134,7 @@
static void propagate_need(
ARGMOD(Basic_block *bb),
- ARGIN(const SymReg* r),
+ ARGIN(const SymReg *r),
int i)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
Modified: branches/gsoc_pdd09/compilers/imcc/cfg.h
==============================================================================
--- branches/gsoc_pdd09/compilers/imcc/cfg.h (original)
+++ branches/gsoc_pdd09/compilers/imcc/cfg.h Wed Jul 30 17:58:29 2008
@@ -59,48 +59,45 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-void build_cfg(PARROT_INTERP, ARGMOD(struct _IMC_Unit *unit))
+void build_cfg(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
-void clear_basic_blocks(ARGMOD(struct _IMC_Unit *unit))
+void clear_basic_blocks(ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
FUNC_MODIFIES(*unit);
-void compute_dominance_frontiers(PARROT_INTERP,
- ARGMOD(struct _IMC_Unit *unit))
+void compute_dominance_frontiers(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
-void compute_dominators(PARROT_INTERP, ARGMOD(struct _IMC_Unit *unit))
+void compute_dominators(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
PARROT_WARN_UNUSED_RESULT
-int edge_count(ARGIN(const struct _IMC_Unit *unit))
+int edge_count(ARGIN(const IMC_Unit *unit))
__attribute__nonnull__(1);
-void find_basic_blocks(PARROT_INTERP,
- ARGMOD(struct _IMC_Unit *unit),
- int first)
+void find_basic_blocks(PARROT_INTERP, ARGMOD(IMC_Unit *unit), int first)
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
-void find_loops(PARROT_INTERP, ARGMOD(struct _IMC_Unit *unit))
+void find_loops(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
-void free_life_info(ARGIN(const struct _IMC_Unit *unit), ARGMOD(SymReg *r))
+void free_life_info(ARGIN(const IMC_Unit *unit), ARGMOD(SymReg *r))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*r);
-void life_analysis(PARROT_INTERP, ARGIN(const struct _IMC_Unit *unit))
+void life_analysis(PARROT_INTERP, ARGIN(const IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -112,17 +109,17 @@
PARROT_WARN_UNUSED_RESULT
int natural_preheader(
- ARGIN(const struct _IMC_Unit *unit),
+ ARGIN(const IMC_Unit *unit),
ARGIN(const Loop_info* loop_info))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
void search_predecessors_not_in(
ARGIN(const Basic_block *node),
- ARGMOD(Set* s))
+ ARGMOD(Set *s))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
- FUNC_MODIFIES(* s);
+ FUNC_MODIFIES(*s);
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: compilers/imcc/cfg.c */
Modified: branches/gsoc_pdd09/compilers/imcc/instructions.h
==============================================================================
--- branches/gsoc_pdd09/compilers/imcc/instructions.h (original)
+++ branches/gsoc_pdd09/compilers/imcc/instructions.h Wed Jul 30 17:58:29 2008
@@ -103,7 +103,7 @@
PARROT_API
int emit_flush(PARROT_INTERP,
ARGIN_NULLOK(void *param),
- ARGIN(struct _IMC_Unit *unit))
+ ARGIN(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(3);
@@ -113,9 +113,7 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-Instruction * _delete_ins(
- ARGMOD(struct _IMC_Unit *unit),
- ARGIN(Instruction *ins))
+Instruction * _delete_ins(ARGMOD(IMC_Unit *unit), ARGIN(Instruction *ins))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
@@ -134,9 +132,7 @@
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
-Instruction * delete_ins(
- ARGMOD(struct _IMC_Unit *unit),
- ARGMOD(Instruction *ins))
+Instruction * delete_ins(ARGMOD(IMC_Unit *unit), ARGMOD(Instruction *ins))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit)
@@ -144,7 +140,7 @@
PARROT_CAN_RETURN_NULL
Instruction * emitb(PARROT_INTERP,
- ARGMOD_NULLOK(struct _IMC_Unit *unit),
+ ARGMOD_NULLOK(IMC_Unit *unit),
ARGIN_NULLOK(Instruction *i))
__attribute__nonnull__(1);
@@ -175,7 +171,7 @@
__attribute__nonnull__(1);
void insert_ins(
- ARGMOD(struct _IMC_Unit *unit),
+ ARGMOD(IMC_Unit *unit),
ARGMOD_NULLOK(Instruction *ins),
ARGMOD(Instruction *tmp))
__attribute__nonnull__(1)
@@ -195,7 +191,7 @@
PARROT_CAN_RETURN_NULL
Instruction * move_ins(
- ARGMOD(struct _IMC_Unit *unit),
+ ARGMOD(IMC_Unit *unit),
ARGMOD(Instruction *ins),
ARGMOD(Instruction *to))
__attribute__nonnull__(1)
@@ -206,7 +202,7 @@
FUNC_MODIFIES(*to);
void prepend_ins(
- ARGMOD(struct _IMC_Unit *unit),
+ ARGMOD(IMC_Unit *unit),
ARGMOD_NULLOK(Instruction *ins),
ARGMOD(Instruction *tmp))
__attribute__nonnull__(1)
@@ -215,7 +211,7 @@
FUNC_MODIFIES(*tmp);
void subst_ins(
- ARGMOD(struct _IMC_Unit *unit),
+ ARGMOD(IMC_Unit *unit),
ARGMOD(Instruction *ins),
ARGMOD(Instruction *tmp),
int needs_freeing)
Modified: branches/gsoc_pdd09/compilers/imcc/symreg.h
==============================================================================
--- branches/gsoc_pdd09/compilers/imcc/symreg.h (original)
+++ branches/gsoc_pdd09/compilers/imcc/symreg.h Wed Jul 30 17:58:29 2008
@@ -157,7 +157,7 @@
FUNC_MODIFIES(*hsh)
FUNC_MODIFIES(*r);
-void add_namespace(PARROT_INTERP, ARGMOD(struct _IMC_Unit *unit))
+void add_namespace(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
@@ -191,7 +191,7 @@
void clear_globals(PARROT_INTERP)
__attribute__nonnull__(1);
-void clear_locals(ARGIN_NULLOK(struct _IMC_Unit *unit));
+void clear_locals(ARGIN_NULLOK(IMC_Unit *unit));
void clear_sym_hash(ARGMOD(SymHash *hsh))
__attribute__nonnull__(1)
FUNC_MODIFIES(*hsh);
Modified: branches/gsoc_pdd09/include/parrot/dod.h
==============================================================================
--- branches/gsoc_pdd09/include/parrot/dod.h (original)
+++ branches/gsoc_pdd09/include/parrot/dod.h Wed Jul 30 17:58:29 2008
@@ -278,57 +278,24 @@
__attribute__nonnull__(1);
PARROT_WARN_UNUSED_RESULT
+PARROT_INLINE
UINTVAL gc_it_get_card_mark(ARGMOD(Gc_it_hdr *hdr))
__attribute__nonnull__(1)
FUNC_MODIFIES(*hdr);
-PARROT_INLINE
-PARROT_WARN_UNUSED_RESULT
-UINTVAL gc_it_get_card_mark_index(ARGIN(Gc_it_card * card), UINTVAL index)
- __attribute__nonnull__(1);
-
void gc_it_mark_threaded(SHIM_INTERP);
UINTVAL gc_it_ptr_get_aggregate(ARGIN(void * const ptr))
__attribute__nonnull__(1);
-int gc_it_ptr_is_any_pmc(PARROT_INTERP, ARGIN(void *ptr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-int gc_it_ptr_is_const_pmc(PARROT_INTERP, ARGIN(void *ptr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-int gc_it_ptr_is_pmc(PARROT_INTERP, ARGIN(void *ptr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-int gc_it_ptr_is_pmc_ext(PARROT_INTERP, ARGIN(void *ptr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-PARROT_CANNOT_RETURN_NULL
-Small_Object_Pool * gc_it_ptr_is_sized_buffer(PARROT_INTERP,
- ARGIN(void *ptr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
void gc_it_ptr_set_aggregate(ARGMOD(void *ptr), unsigned char flag)
__attribute__nonnull__(1)
FUNC_MODIFIES(*ptr);
+PARROT_INLINE
void gc_it_set_card_mark(ARGMOD(Gc_it_hdr *hdr), UINTVAL flag)
__attribute__nonnull__(1)
FUNC_MODIFIES(*hdr);
-PARROT_INLINE
-void gc_it_set_card_mark_index(
- ARGMOD(Gc_it_card * card),
- UINTVAL index,
- UINTVAL flag)
- __attribute__nonnull__(1)
- FUNC_MODIFIES(* card);
-
void gc_it_trace_normal(PARROT_INTERP)
__attribute__nonnull__(1);
Modified: branches/gsoc_pdd09/src/gc/gc_it.c
==============================================================================
--- branches/gsoc_pdd09/src/gc/gc_it.c (original)
+++ branches/gsoc_pdd09/src/gc/gc_it.c Wed Jul 30 17:58:29 2008
@@ -53,10 +53,6 @@
FUNC_MODIFIES(*pool)
FUNC_MODIFIES(*new_arena);
-static void gc_it_clear_gc_lists(ARGMOD(Gc_it_data * gc_priv_data))
- __attribute__nonnull__(1)
- FUNC_MODIFIES(* gc_priv_data);
-
PARROT_INLINE
static void gc_it_enqueue_all_roots(PARROT_INTERP)
__attribute__nonnull__(1);
@@ -85,27 +81,6 @@
FUNC_MODIFIES(*gc_priv_data)
FUNC_MODIFIES(*pool);
-static int gc_it_hdr_is_any_pmc(PARROT_INTERP, ARGIN(Gc_it_hdr *hdr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-static int gc_it_hdr_is_const_pmc(PARROT_INTERP, ARGIN(Gc_it_hdr *hdr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-static int gc_it_hdr_is_pmc(PARROT_INTERP, ARGIN(Gc_it_hdr *hdr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-static int gc_it_hdr_is_pmc_ext(PARROT_INTERP, ARGIN(Gc_it_hdr *hdr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
-static int gc_it_hdr_is_PObj_compatible(PARROT_INTERP,
- ARGIN(Gc_it_hdr *hdr))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
PARROT_INLINE
static void gc_it_mark_PObj_children_grey(PARROT_INTERP,
ARGMOD(Gc_it_hdr *hdr))
@@ -113,7 +88,9 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*hdr);
-static void gc_it_post_sweep_cleanup(SHIM_INTERP);
+static void gc_it_post_sweep_cleanup(PARROT_INTERP)
+ __attribute__nonnull__(1);
+
static void gc_it_sweep_header_arenas(PARROT_INTERP,
ARGMOD(Gc_it_data *gc_priv_data),
ARGMOD(Small_Object_Pool *pool))
Modified: branches/gsoc_pdd09/src/hash.c
==============================================================================
--- branches/gsoc_pdd09/src/hash.c (original)
+++ branches/gsoc_pdd09/src/hash.c Wed Jul 30 17:58:29 2008
@@ -101,6 +101,18 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*s);
+static void parrot_mark_hash_both(PARROT_INTERP, ARGIN(Hash *hash))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void parrot_mark_hash_keys(PARROT_INTERP, ARGIN(Hash *hash))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void parrot_mark_hash_values(PARROT_INTERP, ARGIN(Hash *hash))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
PARROT_WARN_UNUSED_RESULT
PARROT_PURE_FUNCTION
static int pointer_compare(SHIM_INTERP,
@@ -114,15 +126,6 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-static void
-parrot_mark_hash_keys(PARROT_INTERP, ARGIN(Hash *));
-
-static void
-parrot_mark_hash_values(PARROT_INTERP, ARGIN(Hash *));
-
-static void
-parrot_mark_hash_both(PARROT_INTERP, ARGIN(Hash *));
-
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: static */
|
|