September 2004 - Projects

[nolimips: 132] Use time stamp trick for bison generated files.
by Noe 29 Sep '04

29 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/parse/Makefile.am: Use time stamp trick for bison generated files. 2004-09-28 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/parse/Makefile.am --- src/parse/Makefile.am (revision 131) +++ src/parse/Makefile.am (revision 132) @@ -30,8 +30,19 @@ @mv -f $@.tmp $@ asm-parse.yy: parse-asm-parse.stamp -$(FROM_ASM_PARSE_YY): $(srcdir)/asm-parse.yy - bison -S lalr1.cc -d -ra $(srcdir)/asm-parse.yy -o asm-parse.cc +bison.stamp: asm-parse.yy + @rm -rf $@.tmp + @touch $@.tmp + bison -S lalr1.cc -d -ra asm-parse.yy -o asm-parse.cc + @mv -f $@.tmp $@ + +# Run bison if a file that can be created by it is missing: + +asm-parse.cc $(FROM_ASM_PARSE_YY): bison.stamp + @if test ! -f $@; then \ + @rm -f bison.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) bison.stamp; \ + fi MAINTAINERCLEANFILES = asm-scan.ll asm-scan.yy $(FROM_ASM_PARSE_YY)

2 4

[nolimips: 131] Do not update timestamps of generators when they fail.
by Noe 28 Sep '04

28 Sep '04

I forgot to use the stamp trick on bison generated files, the very next patch will do it. Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Do not update timestamps of generators when they fail. * src/parse/Makefile.am, dev/inst-makefile-gen.py: Suggested by Akim Demaille: Read Automake.texi :) Index: src/parse/Makefile.am --- src/parse/Makefile.am (revision 130) +++ src/parse/Makefile.am (revision 131) @@ -13,17 +13,22 @@ asm-parse.yy parse-asm-parse.stamp \ $(FROM_ASM_PARSE_YY) +# This code comes from "Handling Tools that Produce Many Outputs", +# from the Automake documentation. + parse-asm-scan.stamp: $(top_srcdir)/dev/parse-asm-scan-gen.py $(top_srcdir)/dev/nolimips.xml + @rm -rf $@.tmp + @touch $@.tmp $(top_srcdir)/dev/parse-asm-scan-gen.py < $(top_srcdir)/dev/nolimips.xml - touch $@ + @mv -f $@.tmp $@ asm-scan.ll: parse-asm-scan.stamp - touch $@ parse-asm-parse.stamp: $(top_srcdir)/dev/parse-asm-parse-gen.py $(top_srcdir)/dev/nolimips.xml + @rm -rf $@.tmp + @touch $@.tmp $(top_srcdir)/dev/parse-asm-parse-gen.py < $(top_srcdir)/dev/nolimips.xml - touch $@ + @mv -f $@.tmp $@ asm-parse.yy: parse-asm-parse.stamp - touch $@ $(FROM_ASM_PARSE_YY): $(srcdir)/asm-parse.yy bison -S lalr1.cc -d -ra $(srcdir)/asm-parse.yy -o asm-parse.cc Index: dev/inst-makefile-gen.py --- dev/inst-makefile-gen.py (revision 130) +++ dev/inst-makefile-gen.py (revision 131) @@ -50,20 +50,28 @@ program_builder.hh inst-builder-gen.stamp \\ program_solver.hh program_solver.cc inst-solver-gen.stamp +# This code comes from \"Handling Tools that Produce Many Outputs\", +# from the Automake documentation. inst-nodes-gen.stamp: $(top_srcdir)/dev/inst-nodes-gen.py $(top_srcdir)/dev/nolimips.xml + @rm -rf $@.tmp + @touch $@.tmp $(top_srcdir)/dev/inst-nodes-gen.py < $(top_srcdir)/dev/nolimips.xml - touch $@ + @mv -f $@.tmp $@ $(FROM_INST_NODES_GEN_PY): inst-nodes-gen.stamp inst-builder-gen.stamp: $(top_srcdir)/dev/inst-builder-gen.py $(top_srcdir)/dev/nolimips.xml + @rm -rf $@.tmp + @touch $@.tmp $(top_srcdir)/dev/inst-builder-gen.py < $(top_srcdir)/dev/nolimips.xml - touch $@ + @mv -f $@.tmp $@ program_builder.hh: inst-builder-gen.stamp inst-solver-gen.stamp: $(top_srcdir)/dev/inst-solver-gen.py $(top_srcdir)/dev/nolimips.xml + @rm -rf $@.tmp + @touch $@.tmp $(top_srcdir)/dev/inst-solver-gen.py < $(top_srcdir)/dev/nolimips.xml - touch $@ + @mv -f $@.tmp $@ program_solver.hh program_solver.cc: inst-solver-gen.stamp

