- Projects

LT 81: auto-build: Directory in url and output in yaml.
by Ertai 19 Jul '04

19 Jul '04

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."

1 0

[Task #153] oln conversion
by noreply＠lrde.epita.fr 19 Jul '04

19 Jul '04

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…

1 0

NEVV! Great de@ls on all your favorite s0ftware from Gelbman's S0ftShop
by Milton Shapiro 19 Jul '04

19 Jul '04

1 0

[nolimips: 119] shell::Shell is a pseudo-visitor of shell::Cmd
by Noe 18 Jul '04

18 Jul '04

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

1 0

[nolimips: 117] Move readline wrapper to misc/
by Noe 18 Jul '04

18 Jul '04

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

1 0

Vlsit Himmelfarb's Softw@re Sh0p for all Office XP s0ftware at 9O% 0ff
by Trevor Schulhof 18 Jul '04

18 Jul '04

1 0

Returned mail: see transcript for details
by Mail Delivery Subsystem 16 Jul '04

16 Jul '04

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

1 0

[nolimips: 115] Hide memory behind MMU, stage 2
by Noe 15 Jul '04

15 Jul '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/vm/memory.hh, src/vm/mmu.hh, src/vm/virtual_machine.cc: Make the MMU responsible of address translation and exception raising. * src/vm/cp0.hh (raise_addr_load, raise_addr_store): Add address load and store exception. * src/vm/virtual_machine.hh (execute): Stop execution on fatal exceptions. Index: src/vm/cp0.hh --- src/vm/cp0.hh (revision 109) +++ src/vm/cp0.hh (working copy) @@ -106,6 +106,8 @@ // Initialize registers to 0. for (unsigned i = 0; i < 32; ++i) registers[i] = 0; + + fatal_exception_ = false; } /** \name Explicit register accessors @@ -143,6 +145,30 @@ std::cerr << "Runtime Exception: Overflow" << std::endl; exit_set(exit_runtime); } + + /// Raise an address error on load exception + void raise_addr_load() + { + registers[cause] = addr_load; + std::cerr << "Runtime Exception: Address error on load" << std::endl; + fatal_exception_ = true; + exit_set(exit_runtime); + } + /// Raise an address error on load exception + void raise_addr_store() + { + registers[cause] = addr_store; + std::cerr << "Runtime Exception: Address error on store" << std::endl; + fatal_exception_ = true; + exit_set(exit_runtime); + } + + bool fatal_exception() const + { + return fatal_exception_; + } + protected: + bool fatal_exception_; /** \} */ protected: Index: src/vm/memory.hh --- src/vm/memory.hh (revision 113) +++ src/vm/memory.hh (working copy) @@ -42,14 +42,21 @@ static const int stack_bottom = INT32_MAX - 3; static const int default_stack_size = 512 * 1024; + enum segment_kind + { + heap = 0, + stack = 1 + }; + /** \name Constructor and destructor \{ */ public: /// Construct a Memory. Memory(int stack_size = default_stack_size): - heap_(0), stack_(stack_size), stack_top_(stack_bottom - stack_size + 4) + stack_top_(stack_bottom - stack_size + 4) { assertion(stack_size > 0); + segments_[stack].resize(stack_size); } /** \} */ @@ -59,33 +66,29 @@ // DO NOT zero-ify the memory } - protected: - int translate(int offset) const - { - precondition(offset >= stack_top_); - // Stack grows down - return offset - stack_top_; - } - public: int sbrk(int size) { precondition(size >= 0); - int ptr = heap_.size(); + int ptr = segments_[heap].size(); if (size) // FIXME: check collision with stack - heap_.resize(size + heap_.size()); + segments_[heap].resize(size + segments_[heap].size()); return ptr; } public: int heap_size() const { - return heap_.size (); + return segments_[heap].size(); } int stack_size() const { - return stack_.size (); + return segments_[stack].size(); + } + int get_stack_top() const + { + return stack_top_; } /** \name Store instructions. @@ -93,28 +96,20 @@ public: void store(const inst::DataSection& data_section) { - heap_.resize(data_section.size()); + segments_[heap].resize(data_section.size()); for (int i = 0; i < data_section.size(); ++i) - heap_.store_byte(i, data_section.load_byte(i)); + segments_[heap].store_byte(i, data_section.load_byte(i)); } /// Store a byte in memory. - void store_byte(int offset, int b) + void store_byte(segment_kind k, int offset, int b) { - precondition(offset >= 0); - if (offset < heap_.size()) - heap_.store_byte(offset, b); - else - stack_.store_byte(translate(offset), b); + segments_[k].store_byte(offset, b); } /// Store a word in memory. - void store_word(int offset, int w) + void store_word(segment_kind k, int offset, int w) { - precondition(offset >= 0); - if (offset < heap_.size()) - heap_.store_word(offset, w); - else - stack_.store_word(translate(offset), w); + segments_[k].store_word(offset, w); } /** \} */ @@ -122,26 +117,19 @@ \{ */ public: /// Load a byte from memory. - int load_byte(int offset) const + int load_byte(segment_kind k, int offset) const { - precondition(offset >= 0); - if (offset < heap_.size()) - return heap_.load_byte(offset); - return stack_.load_byte(translate(offset)); + return segments_[k].load_byte(offset); } /// Load a word from memory. - int load_word(int offset) const + int load_word(segment_kind k, int offset) const { - precondition(offset >= 0); - if (offset < heap_.size()) - return heap_.load_word(offset); - return stack_.load_word(translate(offset)); + return segments_[k].load_word(offset); } /** \} */ protected: - Segment heap_; - Segment stack_; + Segment segments_[2]; const int stack_top_; }; Index: src/vm/virtual_machine.hh --- src/vm/virtual_machine.hh (revision 114) +++ src/vm/virtual_machine.hh (working copy) @@ -65,7 +65,7 @@ std::ostream& ostr = std::cout): mode_(mode), status_(stop), - mmu_(memory_), + mmu_(cp0_, memory_), cpu_(mmu_, cp0_, istr, ostr, check_callee_save_p, trace_exec_p) { } Index: src/vm/mmu.hh --- src/vm/mmu.hh (revision 114) +++ src/vm/mmu.hh (working copy) @@ -23,6 +23,7 @@ # include "inst/text_section.hh" +# include "vm/cp0.hh" # include "vm/memory.hh" namespace vm @@ -34,7 +35,8 @@ /** \name Constructor and destructor \{ */ public: - Mmu(Memory& memory): + Mmu(Cp0 &cp0, Memory &memory): + cp0_(cp0), memory_(memory), text_section_(0) {} @@ -48,6 +50,27 @@ /** \name Proxy for memory data access. \{ */ + protected: + bool translate(int &offset, Memory::segment_kind &k) const + { + if (0 <= offset) + { + if (offset < memory_.heap_size()) + { + k = Memory::heap; + return true; + } + if (memory_.get_stack_top() <= offset) + { + k = Memory::stack; + // Stack grows down + offset = offset - memory_.get_stack_top(); + return true; + } + } + return false; + } + public: void data_store(const inst::DataSection& data_section) { @@ -57,23 +80,41 @@ /// Store a byte in memory. void data_store_byte(int offset, int b) { - memory_.store_byte(offset, b); + Memory::segment_kind k; + if (translate(offset, k)) + memory_.store_byte(k, offset, b); + else + cp0_.raise_addr_store(); } /// Store a word in memory. void data_store_word(int offset, int w) { - memory_.store_word(offset, w); + Memory::segment_kind k; + if (translate(offset, k)) + memory_.store_word(k, offset, w); + else + cp0_.raise_addr_store(); } /// Load a byte from memory. int data_load_byte(int offset) const { - return memory_.load_byte(offset); + Memory::segment_kind k; + if (translate(offset, k)) + return memory_.load_byte(k, offset); + + cp0_.raise_addr_load(); + return 0; } /// Load a word from memory. int data_load_word(int offset) const { - return memory_.load_word(offset); + Memory::segment_kind k; + if (translate(offset, k)) + return memory_.load_word(k, offset); + + cp0_.raise_addr_load(); + return 0; } int data_sbrk(int size) @@ -92,6 +133,14 @@ const inst::Inst & inst_load(int offset) const { + // Precondition + if (offset < 0 || text_section_->size() <= offset) + { + std::cerr << "inst_load" << std::endl; + cp0_.raise_addr_load(); + return (*text_section_)[0]; // FIXME: NO! + } + return (*text_section_)[offset]; } @@ -106,9 +155,11 @@ /** \} */ protected: + /// Control coprocessor link + Cp0 &cp0_; + /// Memory link. Memory& memory_; - const inst::TextSection* text_section_; }; Index: src/vm/virtual_machine.cc --- src/vm/virtual_machine.cc (revision 113) +++ src/vm/virtual_machine.cc (working copy) @@ -55,7 +55,7 @@ // FIXME: precondition on loaded program cpu_.set_pc(main_offset_); - while (!cpu_.get_halt()) + while (! (cpu_.get_halt() || cp0_.fatal_exception())) { cpu_.step(); cp0_.set_count(cp0_.get_count() + 1); @@ -78,7 +78,7 @@ { cpu_.step(); cp0_.set_count(cp0_.get_count() + 1); - if (cpu_.get_halt()) + if (cpu_.get_halt() || cp0_.fatal_exception()) { status_ = halt; std::cerr << "Program exited." << std::endl;

1 0

[nolimips: 114] Use the MMU to access instructions.
by Noe 14 Jul '04

14 Jul '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/vm/mmu.hh: Hide instructions' access behind MMU. * src/vm/cpu.hh, src/vm/cpu.cc, src/vm/virtual_machine.hh: Use the MMU to access instructions. 2004-07-14 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 109) +++ src/vm/cpu.hh (working copy) @@ -318,7 +318,7 @@ pipeline_[e_stage] = pipeline_[r_stage]; pipeline_[r_stage] = pipeline_[d_stage]; pipeline_[d_stage] = pipeline_[i_stage]; - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); pipeline_[e_stage]->accept(*this); pc_ = pc_ + 4; Index: src/vm/virtual_machine.hh --- src/vm/virtual_machine.hh (revision 113) +++ src/vm/virtual_machine.hh (working copy) @@ -99,13 +99,13 @@ /// Check if a label exists bool has_label(const std::string& label) const { - return mmu_.inst().has_label(inst::Label(label)); + return mmu_.inst_has_label(label); } /// Return the offset of a label int get_offset(const std::string& label) const { - return mmu_.inst().get_offset(inst::Label(label)); + return mmu_.inst_get_offset(label); } public: Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 113) +++ src/vm/cpu.cc (working copy) @@ -463,7 +463,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } void Cpu::visit(const inst::Jr& jr) @@ -477,7 +477,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } void @@ -491,7 +491,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); // Assume it is a call call(); @@ -507,7 +507,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); // Assume it is a call call(); @@ -526,7 +526,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } void @@ -540,7 +540,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } @@ -556,7 +556,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } void @@ -575,7 +575,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } void @@ -589,7 +589,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } @@ -605,7 +605,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } void @@ -619,7 +619,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } void @@ -638,7 +638,7 @@ // Bubble in decode stage pipeline_[d_stage] = bubble_; // Speculatively fetched instruction - pipeline_[i_stage] = & mmu_.inst()[pc_ / 4]; + pipeline_[i_stage] = & mmu_.inst_load(pc_ / 4); } } Index: src/vm/mmu.hh --- src/vm/mmu.hh (revision 113) +++ src/vm/mmu.hh (working copy) @@ -85,14 +85,24 @@ /** \name Proxy for memory instruction access. \{ */ public: - const inst::TextSection& inst() const - { - return *text_section_; - } void inst_store(const inst::TextSection& text_section) { text_section_ = &text_section; } + + const inst::Inst & inst_load(int offset) const + { + return (*text_section_)[offset]; + } + + int inst_has_label(const std::string &label) const + { + return text_section_->has_label(inst::Label(label)); + } + int inst_get_offset(const std::string &label) const + { + return text_section_->get_offset(inst::Label(label)); + } /** \} */ protected:

