Index: src/jit/i386/exec_dep.h
===================================================================
--- src/jit/i386/exec_dep.h	(revision 22775)
+++ src/jit/i386/exec_dep.h	(working copy)
@@ -18,157 +18,22 @@
 #ifndef PARROT_I386_EXEC_DEP_H_GUARD
 #define PARROT_I386_EXEC_DEP_H_GUARD
 
-#ifdef JIT_CGP
-
 void
 Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
-                     PARROT_INTERP)
-{
-    Parrot_jit_optimizer_section_ptr cur_section =
-        jit_info->optimizer->cur_section;
-    int i, j, last_is_branch = 0;
-    void ** offset;
-    extern PARROT_API char **Parrot_exec_rel_addr;
-    extern PARROT_API int Parrot_exec_rel_count;
+                     PARROT_INTERP);
 
-    assert(op_jit[*jit_info->cur_op].extcall == 1);
-    if (cur_section->done == 1)
-        return;
-    else if (cur_section->done == -1 && --cur_section->ins_count > 0)
-        return;
-    /* check, where section ends
-     */
-    if (interp->op_info_table[*cur_section->end].jump)
-        last_is_branch = 1;
-    else if (cur_section->next && !cur_section->next->isjit)
-        last_is_branch = 1;
-    /* if more then 1 op, then jump to CGP, branches are never
-     * executed in CGP, they are handled below */
-    if (cur_section->done >= 0 &&
-            (INTVAL)cur_section->op_count >= 2 + last_is_branch) {
-        int saved = 0;
-        offset = (void **)((int)jit_info->cur_op -
-            (int)interp->code->base.data);
-
-        jit_emit_mov_ri_i(jit_info->native_ptr, emit_ESI, offset);
-        Parrot_exec_add_text_rellocation(jit_info->objfile,
-            jit_info->native_ptr, RTYPE_COM, "exec_prederef_code", -4);
-        emitm_callm(jit_info->native_ptr, emit_ESI, 0, 0, 0);
-        /* now patch a B<cpu_ret> opcode after the end of the
-         * prederefed (non JIT) section
-         */
-        if (last_is_branch) {
-            offset = (cur_section->end - interp->code->base.data) +
-                interp->code->prederef.code;
-            cur_section->done = -1;
-            /* ins to skip */
-            cur_section->ins_count = cur_section->op_count - 1;
-        }
-        else {
-            /* There must be a next section: either we have a B<end>
-             * or a JITed branch,
-             * when the branch is non JIT, we are in the above case
-             */
-            offset = (cur_section->next->begin - interp->code->base.data)
-                + interp->code->prederef.code;
-            cur_section->done = 1;
-        }
-        i = (int)(((op_func_t*)interp->op_lib->op_func_table)[2]);
-        j = (int)cgp_core;
-        *offset = (void *)(i - j);
-    }
-    else {
-
-        /* else call normal funtion */
-        emitm_pushl_i(jit_info->native_ptr, 0x0);
-        Parrot_exec_add_text_rellocation(jit_info->objfile,
-            jit_info->native_ptr, RTYPE_COM, "interpre", -4);
-        emitm_pushl_i(jit_info->native_ptr,
-            jit_info->objfile->bytecode_header_size +
-                jit_info->op_i * sizeof (opcode_t));
-        Parrot_exec_add_text_rellocation(jit_info->objfile,
-            jit_info->native_ptr, RTYPE_DATA, "program_code", -4);
-
-        Parrot_exec_add_text_rellocation_func(jit_info->objfile,
-            jit_info->native_ptr,
-                interp->op_info_table[*jit_info->cur_op].func_name);
-        emitm_calll(jit_info->native_ptr, EXEC_CALLDISP);
-        emitm_addb_i_r(jit_info->native_ptr, 8, emit_ESP);
-        /* when this was a branch, then EAX is now the offset
-         * in the byte_code
-         */
-
-    }
-}
-
-#else /* JIT_CGP */
-
 void
-Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
-                     PARROT_INTERP)
-{
-    emitm_pushl_i(jit_info->native_ptr,
-        jit_info->objfile->bytecode_header_size +
-            jit_info->op_i * sizeof (opcode_t));
-    Parrot_exec_add_text_rellocation(jit_info->objfile, jit_info->native_ptr,
-        RTYPE_DATA, "program_code", -4);
-
-    Parrot_exec_add_text_rellocation_func(jit_info->objfile,
-        jit_info->native_ptr,
-            interp->op_info_table[*jit_info->cur_op].func_name);
-    emitm_calll(jit_info->native_ptr, EXEC_CALLDISP);
-    emitm_addb_i_r(jit_info->native_ptr, 4, emit_ESP);
-}
-
-#endif /* JIT_CGP */
-
-void
 Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info,
-                   PARROT_INTERP)
-{
-    Parrot_exec_normal_op(jit_info, interp);
-    Parrot_emit_jump_to_eax(jit_info, interp);
-}
+                   PARROT_INTERP);
 
 void
 Parrot_exec_restart_op(Parrot_jit_info_t *jit_info,
-                   PARROT_INTERP)
-{
-    char *jmp_ptr, *sav_ptr;
+                   PARROT_INTERP);
 
-    Parrot_exec_normal_op(jit_info, interp);
-    /* test eax, if zero (e.g after trace), return from JIT */
-    jit_emit_test_r_i(jit_info->native_ptr, emit_EAX);
-    /* remember PC */
-    jmp_ptr = jit_info->native_ptr;
-    /* emit jump past exit code, dummy offset
-     * this assumes exit code is not longer then a short jump (126 bytes) */
-    emitm_jxs(jit_info->native_ptr, emitm_jnz, 0);
-    exec_emit_end(jit_info->native_ptr);
-    /* fixup above jump */
-    sav_ptr = jit_info->native_ptr;
-    jit_info->native_ptr = jmp_ptr;
-    emitm_jxs(jit_info->native_ptr, emitm_jnz, (long)(sav_ptr - jmp_ptr) - 2);
-    /* restore PC */
-    jit_info->native_ptr = sav_ptr;
-    Parrot_emit_jump_to_eax(jit_info, interp);
-}
-
 /* Assign the offset of the progra_code */
-static void
-offset_fixup(Parrot_exec_objfile_t *obj)
-{
-    int i,j;
+void
+offset_fixup(Parrot_exec_objfile_t *obj);
 
-    for (i = 0; i < obj->data_count; i++) {
-#ifdef EXEC_A_OUT
-        obj->symbol_table[i].value = obj->text.size;
-#endif
-        for (j = 0; j < i; j++)
-            obj->symbol_table[i].value += obj->data_size[j];
-    }
-}
-
 #endif /* PARROT_I386_EXEC_DEP_H_GUARD */
 
 
Index: src/jit/i386/exec_dep.c
===================================================================
--- src/jit/i386/exec_dep.c	(revision 0)
+++ src/jit/i386/exec_dep.c	(revision 0)
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2003-2007, The Perl Foundation.
+ */
+
+/*
+ * exec_dep.c
+ *
+ * SVN Info
+ *    $Id$
+ * Overview:
+ *    i386 dependent functions to emit an executable.
+ * History:
+ *      Initial version by Daniel Grunblatt on 2003.6.9
+ * Notes:
+ * References:
+ */
+
+#include "parrot/parrot.h"
+#include "jit.h"
+#define JIT_EMIT 1
+#include "jit_emit.h"
+#include "exec_dep.h"
+
+#ifdef JIT_CGP
+
+void
+Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
+                     PARROT_INTERP)
+{
+    Parrot_jit_optimizer_section_ptr cur_section =
+        jit_info->optimizer->cur_section;
+    int i, j, last_is_branch = 0;
+    void ** offset;
+    extern PARROT_API char **Parrot_exec_rel_addr;
+    extern PARROT_API int Parrot_exec_rel_count;
+
+    assert(op_jit[*jit_info->cur_op].extcall == 1);
+    if (cur_section->done == 1)
+        return;
+    else if (cur_section->done == -1 && --cur_section->ins_count > 0)
+        return;
+    /* check, where section ends
+     */
+    if (interp->op_info_table[*cur_section->end].jump)
+        last_is_branch = 1;
+    else if (cur_section->next && !cur_section->next->isjit)
+        last_is_branch = 1;
+    /* if more then 1 op, then jump to CGP, branches are never
+     * executed in CGP, they are handled below */
+    if (cur_section->done >= 0 &&
+            (INTVAL)cur_section->op_count >= 2 + last_is_branch) {
+        int saved = 0;
+        offset = (void **)((int)jit_info->cur_op -
+            (int)interp->code->base.data);
+
+        jit_emit_mov_ri_i(jit_info->native_ptr, emit_ESI, offset);
+        Parrot_exec_add_text_rellocation(jit_info->objfile,
+            jit_info->native_ptr, RTYPE_COM, "exec_prederef_code", -4);
+        emitm_callm(jit_info->native_ptr, emit_ESI, 0, 0, 0);
+        /* now patch a B<cpu_ret> opcode after the end of the
+         * prederefed (non JIT) section
+         */
+        if (last_is_branch) {
+            offset = (cur_section->end - interp->code->base.data) +
+                interp->code->prederef.code;
+            cur_section->done = -1;
+            /* ins to skip */
+            cur_section->ins_count = cur_section->op_count - 1;
+        }
+        else {
+            /* There must be a next section: either we have a B<end>
+             * or a JITed branch,
+             * when the branch is non JIT, we are in the above case
+             */
+            offset = (cur_section->next->begin - interp->code->base.data)
+                + interp->code->prederef.code;
+            cur_section->done = 1;
+        }
+        i = (int)(((op_func_t*)interp->op_lib->op_func_table)[2]);
+        j = (int)cgp_core;
+        *offset = (void *)(i - j);
+    }
+    else {
+
+        /* else call normal funtion */
+        emitm_pushl_i(jit_info->native_ptr, 0x0);
+        Parrot_exec_add_text_rellocation(jit_info->objfile,
+            jit_info->native_ptr, RTYPE_COM, "interpre", -4);
+        emitm_pushl_i(jit_info->native_ptr,
+            jit_info->objfile->bytecode_header_size +
+                jit_info->op_i * sizeof (opcode_t));
+        Parrot_exec_add_text_rellocation(jit_info->objfile,
+            jit_info->native_ptr, RTYPE_DATA, "program_code", -4);
+
+        Parrot_exec_add_text_rellocation_func(jit_info->objfile,
+            jit_info->native_ptr,
+                interp->op_info_table[*jit_info->cur_op].func_name);
+        emitm_calll(jit_info->native_ptr, EXEC_CALLDISP);
+        emitm_addb_i_r(jit_info->native_ptr, 8, emit_ESP);
+        /* when this was a branch, then EAX is now the offset
+         * in the byte_code
+         */
+
+    }
+}
+
+#else /* JIT_CGP */
+
+void
+Parrot_exec_normal_op(Parrot_jit_info_t *jit_info,
+                     PARROT_INTERP)
+{
+    emitm_pushl_i(jit_info->native_ptr,
+        jit_info->objfile->bytecode_header_size +
+            jit_info->op_i * sizeof (opcode_t));
+    Parrot_exec_add_text_rellocation(jit_info->objfile, jit_info->native_ptr,
+        RTYPE_DATA, "program_code", -4);
+
+    Parrot_exec_add_text_rellocation_func(jit_info->objfile,
+        jit_info->native_ptr,
+            interp->op_info_table[*jit_info->cur_op].func_name);
+    emitm_calll(jit_info->native_ptr, EXEC_CALLDISP);
+    emitm_addb_i_r(jit_info->native_ptr, 4, emit_ESP);
+}
+
+#endif /* JIT_CGP */
+
+void
+Parrot_exec_cpcf_op(Parrot_jit_info_t *jit_info,
+                   PARROT_INTERP)
+{
+    Parrot_exec_normal_op(jit_info, interp);
+    Parrot_emit_jump_to_eax(jit_info, interp);
+}
+
+void
+Parrot_exec_restart_op(Parrot_jit_info_t *jit_info,
+                   PARROT_INTERP)
+{
+    char *jmp_ptr, *sav_ptr;
+
+    Parrot_exec_normal_op(jit_info, interp);
+    /* test eax, if zero (e.g after trace), return from JIT */
+    jit_emit_test_r_i(jit_info->native_ptr, emit_EAX);
+    /* remember PC */
+    jmp_ptr = jit_info->native_ptr;
+    /* emit jump past exit code, dummy offset
+     * this assumes exit code is not longer then a short jump (126 bytes) */
+    emitm_jxs(jit_info->native_ptr, emitm_jnz, 0);
+    exec_emit_end(jit_info->native_ptr);
+    /* fixup above jump */
+    sav_ptr = jit_info->native_ptr;
+    jit_info->native_ptr = jmp_ptr;
+    emitm_jxs(jit_info->native_ptr, emitm_jnz, (long)(sav_ptr - jmp_ptr) - 2);
+    /* restore PC */
+    jit_info->native_ptr = sav_ptr;
+    Parrot_emit_jump_to_eax(jit_info, interp);
+}
+
+/* Assign the offset of the progra_code */
+void
+offset_fixup(Parrot_exec_objfile_t *obj)
+{
+    int i,j;
+
+    for (i = 0; i < obj->data_count; i++) {
+#ifdef EXEC_A_OUT
+        obj->symbol_table[i].value = obj->text.size;
+#endif
+        for (j = 0; j < i; j++)
+            obj->symbol_table[i].value += obj->data_size[j];
+    }
+}
+
+/*
+ * Local variables:
+ *   c-file-style: "parrot"
+ * End:
+ * vim: expandtab shiftwidth=4:
+ */

