[svn:parrot] r41326 - in branches/kill_jit: config/gen/makefiles src tools/build

[darbelo at svn.parrot.org]

Author: darbelo
Date: Thu Sep 17 20:14:37 2009
New Revision: 41326
URL: https://trac.parrot.org/parrot/changeset/41326

Log:
Unbreak non-x86 build. Test pass.

Modified:
   branches/kill_jit/config/gen/makefiles/root.in
   branches/kill_jit/src/frame_builder.h
   branches/kill_jit/tools/build/nativecall.pl

Modified: branches/kill_jit/config/gen/makefiles/root.in
==============================================================================
--- branches/kill_jit/config/gen/makefiles/root.in	Thu Sep 17 19:39:19 2009	(r41325)
+++ branches/kill_jit/config/gen/makefiles/root.in	Thu Sep 17 20:14:37 2009	(r41326)
@@ -439,7 +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)/frame_builder$(O) \
     $(SRC_DIR)/nci$(O) \
     $(SRC_DIR)/oo$(O) \
     $(SRC_DIR)/packfile$(O) \
@@ -618,7 +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)/frame_builder.str \
     $(SRC_DIR)/nci.str \
     $(SRC_DIR)/packfile.str \
     $(SRC_DIR)/pmc.str \
@@ -1183,12 +1183,12 @@
 $(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)/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) : $(SRC_DIR)/frame_builder.h   $(GENERAL_H_FILES) $(SRC_DIR)/frame_builder.c $(SRC_DIR)/frame_builder.str
+$(SRC_DIR)/frame_builder$(O) : $(SRC_DIR)/frame_builder.h $(GENERAL_H_FILES) $(SRC_DIR)/frame_builder.c $(SRC_DIR)/frame_builder.str
 
 $(SRC_DIR)/vtables$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/vtables.c
 

Modified: branches/kill_jit/src/frame_builder.h
==============================================================================
--- branches/kill_jit/src/frame_builder.h	Thu Sep 17 19:39:19 2009	(r41325)
+++ branches/kill_jit/src/frame_builder.h	Thu Sep 17 20:14:37 2009	(r41326)
@@ -364,6 +364,11 @@
 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)
+
 /*
  * set return value
  */

Modified: branches/kill_jit/tools/build/nativecall.pl
==============================================================================
--- branches/kill_jit/tools/build/nativecall.pl	Thu Sep 17 19:39:19 2009	(r41325)
+++ branches/kill_jit/tools/build/nativecall.pl	Thu Sep 17 20:14:37 2009	(r41326)
@@ -230,14 +230,7 @@
  * - if it returns NULL, the hardcoded version will do the job
  */
 
-#if defined(CAN_BUILD_CALL_FRAMES)
-#  include "frame_builder.h"
-#endif
-
-#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)
+#include "frame_builder.h"
 
 #ifndef CAN_BUILD_CALL_FRAMES
 /* All our static functions that call in various ways. Yes, terribly