Commit e7ae3852 authored by Benoit Perrot's avatar Benoit Perrot
Browse files

2005-07-31 Benoît Perrot <benoit@nostromo.lrde.epita.fr>

	Move generators to source directories.

	* dev/parse-asm-parse-gen.py, dev/parse-asm-scan-gen.py,
	* dev/inst-solver-gen.py, dev/inst-nodes-gen.py,
	* dev/inst-builder-gen.py, dev/inst-nodes-mk-gen.py,
	* dev/doc-inst-set-gen.py:
	Move to...
	* src/parse/asm-parse.yy.gen.py, src/parse/asm-scan.ll.gen.py,
	* src/inst/program_solver.gen.py, src/inst/nodes.gen.py,
	* src/inst/program_builder.hh.gen.py, src/inst/nodes.mk.gen.py,
	* doc/inst-set.texi.gen.py:
	These files (respectively).
	* src/parse/Makefile.am, src/inst/Makefile.am, doc/Makefile.am,
	* Makefile.am:
	Update accordingly.
	
parent 50db7c36
2005-07-31 Benot Perrot <benoit@nostromo.lrde.epita.fr> 2005-07-31 Benot Perrot <benoit@nostromo.lrde.epita.fr>
Move generators to source directories.
* dev/parse-asm-parse-gen.py, dev/parse-asm-scan-gen.py,
* dev/inst-solver-gen.py, dev/inst-nodes-gen.py,
* dev/inst-builder-gen.py, dev/inst-nodes-mk-gen.py,
* dev/doc-inst-set-gen.py:
Move to...
* src/parse/asm-parse.yy.gen.py, src/parse/asm-scan.ll.gen.py,
* src/inst/program_solver.gen.py, src/inst/nodes.gen.py,
* src/inst/program_builder.hh.gen.py, src/inst/nodes.mk.gen.py,
* doc/inst-set.texi.gen.py:
These files (respectively).
* src/parse/Makefile.am, src/inst/Makefile.am, doc/Makefile.am,
* Makefile.am:
Update accordingly.
2005-07-31 Benot Perrot <benoit@nostromo.lrde.epita.fr>
* configure.ac: Bump to 0.8a * configure.ac: Bump to 0.8a
* NEWS: Fix release date. * NEWS: Fix release date.
......
...@@ -5,11 +5,5 @@ SUBDIRS = config lib src doc tests distrib ...@@ -5,11 +5,5 @@ SUBDIRS = config lib src doc tests distrib
EXTRA_DIST = \ EXTRA_DIST = \
bootstrap \ bootstrap \
dev/nolimips.xml \ dev/nolimips.xml \
dev/nolimips.py \ dev/nolimips.py
dev/parse-asm-scan-gen.py \
dev/parse-asm-parse-gen.py \
dev/inst-nodes-mk-gen.py \
dev/inst-nodes-gen.py \
dev/inst-builder-gen.py \
dev/inst-solver-gen.py \
dev/doc-inst-set-gen.py
...@@ -2,22 +2,25 @@ AM_MAKEINFOFLAGS = --no-split ...@@ -2,22 +2,25 @@ AM_MAKEINFOFLAGS = --no-split
TEXI2DVI = texi2dvi --batch TEXI2DVI = texi2dvi --batch
FROM_DOC_INST_SET_GEN_PY = \ FROM_INST_SET_TEXI_GEN_PY = \
inst-set.texi inst-set.texi
BUILT_SOURCES = \ BUILT_SOURCES = \
$(FROM_DOC_INST_SET_GEN_PY) doc-inst-set-gen.log $(FROM_INST_SET_TEXI_GEN_PY) inst-set.texi.stamp
doc-inst-set-gen.log: $(top_srcdir)/dev/doc-inst-set-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST = $(srcdir)/inst-set.texi.gen.py
$(top_srcdir)/dev/doc-inst-set-gen.py . < $(top_srcdir)/dev/nolimips.xml inst-set.texi.stamp: $(srcdir)/inst-set.texi.gen.py $(top_srcdir)/dev/nolimips.xml
touch $@ @rm -rf $@.tmp
$(FROM_DOC_INST_SET_GEN_PY): doc-inst-set-gen.log @touch $@.tmp
PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/inst-set.texi.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@
$(FROM_INST_SET_TEXI_GEN_PY): inst-set.texi.stamp
MAINTAINERCLEANFILES = $(FROM_DOC_INST_SET_GEN_PY) MAINTAINERCLEANFILES = $(FROM_INST_SET_TEXI_GEN_PY)
info_TEXINFOS = nolimips.texi info_TEXINFOS = nolimips.texi
nolimips_TEXINFOS = \ nolimips_TEXINFOS = \
macros.texi \ macros.texi \
fdl.texi \ fdl.texi \
$(FROM_DOC_INST_SET_GEN_PY) doc-inst-set-gen.log $(FROM_INST_SET_TEXI_GEN_PY) inst-set.texi.stamp
include $(srcdir)/nodes.mk include $(srcdir)/nodes.mk
BUILT_SOURCES = \ BUILT_SOURCES = \
$(FROM_INST_NODES_GEN_PY) inst-nodes-gen.stamp \ $(FROM_NODES_GEN_PY) nodes.stamp \
program_builder.hh inst-builder-gen.stamp \ program_builder.hh program_builder.hh.stamp \
program_solver.hh program_solver.cc inst-solver-gen.stamp program_solver.hh program_solver.cc program_solver.stamp
# This code comes from "Handling Tools that Produce Many Outputs", # This code comes from "Handling Tools that Produce Many Outputs",
# from the Automake documentation. # from the Automake documentation.
$(srcdir)/nodes.mk: $(top_srcdir)/dev/inst-nodes-mk-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST = $(srcdir)/nodes.mk.gen.py
$(top_srcdir)/dev/inst-nodes-mk-gen.py < $(top_srcdir)/dev/nolimips.xml >$@.tmp nodes.mk: $(srcdir)/nodes.mk.gen.py $(top_srcdir)/dev/nolimips.xml
PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/nodes.mk.gen.py < $(top_srcdir)/dev/nolimips.xml >$@.tmp
mv -f $@.tmp $@ mv -f $@.tmp $@
$(srcdir)/inst-nodes-gen.stamp: $(top_srcdir)/dev/inst-nodes-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST += $(srcdir)/nodes.gen.py
nodes.stamp: $(srcdir)/nodes.gen.py $(top_srcdir)/dev/nolimips.xml
@rm -rf $@.tmp @rm -rf $@.tmp
@touch $@.tmp @touch $@.tmp
$(top_srcdir)/dev/inst-nodes-gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/nodes.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@ @mv -f $@.tmp $@
$(FROM_INST_NODES_GEN_PY): inst-nodes-gen.stamp $(FROM_NODES_GEN_PY): nodes.stamp
$(srcdir)/inst-builder-gen.stamp: $(top_srcdir)/dev/inst-builder-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST += $(srcdir)/program_builder.hh.gen.py
program_builder.hh.stamp: $(srcdir)/program_builder.hh.gen.py $(top_srcdir)/dev/nolimips.xml
@rm -rf $@.tmp @rm -rf $@.tmp
@touch $@.tmp @touch $@.tmp
$(top_srcdir)/dev/inst-builder-gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/program_builder.hh.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@ @mv -f $@.tmp $@
program_builder.hh: inst-builder-gen.stamp program_builder.hh: program_builder.hh.stamp
$(srcdir)/inst-solver-gen.stamp: $(top_srcdir)/dev/inst-solver-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST += $(srcdir)/program_solver.gen.py
program_solver.stamp: $(srcdir)/program_solver.gen.py $(top_srcdir)/dev/nolimips.xml
@rm -rf $@.tmp @rm -rf $@.tmp
@touch $@.tmp @touch $@.tmp
$(top_srcdir)/dev/inst-solver-gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/program_solver.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@ @mv -f $@.tmp $@
program_solver.hh program_solver.cc: inst-solver-gen.stamp program_solver.hh program_solver.cc: program_solver.stamp
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES = \
$(FROM_INST_NODES_GEN_PY) \ $(FROM_NODES_GEN_PY) \
program_builder.hh \ program_builder.hh \
program_solver.hh program_solver.cc program_solver.hh program_solver.cc
noinst_LIBRARIES = libinst.a noinst_LIBRARIES = libinst.a
libinst_a_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src libinst_a_CPPFLAGS = -I $(top_srcdir)/lib -I $(top_srcdir)/src -I $(top_builddir)/src
libinst_a_SOURCES = \ libinst_a_SOURCES = \
$(FROM_INST_NODES_GEN_PY) inst-nodes-gen.stamp \ $(FROM_NODES_GEN_PY) nodes.stamp \
register.hh \ register.hh \
exp.hh exp.cc \ exp.hh exp.cc \
int_exp.hh int_exp.cc \ int_exp.hh int_exp.cc \
...@@ -58,5 +62,5 @@ libinst_a_SOURCES = \ ...@@ -58,5 +62,5 @@ libinst_a_SOURCES = \
text_section.hh text_section.cc \ text_section.hh text_section.cc \
data_section.hh data_section.cc \ data_section.hh data_section.cc \
program.hh \ program.hh \
program_builder.hh program_builder.cc inst-builder-gen.stamp \ program_builder.hh program_builder.cc program_builder.hh.stamp \
program_solver.hh program_solver.cc inst-solver-gen.stamp program_solver.hh program_solver.cc program_solver.stamp
...@@ -29,7 +29,7 @@ from nolimips import license, depth ...@@ -29,7 +29,7 @@ from nolimips import license, depth
parser = nolimips.InstructionSetParser() parser = nolimips.InstructionSetParser()
instructions = parser.parse(sys.stdin) instructions = parser.parse(sys.stdin)
print "FROM_INST_NODES_GEN_PY = \\" print "FROM_NODES_GEN_PY = \\"
for i in range(0, len(instructions)): for i in range(0, len(instructions)):
if instructions[i].level == "native": if instructions[i].level == "native":
line = "\t" line = "\t"
......
...@@ -6,31 +6,33 @@ FROM_ASM_PARSE_YY = \ ...@@ -6,31 +6,33 @@ FROM_ASM_PARSE_YY = \
$(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \ $(srcdir)/stack.hh $(srcdir)/position.hh $(srcdir)/location.hh \
$(srcdir)/asm-parse.hh $(srcdir)/asm-parse.hh
BUILT_SOURCES = \ BUILT_SOURCES = \
asm-scan.ll parse-asm-scan.stamp \ asm-scan.ll asm-scan.ll.stamp \
asm-parse.yy parse-asm-parse.stamp \ asm-parse.yy asm-parse.yy.stamp \
$(FROM_ASM_PARSE_YY) $(FROM_ASM_PARSE_YY)
# This code comes from "Handling Tools that Produce Many Outputs", # This code comes from "Handling Tools that Produce Many Outputs",
# from the Automake documentation. # from the Automake documentation.
$(srcdir)/parse-asm-scan.stamp: $(top_srcdir)/dev/parse-asm-scan-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST = $(srcdir)/asm-scan.ll.gen.py
asm-scan.ll.stamp: $(srcdir)/asm-scan.ll.gen.py $(top_srcdir)/dev/nolimips.xml
@rm -rf $@.tmp @rm -rf $@.tmp
@touch $@.tmp @touch $@.tmp
$(top_srcdir)/dev/parse-asm-scan-gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/asm-scan.ll.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@ @mv -f $@.tmp $@
$(srcdir)/asm-scan.ll: $(srcdir)/parse-asm-scan.stamp $(srcdir)/asm-scan.ll: asm-scan.ll.stamp
$(srcdir)/parse-asm-parse.stamp: $(top_srcdir)/dev/parse-asm-parse-gen.py $(top_srcdir)/dev/nolimips.xml EXTRA_DIST += $(srcdir)/asm-parse.yy.gen.py
asm-parse.yy.stamp: $(srcdir)/asm-parse.yy.gen.py $(top_srcdir)/dev/nolimips.xml
@rm -rf $@.tmp @rm -rf $@.tmp
@touch $@.tmp @touch $@.tmp
$(top_srcdir)/dev/parse-asm-parse-gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml PYTHONPATH="$(top_srcdir)/dev/:$$PYTHONPATH" $(srcdir)/asm-parse.yy.gen.py $(srcdir) < $(top_srcdir)/dev/nolimips.xml
@mv -f $@.tmp $@ @mv -f $@.tmp $@
$(srcdir)/asm-parse.yy: $(srcdir)/parse-asm-parse.stamp $(srcdir)/asm-parse.yy: asm-parse.yy.stamp
BISONXX = $(top_srcdir)/config/bison++ BISONXX = $(top_srcdir)/config/bison++
EXTRA_DIST = $(srcdir)/bison++.stamp EXTRA_DIST += $(srcdir)/bison++.stamp
$(srcdir)/bison++.stamp: $(srcdir)/asm-parse.yy $(srcdir)/bison++.stamp: $(srcdir)/asm-parse.yy
@rm -rf bison++.stamp.tmp @rm -rf bison++.stamp.tmp
@touch bison++.stamp.tmp @touch bison++.stamp.tmp
...@@ -51,7 +53,7 @@ noinst_LIBRARIES = libparse.a ...@@ -51,7 +53,7 @@ noinst_LIBRARIES = libparse.a
libparse_a_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src libparse_a_CPPFLAGS = -I $(top_srcdir)/src -I $(top_builddir)/src
libparse_a_SOURCES = \ libparse_a_SOURCES = \
asm-parse.yy parse-asm-parse.stamp \ asm-parse.yy asm-parse.yy.stamp \
$(FROM_ASM_PARSE_YY) \ $(FROM_ASM_PARSE_YY) \
asm-scan.ll asm-scan.hh parse-asm-scan.stamp \ asm-scan.ll asm-scan.hh asm-scan.ll.stamp \
libparse.hh libparse.cc libparse.hh libparse.cc
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment