[svn:parrot] r41172 - trunk/src/jit/i386

[bacek at svn.parrot.org]

Author: bacek
Date: Wed Sep  9 10:40:42 2009
New Revision: 41172
URL: https://trac.parrot.org/parrot/changeset/41172

Log:
[cage] Make headerize happy about JIT-generated functions

Modified:
   trunk/src/jit/i386/exec_dep.c
   trunk/src/jit/i386/exec_dep.h

Modified: trunk/src/jit/i386/exec_dep.c
==============================================================================
--- trunk/src/jit/i386/exec_dep.c	Wed Sep  9 05:46:53 2009	(r41171)
+++ trunk/src/jit/i386/exec_dep.c	Wed Sep  9 10:40:42 2009	(r41172)
@@ -26,7 +26,7 @@
 #ifdef JIT_CGP
 
 void
-Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+Parrot_exec_normal_op(ARGIN(Parrot_jit_info_t *jit_info), PARROT_INTERP)
 {
     ASSERT_ARGS(Parrot_exec_normal_op)
     Parrot_jit_optimizer_section_ptr cur_section =
@@ -111,7 +111,7 @@
 #else /* JIT_CGP */
 
 void
-Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
+Parrot_exec_normal_op(ARGIN(Parrot_jit_info_t *jit_info),
                      PARROT_INTERP)
 {
     ASSERT_ARGS(Parrot_exec_normal_op)
@@ -131,7 +131,7 @@
 #endif /* JIT_CGP */
 
 void
-Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info,
+Parrot_exec_cpcf_op(ARGIN(Parrot_jit_info_t *jit_info),
                    PARROT_INTERP)
 {
     ASSERT_ARGS(Parrot_exec_cpcf_op)
@@ -140,7 +140,7 @@
 }
 
 void
-Parrot_exec_restart_op(Parrot_jit_info_t *jit_info,
+Parrot_exec_restart_op(ARGIN(Parrot_jit_info_t *jit_info),
                    PARROT_INTERP)
 {
     ASSERT_ARGS(Parrot_exec_restart_op)
@@ -171,7 +171,7 @@
 
 /* Assign the offset of the program_code */
 void
-offset_fixup(Parrot_exec_objfile_t *obj)
+offset_fixup(ARGIN(Parrot_exec_objfile_t *obj))
 {
     ASSERT_ARGS(offset_fixup)
     int i;

Modified: trunk/src/jit/i386/exec_dep.h
==============================================================================
--- trunk/src/jit/i386/exec_dep.h	Wed Sep  9 05:46:53 2009	(r41171)
+++ trunk/src/jit/i386/exec_dep.h	Wed Sep  9 10:40:42 2009	(r41172)
@@ -20,28 +20,45 @@
 /* HEADERIZER BEGIN: src/exec_dep.c */
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 
-void offset_fixup(Parrot_exec_objfile_t *obj);
-void Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+void offset_fixup(ARGIN(Parrot_exec_objfile_t *obj))
+        __attribute__nonnull__(1);
+
+void Parrot_exec_cpcf_op(ARGIN(Parrot_jit_info_t *jit_info), PARROT_INTERP)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-void Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+void Parrot_exec_normal_op(
+    ARGIN(Parrot_jit_info_t *jit_info),
+    PARROT_INTERP)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-void Parrot_exec_normal_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+void Parrot_exec_normal_op(
+    ARGIN(Parrot_jit_info_t *jit_info),
+    PARROT_INTERP)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-void Parrot_exec_restart_op(Parrot_jit_info_t *jit_info, PARROT_INTERP)
+void Parrot_exec_restart_op(
+    ARGIN(Parrot_jit_info_t *jit_info),
+    PARROT_INTERP)
+        __attribute__nonnull__(1)
         __attribute__nonnull__(2);
 
-#define ASSERT_ARGS_offset_fixup __attribute__unused__ int _ASSERT_ARGS_CHECK = 0
+#define ASSERT_ARGS_offset_fixup __attribute__unused__ int _ASSERT_ARGS_CHECK = \
+       PARROT_ASSERT_ARG(obj)
 #define ASSERT_ARGS_Parrot_exec_cpcf_op __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
+       PARROT_ASSERT_ARG(jit_info) \
+    || PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_exec_normal_op __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
+       PARROT_ASSERT_ARG(jit_info) \
+    || PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_exec_normal_op __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
+       PARROT_ASSERT_ARG(jit_info) \
+    || PARROT_ASSERT_ARG(interp)
 #define ASSERT_ARGS_Parrot_exec_restart_op __attribute__unused__ int _ASSERT_ARGS_CHECK = \
-       PARROT_ASSERT_ARG(interp)
+       PARROT_ASSERT_ARG(jit_info) \
+    || PARROT_ASSERT_ARG(interp)
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */
 /* HEADERIZER END: src/exec_dep.c */