1 0

Nolimips: src != build
by Akim Demaille 28 Sep '04

28 Sep '04

En src != build, nolimips gère incorrectement la reconstruction du parseur :( Ça fait perdre du temps avant de comprendre ce qu'il se passe...

1 0

[nolimips: 130] Add data storage directives.
by Noe 26 Sep '04

26 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Add data storage directives. * dev/parse-asm-scan-gen.py, dev/parse-asm-parse-gen.py: Add `.byte', .half', `.ascii' directives. * dev/inst-builder-gen.py: Implement new directives. * src/inst/data_section.hh: Move `.asciiz' implementation to program_builder.hh. 2004-09-26 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/inst/data_section.hh --- src/inst/data_section.hh (revision 129) +++ src/inst/data_section.hh (revision 130) @@ -81,14 +81,6 @@ add_byte(w / pow); } - void add_asciiz(const std::string* s) - { - for (unsigned i = 0; i < s->size (); ++i) - add_byte((*s)[i]); - add_byte(0); - } - - public: int load_byte(int offset) const { Index: dev/inst-builder-gen.py --- dev/inst-builder-gen.py (revision 129) +++ dev/inst-builder-gen.py (revision 130) @@ -73,18 +73,27 @@ } public: + void add_inst_label(Label *label) + { + program_->text_section ().add_label(label); + } + void add_data_label(Label *label) { program_->data_section ().add_label(label); } - void add_inst_label(Label *label) + + public: + void add_byte(int imm) { - program_->text_section ().add_label(label); + program_->data_section ().add_byte(imm); } - void add_space (int size) + void add_half(int imm) { - program_->data_section ().add_space(size); + // FIXME: check that imm is less than 0x10000! + add_byte((imm >> 8) && 0xff); + add_byte(imm && 0xff); } void add_word (int imm) @@ -98,9 +107,20 @@ add_word (program_->data_section ().get_offset(* label)); } + void add_ascii(const std::string *str) + { + for (unsigned i = 0; i < str->size (); ++i) + program_->data_section ().add_byte((*str)[i]); + } void add_asciiz (const std::string *str) { - program_->data_section ().add_asciiz (str); + add_ascii(str); + add_byte(0); + } + + void add_space (int size) + { + program_->data_section ().add_space(size); } public:""" Index: dev/parse-asm-scan-gen.py --- dev/parse-asm-scan-gen.py (revision 129) +++ dev/parse-asm-scan-gen.py (revision 130) @@ -95,9 +95,13 @@ \".text\" return DIR_TEXT; \".data\" return DIR_DATA; + +\".space\" return DIR_SPACE; +\".byte\" return DIR_BYTE; +\".half\" return DIR_HALF; \".word\" return DIR_WORD; +\".ascii\" return DIR_ASCII; \".asciiz\" return DIR_ASCIIZ; -\".space\" return DIR_SPACE; """ ## Body -------------------------------- Index: dev/parse-asm-parse-gen.py --- dev/parse-asm-parse-gen.py (revision 129) +++ dev/parse-asm-parse-gen.py (revision 130) @@ -92,8 +92,12 @@ %token DIR_TEXT \".text\" %token DIR_DATA \".data\" + %token DIR_SPACE \".space\" +%token DIR_BYTE \".byte\" +%token DIR_HALF \".half\" %token DIR_WORD \".word\" +%token DIR_ASCII \".ascii\" %token DIR_ASCIIZ \".asciiz\" """ @@ -120,14 +124,25 @@ // Label : LABEL_DEF { program_builder.add_data_label($1); } -// Reserve space + +// Uninitialized space | DIR_SPACE INTEGER { program_builder.add_space ($2); } + // Values +| DIR_BYTE INTEGER +{ program_builder.add_byte($2); } + +| DIR_HALF INTEGER +{ program_builder.add_half($2); } + | DIR_WORD INTEGER { program_builder.add_word ($2); } | DIR_WORD LABEL { program_builder.add_word ($2); } + +| DIR_ASCII STRING +{ program_builder.add_ascii($2); } | DIR_ASCIIZ STRING { program_builder.add_asciiz ($2); }

1 0

[nolimips: 129] Fix label search for program display
by Noe 26 Sep '04

26 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/inst/text_section.cc: Fix label search for program display. 2004-09-26 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/inst/text_section.cc --- src/inst/text_section.cc (revision 128) +++ src/inst/text_section.cc (revision 129) @@ -44,7 +44,7 @@ for (unsigned i = 0; i < insts_.size(); ++i) { std::map<int, label_list_type>::const_iterator it = - labels_.find(i); + labels_.find(i * 4); if (it != labels_.end()) for (label_list_type::const_iterator l = (*it).second.begin(); l != (*it).second.end(); ++l)

1 0

[nolimips: 128] Name sections
by Noe 26 Sep '04

26 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Name sections. * src/inst/section: Add name attribute. * src/inst/text_section.hh, src/inst/data_section.hh: Default it to `.text' for text sections and `.data' for data sections. * src/inst/text_section.cc, src/inst/data_section.cc (print): Display name. Index: src/inst/data_section.cc --- src/inst/data_section.cc (revision 127) +++ src/inst/data_section.cc (revision 128) @@ -26,8 +26,7 @@ // -------------------------------------------------------------------------- DataSection::~DataSection() - { - } + {} // -------------------------------------------------------------------------- // Print operator @@ -39,7 +38,7 @@ if (size_ == 0) return; - ostr << "\t.data" << std::endl; + ostr << "\t" << name_ << std::endl; int i = 0; while (i < size_) Index: src/inst/data_section.hh --- src/inst/data_section.hh (revision 127) +++ src/inst/data_section.hh (revision 128) @@ -33,11 +33,13 @@ namespace inst { + /// Abstract an assembly data section class DataSection: public Section { public: - DataSection(): + DataSection(const std::string &name = ".data"): + Section(name), size_(0) { std::memset(bytes_, 0, INST_DATA_DATASIZE); Index: src/inst/text_section.cc --- src/inst/text_section.cc (revision 127) +++ src/inst/text_section.cc (revision 128) @@ -39,7 +39,8 @@ void TextSection::print(std::ostream& ostr) const { - ostr << "\t.text" << std::endl; + ostr << "\t" << name_ << std::endl; + for (unsigned i = 0; i < insts_.size(); ++i) { std::map<int, label_list_type>::const_iterator it = Index: src/inst/section.hh --- src/inst/section.hh (revision 127) +++ src/inst/section.hh (revision 128) @@ -29,6 +29,7 @@ namespace inst { + /// Abstract an assembly section class Section { protected: @@ -39,12 +40,12 @@ typedef std::map<const Label, int> label_offset_type; public: - Section() - { - } + /// Construct an abstract section `\a name' + Section(const std::string &name): + name_(name) + {} virtual ~Section() - { - } + {} protected: void add_label(Label *label, int offset) @@ -76,6 +77,8 @@ virtual void print(std::ostream& ostr) const = 0; protected: + std::string name_; + // FIXME: Might be static, to avoid multi-definition of labels. offset_label_type labels_; label_offset_type offsets_; Index: src/inst/text_section.hh --- src/inst/text_section.hh (revision 127) +++ src/inst/text_section.hh (revision 128) @@ -30,13 +30,14 @@ namespace inst { + /// Implement an assembly text (code) section class TextSection: public Section { public: - TextSection() - { - } + TextSection(const std::string &name = ".text"): + Section(name) + {} virtual ~TextSection(); public:

1 0

LT 113: p2s: More merge verbosity
by Akim Demaille 23 Sep '04

23 Sep '04

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Prcs2svn.merge): Rename some variables and add info message to help understanding what this routine actually does. (Main.main): Report the command line and revision of this tool. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 112) +++ prcs2svn/prcs2svn.py (working copy) @@ -985,33 +985,43 @@ xchdir (os.path.join (self.workdir, self.svn.branch)) prcs_merged_parents = [] for prcs_merge_parent in prcsProject.prj.merge_parents: + # PRCS Revision to Merge. + prcs_m_rev = prcs_merge_parent[0] # Skip already merged parents (complete/incomplete repetition). - if prcs_merge_parent[0] in prcs_merged_parents: + if prcs_m_rev in prcs_merged_parents: continue - prcs_merged_parents.append(prcs_merge_parent[0]) - info("> Merge with PRCS revision " + prcs_merge_parent[0]) - svn_merge_parent = self.prcs_to_svn[prcs_merge_parent[0]] + prcs_merged_parents.append (prcs_m_rev) + + # SVN Revision to merge. + svn_m_branch = self.prcs_to_svn[prcs_m_rev][0] + svn_m_rev = self.prcs_to_svn[prcs_m_rev][1] + info("> Merge with PRCS revision %s (%s)" % (prcs_m_rev, svn_m_rev)) + + # Previous SVN Revision (of the current branch). svn_parent = self.prcs_to_svn[prcsProject.prj.parent_version.name()] + print >>sys.stderr, "BRANCH: " + prcsProject.prj.parent_version.name() + # Compute most recent common point (see oln 0_5.103). - svn_branch_start = self.svn.branches[svn_merge_parent[0]][0] + print >>sys.stderr, "REV: " + self.svn.branches[svn_m_branch].__str__ () + svn_branch_start = self.svn.branches[svn_m_branch][0] if svn_branch_start < self.svn.branches[self.svn.branch][0] and \ - self.svn.branches[self.svn.branch][0] < svn_merge_parent[1]: + self.svn.branches[self.svn.branch][0] < svn_m_rev: svn_branch_start = self.svn.branches[self.svn.branch][0] # Do merge. Ignore errors, since anyway we will solve all the # conflicts and make a fresh and clean tree. xsystem("svn --force merge " + \ "-r " + str(svn_branch_start) + \ - ":" + str(svn_merge_parent[1]) + \ + ":" + str(svn_m_rev) + \ " " + urlparse.urljoin(self.svn.repository + "/", - svn_merge_parent[0]), True) + svn_m_branch), True) # The conflicts will be resolved later, tell it now to Subversion. xsystem("svn resolved --recursive .") self.svn.changes_commit ("prcs2svn", "Only merge branches, "+\ "conflicts will be resolved later.", prcsProject.create_date) # Compute the intermediate project descriptor - prcs_checkout ("-r " + prcs_merge_parent[0] + " " + + prcs_checkout ("-r " + prcs_m_rev + " " + prcsProject.name + ".prj " + prcsProject.name + ".prj") prcsProject.prev_prj = prcs.merge(prcsProject.prev_prj, prcsProject.prj_parser.parse(prcsProject.name + ".prj"), @@ -1124,6 +1134,8 @@ class Main: def main(self): + info ("This is prcs2svn $Id$.") + info ("Command line arguments: " + sys.argv.__str__ ()) self.parse_opt(sys.argv[1:]) self.test_environment() self.init_repositories() @@ -1199,6 +1211,7 @@ "svn-root=", "copy-svn", "svn-project=", "subdir=", "keep-deleted-files", + "no-check", "no-rekey", "no-ignores"]) except getopt.GetoptError, error_msg: raise ScanOpt(str(error_msg)) Property changes on: prcs2svn/prcs2svn.py ___________________________________________________________________ Name: svn:keywords + Id