Property changes on: src/jit/i386/exec_dep.c
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Index: config/auto/jit.pm
===================================================================
--- config/auto/jit.pm	(revision 22775)
+++ config/auto/jit.pm	(working copy)
@@ -179,7 +179,7 @@
                 TEMP_exec_h =>
 '$(SRC_DIR)/jit.h $(INC_DIR)/exec.h $(SRC_DIR)/exec_dep.h $(SRC_DIR)/exec_save.h',
                 TEMP_exec_o =>
-                    '$(SRC_DIR)/exec$(O) $(SRC_DIR)/exec_cpu$(O) $(SRC_DIR)/exec_save$(O)',
+                    '$(SRC_DIR)/exec$(O) $(SRC_DIR)/exec_dep$(O) $(SRC_DIR)/exec_cpu$(O) $(SRC_DIR)/exec_save$(O)',
                 execcapable => 1
             );
         }
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in	(revision 22775)
+++ config/gen/makefiles/root.in	(working copy)
@@ -970,6 +970,8 @@
 
 $(SRC_DIR)/exec$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@ $(SRC_DIR)/jit_emit.h
 
+$(SRC_DIR)/exec_dep$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@ $(SRC_DIR)/jit_emit.h
+
 $(SRC_DIR)/exec_cpu$(O) : $(GENERAL_H_FILES) @TEMP_exec_h@ $(SRC_DIR)/jit_emit.h
 
 $(INC_DIR)/extend_vtable.h $(SRC_DIR)/extend_vtable.c $(SRC_DIR)/vtable.h : vtable.tbl $(BUILD_TOOLS_DIR)/vtable_extend.pl lib/Parrot/Vtable.pm
@@ -1161,6 +1163,8 @@
 	$(CP) $(SRC_DIR)/jit/@jitcpuarch@/jit_emit.h $(SRC_DIR)/jit_emit.h
 $(SRC_DIR)/exec_dep.h : $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.h
 	$(CP) $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.h $(SRC_DIR)/exec_dep.h
+$(SRC_DIR)/exec_dep.c : $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.c
+	$(CP) $(SRC_DIR)/jit/@jitcpuarch@/exec_dep.c $(SRC_DIR)/exec_dep.c
 $(SRC_DIR)/jit_cpu.c : lib/Parrot/OpLib/core.pm $(SRC_DIR)/jit_emit.h \
     $(SRC_DIR)/jit/@jitcpuarch@/core.jit $(JIT_BUILD_TOOL)
 	$(PERL) $(JIT_BUILD_TOOL) @jitcpuarch@ $(SRC_DIR)/jit_cpu.c