Author: infinoid
Date: Fri Jan 2 23:19:03 2009
New Revision: 34863
Modified:
trunk/include/parrot/atomic/gcc_x86.h
trunk/include/parrot/exec.h
trunk/src/exec.c
trunk/src/jit/i386/exec_dep.h
Log:
[cage] Run headerizer on x86-32, to regenerate various JIT-related things.
This fixes some ASSERT_ARGS warnings for src/exec.o.
Modified: trunk/include/parrot/atomic/gcc_x86.h
==============================================================================
--- trunk/include/parrot/atomic/gcc_x86.h (original)
+++ trunk/include/parrot/atomic/gcc_x86.h Fri Jan 2 23:19:03 2009
@@ -33,10 +33,12 @@
long parrot_i386_xadd(ARGIN(volatile long *l), long amount)
__attribute__nonnull__(1);
-#define ASSERT_ARGS_parrot_i386_cmpxchg assert(ptr); \
- assert(expect); \
- assert(update);
-#define ASSERT_ARGS_parrot_i386_xadd assert(l);
+#define ASSERT_ARGS_parrot_i386_cmpxchg __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(ptr) \
+ || PARROT_ASSERT_ARG(expect) \
+ || PARROT_ASSERT_ARG(update)
+#define ASSERT_ARGS_parrot_i386_xadd __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(l)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: src/atomic/gcc_x86.c */
Modified: trunk/include/parrot/exec.h
==============================================================================
--- trunk/include/parrot/exec.h (original)
+++ trunk/include/parrot/exec.h Fri Jan 2 23:19:03 2009
@@ -149,21 +149,29 @@
__attribute__nonnull__(2)
FUNC_MODIFIES(*obj);
-#define ASSERT_ARGS_Parrot_exec_add_text_rellocation assert(obj); \
- assert(nptr); \
- assert(symbol);
-#define ASSERT_ARGS_Parrot_exec_add_text_rellocation_func assert(obj); \
- assert(nptr); \
- assert(func_name);
-#define ASSERT_ARGS_Parrot_exec_add_text_rellocation_reg assert(obj); \
- assert(nptr); \
- assert(var);
-#define ASSERT_ARGS_Parrot_exec assert(interp); \
- assert(pc); \
- assert(code_start); \
- assert(code_end);
-#define ASSERT_ARGS_Parrot_exec_add_symbol assert(obj); \
- assert(symbol);
+#define ASSERT_ARGS_Parrot_exec_add_text_rellocation \
+ __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj) \
+ || PARROT_ASSERT_ARG(nptr) \
+ || PARROT_ASSERT_ARG(symbol)
+#define ASSERT_ARGS_Parrot_exec_add_text_rellocation_func \
+ __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj) \
+ || PARROT_ASSERT_ARG(nptr) \
+ || PARROT_ASSERT_ARG(func_name)
+#define ASSERT_ARGS_Parrot_exec_add_text_rellocation_reg \
+ __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj) \
+ || PARROT_ASSERT_ARG(nptr) \
+ || PARROT_ASSERT_ARG(var)
+#define ASSERT_ARGS_Parrot_exec __attribute__unused__ int _ASSERT_ARGS_CHECK =
\
+ PARROT_ASSERT_ARG(interp) \
+ || PARROT_ASSERT_ARG(pc) \
+ || PARROT_ASSERT_ARG(code_start) \
+ || PARROT_ASSERT_ARG(code_end)
+#define ASSERT_ARGS_Parrot_exec_add_symbol __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj) \
+ || PARROT_ASSERT_ARG(symbol)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: src/exec.c */
Modified: trunk/src/exec.c
==============================================================================
--- trunk/src/exec.c (original)
+++ trunk/src/exec.c Fri Jan 2 23:19:03 2009
@@ -49,10 +49,13 @@
__attribute__nonnull__(1)
__attribute__nonnull__(2);
-#define ASSERT_ARGS_add_data_member assert(obj);
-#define ASSERT_ARGS_exec_init assert(obj);
-#define ASSERT_ARGS_symbol_list_find assert(obj); \
- assert(symbol);
+#define ASSERT_ARGS_add_data_member __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj)
+#define ASSERT_ARGS_exec_init __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj)
+#define ASSERT_ARGS_symbol_list_find __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(obj) \
+ || PARROT_ASSERT_ARG(symbol)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: static */
Modified: trunk/src/jit/i386/exec_dep.h
==============================================================================
--- trunk/src/jit/i386/exec_dep.h (original)
+++ trunk/src/jit/i386/exec_dep.h Fri Jan 2 23:19:03 2009
@@ -19,36 +19,28 @@
/* HEADERIZER BEGIN: src/exec_dep.c */
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
-void offset_fixup(ARGMOD(Parrot_exec_objfile_t *obj))
- __attribute__nonnull__(1)
- FUNC_MODIFIES(*obj);
-
-void Parrot_exec_cpcf_op(ARGMOD(Parrot_jit_info_t *jit_info), PARROT_INTERP)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*jit_info);
-
-void Parrot_exec_normal_op(
- ARGMOD(Parrot_jit_info_t *jit_info),
- PARROT_INTERP)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*jit_info);
-
-void Parrot_exec_normal_op(
- ARGMOD(Parrot_jit_info_t *jit_info),
- PARROT_INTERP)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*jit_info);
-
-void Parrot_exec_restart_op(
- ARGMOD(Parrot_jit_info_t *jit_info),
- PARROT_INTERP)
- __attribute__nonnull__(1)
- __attribute__nonnull__(2)
- FUNC_MODIFIES(*jit_info);
-
+void offset_fixup(Parrot_exec_objfile_t *obj);
+void Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+ __attribute__nonnull__(2);
+
+void Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+ __attribute__nonnull__(2);
+
+void Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+ __attribute__nonnull__(2);
+
+void Parrot_exec_restart_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+ __attribute__nonnull__(2);
+
+#define ASSERT_ARGS_offset_fixup __attribute__unused__ int _ASSERT_ARGS_CHECK
= 0
+#define ASSERT_ARGS_Parrot_exec_cpcf_op __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
+#define ASSERT_ARGS_Parrot_exec_normal_op __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
+#define ASSERT_ARGS_Parrot_exec_normal_op __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
+#define ASSERT_ARGS_Parrot_exec_restart_op __attribute__unused__ int
_ASSERT_ARGS_CHECK = \
+ PARROT_ASSERT_ARG(interp)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: src/exec_dep.c */