1 0

[nolimips: 121] Split task.hh and task.cc
by Noe 23 Sep '04

23 Sep '04

Index: trunk/ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/task/task.hh, src/task/task.cc: Split in... * src/task/function_task.hh, src/task/function_task.cc, * src/task/libtask.hh: These new files. * src/task/Makefile.am: Distribute new files. * src/task/task-tasks.hh, src/shell/shell-tasks.hh, * src/parse/parse-tasks.hh, src/nolimips-tasks.hh, * src/inst/inst-tasks.hh, src/vm/vm-tasks.hh: Include libtask.hh instead of task/task.hh Test invalid access to memory. Index: trunk/src/task/task.hh --- trunk/src/task/task.hh (revision 120) +++ trunk/src/task/task.hh (revision 121) @@ -72,44 +72,6 @@ deps_type dependencies_; }; - - class FunctionTask : public Task - { - public: - FunctionTask (void (*execute) (void), - const std::string& option, const std::string& module_name, - const std::string& desc, const std::string& deps = ""): - Task (option, module_name, desc, deps), - execute_ (execute) - { - } - - public: - virtual void execute() const; - - private: - void (*execute_) (void); - }; - - -#ifdef NOLIMIPS_CC_ - -# define TASK_MODULE(Name) \ - const char module_name [] = Name; -# define TASK_DECLARE(Option, Desc, Routine, Deps) \ - extern void (Routine) (void); \ - task::FunctionTask task_##Routine (Routine, \ - Option, module_name, \ - Desc, Deps) -#else // !NOLIMIPS_CC_ - -# define TASK_MODULE(Name) -# define TASK_DECLARE(Name, Help, Routine, Dependencies) \ - extern void (Routine) (void) - -#endif // NOLIMIPS_CC_ - } // namespace task #endif // !TASK_TASK_HH - Index: trunk/src/task/task-tasks.hh --- trunk/src/task/task-tasks.hh (revision 120) +++ trunk/src/task/task-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef TASK_TASK_TASKS_HH # define TASK_TASK_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace task { Index: trunk/src/task/function_task.hh --- trunk/src/task/function_task.hh (revision 0) +++ trunk/src/task/function_task.hh (revision 121) @@ -0,0 +1,44 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +#ifndef TASK_FUNCTION_TASK_HH +# define TASK_FUNCTION_TASK_HH + +#include "task/task.hh" + +namespace task +{ + + class FunctionTask: public Task + { + public: + FunctionTask(void (*execute) (void), + const std::string& option, const std::string& module_name, + const std::string& desc, const std::string& deps = ""); + + public: + virtual void execute() const; + + private: + void (*execute_) (void); + }; + +} // namespace task + +#endif // !TASK_FUNCTION_TASK_HH Index: trunk/src/task/task.cc --- trunk/src/task/task.cc (revision 120) +++ trunk/src/task/task.cc (revision 121) @@ -71,11 +71,4 @@ // std::cout << "\t" << *i << std::endl; // } - - void - FunctionTask::execute() const - { - execute_(); - } - } // namespace task Index: trunk/src/task/libtask.hh --- trunk/src/task/libtask.hh (revision 0) +++ trunk/src/task/libtask.hh (revision 121) @@ -0,0 +1,43 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#ifndef TASK_LIBTASK_HH +# define TASK_LIBTASK_HH + +# include "task/function_task.hh" + +# ifdef NOLIMIPS_CC_ + +# define TASK_MODULE(Name) \ + const char module_name [] = Name; +# define TASK_DECLARE(Option, Desc, Routine, Deps) \ + extern void (Routine) (void); \ + task::FunctionTask task_##Routine (Routine, \ + Option, module_name, \ + Desc, Deps) +# else // !NOLIMIPS_CC_ + +# define TASK_MODULE(Name) +# define TASK_DECLARE(Name, Help, Routine, Dependencies) \ + extern void (Routine) (void) + +# endif // NOLIMIPS_CC_ + +#endif // !TASK_LIBTASK_HH Index: trunk/src/task/Makefile.am --- trunk/src/task/Makefile.am (revision 120) +++ trunk/src/task/Makefile.am (revision 121) @@ -3,5 +3,7 @@ noinst_LIBRARIES = libtask.a libtask_a_SOURCES = \ task.hh task.cc \ + function_task.hh function_task.cc \ task_register.hh task_register.cc \ + libtask.hh \ task-tasks.hh task-tasks.cc Index: trunk/src/task/function_task.cc --- trunk/src/task/function_task.cc (revision 0) +++ trunk/src/task/function_task.cc (revision 121) @@ -0,0 +1,41 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 Akim Demaille <akim(a)epita.fr> and +// Benoit Perrot <benoit(a)lrde.epita.fr> +// +// Nolimips is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// Nolimips is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// + +#include "task/function_task.hh" + +namespace task +{ + + FunctionTask::FunctionTask(void (*execute) (void), + const std::string& option, + const std::string& module_name, + const std::string& desc, + const std::string& deps): + Task(option, module_name, desc, deps), + execute_(execute) + {} + + void + FunctionTask::execute() const + { + execute_(); + } + +} // namespace task Index: trunk/src/vm/vm-tasks.hh --- trunk/src/vm/vm-tasks.hh (revision 120) +++ trunk/src/vm/vm-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef VM_VM_TASKS_HH # define VM_VM_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace vm { Index: trunk/src/shell/shell-tasks.hh --- trunk/src/shell/shell-tasks.hh (revision 120) +++ trunk/src/shell/shell-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef SHELL_SHELL_TASKS_HH # define SHELL_SHELL_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace shell { Index: trunk/src/parse/parse-tasks.hh --- trunk/src/parse/parse-tasks.hh (revision 120) +++ trunk/src/parse/parse-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef PARSE_PARSE_TASKS_HH # define PARSE_PARSE_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace inst { class Program; } Index: trunk/src/nolimips-tasks.hh --- trunk/src/nolimips-tasks.hh (revision 120) +++ trunk/src/nolimips-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef NOLIMIPS_TASKS_HH # define NOLIMIPS_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace nolimips { Index: trunk/src/inst/inst-tasks.hh --- trunk/src/inst/inst-tasks.hh (revision 120) +++ trunk/src/inst/inst-tasks.hh (revision 121) @@ -19,7 +19,7 @@ #ifndef INST_INST_TASKS_HH # define INST_INST_TASKS_HH -# include "task/task.hh" +# include "task/libtask.hh" namespace inst {

