Projects July 2004

projects@lrde.epita.fr

15 participants
42 discussions

by noreply＠lrde.epita.fr

Task #151 has been updated. Project: LrdeTools Subproject: prcs2svn Summary: bug report svn Complete: 100% Status: Closed Description: Isolate the bug which appeared in tc: a checkin using file:// with a log containing special chars is badly interpreted when you try to get it via http (i.e. svn checkout http://...). Follow-Ups: ------------------------------------------------------- Date: 19/07/2004 19:48 By: odou_s Comment: From: Simon Odou <simon(a)lrde.epita.fr> To: dev(a)subversion.tigris.org For the same project, the svn behavior is different with "file://" and "http://". Commits with particular log message can be rejected with "http" but accepted with "file". Then the command "svn log" might fail. $ svn co http://localhost/test && cd test Checked out revision 0. $ touch a && svn add a A a $ echo "a" >> a && svn ci -m `echo -ne "\0x1"` svn: Commit failed (details follow): svn: applying log message to /test/!svn/wbl/0f562004-95df-0310-837a-e85ba3689386/0: 400 Bad Request (http://localhost) If you checkout your project using file system, then your commit is accepted: $ svn co file:///svn/test && cd test Checked out revision 0. $ touch a && svn add a A a $ echo "a" >> a && svn ci -m `echo -ne "\0x1"` Adding a Transmitting file data . Committed revision 1. Using the file system, the svn log command succeed: $ svn log | cat -e No commit for revision 0.$ ------------------------------------------------------------------------$ r1 | simon | 2004-07-19 19:01:53 +0200 (Mon, 19 Jul 2004) | 1 line$ $ ^A$ ------------------------------------------------------------------------$ But using http, it fails: $ svn log svn: REPORT request failed on '/test/!svn/bc/2' svn: The REPORT request returned invalid XML in the response: XML parse error at line 7: internal error. (/test/!svn/bc/2) NB: it seems to be the same problem for most of special characters between 0x1 and 0x1f. ------------------------------------------------------- For more info, visit: http://gforge.lrde.epita.fr/pm/task.php?func=detailtask&project_task_id=151…

19 years, 9 months

[BUG] prcs2svn

by Geoffroy Fouquier

La vérification de la cohérence des dates est effectuée même lorsque l'option -p n'est pas activée. Si un problème survient, le programme demande de désactiver l'option '-p' ... -- Geoffroy Fouquier Geoffroy.Fouquier(a)lrde.epita.fr

19 years, 9 months

LT 82: Improve the CSS for auto-build.

by Clement Vasseur