1 0

[nolimips: 113] Fix run and load shell commands
by Noe 14 Jul '04

14 Jul '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/vm/memory.hh, src/vm/mmu.hh, src/vm/cpu.cc, * src/vm/virtual_machine.cc: Implement reset() method. * src/vm/virtual_machine.hh, src/vm/virtual_machine.hh: Keep and reload the main offset of loaded program. 2004-07-14 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/vm/memory.hh --- src/vm/memory.hh (revision 109) +++ src/vm/memory.hh (working copy) @@ -53,6 +53,12 @@ } /** \} */ + /// Reset the memory + void reset() + { + // DO NOT zero-ify the memory + } + protected: int translate(int offset) const { Index: src/vm/virtual_machine.hh --- src/vm/virtual_machine.hh (revision 112) +++ src/vm/virtual_machine.hh (working copy) @@ -86,6 +86,8 @@ public: /// Load a program into memory. void load_program(const inst::Program& program); + protected: + int main_offset_; // FIXME: Must disappear! public: /// Execute a program. Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 109) +++ src/vm/cpu.cc (working copy) @@ -69,6 +69,7 @@ // Initialize special registers to 0. lo_ = 0; hi_ = 0; + pc_ = 0; // Initialize pipeline with nops for (unsigned i = 0; i < 6; ++i) Index: src/vm/mmu.hh --- src/vm/mmu.hh (revision 109) +++ src/vm/mmu.hh (working copy) @@ -40,6 +40,12 @@ {} /** \} */ + /// Reset the mmu + void reset() + { + // Nothing to do? + } + /** \name Proxy for memory data access. \{ */ public: Index: src/vm/virtual_machine.cc --- src/vm/virtual_machine.cc (revision 112) +++ src/vm/virtual_machine.cc (working copy) @@ -24,27 +24,37 @@ void VirtualMachine::reset() { + memory_.reset(); + mmu_.reset(); + cp0_.reset(); + cpu_.reset(); } void VirtualMachine::load_program(const inst::Program &program) { + reset(); + if (! program.text_section ().has_label(inst::Label("main"))) { std::cerr << "No `main' label in assembly file." << std::endl; exit_set(exit_runtime); return; } + main_offset_ = program.text_section().get_offset(inst::Label("main")); mmu_.data_store(program.data_section()); mmu_.inst_store(program.text_section()); - cpu_.set_pc(program.text_section ().get_offset(inst::Label("main"))); } void VirtualMachine::execute() { - // FIXME: precondition on loaded program + // FIXME: VirtualMachine::reset()? + cp0_.reset(); + cpu_.reset(); + // FIXME: precondition on loaded program + cpu_.set_pc(main_offset_); while (!cpu_.get_halt()) { cpu_.step(); @@ -55,9 +65,14 @@ void VirtualMachine::execute(bool trace_p) { + // FIXME: VirtualMachine::reset()? + cp0_.reset(); + cpu_.reset(); + if (status_ == stop) return; + cpu_.set_pc(main_offset_); cpu_.set_trace(trace_p); while (status_ == run) {

1 0