cvsuser 03/12/23 06:36:13
Modified: config/gen/makefiles root.in
config/auto cgoto.pl
build_tools ops2c.pl
src .cvsignore
Added: ops .cvsignore
Log:
Generate the derived *.c files from *.ops files in the ops/ directory
instead of the src/
Revision Changes Path
1.176 +20 -20 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -w -r1.175 -r1.176
--- root.in 18 Dec 2003 12:20:30 -0000 1.175
+++ root.in 23 Dec 2003 14:36:04 -0000 1.176
@@ -233,9 +233,6 @@
$(SRC)/global_setup$(O) \
$(SRC)/interpreter$(O) \
$(SRC)/register$(O) \
- $(SRC)/core_ops$(O) \
- $(SRC)/core_ops_prederef$(O) \
- $(SRC)/core_ops_switch$(O) \
$(SRC)/memory$(O) \
$(SRC)/objects$(O) \
$(SRC)/packfile$(O) \
@@ -283,6 +280,9 @@
$(SRC)/mmd$(O) \
$(SRC)/extend$(O) \
pf/pf_items$(O) \
+ $(OPS)/core_ops$(O) \
+ $(OPS)/core_ops_prederef$(O) \
+ $(OPS)/core_ops_switch$(O) \
${asmfun_o} \
${cg_o} \
${exec_o} \
@@ -726,8 +726,6 @@
$(SRC)/embed$(O) : $(GENERAL_H_FILES) $(INC)/debug.h
-$(SRC)/core_ops$(O) : $(GENERAL_H_FILES) $(SRC)/core_ops.c
-
$(SRC)/dataypes$(O) : $(GENERAL_H_FILES) $(SRC)/dataypes.c
$(SRC)/exit$(O) : $(GENERAL_H_FILES) $(SRC)/exit.c
@@ -741,33 +739,35 @@
$(SRC)/nci.c : $(SRC)/call_list.txt $(BUILD_TOOL)/build_nativecall.pl
$(PERL) $(BUILD_TOOL)/build_nativecall.pl $(SRC)/call_list.txt
+$(SRC)/warnings$(O) : $(GENERAL_H_FILES)
+
+$(SRC)/misc$(O) : $(GENERAL_H_FILES)
+
+$(SRC)/utils$(O) : $(GENERAL_H_FILES)
+
+$(SRC)/spf_render$(O) : $(GENERAL_H_FILES)
+
+$(SRC)/spf_vtable$(O) : $(GENERAL_H_FILES)
+
+$(OPS)/core_ops$(O) : $(GENERAL_H_FILES) $(OPS)/core_ops.c
+
#core_ops depends upon config.h so that it gets updated along with updates to
config.h's version numbers
-$(SRC)/core_ops.c $(INC)/oplib/core_ops.h : $(OPS_FILES) $(BUILD_TOOL)/ops2c.pl
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h lib/Parrot/OpLib/core.pm
+$(OPS)/core_ops.c $(INC)/oplib/core_ops.h : $(OPS_FILES) $(BUILD_TOOL)/ops2c.pl
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h lib/Parrot/OpLib/core.pm
$(PERL) $(BUILD_TOOL)/ops2c.pl C --core
-$(SRC)/core_ops_prederef$(O) : $(GENERAL_H_FILES) $(SRC)/core_ops_prederef.c
+$(OPS)/core_ops_prederef$(O) : $(GENERAL_H_FILES) $(OPS)/core_ops_prederef.c
-$(SRC)/core_ops_prederef.c $(INC)/oplib/core_ops_prederef.h : $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h
lib/Parrot/OpLib/core.pm
+$(OPS)/core_ops_prederef.c $(INC)/oplib/core_ops_prederef.h : $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h
lib/Parrot/OpLib/core.pm
$(PERL) $(BUILD_TOOL)/ops2c.pl CPrederef --core
-$(SRC)/core_ops_switch$(O) : $(GENERAL_H_FILES) $(SRC)/core_ops_switch.c
+$(OPS)/core_ops_switch$(O) : $(GENERAL_H_FILES) $(OPS)/core_ops_switch.c
-$(SRC)/core_ops_switch.c $(INC)/oplib/core_ops_switch.h : $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h
lib/Parrot/OpLib/core.pm
+$(OPS)/core_ops_switch.c $(INC)/oplib/core_ops_switch.h : $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(INC)/config.h
lib/Parrot/OpLib/core.pm
$(PERL) $(BUILD_TOOL)/ops2c.pl CSwitch --core
${cg_c}
${gc_c}
-
-$(SRC)/warnings$(O) : $(GENERAL_H_FILES)
-
-$(SRC)/misc$(O) : $(GENERAL_H_FILES)
-
-$(SRC)/utils$(O) : $(GENERAL_H_FILES)
-
-$(SRC)/spf_render$(O) : $(GENERAL_H_FILES)
-
-$(SRC)/spf_vtable$(O) : $(GENERAL_H_FILES)
# $(STICKY_FILES) : Configure.pl
# $(PERL) Configure.pl
1.10 +7 -7 parrot/config/auto/cgoto.pl
Index: cgoto.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/cgoto.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- cgoto.pl 10 Dec 2003 11:44:17 -0000 1.9
+++ cgoto.pl 23 Dec 2003 14:36:07 -0000 1.10
@@ -27,17 +27,17 @@
Configure::Data->set(
cg_h => '$(INC)/oplib/core_ops_cg.h $(INC)/oplib/core_ops_cgp.h',
cg_c => <<'EOF',
-$(SRC)/core_ops_cg$(O): $(GENERAL_H_FILES) $(SRC)/core_ops_cg.c
-$(SRC)/core_ops_cgp$(O): $(GENERAL_H_FILES) $(SRC)/core_ops_cgp.c
+$(OPS)/core_ops_cg$(O): $(GENERAL_H_FILES) $(OPS)/core_ops_cg.c
+$(OPS)/core_ops_cgp$(O): $(GENERAL_H_FILES) $(OPS)/core_ops_cgp.c
-$(SRC)/core_ops_cg.c $(INC)/oplib/core_ops_cg.h: $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm
lib/Parrot/OpTrans/CGoto.pm
+$(OPS)/core_ops_cg.c $(INC)/oplib/core_ops_cg.h: $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm
lib/Parrot/OpTrans/CGoto.pm
$(PERL) $(BUILD_TOOL)/ops2c.pl CGoto --core
-$(SRC)/core_ops_cgp.c $(INC)/oplib/core_ops_cgp.h: $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGP.pm
+$(OPS)/core_ops_cgp.c $(INC)/oplib/core_ops_cgp.h: $(OPS_FILES)
$(BUILD_TOOL)/ops2c.pl lib/Parrot/OpsFile.pm lib/Parrot/Op.pm lib/Parrot/OpTrans/CGP.pm
$(PERL) $(BUILD_TOOL)/ops2c.pl CGP --core
EOF
- cg_o => '$(SRC)/core_ops_cg$(O) $(SRC)/core_ops_cgp$(O)',
- cg_r => '$(RM_F) $(INC)/oplib/core_ops_cg.h $(SRC)/core_ops_cg.c \
- $(INC)/oplib/core_ops_cgp.h $(SRC)/core_ops_cgp.c',
+ cg_o => '$(OPS)/core_ops_cg$(O) $(OPS)/core_ops_cgp$(O)',
+ cg_r => '$(RM_F) $(INC)/oplib/core_ops_cg.h $(OPS)/core_ops_cg.c \
+ $(INC)/oplib/core_ops_cgp.h $(OPS)/core_ops_cgp.c',
cg_flag => '-DHAVE_COMPUTED_GOTO'
);
}
1.65 +3 -3 parrot/build_tools/ops2c.pl
Index: ops2c.pl
===================================================================
RCS file: /cvs/public/parrot/build_tools/ops2c.pl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -w -r1.64 -r1.65
--- ops2c.pl 19 Nov 2003 15:29:04 -0000 1.64
+++ ops2c.pl 23 Dec 2003 14:36:09 -0000 1.65
@@ -5,7 +5,7 @@
# Generate a C header and source file from the operation definitions in
# an .ops file, using a supplied transform.
#
-# $Id: ops2c.pl,v 1.64 2003/11/19 15:29:04 leo Exp $
+# $Id: ops2c.pl,v 1.65 2003/12/23 14:36:09 boemmels Exp $
#
use strict;
@@ -64,10 +64,10 @@
my $incdir = "include/parrot/oplib";
my $include = "parrot/oplib/${base}_ops${suffix}.h";
my $header = "include/$include";
-my $source = "src/${base}_ops${suffix}.c";
+my $source = "ops/${base}_ops${suffix}.c";
if ($base =~ m!^dynoplibs/! || $dynamic) {
- $source =~ s!src/!!;
+ $source =~ s!ops/!!;
$header = "${base}_ops${suffix}.h";
$base =~ s!^.*[/\\]!!;
$include = "${base}_ops${suffix}.h";
1.2 +0 -5 parrot/src/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /cvs/public/parrot/src/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- .cvsignore 24 Oct 2003 06:40:21 -0000 1.1
+++ .cvsignore 23 Dec 2003 14:36:11 -0000 1.2
@@ -1,8 +1,3 @@
-core_ops.c
-core_ops_cg.c
-core_ops_cgp.c
-core_ops_prederef.c
-core_ops_switch.c
core_pmcs.c
exec_cpu.c
fingerprint.c
1.1 parrot/ops/.cvsignore
Index: .cvsignore
===================================================================
*.c