2 7

[nolimips: 125] Li is not a native instruction
by Noe 22 Sep '04

22 Sep '04

This patch reveals the lack of nolimips in immediate checking: li $t0, 0x10001 is invalid since 0x10001 does not fit in 16bits. In these cases, the assembler should output: lui $t0, 0x1 ori $t0, $t0, 0x10000 ... The worst is that this remark is valid for every immediate instructions (addi, ori, andi, etc.) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Li is not a native instruction * dev/nolimips.xml, src/int/program_builder.cc: Make `li' a pseudo instruction for `addiu'. * src/vm/cpu.hh, src/vm/cpu.cc: Remove emulation of `li'. Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 124) +++ src/vm/cpu.hh (revision 125) @@ -195,7 +195,6 @@ virtual void visit(const inst::Lb& lb); virtual void visit(const inst::Lbu& Lbu); virtual void visit(const inst::Lw& lw); - virtual void visit(const inst::Li& li); virtual void visit(const inst::Sb& sb); virtual void visit(const inst::Sw& sw); Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 124) +++ src/vm/cpu.cc (revision 125) @@ -365,12 +365,6 @@ // Move instructions // -------------------------------------------------------------------------- - void - Cpu::visit(const inst::Li& li) - { - set_register(li.get_dest (), li.get_imm ()); - } - // Store void Cpu::visit(const inst::Sb& sb) Index: src/inst/program_builder.cc --- src/inst/program_builder.cc (revision 124) +++ src/inst/program_builder.cc (revision 125) @@ -50,7 +50,8 @@ { // Warning: is not implemented in as for mips, check why. program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Mul(*dest, *src1, Register(Register::general, Cpu::at))); } @@ -67,7 +68,8 @@ { // FIXME: program_solver must warn and/or break when exp is zero program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Div(*src1, Register(Register::general, Cpu::at))); program_->text_section ().add_inst(new Mflo(*dest)); @@ -84,7 +86,8 @@ { // FIXME: program_solver must warn and/or break when exp is zero program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Divu(*src1, Register(Register::general, Cpu::at))); program_->text_section ().add_inst(new Mflo(*dest)); @@ -234,7 +237,8 @@ ProgramBuilder::add_sgt(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Slt(*dest, Register(Register::general, Cpu::at), *src1)); } @@ -242,7 +246,8 @@ ProgramBuilder::add_sgtu(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Sltu(*dest, Register(Register::general, Cpu::at), *src1)); } @@ -258,7 +263,8 @@ ProgramBuilder::add_sle(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Slt(*dest, Register(Register::general, Cpu::at), *src1)); program_->text_section ().add_inst(new Xori(*dest, *dest, new IntExp(1))); @@ -273,7 +279,8 @@ ProgramBuilder::add_sleu(Register *dest, Register *src1, Exp *src2) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Sltu(*dest, Register(Register::general, Cpu::at), *src1)); program_->text_section (). @@ -288,7 +295,8 @@ ProgramBuilder::add_bne(Register *src1, Exp *src2, Exp *dest) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Bne(*src1, Register(Register::general, Cpu::at), dest)); // This nop is in the delay slot @@ -301,7 +309,8 @@ ProgramBuilder::add_beq(Register *src1, Exp *src2, Exp *dest) { program_->text_section (). - add_inst(new Li(Register(Register::general, Cpu::at), src2)); + add_inst(new Addiu(Register(Register::general, Cpu::at), + Register(Register::general, Cpu::zero), src2)); program_->text_section (). add_inst(new Beq(*src1, Register(Register::general, Cpu::at), dest)); // This nop is in the delay slot @@ -545,7 +554,10 @@ new IntExp(0))); } - // Load address ------------------------------------------ + // Load -------------------------------------------------- + + // Load address + // FIXME: alias? void ProgramBuilder::add_la (Register *dest, Exp *exp, Register *base) { @@ -554,8 +566,8 @@ void ProgramBuilder::add_la (Register *reg, Exp *exp) { - // FIXME: alias - program_->text_section ().add_inst(new Li(*reg, exp)); + program_->text_section (). + add_inst(new Addiu(*reg, Register(Register::general, Cpu::zero), exp)); } } // namespace inst Index: dev/nolimips.xml --- dev/nolimips.xml (revision 124) +++ dev/nolimips.xml (revision 125) @@ -1026,15 +1026,11 @@ </syntax> </instruction> -  - <instruction opcode="li" level="native" kind="load"> + <instruction opcode="li" level="pseudo" kind="load"> <description>Move the constant imm into dest.</description> - <format> - <attribute type="Register" name="dest"/> - <attribute type="Exp" name="imm"/> - </format> - <syntax> + <syntax alias="ori"> <token kind="register" /> + <token kind="hidden" value="new Register(Register::general, Cpu::zero)"/> <token kind="immediate" /> </syntax> </instruction>

