[svn:parrot] r41310 - in branches/kill_jit: config/auto config/gen/makefiles tools/build

[darbelo at svn.parrot.org]

Author: darbelo
Date: Wed Sep 16 23:13:30 2009
New Revision: 41310
URL: https://trac.parrot.org/parrot/changeset/41310

Log:
Actually use the data gathered by auto::frames to conditionally build the frame builder. Next we'll move Parrot_jit_build_call_func and dependencies into the src/frame_builder.c and kill the x86 JIT for good.

Modified:
   branches/kill_jit/config/auto/frames.pm
   branches/kill_jit/config/gen/makefiles/root.in
   branches/kill_jit/tools/build/nativecall.pl

Modified: branches/kill_jit/config/auto/frames.pm
==============================================================================
--- branches/kill_jit/config/auto/frames.pm	Wed Sep 16 21:22:58 2009	(r41309)
+++ branches/kill_jit/config/auto/frames.pm	Wed Sep 16 23:13:30 2009	(r41310)
@@ -42,7 +42,20 @@
         $can_build_call_frames = 1;
     }
 
-    $conf->data->set( can_build_call_frames => $can_build_call_frames );
+    if ( $can_build_call_frames ) {
+        $conf->data->set(
+            can_build_call_frames => 1,
+            cc_build_call_frames  => '-DCAN_BUILD_CALL_FRAMES',
+        );
+    }
+    else {
+        $conf->data->set(
+            can_build_call_frames => 0,
+            cc_build_call_frames  => '',
+        );
+    }
+
+
     $self->set_result($can_build_call_frames?'yes':'no');
     return 1;
 }

Modified: branches/kill_jit/config/gen/makefiles/root.in
==============================================================================
--- branches/kill_jit/config/gen/makefiles/root.in	Wed Sep 16 21:22:58 2009	(r41309)
+++ branches/kill_jit/config/gen/makefiles/root.in	Wed Sep 16 23:13:30 2009	(r41310)
@@ -103,7 +103,7 @@
 CC_INC           := @cc_inc@
 C_LIBS           := @libs@
 CC_SHARED        := @cc_shared@
-CFLAGS           := $(CC_INC) @ccflags@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ @clock_best@ $(CC_SHARED)
+CFLAGS           := $(CC_INC) @ccflags@ @cc_build_call_frames@ @cc_debug@ @ccwarn@ @cg_flag@ @gc_flag@ @clock_best@ $(CC_SHARED)
 LINK_DYNAMIC     := @link_dynamic@
 LINK             := @link@
 LINKFLAGS        := @linkflags@ @link_debug@ @ld_debug@
@@ -439,6 +439,7 @@
     $(SRC_DIR)/longopt$(O) \
     $(SRC_DIR)/misc$(O) \
     $(SRC_DIR)/multidispatch$(O) \
+#IF(can_build_call_frames):    $(SRC_DIR)/frame_builder$(O) \
     $(SRC_DIR)/nci$(O) \
     $(SRC_DIR)/oo$(O) \
     $(SRC_DIR)/packfile$(O) \
@@ -617,6 +618,7 @@
     $(SRC_DIR)/key.str \
     $(SRC_DIR)/library.str \
     $(SRC_DIR)/multidispatch.str \
+#IF(can_build_call_frames):    $(SRC_DIR)/frame_builder.str \
     $(SRC_DIR)/nci.str \
     $(SRC_DIR)/packfile.str \
     $(SRC_DIR)/pmc.str \
@@ -1181,10 +1183,13 @@
 $(SRC_DIR)/exit$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/exit.c
 
 $(SRC_DIR)/nci$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/nci.c $(SRC_DIR)/nci.str \
+#IF(can_build_call_frames):        $(SRC_DIR)/frame_builder$(O) \
         $(SRC_DIR)/pmc/pmc_managedstruct.h \
         $(SRC_DIR)/pmc/pmc_nci.h \
         $(SRC_DIR)/pmc/pmc_pointer.h
 
+#IF(can_build_call_frames):$(SRC_DIR)/frame_builder$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/frame_builder.c $(SRC_DIR)/frame_builder.str
+
 $(SRC_DIR)/vtables$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/vtables.c
 
 $(SRC_DIR)/gc/system$(O) : $(GENERAL_H_FILES)  $(SRC_DIR)/gc/gc_private.h

Modified: branches/kill_jit/tools/build/nativecall.pl
==============================================================================
--- branches/kill_jit/tools/build/nativecall.pl	Wed Sep 16 21:22:58 2009	(r41309)
+++ branches/kill_jit/tools/build/nativecall.pl	Wed Sep 16 23:13:30 2009	(r41310)
@@ -232,8 +232,7 @@
  */
 
 #if defined(CAN_BUILD_CALL_FRAMES)
-#  include "parrot/exec.h"
-#  include "jit.h"
+#  include "frame_builder.h"
 #endif
 
 /*