[svn:parrot] r41337 - in branches/kill_jit: compilers/imcc src src/interp src/runcore
darbelo at svn.parrot.org
darbelo at svn.parrot.org
Fri Sep 18 19:23:59 UTC 2009
Author: darbelo
Date: Fri Sep 18 19:23:58 2009
New Revision: 41337
URL: https://trac.parrot.org/parrot/changeset/41337
Log:
Remove some more exec-related dead code.
Modified:
branches/kill_jit/compilers/imcc/main.c
branches/kill_jit/src/frame_builder.c
branches/kill_jit/src/interp/inter_create.c
branches/kill_jit/src/runcore/cores.c
branches/kill_jit/src/runcore/main.c
Modified: branches/kill_jit/compilers/imcc/main.c
==============================================================================
--- branches/kill_jit/compilers/imcc/main.c Fri Sep 18 18:09:39 2009 (r41336)
+++ branches/kill_jit/compilers/imcc/main.c Fri Sep 18 19:23:58 2009 (r41337)
@@ -897,16 +897,8 @@
if (STREQ(ext, ".pbc"))
SET_STATE_WRITE_PBC(interp);
else if (STREQ(ext, PARROT_OBJ_EXT)) {
-#if EXEC_CAPABLE
- SET_STATE_LOAD_PBC(interp);
- SET_STATE_RUN_PBC(interp);
- UNSET_STATE_WRITE_PBC(interp);
- *obj_file = 1;
- Parrot_set_run_core(interp, PARROT_EXEC_CORE);
-#else
UNUSED(obj_file);
IMCC_fatal_standalone(interp, 1, "main: can't produce object file");
-#endif
}
}
}
Modified: branches/kill_jit/src/frame_builder.c
==============================================================================
--- branches/kill_jit/src/frame_builder.c Fri Sep 18 18:09:39 2009 (r41336)
+++ branches/kill_jit/src/frame_builder.c Fri Sep 18 19:23:58 2009 (r41337)
@@ -955,18 +955,6 @@
offsetof(Parrot_jit_arena_t, op_map));
}
-#if EXEC_CAPABLE
- else {
- int *reg;
- emitm_subl_i_r(jit_info->native_ptr,
- jit_info->objfile->bytecode_header_size, emit_EAX);
- Parrot_exec_add_text_rellocation(jit_info->objfile,
- jit_info->native_ptr, RTYPE_DATA, "program_code", -4);
- reg = Parrot_exec_add_text_rellocation_reg(jit_info->objfile,
- jit_info->native_ptr, "opcode_map", 0, 0);
- jit_emit_mov_ri_i(interp, jit_info->native_ptr, emit_EDX, (long) reg);
- }
-#endif
/* get base pointer */
emitm_movl_m_r(interp, jit_info->native_ptr, emit_EBX, emit_EBX, 0, 1,
offsetof(Interp, ctx));
@@ -1051,14 +1039,6 @@
/*
* TODO not all constants are shared between interpreters
*/
-#if EXEC_CAPABLE
- if (jit_info->objfile) {
- jit_emit_fload_m_n(interp, jit_info->native_ptr, CONST(i));
- Parrot_exec_add_text_rellocation(jit_info->objfile,
- jit_info->native_ptr, RTYPE_DATA, "const_table", -4);
- }
- else
-#endif
jit_emit_fload_m_n(interp, jit_info->native_ptr,
&interp->code->const_table->
constants[pi]->u.number);
@@ -1071,14 +1051,6 @@
break;
case PARROT_ARG_SC:
-#if EXEC_CAPABLE
- if (jit_info->objfile) {
- emitm_pushl_m(jit_info->native_ptr, CONST(i));
- Parrot_exec_add_text_rellocation(jit_info->objfile,
- jit_info->native_ptr, RTYPE_DATA, "const_table", -4);
- }
- else
-#endif
emitm_pushl_i(jit_info->native_ptr,
interp->code->const_table->
constants[pi]->u.string);
@@ -1086,15 +1058,6 @@
case PARROT_ARG_KC:
case PARROT_ARG_PC:
-#if EXEC_CAPABLE
- if (jit_info->objfile) {
- emitm_pushl_m(jit_info->native_ptr, CONST(i));
- Parrot_exec_add_text_rellocation(jit_info->objfile,
- jit_info->native_ptr, RTYPE_DATA,
- "const_table", -4);
- }
- else
-#endif
emitm_pushl_i(jit_info->native_ptr,
interp->code->const_table->
constants[pi]->u.key);
Modified: branches/kill_jit/src/interp/inter_create.c
==============================================================================
--- branches/kill_jit/src/interp/inter_create.c Fri Sep 18 18:09:39 2009 (r41336)
+++ branches/kill_jit/src/interp/inter_create.c Fri Sep 18 19:23:58 2009 (r41337)
@@ -44,14 +44,6 @@
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: static */
-#if EXEC_CAPABLE
- extern int Parrot_exec_run;
-#endif
-
-#if EXEC_CAPABLE
-Interp interpre;
-#endif
-
#define ATEXIT_DESTROY
/*
@@ -122,12 +114,7 @@
Interp *interp;
/* Get an empty interpreter from system memory */
-#if EXEC_CAPABLE
- if (Parrot_exec_run)
- interp = &interpre;
- else
-#endif
- interp = mem_allocate_zeroed_typed(Interp);
+ interp = mem_allocate_zeroed_typed(Interp);
interp->lo_var_ptr = NULL;
Modified: branches/kill_jit/src/runcore/cores.c
==============================================================================
--- branches/kill_jit/src/runcore/cores.c Fri Sep 18 18:09:39 2009 (r41336)
+++ branches/kill_jit/src/runcore/cores.c Fri Sep 18 19:23:58 2009 (r41337)
@@ -1104,39 +1104,15 @@
*/
-#if EXEC_CAPABLE
- extern int Parrot_exec_run;
-#endif
-
PARROT_WARN_UNUSED_RESULT
PARROT_CAN_RETURN_NULL
static opcode_t *
runops_exec_core(PARROT_INTERP, ARGIN(Parrot_runcore_t *runcore), ARGIN(opcode_t *pc))
{
ASSERT_ARGS(runops_exec_core)
-#if EXEC_CAPABLE
- opcode_t *code_start = interp->code->base.data;
-
- /* size in opcodes */
- UINTVAL code_size = interp->code->base.size;
- opcode_t *code_end = code_start + code_size;
-
-# if defined HAVE_COMPUTED_GOTO && defined USE_CGP
-# ifdef __GNUC__
-# ifdef PARROT_I386
- init_prederef(interp, PARROT_CGP_CORE);
-# endif
-# endif
-# endif
- if (Parrot_exec_run == 1)
- Parrot_exec(interp, pc, code_start, code_end);
- else
- run_native(interp, pc, code_start);
-#else
UNUSED(interp);
UNUSED(pc);
-#endif
return NULL;
}
Modified: branches/kill_jit/src/runcore/main.c
==============================================================================
--- branches/kill_jit/src/runcore/main.c Fri Sep 18 18:09:39 2009 (r41336)
+++ branches/kill_jit/src/runcore/main.c Fri Sep 18 19:23:58 2009 (r41337)
@@ -496,43 +496,6 @@
}
-#if EXEC_CAPABLE
-
-/*
-
-=item C<void exec_init_prederef(PARROT_INTERP, void *prederef_arena)>
-
-C<< interp->op_lib >> = prederefed oplib
-
-The "normal" C<op_lib> has a copy in the interpreter structure - but get
-the C<op_code> lookup function from standard core prederef has no
-C<op_info_table>
-
-=cut
-
-*/
-
-void
-exec_init_prederef(PARROT_INTERP, ARGIN(void *prederef_arena))
-{
- ASSERT_ARGS(exec_init_prederef)
- Parrot_runcore_t *old_runcore = interp->run_core;
- Parrot_runcore_switch(interp, Parrot_str_new_constant(interp, "cgp"));
-
- load_prederef(interp, interp->run_core);
- interp->run_core = old_runcore;
-
- if (!interp->code->prederef.code) {
- void ** const temp = (void **)prederef_arena;
-
- interp->code->prederef.code = temp;
- /* TODO */
- }
-}
-
-#endif
-
-
/*
=item C<void * init_jit(PARROT_INTERP, opcode_t *pc)>
More information about the parrot-commits
mailing list