2 5

LT 112: p2s: --no-check
by Akim Demaille 22 Sep '04

22 Sep '04

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Main.parse_opt): Handle --no-check. (Informations.check_conversion): New. (repository_cmp): Use it. Use the svn project descriptor as argument instead of passing parts of it. (Prcs2svn.convert_project): Adjust. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 111) +++ prcs2svn/prcs2svn.py (working copy) @@ -240,6 +240,9 @@ # Delete files after a merge keep_deleted_files = False + # Check the consistence bw PRCS and Subversion + check_conversion = True + # Translate Populate-Ignores translate_ignores = True @@ -471,10 +474,11 @@ # Main to compare two repositories. -def repository_cmp (prcs_project, svn_project, svn_repo, prcs_revision="", - svn_revision=""): - repo_cmp = repositoryCmp (prcs_project, svn_project) - repo_cmp.doit (svn_repo, prcs_revision, svn_revision) +def repository_cmp (prcs_project, svn, prcs_revision="", svn_revision=""): + if infos.check_conversion: + debug (" > Check working copy coherency") + repo_cmp = repositoryCmp (prcs_project, svn.name) + repo_cmp.doit (svn.repository, prcs_revision, svn_revision) # Don't rely on the dtor, since it is non deterministically called! xrm (repo_cmp.tmp) @@ -901,15 +905,12 @@ prcsProject.create_date) for prcs_version in prcs_versions: self.convert_project_of_revision(prcsProject, prcs_version) - debug(" > Check working copy coherency") - repository_cmp(prcsProject.name, self.svn.name, - self.svn.repository, + repository_cmp (prcsProject.name, self.svn, prcsProject.prj.version.name(), str(self.svn.revision)) - repository_cmp(prcsProject.name, self.svn.name, self.svn.repository) + repository_cmp (prcsProject.name, self.svn) self.prcs_to_svn_list.append(self.prcs_to_svn) - # Ask user to convert a revision. def ask_revision_proceed(self): if not infos.force: @@ -1230,6 +1231,8 @@ infos.keep_deleted_files = True elif o == "--svn-root": infos.svn_root = a + elif o == "--no-check": + infos.check_conversion = False elif o == "--no-ignores": infos.translate_ignores = False elif o == "--no-rekey": @@ -1259,6 +1262,7 @@ print " [--copy-prcs]" print " [--copy-svn]" print " [--keep-deleted-files]" + print " [--no-check]" print " [--no-ignores]" print " [--no-rekey]" print " [--preserve-dates]" @@ -1292,11 +1296,16 @@ --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). --keep-deleted-files preserve deleted files after a merge operation + +Development Options: + --no-check do not check that PRCS and Subversion trees are equal --no-ignores do not translate PRCS Populate-IGnore into Subversion - svn:ignore property. - This is useful to speed up tests. - --no-rekey do not translate PRCS keywords into Subversion keywords. - This is useful to speed up tests. + svn:ignore property + --no-rekey do not translate PRCS keywords into Subversion keywords + +These options are useful to speed up tests. Do not use them to perform +real conversion. + Subversion destination repository and project: --svn-root=URL set subversion repository root to URL

1 0