Index: ChangeLog from Clement Vasseur <clement.vasseur(a)lrde.epita.fr> * auto-build/auto-build: Improve the CSS for Mozilla/Firefox. Add a `cpu' config to use the -j option of make. * auto-build/packages.list: Adjust. Index: auto-build/auto-build --- auto-build/auto-build (revision 81) +++ auto-build/auto-build (working copy) @@ -231,7 +231,7 @@ my $value = $2; my $err = 1; - foreach ('url', 'cfg', 'opt', 'env', 'dif') { + foreach ('url', 'cfg', 'opt', 'env', 'dif', 'cpu') { if ($field eq $_) { $err = 0; last; @@ -318,11 +318,11 @@ print <<HTML; <tr class="body"> - <td style="width:10em"> + <td class="left" style="width:10em"> <a href=\"$pkg->{'name'}/index.html\">$pkg->{'name'}</a> </td> - <td style="width:6em" class="st_$pkg->{'status'}">$pkg->{'status'}</td> - <td style="width:6em" class="time">$time</td> + <td style="width:7em" class="st_$pkg->{'status'}">$pkg->{'status'}</td> + <td style="width:7em" class="time">$time</td> </tr> HTML } @@ -360,17 +360,17 @@ print <<HTML; <tr class="body"> - <td style="width:8em"> + <td class="left" style="width:8em"> <a href=\"$step->{'name'}.html\">$step->{'name'}</a> </td> - <td style="width:6em" class="st_$step->{'status'}">$step->{'status'}</td> - <td style="width:6em" class="time">$time</td> + <td style="width:7em" class="st_$step->{'status'}">$step->{'status'}</td> + <td style="width:7em" class="time">$time</td> </tr> HTML } else { print <<HTML; <tr class="body"> - <td style="width:8em">$step->{'name'}</td> + <td class="left" style="width:8em">$step->{'name'}</td> <td style="width:6em" /> <td style="width:6em" /> </tr> @@ -429,9 +429,11 @@ my $archives_ready; while (<$LOG>) { + s/\</\&lt/g; + s/\>/\&gt/g; foreach my $c (@colors) { if (m/$c->[0]/) { - s/^(.*?)($c->[0])(.*)$/$1<font color=\"$c->[1]\">$2<\/font>$3/g; + s/^(.*?)($c->[0])(.*)$/$1<span style=\"color:$c->[1]\">$2<\/span>$3/g; last; } } @@ -467,6 +469,7 @@ md5sum \"$build_dir/$pkg->{'name'}/$3\"`); } $pkg->{'rev'} = $rev; + $pkg->{'rev'} = '0' unless defined $pkg->{'rev'}; if (-f $revfile) { chomp($rev = `cat \"$revfile\"`); @@ -564,16 +567,30 @@ &create_dir("$build_dir/$pkg->{'name'}"); &create_dir($dir); + if (defined $pkg->{'dif'}) { + my $bootstrap; + $bootstrap = pop @steps if $steps[-1]->{'name'} eq 'bootstrap'; push @steps, { 'name' => 'patch', 'cmd' => "patch -p0 -t -i \"$pkg->{'dif'}\"" - } if defined $pkg->{'dif'}; + }; + if (defined $bootstrap) { + if (defined $bootstrap->{'dir'}) { + $steps[-1]->{'dir'} = $bootstrap->{'dir'}; + undef $bootstrap->{'dir'}; + } + push @steps, $bootstrap; + } + } + + my $cpu = ''; + $cpu = " -j $pkg->{'cpu'}" if defined $pkg->{'cpu'}; push @steps, { 'name' => 'configure', 'cmd' => "./configure --prefix=$inst_dir/$pkg->{'name'} $pkg->{'cfg'}" }, { - 'name' => 'build', 'cmd' => 'make' + 'name' => 'build', 'cmd' => "make$cpu" }; my $dcf = ''; @@ -582,10 +599,10 @@ push @steps, { 'name' => 'check', - 'cmd' => 'make -k check' + 'cmd' => "make$cpu -k check" }, { 'name' => 'distcheck', - 'cmd' => "make -k ${dcf}distcheck" + 'cmd' => "make$cpu -k ${dcf}distcheck" } unless $pkg->{'opt'} =~ m/\bno-check\b/; push @steps, { @@ -676,13 +693,14 @@ color: #003377; } +.left { text-align: left; } table { margin-left:auto; margin-right:auto; } h1,h4 { text-align: center; background-color: #CCCCFF; } -h3 { text-indent: 1em } +h3 { text-align: left; text-indent: 1em } a { text-decoration: none; color: #003377; } a:hover { text-decoration: underline; color: #003377; } -pre { font-family: Courier, monospace; } -tr { text-indent: 0em; } +pre { text-align: left; font-family: Courier, monospace; } +tr { text-indent: 0em; text-align: center; } td { text-indent: 0em; font-family: Verdana, Helvetica, sans-serif; } tr.body { background-color: #E5E5E5; } td.time { color: gray } Index: auto-build/packages.list --- auto-build/packages.list (revision 81) +++ auto-build/packages.list (working copy) @@ -15,50 +15,35 @@ color red "^SdfChecker:error:.*$" color maroon "^warning:.*$" color maroon "^SdfChecker:warning:.*$" +color maroon "^[\w\/\.]+:\d+: [Ww]arning:.*$" +color red "^[\w\/\.]+: In .*$" color gray "^make.*:.*$" color green "^PASS:" color blue "^XPASS:" color red "^FAIL:" -### StrategoXT ################################################################ - -section "StrategoXT" - -#------------------------------------------------------------------------------ - -aterm +### Tiger ##################################################################### - url: http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.2.tar.gz - cfg: --with-gcc - opt: rm-build-dir +section "Tiger" #------------------------------------------------------------------------------ -sdf +havm - url: ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.2.tar.gz - cfg: --with-aterm=${aterm} - opt: no-check, rm-build-dir + url: svn://svn.lrde.epita.fr/svn/havm/trunk + dif: /home/lrde/lrde-2005/vasseu_c/havm.diff #------------------------------------------------------------------------------ -strategoxt - - url: http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/stratego xt-head.tar.gz - cfg: --with-aterm=${aterm}\ - --with-sdf=${sdf} - opt: no-check, rm-build-dir +nolimips -#------------------------------------------------------------------------------ + url: svn://svn.lrde.epita.fr/svn/nolimips/trunk -stratego-shell +### StrategoXT ################################################################ - url: svn://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/experimental/stratego-she ll - cfg: --with-aterm=${aterm}\ - --with-sdf=${sdf}\ - --with-strategoxt=${strategoxt} - env: PATH="${strategoxt}/bin:$PATH" - opt: rm-build-dir +aterm = /home/lrde/lrde/usr/Aterm +sdf = /home/lrde/lrde/usr/Sdf +strategoxt = /home/lrde/lrde/usr/StrategoXT ### Transformers ############################################################## @@ -120,7 +105,7 @@ sdf-attribute - url: svn://svn.lrde.epita.fr/svn/transformers/experimental/sdf-attribute + url: svn://svn.lrde.epita.fr/svn/transformers/trunk/sdf-attribute cfg: --with-aterm=${aterm}\ --with-sdf=${sdf}\ --with-strategoxt=${strategoxt}\ @@ -132,7 +117,7 @@ c-grammar - url: svn://svn.lrde.epita.fr/svn/transformers/branches/c-grammar + url: svn://svn.lrde.epita.fr/svn/transformers/trunk/c-grammar cfg: --with-aterm=${aterm}\ --with-sdf=${sdf}\ --with-strategoxt=${strategoxt}\ @@ -142,7 +127,7 @@ --with-sdf-astgen=${sdf-astgen}\ --with-sdf-attribute=${sdf-attribute}\ --with-esdf=${esdf} - env: PATH="${sdf-detgen}/bin:${stratego-shell}/bin:${strategoxt}/bin:$PATH" + env: PATH="/mnt/daily/usr/stratego-shell/bin:${strategoxt}/bin:$PATH" #------------------------------------------------------------------------------ @@ -172,20 +157,6 @@ #------------------------------------------------------------------------------ -cxx-typecheck - - url: svn://svn.lrde.epita.fr/svn/transformers/trunk/cxx-typecheck - cfg: --with-aterm=${aterm}\ - --with-sdf=${sdf}\ - --with-strategoxt=${strategoxt}\ - --with-boxedsdf=${boxedsdf}\ - --with-sdf-option=${sdf-option}\ - --with-cxx-grammar=${cxx-grammar}\ - --with-esdf=${esdf} - env: PATH="${strategoxt}/bin:$PATH" - -#------------------------------------------------------------------------------ - specs-grammar url: svn://svn.lrde.epita.fr/svn/transformers/trunk/specs-grammar @@ -200,23 +171,6 @@ --with-sdf-astgen=${sdf-astgen} env: PATH="${strategoxt}/bin:$PATH" -### Tiger ##################################################################### - -section "Tiger" - -#------------------------------------------------------------------------------ - -havm - - url: svn://svn.lrde.epita.fr/svn/havm/trunk - dif: /home/lrde/lrde-2005/vasseu_c/havm.diff - -#------------------------------------------------------------------------------ - -nolimips - - url: svn://svn.lrde.epita.fr/svn/nolimips/trunk - ### Olena ##################################################################### section "Olena" @@ -226,7 +180,9 @@ olena url: prcs://oln - env: PRCS_REPOSITORY="/home/lrde/admin/prcs/repository" + cpu: 2 + env: PRCS_REPOSITORY="/home/lrde/admin/prcs/repository",\ + CXX="g++-3.4" ### Vaucanson ################################################################# @@ -237,6 +193,8 @@ vaucanson url: svn://svn.lrde.epita.fr/svn/vaucanson/trunk - env: PATH="/home/lrde/lrde-2005/vasseu_c/usr/bin/old:$PATH" + cpu: 2 + env: PATH="/home/lrde/lrde-2005/vasseu_c/usr/bin/old:$PATH",\ + CXX="g++-3.3" #------------------------------------------------------------------------------

19 years, 9 months

LT 81: auto-build: Directory in url and output in yaml.

by Ertai

Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> * auto-build/auto-build: Make it print its output in yaml. Accept a directory in url. Index: auto-build/auto-build --- auto-build/auto-build (revision 80) +++ auto-build/auto-build (working copy) @@ -103,7 +103,7 @@ &gen_summary; foreach my $pkg (@packages) { - print "$pkg->{'name'}\n"; + print "$pkg->{'name'}:\n"; &ch_dir($build_dir); next if &check_revision($pkg); @@ -387,7 +387,7 @@ $_[0]->{'status'} = $_[1]; system("echo \"$_[1]\" > \"$build_dir/$_[0]->{'name'}/.status\"") and die "$0: unable to create `$build_dir/$_[0]->{'name'}/.status'\n"; - print " $_[1]\n"; + print " - $_[1]\n"; &gen_summary; } @@ -495,7 +495,20 @@ }; } - if (m|^file://(.*)$|) { + if (m|^file://(.*)$| and -d $1 and /^([^\/]*)\/(.*)$/) { + my $dir = $1; + $pkg->{'dir'} = $2; + + push @steps, { + 'name' => 'copy', + 'cmd' => "cp -r \"$dir\" ." + }, { + 'dir' => "echo \"$pkg->{'dir'}\"", + 'name' => 'bootstrap', + 'cmd' => "./bootstrap" + }; + + } elsif (m|^file://(.*)$|) { my $file = $_ = $1; my $c; -- Pouillard Nicolas LRDE CSI 2006 ertai(a)lrde.epita.fr "Emacs is a nice OS - but it lacks a good text editor. That's why I am using Vim."

19 years, 9 months

[Task #153] oln conversion

by noreply＠lrde.epita.fr

Task #153 has been updated. Project: LrdeTools Subproject: prcs2svn Summary: oln conversion Complete: 80% Status: Open Description: Fix bugs in prcs2svn to allow the oln conversion. Usually they are due to an inconsistent order of prcs2svn to do successive merge and normal operations. Follow-Ups: ------------------------------------------------------- Date: 19/07/2004 13:32 By: odou_s Comment: In features.11, oln/oln/basics_graph.hh must be renamed to olena/oln/basics_graph.hh before the merge with 8.24. Now reaches 8.40. ------------------------------------------------------- Date: 12/07/2004 17:32 By: odou_s Comment: reaches PRCS revision 8.11. Stops in features.11. ------------------------------------------------------- For more info, visit: http://gforge.lrde.epita.fr/pm/task.php?func=detailtask&project_task_id=153…

19 years, 9 months

NEVV! Great de@ls on all your favorite s0ftware from Gelbman's S0ftShop

by Milton Shapiro

19 years, 9 months

[nolimips: 119] shell::Shell is a pseudo-visitor of shell::Cmd

by Noe

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> shell::Cmd is a minimalist AST, shell::Shell is one of its visitor. * src/shell/cmd.hh: Move execution engine to... * src/shell/shell.hh, src/shell/shell.cc: This class. 2004-07-18 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/shell/cmd.hh --- src/shell/cmd.hh (revision 118) +++ src/shell/cmd.hh (working copy) @@ -24,22 +24,8 @@ # define SHELL_CMD_HH # include <list> -# include <map> - # include <string> -# include <sstream> -# include <iostream> - -# include <algorithm> - -# include "common.hh" -# include "modules.hh" -# include "task/task_register.hh" -# include "parse/libparse.hh" -# include "vm/virtual_machine.hh" -# include "shell/shell.hh" - namespace shell { /// Cmd Class. @@ -72,238 +58,41 @@ \{ */ public: /// Construct a Cmd. - Cmd(const cmd_type_type cmd_type, Shell &sh): - cmd_type_(cmd_type), - sh_(sh) - { - } + Cmd(const cmd_type_type cmd_type): + cmd_type_(cmd_type) + {} /// Destroy a Cmd. ~Cmd() {} /** \} */ + /** \name Accessors + \{ */ + public: /// Add an argument void push_arg(const std::string &arg) { list_args_.push_back(arg); } - /// Execute the Cmd. - int execute() - { - switch (cmd_type_) + /// Return the list of arguments + const list_args_type & get_args() const { - case cmd_quit: - return 1; - case cmd_unknown: - e_error(); - break; - case cmd_load: - e_load(); - break; - case cmd_run: - e_run(); - break; - case cmd_continue: - e_continue(); - break; - case cmd_next: - e_next(); - break; - case cmd_dump: - e_dump(); - break; - case cmd_print: - e_print(); - break; - case cmd_display: - e_display(); - break; - case cmd_undisplay: - e_undisplay(); - break; - case cmd_mem: - e_mem(); - break; - case cmd_break: - e_break(); - break; - case cmd_nop_after_branch: - e_nop_after_branch(); - break; - case cmd_null: - break; - case cmd_help: - e_help(); - } - return 0; + return list_args_; } /// Return the Cmd type. - cmd_type_type get_cmd_type() const + cmd_type_type get_type() const { return cmd_type_; } - - /** \name Function to execute. - \{ */ - private: - void e_load() - { - // FIXME: introducing memory leak! - filename = strdup(list_args_.begin()->c_str()); - - //std::cerr << "#DEBUG: _load: filename == " << filename << std::endl; - - parse::tasks::parse(); - inst::tasks::prg_solve(); - sh_.vm_.load_program(* parse::tasks::program); - } - - void e_run() - { - if (!parse::tasks::program) - { - std::cerr << "No program loaded." << std::endl; - return; - } - - if (sh_.vm_.get_status() != vm::VirtualMachine::halt) - sh_.vm_.set_runnable(); - else - { - sh_.vm_.reset(); - sh_.vm_.set_runnable(); - } - sh_.vm_.execute(false); - } - - void e_continue() - { - if (!parse::tasks::program) - { - std::cerr << "No program loaded." << std::endl; - return; - } - - if (sh_.vm_.get_status() != vm::VirtualMachine::halt) - { - sh_.vm_.set_runnable(); - sh_.vm_.execute(false); - } - else - std::cerr << "The program is not being run." << std::endl; - } - - void e_next() - { - if (!parse::tasks::program) - { - std::cerr << "No program loaded." << std::endl; - return; - } - - if (sh_.vm_.get_status() != vm::VirtualMachine::halt) - { - sh_.vm_.set_run_next(); - sh_.vm_.execute(true); - } - else - std::cerr << "The program is not being run." << std::endl; - } - - void e_break() - { - if (!parse::tasks::program) - { - std::cerr << "No program loaded." << std::endl; - return; - } - - //std::cerr <<"#DEBUG: label = " << *label << std::endl; -// sh_.vm_.add_break(*label); - sh_.vm_.add_breakpoint(*list_args_.begin()); - } - - void e_display() - { - sh_.add_display(*list_args_.begin()); - } - - void e_undisplay() - { - sh_.remove_display(*list_args_.begin()); - } - - void e_dump() - { - std::cout << sh_.vm_ << std::endl; - } - - void e_print() - { - std::cout - << *list_args_.begin() << " = " - << sh_.get_register(*list_args_.begin()) << std::endl; - } - - void e_nop_after_branch() - { - parse::tasks::nop_after_branch(); - } - - void e_mem() - { -// const std::string* addr = *(list_args_.begin()); - //std::cout << "addr: " << *addr << " = " << sh_.vm_.get_memory_offset(atoi(addr->c_str())) << std::endl; - } - - void e_error() const - { - std::cerr << "Command error" << std::endl; - } - - void e_help() const - { - std::cout << "run <args>" << std::endl - << "\trun the current loaded file with the specified arguments" - << std::endl - << "load <filename>" << std::endl - << "\tload the specified filename" << std::endl - << "break <label>" << std::endl - << "\tenable a break point on a label" << std::endl - << "quit" << std::endl - << "\tquit the debugging session" << std::endl - << "next" << std::endl - << "\texecute the next asm line" << std::endl - << "continue" << std::endl - << "\tcontinue to the next breakpoint" << std::endl - << "display <register>" << std::endl - << "\tdisplay (and set displayable) a register value" - << std::endl - << "undisplay <register>" << std::endl - << "\tundisplay a register" << std::endl - << "print <register>" << std::endl - << "\tprint a register value" << std::endl - << "dump" << std::endl - << "\tdump all the register value" << std::endl - << "mem <addr>" << std::endl - << "\tprint a the value of a memory region" << std::endl - << "nop-after-branch" << std::endl - << "\tenable Fill delay slot of branch instructions " - << "with NOP" << std::endl; - } - /** \} */ private: /// The command type. cmd_type_type cmd_type_; - /// Link to shell class. - Shell &sh_; - /// List of arguments. list_args_type list_args_; }; Index: src/shell/shell.hh --- src/shell/shell.hh (revision 118) +++ src/shell/shell.hh (working copy) @@ -39,7 +39,7 @@ # include "task/task_register.hh" # include "vm/virtual_machine.hh" - +# include "shell/cmd.hh" namespace shell { @@ -63,15 +63,9 @@ HELP = 213 }; - /** Forward declaration. */ - class Cmd; - /// Shell Class. class Shell { - /// friend class (dirty). - friend class Cmd; - public: /** \name Shortand type definition \{ */ @@ -201,6 +195,29 @@ return TERROR; } + /** \name Execution engine + \{ */ + protected: + void do_load(const Cmd &cmd); + void do_run(); + void do_continue(); + void do_next(); + void do_break(const Cmd &cmd); + + void do_display(const Cmd &cmd); + void do_undisplay(const Cmd &cmd); + void do_dump(); + void do_print(const Cmd &cmd); + void do_mem(); + + void do_nop_after_branch(); + + void do_error() const; + void do_help() const; + + int execute(const Cmd &cmd); + /** \} */ + private: /// virtual machine link. vm::VirtualMachine vm_; Index: src/shell/shell.cc --- src/shell/shell.cc (revision 118) +++ src/shell/shell.cc (working copy) @@ -19,6 +19,8 @@ #include "misc/readline.hh" +#include "parse/libparse.hh" + #include "shell/shell.hh" #include "shell/cmd.hh" @@ -94,10 +96,10 @@ void Shell::run() { - Cmd *command = new Cmd(Cmd::cmd_null, *this); + Cmd *command = new Cmd(Cmd::cmd_null); std::string line; - while ((command->execute() == 0) && misc::readline("(nolimips) ", line)) + while (execute(*command) == 0 && misc::readline("(nolimips) ", line)) { display(); @@ -120,10 +122,10 @@ switch (eat_word(iss)) { case QUIT: - return new Cmd(Cmd::cmd_quit, *this); + return new Cmd(Cmd::cmd_quit); case RUN: { - command = new Cmd(Cmd::cmd_run, *this); + command = new Cmd(Cmd::cmd_run); std::string tmp = get_next_word(iss); while (0 < tmp.length()) { @@ -134,7 +136,7 @@ } case BREAK: { - command = new Cmd(Cmd::cmd_break, *this); + command = new Cmd(Cmd::cmd_break); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -151,14 +153,14 @@ break; } case CONTINUE: - return new Cmd(Cmd::cmd_continue, *this); + return new Cmd(Cmd::cmd_continue); case NEXT: - return new Cmd(Cmd::cmd_next, *this); + return new Cmd(Cmd::cmd_next); case DUMP: - return new Cmd(Cmd::cmd_dump, *this); + return new Cmd(Cmd::cmd_dump); case LOAD: { - command = new Cmd(Cmd::cmd_load, *this); + command = new Cmd(Cmd::cmd_load); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -170,7 +172,7 @@ } case PRINT: { - command = new Cmd(Cmd::cmd_print, *this); + command = new Cmd(Cmd::cmd_print); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -188,7 +190,7 @@ } case DISPLAY: { - command = new Cmd(Cmd::cmd_display, *this); + command = new Cmd(Cmd::cmd_display); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -206,7 +208,7 @@ } case UNDISPLAY: { - command = new Cmd(Cmd::cmd_undisplay, *this); + command = new Cmd(Cmd::cmd_undisplay); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -224,7 +226,7 @@ } case MEM: { - command = new Cmd(Cmd::cmd_mem, *this); + command = new Cmd(Cmd::cmd_mem); std::string tmp = get_next_word(iss); if (tmp.empty()) { @@ -236,15 +238,228 @@ return command; } case NOP_AFTER_BRANCH: - return new Cmd(Cmd::cmd_nop_after_branch, *this); + return new Cmd(Cmd::cmd_nop_after_branch); case HELP: - return new Cmd(Cmd::cmd_help, *this); + return new Cmd(Cmd::cmd_help); case TERROR: case EOL: break; } - return new Cmd(Cmd::cmd_unknown, *this); + return new Cmd(Cmd::cmd_unknown); + } + + + void + Shell::do_load(const Cmd &cmd) + { + // FIXME: introducing memory leak! + filename = strdup(cmd.get_args().begin()->c_str()); + + //std::cerr << "#DEBUG: _load: filename == " << filename << std::endl; + + parse::tasks::parse(); + inst::tasks::prg_solve(); + vm_.load_program(* parse::tasks::program); + } + + void + Shell::do_run() + { + if (!parse::tasks::program) + { + std::cerr << "No program loaded." << std::endl; + return; + } + + if (vm_.get_status() != vm::VirtualMachine::halt) + vm_.set_runnable(); + else + { + vm_.reset(); + vm_.set_runnable(); + } + vm_.execute(false); + } + + void + Shell::do_continue() + { + if (!parse::tasks::program) + { + std::cerr << "No program loaded." << std::endl; + return; + } + + if (vm_.get_status() != vm::VirtualMachine::halt) + { + vm_.set_runnable(); + vm_.execute(false); + } + else + std::cerr << "The program is not being run." << std::endl; + } + + void + Shell::do_next() + { + if (!parse::tasks::program) + { + std::cerr << "No program loaded." << std::endl; + return; + } + + if (vm_.get_status() != vm::VirtualMachine::halt) + { + vm_.set_run_next(); + vm_.execute(true); + } + else + std::cerr << "The program is not being run." << std::endl; + } + + void + Shell::do_break(const Cmd &cmd) + { + if (!parse::tasks::program) + { + std::cerr << "No program loaded." << std::endl; + return; + } + + //std::cerr <<"#DEBUG: label = " << *label << std::endl; + // sh_.vm_.add_break(*label); + vm_.add_breakpoint(*cmd.get_args().begin()); + } + + void + Shell::do_display(const Cmd &cmd) + { + add_display(*cmd.get_args().begin()); + } + + void + Shell::do_undisplay(const Cmd &cmd) + { + remove_display(*cmd.get_args().begin()); + } + + void + Shell::do_dump() + { + std::cout << vm_ << std::endl; + } + + void + Shell::do_print(const Cmd &cmd) + { + std::cout + << *cmd.get_args().begin() << " = " + << get_register(*cmd.get_args().begin()) << std::endl; + } + + void + Shell::do_nop_after_branch() + { + parse::tasks::nop_after_branch(); + } + + void + Shell::do_mem() + { + // const std::string* addr = *(list_args_.begin()); + //std::cout << "addr: " << *addr << " = " << sh_.vm_.get_memory_offset(atoi(addr->c_str())) << std::endl; + } + + void + Shell::do_error() const + { + std::cerr << "Command error" << std::endl; + } + + void + Shell::do_help() const + { + std::cout + << "run <args>" << std::endl + << "\trun the current loaded file with the specified arguments" + << std::endl + << "load <filename>" << std::endl + << "\tload the specified filename" << std::endl + << "break <label>" << std::endl + << "\tenable a break point on a label" << std::endl + << "quit" << std::endl + << "\tquit the debugging session" << std::endl + << "next" << std::endl + << "\texecute the next asm line" << std::endl + << "continue" << std::endl + << "\tcontinue to the next breakpoint" << std::endl + << "display <register>" << std::endl + << "\tdisplay (and set displayable) a register value" + << std::endl + << "undisplay <register>" << std::endl + << "\tundisplay a register" << std::endl + << "print <register>" << std::endl + << "\tprint a register value" << std::endl + << "dump" << std::endl + << "\tdump all the register value" << std::endl + << "mem <addr>" << std::endl + << "\tprint a the value of a memory region" << std::endl + << "nop-after-branch" << std::endl + << "\tenable Fill delay slot of branch instructions " + << "with NOP" << std::endl; + } + + /// Execute the Cmd. + int + Shell::execute(const Cmd &cmd) + { + switch (cmd.get_type()) + { + case Cmd::cmd_quit: + return 1; + case Cmd::cmd_unknown: + do_error(); + break; + case Cmd::cmd_load: + do_load(cmd); + break; + case Cmd::cmd_run: + do_run(); + break; + case Cmd::cmd_continue: + do_continue(); + break; + case Cmd::cmd_next: + do_next(); + break; + case Cmd::cmd_dump: + do_dump(); + break; + case Cmd::cmd_print: + do_print(cmd); + break; + case Cmd::cmd_display: + do_display(cmd); + break; + case Cmd::cmd_undisplay: + do_undisplay(cmd); + break; + case Cmd::cmd_mem: + do_mem(); + break; + case Cmd::cmd_break: + do_break(cmd); + break; + case Cmd::cmd_nop_after_branch: + do_nop_after_branch(); + break; + case Cmd::cmd_null: + break; + case Cmd::cmd_help: + do_help(); + } + return 0; } } // namespace shell

19 years, 9 months

[nolimips: 117] Move readline wrapper to misc/

by Noe

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/shell/shell.cc: Move readline wrapper to... * src/misc/readline.hh: This file. * src/misc/Makefile.am: Distribute readline.hh Index: src/shell/shell.cc --- src/shell/shell.cc (revision 116) +++ src/shell/shell.cc (working copy) @@ -17,54 +17,14 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -#include "config.h" +#include "misc/readline.hh" #include "shell/shell.hh" #include "shell/cmd.hh" -#ifdef HAVE_READLINE_READLINE_H -# include <readline/readline.h> -// #ifdef HAVE_READLINE_HISTORY_H -# include <readline/history.h> -// #endif HAVE_READLINE_HISTORY_H -#endif // HAVE_READLINE_READLINE_H - namespace shell { - static bool readline(const std::string &prompt, std::string &line); - - // Get a line from the user, returning false on EOF - static - bool - readline(const std::string &prompt, std::string &line) - { -#ifdef HAVE_READLINE_READLINE_H - char *str = ::readline(prompt.c_str()); - - if (!str) - return false; - -// #ifdef HAVE_READLINE_HISTORY_H - // If the line has any text in it, save it on the history. - if (*str) - add_history(str); -// #endif // HAVE_READLINE_HISTORY_H - - line = str; - free(str); - - return true; - -#else // !HAVE_READLINE_READLINE_H - std::cout << prompt; - getline(std::cin, line); - return !std::cin.eof(); - -#endif // HAVE_READLINE_READLINE_H - } - - // -------------------------------------------------------------------------- // Shell // -------------------------------------------------------------------------- @@ -138,7 +98,7 @@ Cmd *command = new Cmd(Cmd::cmd_null, *this); std::string line; - while ((command->execute() == 0) && shell::readline("(nolimips) ", line)) + while ((command->execute() == 0) && misc::readline("(nolimips) ", line)) { display(); Index: src/misc/readline.hh --- src/misc/readline.hh (revision 0) +++ src/misc/readline.hh (revision 0) @@ -0,0 +1,63 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2004 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 "config.h" + +#ifdef HAVE_READLINE_READLINE_H +# include <readline/readline.h> +// #ifdef HAVE_READLINE_HISTORY_H +# include <readline/history.h> +// #endif HAVE_READLINE_HISTORY_H +#endif // HAVE_READLINE_READLINE_H + +#include <string> +#include <iostream> + +namespace misc +{ + + /// Get a line from the user, returning false on EOF + inline bool + readline(const std::string &prompt, std::string &line) + { +#ifdef HAVE_READLINE_READLINE_H + char *str = ::readline(prompt.c_str()); + + if (!str) + return false; + + // #ifdef HAVE_READLINE_HISTORY_H + // If the line has any text in it, save it on the history. + if (*str) + add_history(str); + // #endif // HAVE_READLINE_HISTORY_H + + line = str; + free(str); + + return true; + +#else // !HAVE_READLINE_READLINE_H + std::cout << prompt; + getline(std::cin, line); + return !std::cin.eof(); +#endif // HAVE_READLINE_READLINE_H + } + +} // namespace misc Index: src/misc/Makefile.am --- src/misc/Makefile.am (revision 109) +++ src/misc/Makefile.am (working copy) @@ -6,4 +6,5 @@ escape.hh \ has.hh \ counted_ptr.hh \ - select_const.hh + select_const.hh \ + readline.hh

19 years, 9 months

Vlsit Himmelfarb's Softw@re Sh0p for all Office XP s0ftware at 9O% 0ff

by Trevor Schulhof

19 years, 9 months

Returned mail: see transcript for details

by Mail Delivery Subsystem

The original message was received at Fri, 16 Jul 2004 10:13:18 -0400 (EDT) from ZO113240.ppp.dion.ne.jp [222.11.113.240] ----- The following addresses had permanent fatal errors ----- <sugarman(a)roadrunner.com> (reason: 550 Invalid recipient: <sugarman(a)roadrunner.com>) ----- Transcript of session follows ----- ... while talking to fep.biz.rr.com.: >>> DATA <<< 550 Invalid recipient: <sugarman(a)roadrunner.com> 550 5.1.1 <sugarman(a)roadrunner.com>... User unknown <<< 503 No recipients specified

19 years, 9 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects July 2004