[svn:parrot] r41328 - in branches/kill_jit: compilers/pirc/src config/auto src
darbelo at svn.parrot.org
darbelo at svn.parrot.org
Thu Sep 17 21:26:25 UTC 2009
Author: darbelo
Date: Thu Sep 17 21:26:24 2009
New Revision: 41328
URL: https://trac.parrot.org/parrot/changeset/41328
Log:
Make codetest happy.
Modified:
branches/kill_jit/compilers/pirc/src/bcgen.h
branches/kill_jit/config/auto/frames.pm (props changed)
branches/kill_jit/src/frame_builder.c
branches/kill_jit/src/frame_builder.h
Modified: branches/kill_jit/compilers/pirc/src/bcgen.h
==============================================================================
--- branches/kill_jit/compilers/pirc/src/bcgen.h Thu Sep 17 20:48:33 2009 (r41327)
+++ branches/kill_jit/compilers/pirc/src/bcgen.h Thu Sep 17 21:26:24 2009 (r41328)
@@ -165,12 +165,6 @@
STRING * get_string_const(ARGIN(bytecode * const bc), unsigned index)
__attribute__nonnull__(1);
-PARROT_WARN_UNUSED_RESULT
-PARROT_CANNOT_RETURN_NULL
-opcode_t * make_jit_info(PARROT_INTERP, ARGIN(const struct _IMC_Unit *unit))
- __attribute__nonnull__(1)
- __attribute__nonnull__(2);
-
PARROT_CANNOT_RETURN_NULL
bytecode * new_bytecode(PARROT_INTERP, ARGIN(char const * const filename))
__attribute__nonnull__(1)
@@ -226,9 +220,6 @@
PARROT_ASSERT_ARG(bc)
#define ASSERT_ARGS_get_string_const __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(bc)
-#define ASSERT_ARGS_make_jit_info __attribute__unused__ int _ASSERT_ARGS_CHECK = \
- PARROT_ASSERT_ARG(interp) \
- || PARROT_ASSERT_ARG(unit)
#define ASSERT_ARGS_new_bytecode __attribute__unused__ int _ASSERT_ARGS_CHECK = \
PARROT_ASSERT_ARG(interp) \
|| PARROT_ASSERT_ARG(filename)
Modified: branches/kill_jit/src/frame_builder.c
==============================================================================
--- branches/kill_jit/src/frame_builder.c Thu Sep 17 20:48:33 2009 (r41327)
+++ branches/kill_jit/src/frame_builder.c Thu Sep 17 21:26:24 2009 (r41328)
@@ -25,7 +25,7 @@
/* Fill in the native code offset */
fixup->native_offset =
(ptrdiff_t)(jit_info->native_ptr - jit_info->arena.start);
-}
+}
INTVAL
get_nci_I(PARROT_INTERP, ARGMOD(call_state *st), int n)
@@ -1773,49 +1773,49 @@
* decide to reuse the argument space though. If you are *absolutely sure*
* this does not happen define PARROT_JIT_STACK_REUSE_INTERP.
*/
-# ifdef PARROT_JIT_STACK_REUSE_INTERP
+#ifdef PARROT_JIT_STACK_REUSE_INTERP
/*
* op functions have the signature (cur_op, interp)
* we use the interpreter already on stack and only push the
* cur_op
*/
-# else
+#else
/* push interpreter */
Parrot_jit_emit_get_INTERP(interp, jit_info->native_ptr, emit_ECX);
emitm_pushl_r(jit_info->native_ptr, emit_ECX);
-# endif
+#endif
emitm_pushl_i(jit_info->native_ptr, CORE_OPS_check_events);
call_func(jit_info,
(void (*) (void)) (interp->op_func_table[CORE_OPS_check_events]));
-# ifdef PARROT_JIT_STACK_REUSE_INTERP
+#ifdef PARROT_JIT_STACK_REUSE_INTERP
emitm_addb_i_r(jit_info->native_ptr, 4, emit_ESP);
-# else
+#else
emitm_addb_i_r(jit_info->native_ptr, 8, emit_ESP);
-# endif
+#endif
}
-# ifdef PARROT_JIT_STACK_REUSE_INTERP
+#ifdef PARROT_JIT_STACK_REUSE_INTERP
/*
* op functions have the signature (cur_op, interp)
* we use the interpreter already on stack and only push the
* cur_op
*/
-# else
+#else
Parrot_jit_emit_get_INTERP(interp, jit_info->native_ptr, emit_ECX);
emitm_pushl_r(jit_info->native_ptr, emit_ECX);
-# endif
+#endif
emitm_pushl_i(jit_info->native_ptr, jit_info->cur_op);
call_func(jit_info,
(void (*) (void))(interp->op_func_table[cur_op]));
-# ifdef PARROT_JIT_STACK_REUSE_INTERP
+#ifdef PARROT_JIT_STACK_REUSE_INTERP
emitm_addb_i_r(jit_info->native_ptr, 4, emit_ESP);
-# else
+#else
emitm_addb_i_r(jit_info->native_ptr, 8, emit_ESP);
-# endif
+#endif
}
void
Modified: branches/kill_jit/src/frame_builder.h
==============================================================================
--- branches/kill_jit/src/frame_builder.h Thu Sep 17 20:48:33 2009 (r41327)
+++ branches/kill_jit/src/frame_builder.h Thu Sep 17 21:26:24 2009 (r41328)
@@ -223,7 +223,7 @@
typedef void (*jit_fn_t)(Parrot_jit_info_t *jit_info,
PARROT_INTERP);
-
+
/* Parrot_jit_fn_info_t
* The table of opcodes.
*
@@ -251,7 +251,7 @@
void Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
PARROT_INTERP);
-
+
void Parrot_exec_restart_op(Parrot_jit_info_t *jit_info,
PARROT_INTERP);
@@ -269,7 +269,7 @@
void Parrot_jit_emit_mov_rm_offs(
Interp *, int dst_reg, int base_reg, size_t offs);
-/*
+/*
* interface to architecture specific details
*/
typedef void (*jit_arch_f)(Parrot_jit_info_t *, Interp *);
@@ -287,7 +287,7 @@
int n_preserved_F;
const char *map_F;
} jit_arch_regs;
-
+
typedef void (*mov_RM_f)(PARROT_INTERP, Parrot_jit_info_t *,
int cpu_reg, int base_reg, INTVAL offs);
typedef void (*mov_MR_f)(PARROT_INTERP, Parrot_jit_info_t *,
@@ -296,7 +296,7 @@
typedef struct jit_arch_info_t {
/* CPU <- Parrot reg move functions */
mov_RM_f mov_RM_i;
- mov_RM_f mov_RM_n;
+ mov_RM_f mov_RM_n;
/* Parrot <- CPU reg move functions */
mov_MR_f mov_MR_i;
mov_MR_f mov_MR_n;
@@ -305,7 +305,7 @@
jit_arch_f jit_dofixup;
/* flush caches */
jit_arch_f jit_flush_cache;
- /* register mapping info */
+ /* register mapping info */
const jit_arch_regs regs[JIT_CODE_TYPES];
} jit_arch_info;
@@ -323,7 +323,7 @@
/* custom pmc callback functions */
void Parrot_jit_free_buffer(PARROT_INTERP, void *ptr, void *priv);
PMC* Parrot_jit_clone_buffer(PARROT_INTERP, PMC *pmc, void *priv);
-struct jit_buffer_private_data {
+struct jit_buffer_private_data {
int size;
};
@@ -364,10 +364,10 @@
PMC*
get_nci_P(PARROT_INTERP, ARGMOD(call_state *st), int n);
-#define GET_NCI_I(n) get_nci_I(interp, &st, n)
-#define GET_NCI_S(n) get_nci_S(interp, &st, n)
-#define GET_NCI_N(n) get_nci_N(interp, &st, n)
-#define GET_NCI_P(n) get_nci_P(interp, &st, n)
+#define GET_NCI_I(n) get_nci_I(interp, &st, (n))
+#define GET_NCI_S(n) get_nci_S(interp, &st, (n))
+#define GET_NCI_N(n) get_nci_N(interp, &st, (n))
+#define GET_NCI_P(n) get_nci_P(interp, &st, (n))
/*
* set return value
More information about the parrot-commits
mailing list