Author: petdance
Date: Fri Dec 26 22:26:03 2008
New Revision: 34408
Modified:
trunk/compilers/imcc/imc.h
trunk/compilers/imcc/imcparser.c
trunk/compilers/imcc/imcparser.h
trunk/compilers/imcc/instructions.c
trunk/compilers/imcc/instructions.h
trunk/compilers/imcc/optimizer.c
trunk/compilers/imcc/pbc.c
trunk/include/parrot/debugger.h
trunk/include/parrot/encoding.h
trunk/include/parrot/exceptions.h
trunk/include/parrot/hash.h
trunk/include/parrot/multidispatch.h
trunk/include/parrot/stacks.h
trunk/include/parrot/string_funcs.h
trunk/src/encoding.c
trunk/src/hash.c
Log:
reran headerizer
Modified: trunk/compilers/imcc/imc.h
==============================================================================
--- trunk/compilers/imcc/imc.h (original)
+++ trunk/compilers/imcc/imc.h Fri Dec 26 22:26:03 2008
@@ -250,7 +250,7 @@
FUNC_MODIFIES(*error_message);
int imcc_vfprintf(PARROT_INTERP,
- ARGMOD(PMC *io),
+ ARGIN(PMC *io),
ARGIN(const char *format),
va_list ap)
__attribute__nonnull__(1)
@@ -294,20 +294,6 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-PARROT_CAN_RETURN_NULL
-Instruction * multi_keyed(PARROT_INTERP,
- ARGMOD(IMC_Unit *unit),
- ARGIN(const char *name),
- ARGIN(SymReg **r),
- int nr,
- int keyvec,
- int emit)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- __attribute__nonnull__(3)
- __attribute__nonnull__(4)
- FUNC_MODIFIES(*unit);
-
void op_fullname(
ARGOUT(char *dest),
ARGIN(const char *name),
Modified: trunk/compilers/imcc/imcparser.c
==============================================================================
--- trunk/compilers/imcc/imcparser.c (original)
+++ trunk/compilers/imcc/imcparser.c Fri Dec 26 22:26:03 2008
@@ -1027,7 +1027,7 @@
SymReg * sr;
Instruction *i;
}
-/* Line 187 of yacc.c. */
+/* Line 193 of yacc.c. */
#line 1021 "compilers/imcc/imcparser.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
Modified: trunk/compilers/imcc/imcparser.h
==============================================================================
--- trunk/compilers/imcc/imcparser.h (original)
+++ trunk/compilers/imcc/imcparser.h Fri Dec 26 22:26:03 2008
@@ -303,7 +303,7 @@
SymReg * sr;
Instruction *i;
}
-/* Line 1489 of yacc.c. */
+/* Line 1529 of yacc.c. */
#line 297 "compilers/imcc/imcparser.h"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
Modified: trunk/compilers/imcc/instructions.c
==============================================================================
--- trunk/compilers/imcc/instructions.c (original)
+++ trunk/compilers/imcc/instructions.c Fri Dec 26 22:26:03 2008
@@ -50,7 +50,8 @@
__attribute__nonnull__(1)
__attribute__nonnull__(4);
-static int e_file_open(SHIM_INTERP, ARGIN(void *param))
+static int e_file_open(PARROT_INTERP, ARGIN(void *param))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2);
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
Modified: trunk/compilers/imcc/instructions.h
==============================================================================
--- trunk/compilers/imcc/instructions.h (original)
+++ trunk/compilers/imcc/instructions.h Fri Dec 26 22:26:03 2008
@@ -159,9 +159,7 @@
void imcc_init_tables(PARROT_INTERP)
__attribute__nonnull__(1);
-int ins_print(PARROT_INTERP,
- ARGIN(PMC *io),
- ARGIN(const Instruction *ins))
+int ins_print(PARROT_INTERP, ARGIN(PMC *io), ARGIN(const Instruction *ins))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3);
Modified: trunk/compilers/imcc/optimizer.c
==============================================================================
--- trunk/compilers/imcc/optimizer.c (original)
+++ trunk/compilers/imcc/optimizer.c Fri Dec 26 22:26:03 2008
@@ -83,8 +83,6 @@
/* HEADERIZER BEGIN: static */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-#if DO_LOOP_OPTIMIZATION
-
PARROT_WARN_UNUSED_RESULT
static int _is_ins_save(
ARGIN(const IMC_Unit *unit),
@@ -95,8 +93,6 @@
__attribute__nonnull__(2)
__attribute__nonnull__(3);
-#endif
-
static int branch_branch(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
@@ -153,8 +149,6 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*unit);
-#if DO_LOOP_OPTIMIZATION
-
PARROT_WARN_UNUSED_RESULT
static int is_ins_save(PARROT_INTERP,
ARGIN(const IMC_Unit *unit),
@@ -165,7 +159,6 @@
__attribute__nonnull__(2)
__attribute__nonnull__(3)
__attribute__nonnull__(4);
-#endif
static int strength_reduce(PARROT_INTERP, ARGMOD(IMC_Unit *unit))
__attribute__nonnull__(1)
Modified: trunk/compilers/imcc/pbc.c
==============================================================================
--- trunk/compilers/imcc/pbc.c (original)
+++ trunk/compilers/imcc/pbc.c Fri Dec 26 22:26:03 2008
@@ -126,6 +126,18 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
+PARROT_WARN_UNUSED_RESULT
+PARROT_CAN_RETURN_NULL
+static subs_t * find_sub_by_subid(PARROT_INTERP,
+ ARGIN(const char *lookup),
+ ARGIN(const subs_t *sym),
+ ARGOUT(int *pc))
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ __attribute__nonnull__(4)
+ FUNC_MODIFIES(*pc);
+
static void fixup_globals(PARROT_INTERP)
__attribute__nonnull__(1);
Modified: trunk/include/parrot/debugger.h
==============================================================================
--- trunk/include/parrot/debugger.h (original)
+++ trunk/include/parrot/debugger.h Fri Dec 26 22:26:03 2008
@@ -298,9 +298,7 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-void PDB_free_file(PARROT_INTERP, ARGIN_NULLOK(PDB_file_t *file))
- __attribute__nonnull__(1);
-
+void PDB_free_file(SHIM_INTERP, ARGIN_NULLOK(PDB_file_t *file));
void PDB_get_command(PARROT_INTERP)
__attribute__nonnull__(1);
Modified: trunk/include/parrot/encoding.h
==============================================================================
--- trunk/include/parrot/encoding.h (original)
+++ trunk/include/parrot/encoding.h Fri Dec 26 22:26:03 2008
@@ -126,6 +126,7 @@
PARROT_EXPORT
PARROT_DOES_NOT_RETURN
+PARROT_CANNOT_RETURN_NULL
const ENCODING * Parrot_load_encoding(PARROT_INTERP,
ARGIN(const char *encodingname))
__attribute__nonnull__(1)
Modified: trunk/include/parrot/exceptions.h
==============================================================================
--- trunk/include/parrot/exceptions.h (original)
+++ trunk/include/parrot/exceptions.h Fri Dec 26 22:26:03 2008
@@ -183,7 +183,7 @@
PARROT_EXPORT
PARROT_DOES_NOT_RETURN
void Parrot_ex_throw_from_c_args(PARROT_INTERP,
- ARGIN_NULLOK(void *ret_addr),
+ SHIM(void *ret_addr),
int exitcode,
ARGIN(const char *format),
...)
Modified: trunk/include/parrot/hash.h
==============================================================================
--- trunk/include/parrot/hash.h (original)
+++ trunk/include/parrot/hash.h Fri Dec 26 22:26:03 2008
@@ -179,12 +179,14 @@
__attribute__nonnull__(2);
PARROT_EXPORT
-void parrot_new_cstring_hash(SHIM_INTERP, ARGOUT(Hash **hptr))
+void parrot_new_cstring_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*hptr);
PARROT_EXPORT
-void parrot_new_hash(SHIM_INTERP, ARGOUT(Hash **hptr))
+void parrot_new_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*hptr);
@@ -195,12 +197,14 @@
__attribute__nonnull__(1);
PARROT_EXPORT
-void parrot_new_pmc_hash(SHIM_INTERP, ARGOUT(PMC *container))
+void parrot_new_pmc_hash(PARROT_INTERP, ARGOUT(PMC *container))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*container);
PARROT_EXPORT
-void parrot_new_pointer_hash(SHIM_INTERP, ARGOUT(Hash **hptr))
+void parrot_new_pointer_hash(PARROT_INTERP, ARGOUT(Hash **hptr))
+ __attribute__nonnull__(1)
__attribute__nonnull__(2)
FUNC_MODIFIES(*hptr);
@@ -228,8 +232,7 @@
__attribute__nonnull__(3)
FUNC_MODIFIES(*hash);
-void parrot_new_hash_x(
- PARROT_INTERP,
+void parrot_new_hash_x(PARROT_INTERP,
ARGOUT(Hash **hptr),
PARROT_DATA_TYPE val_type,
Hash_key_type hkey_type,
@@ -241,8 +244,7 @@
__attribute__nonnull__(6)
FUNC_MODIFIES(*hptr);
-void parrot_new_pmc_hash_x(
- PARROT_INTERP,
+void parrot_new_pmc_hash_x(PARROT_INTERP,
ARGMOD(PMC *container),
PARROT_DATA_TYPE val_type,
Hash_key_type hkey_type,
Modified: trunk/include/parrot/multidispatch.h
==============================================================================
--- trunk/include/parrot/multidispatch.h (original)
+++ trunk/include/parrot/multidispatch.h Fri Dec 26 22:26:03 2008
@@ -59,18 +59,6 @@
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-funcptr_t get_mmd_dispatch_type(PARROT_INTERP,
- INTVAL func_nr,
- INTVAL left_type,
- INTVAL right_type,
- ARGOUT(int *is_pmc))
- __attribute__nonnull__(1)
- __attribute__nonnull__(5)
- FUNC_MODIFIES(*is_pmc);
-
-PARROT_EXPORT
-PARROT_WARN_UNUSED_RESULT
-PARROT_CANNOT_RETURN_NULL
PMC* Parrot_build_sig_object_from_varargs(PARROT_INTERP,
ARGIN(const char *sig),
va_list args)
@@ -223,7 +211,7 @@
PARROT_WARN_UNUSED_RESULT
PMC * Parrot_mmd_sort_manhattan_by_sig_pmc(PARROT_INTERP,
ARGIN(PMC *candidates),
- ARGIN(PMC* invoke_sig))
+ ARGIN(PMC *invoke_sig))
__attribute__nonnull__(1)
__attribute__nonnull__(2)
__attribute__nonnull__(3);
Modified: trunk/include/parrot/stacks.h
==============================================================================
--- trunk/include/parrot/stacks.h (original)
+++ trunk/include/parrot/stacks.h Fri Dec 26 22:26:03 2008
@@ -102,7 +102,6 @@
Stack_Entry_t * stack_entry(SHIM_INTERP,
ARGIN(Stack_Chunk_t *stack),
INTVAL depth)
- __attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_EXPORT
Modified: trunk/include/parrot/string_funcs.h
==============================================================================
--- trunk/include/parrot/string_funcs.h (original)
+++ trunk/include/parrot/string_funcs.h Fri Dec 26 22:26:03 2008
@@ -474,9 +474,8 @@
PARROT_EXPORT
PARROT_MALLOC
PARROT_CAN_RETURN_NULL
-char * string_to_cstring_nullable(PARROT_INTERP,
- ARGIN_NULLOK(const STRING *s))
- __attribute__nonnull__(1);
+char * string_to_cstring_nullable(SHIM_INTERP,
+ ARGIN_NULLOK(const STRING *s));
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
@@ -523,7 +522,6 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*tc);
-PARROT_INLINE
void string_free(PARROT_INTERP, ARGIN(STRING *s))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
Modified: trunk/src/encoding.c
==============================================================================
--- trunk/src/encoding.c (original)
+++ trunk/src/encoding.c Fri Dec 26 22:26:03 2008
@@ -164,6 +164,7 @@
PARROT_EXPORT
PARROT_DOES_NOT_RETURN
+PARROT_CANNOT_RETURN_NULL
const ENCODING *
Parrot_load_encoding(PARROT_INTERP, ARGIN(const char *encodingname))
{
Modified: trunk/src/hash.c
==============================================================================
--- trunk/src/hash.c (original)
+++ trunk/src/hash.c Fri Dec 26 22:26:03 2008
@@ -39,8 +39,7 @@
PARROT_CANNOT_RETURN_NULL
PARROT_WARN_UNUSED_RESULT
PARROT_MALLOC
-static Hash * create_hash(
- PARROT_INTERP,
+static Hash * create_hash(PARROT_INTERP,
PARROT_DATA_TYPE val_type,
Hash_key_type hkey_type,
ARGIN(hash_comp_fn compare),
