Projects

projects@lrde.epita.fr

1049 discussions

[LrdeTools][Vcs] 235: Refactor and improve code linked to common_commit.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Refactor and improve code linked to common_commit. * vcs/lib/vcs/vcs.rb: Add a generalized cache support and a generalized delegation support for output (puts, print ...). * vcs/lib/vcs/changelog.rb: Actions are now mk_log_entry, mk_changelog_entry, and mk_message_entry. * vcs/lib/vcs/common_commit.rb: Simplify. Generalize the backup system for all cached files (,messages). * vcs/lib/vcs/form.rb: New. Handle the big editable file, spawned during the common_commit. * vcs/lib/vcs/message.rb: Simplify, because it is now based on mk_*_entry. changelog.rb | 173 +++++++++++++++++-------------------------------------- common_commit.rb | 76 ++++++++++-------------- form.rb | 93 +++++++++++++++++++++++++++++ message.rb | 55 ++++++----------- vcs.rb | 110 +++++++++++++++++++++++++++------- 5 files changed, 287 insertions(+), 220 deletions(-) Index: vcs/lib/vcs/form.rb --- vcs/lib/vcs/form.rb (revision 0) +++ vcs/lib/vcs/form.rb (revision 0) @@ -0,0 +1,93 @@ +# Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. +# Copyright:: Copyright (c) 2005 LRDE. All rights reserved. +# License:: GNU General Public License (GPL). +# Revision:: $Id$ + +class Vcs + + def edit_form! ( *args ) + mk_from(*args) + edit! Form if Form.read =~ /\A---/ + if Form.read =~ /\A---/ + raise Failure, "You must fill this file: `#{Form}' (and remove the first line)" + else + instanciate_form(*args) + return YAML.load(IForm.read)['commited'] + end + end + + + def instanciate_form! ( *args ) + with_cache! IForm, 'instanciated form (title, subject, ChangeLog entry, diff)' do + cl = mk_from(*args).read + ls = [] + YAML.each_document("--- |\n" + cl) { |x| (ls.size == 2)? break : ls << x } + title_subject, input = ls + header = { 'title' => title_subject[/^title: (.*)$/, 1], + 'subject' => title_subject[/^subject: (.*)$/, 1] } + rev = revision.read.to_i + 1 + header.merge!('revision' => rev, 'commited' => false) + if header['title'].nil? or header['title'].blank? + raise Failure, "No title found. Reopen `#{Form}' and add it" + end + header['title'].sub!(/\.$/, '') + b = getBinding(header.merge(:rev => rev)) + input = ERB.new(input, nil, '<-%->', '$erbout_').result(b) + LogEntry.open('w') { |f| f.print input } + puts ERB.new(header.to_yaml, nil, '<-%->', '$erbout_').result(b) + end + end + IForm = ',iform'.to_path unless defined? Vcs::IForm + + + @@subject_format ||= '<%= rev %>: <%= title %>' + + def mk_from! ( *args ) + with_cache! Form, 'complete form (title, subject, ChangeLog entry, diff)' do + + puts " + |--- | ########## Fill this file correctly and remove this line ########## | --- + |title: + |subject: #{@@subject_format}. + | + |--- | ###################### Your ChangeLog entrie ############## 80c| # | --- + |<%= title %>. + | + |".head_cut! + + mk_log_entry!(*args) + + puts "| + |--- | ########### This line, and those below, will be ignored #### 80c| # | --- + |Instructions: + |- The first line must be removed when this file is filled. + |- After you must specify a title, for the news/mail subject. + | The line containing <%= title %> will be replaced by your title, + | <%= subject %> by the subject line, <%= rev %> by the revision... + |- Everywhere in the document you can get/compute some values with + | these tags <%= aRubyExpression %> even some vcs specific call. + | For example <%= status.read %> will include the 'svn status' output. + |- Tabulations and stars ('*') will be added in the ChangeLog before each line. + |- The '80c|' on the fourth line is here to show you where will be the + | limit. The '|' is the 79th char. + | + |".head_cut! + + diffw!(*args) + end + end + alias_command :mkf, :mk_form + Form = ',form'.to_path unless defined? Vcs::Form + + def getBinding ( header ) + code = [] + header.each do |k, v| + code << "#{k} = #{v.inspect}" + end + code << 'binding' + eval(code.join('; ')) + end + protected :getBinding + +end # class Vcs + Property changes on: vcs/lib/vcs/form.rb ___________________________________________________________________ Name: svn:keywords + Id Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 234) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -3,85 +3,77 @@ # License:: GNU General Public License (GPL). # Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ -require 'vcs/vcs' - class Vcs - COMMITED = Pathname.new(',commited') - def common_commit! ( subject_format, *args, &block ) + unless CL.exist? + raise Failure, "No `#{CL}', you are probably not in a valid directory." + end + opts, args = args.partition { |a| a =~ /^-/ } @@subject_format = subject_format update! - unless COMMITED.exist? - - begin - mkchangelog(*args) - rescue MustBeFilled => ex - edit! ex.file - end + Vcs.commited = edit_form!(*args) message(*args) + edit! Message - edit! @@message + iform = nil + + if commited? + iform ||= YAML.load(IForm.read) + else unless @h.agree 'Committing, are you sure? (y/n)', true commit_failed end - cl_entry = concat_changelog!(*args) - - #pager! diff - #pager! status + concat_changelog!(*args) args << 'ChangeLog' unless args.grep(/^[^-]/).empty? - # FIXME simplify cl_entry contents - begin - commit_!('--message', cl_entry, *(opts + args)) - ADD_CL.rename(COMMITED) + commit_!('--message', mk_log_entry(*args), *(opts + args)) + iform = YAML.load(IForm.read).merge('commited' => true) + IForm.open('w') { |f| f.print iform.to_yaml } TMP_CL.delete if TMP_CL.exist? - rescue - commit_failed + rescue Exception => ex + commit_failed ex end update! - else - - message(*args) - edit! @@message - end - header ||= YAML::load(META.read) - - block[header['subject']] if block_given? + block[iform['subject']] if block_given? LOG.info 'Deleting junk files...' TMP_CL.delete if TMP_CL.exist? - ADD_CL.delete if ADD_CL.exist? - COMMITED.delete if COMMITED.exist? - META.delete if META.exist? - messages = Pathname.new(',messages') - messages.mkpath unless messages.directory? - message_rev = messages + "#{@@message}.#{header['rev']}" - LOG.info "Moving `#{@@message}' to `#{message_rev}'..." - @@message.rename(message_rev) - LOG.info "You can remove `#{message_rev}' if everything is ok." + destdir = ',messages'.to_path/iform['revision'].to_s + destdir.mkpath unless destdir.directory? + [LogEntry, Form, IForm, Message, MAIL, NEWS].each do |path| + next unless path.exist? + dest = destdir/path + LOG.info "Moving `#{path}' to `#{dest}'..." + path.rename(dest) + end end + protected :common_commit! - def commit_failed - LOG.info "#{COMMITED}: Contains your ChangeLog entry" if COMMITED.exist? - LOG.error 'Aborting' + def commit_failed ( ex=nil ) + LOG.error "Aborting #{ex}" LOG.info 'You can rerun the same command to resume the commit' raise 'Commit failed' end + cattr_accessor :commited + def commited? + Vcs.commited + end + end # class Vcs Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 234) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -1,165 +1,104 @@ # Author:: Nicolas Pouillard <ertai(a)lrde.epita.fr>. -# Copyright:: Copyright (c) 2004 LRDE. All rights reserved. +# Copyright:: Copyright (c) 2004, 2005 LRDE. All rights reserved. # License:: GNU General Public License (GPL). # Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ -require 'vcs/vcs' -require 'vcs/svn' -class Svn +class Vcs - @@file_st = + @@file_st ||= { - 'A' => 'New', - 'D' => 'Remove', + ?A => 'new', + ?D => 'remove', } - @@file_st.default = '' - @@prop_st = + @@prop_st ||= { - 'M' => 'Changed property' + ?M => 'changed property' } - def mkchangelog_from_status ( *args ) - result = [] + @@entries ||= {} + + def mk_log_entry_contents ( *args ) + return @@entries[args] if @@entries.has_key? args + @@entries[args] = result = [] from_status(*args) do |line, file_st, prop_st, copy_st, file| next if file_st =~ /[?X\\,]/ - next if file == 'ChangeLog' - ls = [] - ls << @@file_st[file_st] if @@file_st.has_key? file_st - ls << @@prop_st[prop_st].downcase if @@prop_st.has_key? prop_st + next if file.to_s == 'ChangeLog' + ls = [@@file_st[file_st[0]], @@prop_st[prop_st[0]]].compact! + ls.first.capitalize! unless ls.empty? result << [file, ls.join(', ')] end raise Failure, 'No changes, so no ChangeLog entry.' if result.empty? result end - private :mkchangelog_from_status + private :mk_log_entry_contents -end # class Svn + def mk_log_entry! ( *args ) + with_cache! LogEntry, 'Log entry' do + mk_log_entry_contents(*args).each do |file, comments| + puts "- #{file}: #{comments}." + end + end + end + alias_command :mkl, :mk_log_entry + LogEntry = ',log'.to_path unless defined? LogEntry -class Vcs + def log_to_changelog ( aString ) + if aString.blank? + puts + else + putc ?\t + aString.sub!(/^-/, '*') + puts aString + end + end + private :log_to_changelog - class MustBeFilled < Exception - attr_reader :file - def initialize ( file ) - @file = file - super("You must fill this file: `#{file.to_s}' (and remove the first line)") - end - end - - @@subject_format = '<%= rev %>: <%= title %>' - - def mkchangelog! ( *args ) - error_handling :changelog_failed - - unless CL.exist? - raise Failure, "No `#{CL}', you are probably not in a valid directory." - end - - cl = ADD_CL - - # Already filled if ,ChangeLog.add exists and not begin by --- - if cl.exist? - just_one_time { LOG.info "#{cl} already exists" } - raise MustBeFilled, cl if cl.read =~ /\A---/ - require 'erb' - ls = [] - YAML.each_document("--- |\n" + cl.read) { |x| (ls.size == 2)? break : ls << x } - title_subject, input = ls - header = { 'title' => title_subject[/^title: (.*)$/, 1], - 'subject' => title_subject[/^subject: (.*)$/, 1] } - rev = revision.read.to_i + 1 - header.merge!('rev' => rev, 'revision' => rev) - raise "no title: reopen #{ADD_CL}" if header['title'].nil? - header['title'].sub!(/\.$/, '') - b = getBinding(header) - header = ERB.new(header.to_yaml, $SAFE, '<-%->', '$erbout_').result(b) - META.open('w') { |f| f.puts header } - output = ERB.new(input, $SAFE, '<-%->', '$erbout_').result(b) - return output - end - - cl_add = mkchangelog_from_status(*args) - LOG.info "Creating a new `#{cl}' file" - cl.open('w') do |f| - head = Time.now.strftime("%Y-%m-%d #{Vcs.full_email}") - f.puts " -|--- | ########## Fill this file correctly and remove this line ########## | --- -|title: -|subject: #{@@subject_format}. -| -|--- | ###################### Your ChangeLog entrie ###################### | --- - |#{head} - | - |\t<%= title %>. - | - |".head_cut! - - cl_add.each do |file, str| - f.puts "\t* #{file}: #{str}." - end - - f.puts "| -|--- | ########### This line, and those below, will be ignored ########### | --- - |Instructions: - |\t* The first line must be removed when this file is filled. - |\t* After you must specify a title, for the news/mail subject. - |\t* The line containing <%= title %> will be replaced by your title, - |\t <%= subject %> by the subject line, <%= rev %> by the revision... - |\t* Everywhere in the document you can get/compute some values with - |\t these tags <%= aRubyExpression %> even some vcs specific call. - |\t For example <%= status.read %> will include the `svn status' output. - | - |".head_cut! - with(f).diffw!(*args) + def mk_changelog_entry! ( *args ) + puts Time.now.strftime("%Y-%m-%d #{Vcs.full_email}") + puts + mk_log_entry(*args).each_line(&method(:log_to_changelog)) end + alias_command :mkcl, :mk_changelog_entry + - raise MustBeFilled, cl + def mk_message_entry! ( *args ) + puts 'Index: ChangeLog' + puts "from #{Vcs.full_email}" + puts + mk_log_entry(*args).each_line(&method(:log_to_changelog)) end + alias_command :mkml, :mk_message_entry + - def concat_changelog! ( *args ) - error_handling :changelog_failed - if cl_entry = mkchangelog(*args) + def concat_changelog! ( *args ) + error_handling :concat_changelog_failed unless TMP_CL.exist? - LOG.info "Moving `#{CL}' to `#{TMP_CL}' ..." + LOG.info "Backup your `#{CL}' to `#{TMP_CL}' ..." CL.rename(TMP_CL) end CL.open('w') do |file| - LOG.info "Prepending `#{ADD_CL}' to `#{CL}' ..." - file.print cl_entry + LOG.info "#{CL}: Writing your new entry ..." + with(file).mk_changelog_entry!(*args) file.puts + LOG.info "#{CL}: Writing the others ..." file.print TMP_CL.read end - - return cl_entry - - end end + alias_command :catcl, :concat_changelog - def changelog_failed + def concat_changelog_failed if TMP_CL.exist? LOG.info "Restoring `#{CL}' from `#{TMP_CL}' ..." TMP_CL.rename(CL) end - LOG.info "#{ADD_CL}: Contains your ChangeLog entry" if ADD_CL.exist? - end - - def getBinding ( header ) - code = [] - header.each do |k, v| - code << "#{k} = #{v.inspect}" - end - code << 'binding' - eval(code.join('; ')) end - protected :getBinding - alias_command :mkcl, :mkchangelog - alias_command :ctcl, :concat_changelog end # class Vcs Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 234) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -14,6 +14,8 @@ require 'ostruct' ENV['LC_ALL'] = 'C' +unless defined? Vcs + # The abstract class for a Vcs wrapper. # Conventions: # example: @@ -27,14 +29,16 @@ # checkout_! # class Vcs - @@version ||= '0.3.0' @@user_conf ||= OpenStruct.new @@color ||= :auto + @@output_io_methods ||= %w[ print puts putc ] # FIXME and so ... + cattr_accessor :version cattr_accessor :default cattr_accessor :user_conf cattr_accessor :color + cattr_accessor :output_io_methods class Failure < Exception end @@ -43,10 +47,6 @@ attr_reader :out_io - def puts ( *a, &b ) - @out_io.puts(*a, &b) - end - def output= ( anObject ) super @out_io = @output.to_io_for_commands @@ -87,6 +87,10 @@ @runner.subscribe_hook(:display_command) do |cmd| LOG.debug { "running: #{cmd.to_sh}" } end + @runner.subscribe_hook(:before_exec) do + STDOUT.flush + STDERR.flush + end end def self.add_basic_method ( meth ) @@ -139,35 +143,51 @@ attr_reader :cmd_data + def self.delegate_to_cmd_data ( *syms ) + syms.flatten.each do |meth| + define_method(meth) do |*a| + raise if block_given? + @cmd_data.out_io.send(meth, *a) + end + end + end + + delegate_to_cmd_data Vcs.output_io_methods + @@checkers = Set.new def run! ( *args ) + flush (@cmd + args).run(@runner) end - def sub_vcs ( out, err ) + def sub_vcs ( out, err, &block ) copy = self.class.new(@cmd) copy.cmd_data_factory = VcsCmdDataFactory.new(:output => out, :error => err) + if block.nil? copy + else + copy.instance_eval(&block) end - - def sub_vcs_with_name ( name ) - sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err")) end - def with ( io ) - io.flush if io.respond_to? :flush - sub_vcs(io, io) + def sub_vcs_with_name ( name, &block ) + sub_vcs(TempPath.new("#{name}-out"), TempPath.new("#{name}-err"), &block) end - def puts ( *a, &b ) - @cmd_data.puts(*a, &b) + def with ( io, &block ) + io.flush if io.respond_to? :flush + sub_vcs(io, io, &block) end def output @cmd_data.out_io end + def flush + output.flush + end + def run ( *args ) sub_vcs.run!(*args) end @@ -182,7 +202,7 @@ end end - %w[ checkout help delete diff status log add update commit ].each do |m| + %w[ checkout delete diff status log add update commit ].each do |m| add_basic_method(m) end @@ -190,20 +210,54 @@ meth = meth.to_s if meth =~ /^(.*)!$/ no_bang = $1 - super if respond_to? no_bang + if respond_to? no_bang + puts send(no_bang, *args) + else run_missing!(no_bang, meth, *args) + end else with_bang = meth + '!' return run_missing!(meth, meth, *args) unless respond_to? with_bang copy = sub_vcs_with_name(meth) - res = copy.send(with_bang, *args) - return res unless res.nil? + copy.send(with_bang, *args) out = copy.cmd_data - out.out_io.flush + out.out_io.close out end end + @@cache ||= {} + + def with_cache ( path=nil, description=nil, &block ) + loc = block.source_location # FIXME verify that this type of cache is working + return @@cache[loc].dup if @@cache.has_key? loc + if path.exist? + LOG.info "#{path} already exists" + return path.read + end + unless path.nil? + if description.nil? + raise ArgumentError, "need a description for #{path}" + end + error_handling do + LOG.info "#{path}: Contains your #{description}" if path.exist? + end + end + begin + LOG.info "Creating a new `#{path}' file ..." + path.open('w') { |f| result = with(f, &block) } + rescue Exception => ex + LOG.error "Removing `#{path}' ..." + path.unlink + raise ex + end + path.read + end + + def with_cache! ( *a, &b ) + puts with_cache(*a, &b) + end + def help! ( *args ) return help_!(*args) unless args.empty? puts "usage: #{(a)cmd.command} <subcommand> [options] [args] @@ -234,6 +288,10 @@ end end + CL = Pathname.new('ChangeLog') unless defined? CL + TMP_CL = Pathname.new(',,ChangeLog') unless defined? TMP_CL + + alias_command :ann, :blame alias_command :annotate, :blame alias_command :praise, :blame @@ -277,22 +335,22 @@ alias_command :checkin, :commit alias_command :populate, :add - def error_handling ( meth ) - @handlers << meth + def error_handling ( meth=nil, &block ) + @handlers << ((block.nil?)? method(meth) : block) end def call_handlers - @handlers.each { |meth| send(meth) } + @handlers.each { |block| block[] } end def call_conf_checkers - @@checkers.each { |meth| send(meth) } + @@checkers.each { |x| (x.is_a? Proc)? x[] : send(x) } end class << self - def add_conf_checker ( meth ) - @@checkers << meth + def add_conf_checker ( meth=nil, &block ) + @@checkers << (block.nil?)? meth : block end def match ( regexps, file ) @@ -328,3 +386,5 @@ end # class << self end # class Vcs + +end Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 234) +++ vcs/lib/vcs/message.rb (working copy) @@ -3,13 +3,8 @@ # License:: GNU General Public License (GPL). # Revision:: $Id: header 98 2004-09-29 12:07:43Z ertai $ -require 'vcs/vcs' -require 'vcs/changelog' - class Vcs - @@message = Pathname.new(',message') - def print_body ( file, options ) LOG.info "Creating a new `#{file}' file" file.open('w') do |f| @@ -17,50 +12,38 @@ f.puts options.to_yaml f.puts '---' f.puts - f.print message.read + with(f).message! end end private :print_body - def message ( *args ) - error_handling :message_failed - unless @@message.exist? - cl_entry = mkchangelog(*args) - TempPath.new('message') do |tmp| - tmp.open('w') do |f| - with(f).url! + def message! ( *args ) + with_cache! Message, 'generated message (ChangeLog, diffstat, diff)' do + url! if defined? COLLABOA - f.puts - f.puts 'You can also view this changeset here:' - f.puts + puts + puts 'You can also view this changeset here:' + puts next_rev = rev.output.read.to_i - next_rev += 1 unless ',commited'.to_path.exist? - f.puts "http://#{COLLABOA}/repository/changesets/#{next_rev}" + next_rev += 1 unless commited? + puts "http://#{COLLABOA}/repository/changesets/#{next_rev}" end - f.puts - f.puts 'Index: ChangeLog' - f.print cl_entry.sub(/^\d+-\d+-\d+/, 'from') - f.puts - with(f).diffstat!(*args) - f.puts + puts + flush + mk_message_entry!(*args) + puts + flush + diffstat!(*args) + puts + flush diffw(*args).each_line do |line| - f.print line if line !~ /^=+$/ - end - end - tmp.mv(@@message) + print line if line !~ /^=+$/ end end - @@message.open('r') end - alias_command :msg, :message + Message = ',message'.to_path unless defined? Message - def message_failed - if @@message.exist? - LOG.info "#{@@message}: Contains the generated message" - LOG.info ' (the ChangeLog entry, the diffstat, the diff)' - end - end end # class Vcs

19 years, 3 months

Re: [LrdeTools] 230: Status & User Configuration File.

by Akim Demaille

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > Index: vcs/NEWS > --- vcs/NEWS (revision 229) > +++ vcs/NEWS (working copy) > @@ -1,3 +1,20 @@ > +New in 0.4 ...: > + > + * Status & User Configuration File: > + >>>> ~/.vcsrc <<<< > + --- > + global_ignore: > + - !re ,messages > + - !re .*\.(diff|patch)$ > + global_unmask: > + - !re \bdoc > + >>>> ~/.vcsrc <<<< This is a very nice addition. Nevertheless, I strongly encourage you to read http://www.gnu.org/software/gnu-arch/tutorial/inventories.html#The_Name-bas… because there are many good ideas in there. And it is probably better to copy here than reinvent.

19 years, 3 months

Re: [LrdeTools][Vcs] 232: Add protocol version and default commit supprt.

by Akim Demaille

19 years, 3 months

Re: [LrdeTools] 234: Add color to the status.

by Akim Demaille

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrdetools/trunk > Index: ChangeLog > from Nicolas Pouillard <ertai(a)lrde.epita.fr> > Add color to the status. > * vcs/lib/vcs/app.rb: Honor the configuration file. > * vcs/lib/vcs/status.rb: Add `color_status'. The `status' command call > `color_status' depending of Vcs.color and/or tty?. > * vcs/lib/vcs/vcs.rb: . > * vcs/NEWS: Add an entry for color. Nice idea!

19 years, 3 months

Re: [LrdeTools] 233: Generalize the use of diffw in Vcs.

by Akim Demaille

>>> "Nicolas" == Nicolas Pouillard <ertai(a)lrde.epita.fr> writes: > - raise ArgumentError, 'The `diffstat\' tool is needed by Vcs.diffstat' > + raise ArgumentError, 'The `diffstat\' tool is needed by Vcs#diffstat' This user does not read Ruby, nor does she care. > + raise ArgumentError, 'Gnu diff is needed by Vcs#diffw' Ditto.

19 years, 3 months

[nolimips: syscalls] Proposition(s)

by Noe

J'ai prepare le terrain pour l'evolution des appels systemes de nolimips ; je compte mettre en place une bibliotheque proposant des wrappers de certaines fonctions de la libc. Je fais donc appel a mes "clients" pour connaitre leurs besoins :) Il y aura au moins les fonctions suivantes : read, write exit malloc Avec ca, on devrait pouvoir coder une runtime tiger -- Noe

19 years, 3 months

[LrdeTools] 234: Add color to the status.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Add color to the status. * vcs/lib/vcs/app.rb: Honor the configuration file. * vcs/lib/vcs/status.rb: Add `color_status'. The `status' command call `color_status' depending of Vcs.color and/or tty?. * vcs/lib/vcs/vcs.rb: . * vcs/NEWS: Add an entry for color. NEWS | 5 +++++ lib/vcs/app.rb | 1 + lib/vcs/status.rb | 28 ++++++++++++++++++++++++++++ lib/vcs/vcs.rb | 6 ++++++ 4 files changed, 40 insertions(+) Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 233) +++ vcs/lib/vcs/app.rb (working copy) @@ -91,6 +91,7 @@ vcs_user_conf = home/'.vcsrc' if vcs_user_conf.exist? Vcs.user_conf = OpenStruct.new(YAML.load(vcs_user_conf.read)) + Vcs.color = Vcs.user_conf.color.to_sym unless Vcs.user_conf.color.nil? end end Index: vcs/NEWS --- vcs/NEWS (revision 233) +++ vcs/NEWS (working copy) @@ -25,6 +25,11 @@ - Files which match global_unmask are prepend by 'U' - Files which begins by `,' (vcs internal use) are prepend by ',' + * Color: + - Status: the status output is now colored depending of the meaning of + the status. The color activation can be choose in your configuration + file (auto, never, always). + New in 0.3 2005-09-16: * The help command now show all commands including vcs ones. Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 233) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -30,9 +30,11 @@ @@version ||= '0.3.0' @@user_conf ||= OpenStruct.new + @@color ||= :auto cattr_accessor :version cattr_accessor :default cattr_accessor :user_conf + cattr_accessor :color class Failure < Exception end @@ -162,6 +164,10 @@ @cmd_data.puts(*a, &b) end + def output + @cmd_data.out_io + end + def run ( *args ) sub_vcs.run!(*args) end Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 233) +++ vcs/lib/vcs/status.rb (working copy) @@ -27,10 +27,38 @@ end protected :from_status + def color_status! ( *args ) + from_status(*args) do |line, file_st, prop_st, cpy, file| + line[0] = @h.color(file_st, *@@style[file_st[0]]) + puts line + end + end + def status! ( *args ) + case Vcs.color + when :never + when :auto then return color_status!(*args) if output.tty? + when :always then return color_status!(*args) + else raise ArgumentError, "Bad value for Vcs.color: #{Vcs.color}" + end from_status(*args) do |line, file_st, prop_st, cpy, file| puts line end end + @@style ||= + { + ?A => [:GREEN], + ?M => [:GREEN], + ?\\ => [:YELLOW], + ?, => [:YELLOW], + ?G => [:BLUE], + ?D => [:MAGENTA], + ?R => [:MAGENTA], + ?~ => [:RED], + ?! => [:RED], + ?? => [:BLINK, :RED], + ?C => [:BLINK, :RED], + } + end # class Svn

19 years, 3 months

[LrdeTools] 233: Generalize the use of diffw in Vcs.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Generalize the use of diffw in Vcs. * vcs/lib/vcs/message.rb, vcs/lib/vcs/diffstat.rb * vcs/lib/vcs/changelog.rb: Use diffw. * vcs/lib/vcs/diff.rb: Add a configuration checker for Gnu Diff. Merge diffw_from_status and diffw. Do not call the diff if the list of files become empty. changelog.rb | 2 +- diff.rb | 23 +++++++++++++++-------- diffstat.rb | 4 ++-- message.rb | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) Index: vcs/lib/vcs/diffstat.rb --- vcs/lib/vcs/diffstat.rb (revision 232) +++ vcs/lib/vcs/diffstat.rb (working copy) @@ -12,13 +12,13 @@ # display statitics on your patch. def diffstat! ( *a ) check_diffstat - (diff(*a) | @@diffstat).run(@runner) + (diffw(*a) | @@diffstat).run(@runner) end alias_command :ds, :diffstat def check_diffstat unless `diffstat -V` =~ /diffstat version/ - raise ArgumentError, 'The `diffstat\' tool is needed by Vcs.diffstat' + raise ArgumentError, 'The `diffstat\' tool is needed by Vcs#diffstat' end end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 232) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -112,7 +112,7 @@ |\t For example <%= status.read %> will include the `svn status' output. | |".head_cut! - with(f).diff!(*args) + with(f).diffw!(*args) end raise MustBeFilled, cl Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 232) +++ vcs/lib/vcs/diff.rb (working copy) @@ -4,9 +4,18 @@ # Revision:: $Id$ class Vcs + def diffw! ( *args ) - diff!(*args) + diff_!(*args) + end + + def check_gnu_diff + unless `diff --version` =~ /GNU/ + raise ArgumentError, 'Gnu diff is needed by Vcs#diffw' + end end + add_conf_checker :check_gnu_diff + end # class Vcs @@ -14,17 +23,15 @@ # A diff only for your eyes def diffw! ( *args ) - diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args - end - - def diffw_from_status! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| next if file_st =~ /[?X\\,D]/ - next if file == 'ChangeLog' - files << Pathname.new(file) + next if file.to_s == 'ChangeLog' + next if file.directory? + files << file end - diffw!(*files.delete_if { |f| f.directory? }) + return if files.empty? and not args.empty? + diff_! '--diff-cmd', 'diff', '-x', '-NPbuw', *files end end # class Svn Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 232) +++ vcs/lib/vcs/message.rb (working copy) @@ -44,7 +44,7 @@ f.puts with(f).diffstat!(*args) f.puts - diffw_from_status(*args).each_line do |line| + diffw(*args).each_line do |line| f.print line if line !~ /^=+$/ end end

19 years, 3 months

[LrdeTools][Vcs] 232: Add protocol version and default commit supprt.

by Nicolas Pouillard

https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard <ertai(a)lrde.epita.fr> Add protocol version and default commit supprt. * vcs/NEWS: Add an entry for vcs extensions files. * vcs/lib/vcs/vcs.rb: Add protocol_version and default_commit. * vcs/lib/vcs/app.rb: Create a cleaner structure. * vcs/lib/vcs/changelog.rb: Update display messages. * vcs/lib/vcs/mycommit.rb: Rename to ... * vcs/lib/vcs/common_commit.rb: ... this. * vcs/lib/vcs/message.rb: Move diff extensions ... * vcs/lib/vcs/diff.rb: ... here. And makes diffw_from_status skip deleted files like (--no-diff-deleted). * vcs/lrdetools.rb, vcs/template/prj.rb: Add protocol_version '0.1'. * vcs/test/options-suite.yml: Add a test for the vcs-svn --help. * vcs/lib/vcs/app.rb: . * vcs/lib/vcs/message.rb: . * vcs/lib/vcs/changelog.rb: . * vcs/lib/vcs/vcs.rb: . * vcs/lib/vcs/opt_parse.rb: . * vcs/lib/vcs/mycommit.rb: Remove. * vcs/lib/vcs/common_commit.rb: New. * vcs/lib/vcs/diff.rb: . * vcs/lrdetools.rb: . * vcs/template/prj.rb: . * vcs/NEWS: . NEWS | 10 ++++ lib/vcs/app.rb | 105 +++++++++++++++++++++++++++++------------------ lib/vcs/changelog.rb | 3 - lib/vcs/common_commit.rb | 2 lib/vcs/diff.rb | 14 +++++- lib/vcs/message.rb | 14 ------ lib/vcs/mycommit.rb | 87 -------------------------------------- lib/vcs/opt_parse.rb | 6 ++ lib/vcs/vcs.rb | 63 ++++++++++++++++++---------- lrdetools.rb | 3 + template/prj.rb | 3 + test/options-suite.yml | 15 ++++++ 12 files changed, 161 insertions(+), 164 deletions(-) Index: vcs/template/prj.rb --- vcs/template/prj.rb (revision 231) +++ vcs/template/prj.rb (working copy) @@ -15,6 +15,9 @@ '<' + "%= #{s} %" + '>' end %> + + protocol_version '0.1' + def <%= project %>_commit! ( *args ) common_commit!("<%= tag 'rev' %>: <%= project %>: <%= tag 'title' %>", *args) do |subject| Index: vcs/lib/vcs/app.rb --- vcs/lib/vcs/app.rb (revision 231) +++ vcs/lib/vcs/app.rb (working copy) @@ -23,68 +23,93 @@ # Vcs is a wrapper over any version control system. class VcsApp - @@vcs = Pathname.new(__FILE__).expand_path.dirname - @@dir = @@vcs.parent - require @@vcs + 'vcs' unless defined? Vcs + @@vcs_dir ||= Pathname.new(__FILE__).expand_path.dirname + @@dir ||= @@vcs_dir.parent + @@extension_dirs ||= [] + + require @@vcs_dir + 'vcs' unless defined? Vcs + @@dir.load_path! - cattr_accessor :all_vcs - cattr_accessor :by_name + cattr_accessor :vcs_dir cattr_accessor :dir + cattr_accessor :extension_dirs cattr_accessor :path - dir = Pathname.pwd - while not dir.root? and not (vcs_dir = dir + 'vcs').exist? - dir = dir + '..' - end - vcs_dir = vcs_dir.expand_path - vcs_dir.load_path! - - HOME = ENV['HOME'].to_path - vcs_user_conf = HOME/'.vcsrc' - if vcs_user_conf.exist? - Vcs.user_conf = OpenStruct.new(YAML.load(vcs_user_conf.read)) - end + class << self - Pathname.glob("{#{@@vcs},#{vcs_dir}}/*.rb") do |file| + def requirements + Pathname.glob("{#{vcs_dir},#{extension_dirs.join(',')}}/*.rb") do |file| next if file.to_s =~ /\/(app|opt_parse|vcs)\.rb$/ LOG.debug { file.basename.to_s } require file.to_s end + grab_all_vcs() + end - @@all_vcs ||= [] - @@by_name ||= {} + def grab_all_vcs + @@all_vcs ||= {} if @@all_vcs.empty? ObjectSpace.each_object(Class) do |aClass| if aClass != Vcs and aClass.ancestors.include? Vcs - name = aClass.to_s.to_sym - @@all_vcs << name - @@by_name[name.to_s.downcase] = aClass + name = aClass.to_s.demodulize.underscore.to_sym + @@all_vcs[name] = aClass + end end end end - require 'vcs/opt_parse' + def all_vcs + @@all_vcs.keys + end + end + + requirements() + require 'vcs/opt_parse' @@parser = Vcs::OptParse.new def initialize ( __file__, vcs_type=nil ) - @@path = __file__ + @@path = __file__.to_path Vcs.default ||= vcs_type end + def vcs_extensions_setup + dir = Pathname.pwd + while not dir.root? and not (vcs_dir = dir + 'vcs').exist? + dir = dir + '..' + end + vcs_dir = vcs_dir.expand_path + vcs_dir.load_path! + extension_dirs << vcs_dir + VcsApp.requirements() + end + + def user_configuration_setup + home = ENV['HOME'].to_path + vcs_user_conf = home/'.vcsrc' + if vcs_user_conf.exist? + Vcs.user_conf = OpenStruct.new(YAML.load(vcs_user_conf.read)) + end + end + def run vcs = nil begin - @@parser.parse! ARGV + vcs_extensions_setup() + user_configuration_setup() + @@parser.parse! ARGV if Vcs.default.nil? if Vcs.default.nil? STDERR.puts @@parser - STDERR.puts "\nSpecify at least a Vcs type, or use a wrapped command\n" + - 'like svn, cvs, prcs in the vcs bin directory.' + STDERR.puts " + | + |Specify at least a Vcs type, or use a wrapped command + |like svn, cvs, prcs in the vcs bin directory. + ".head_cut! exit end - vcs = @@by_name[Vcs.default.to_s.downcase].new + vcs = @@all_vcs[Vcs.default.to_s.downcase.to_sym].new if ARGV.empty? meth = :help! @@ -94,10 +119,12 @@ vcs.send(meth, *ARGV) - rescue Exception + rescue SystemExit => ex + raise ex + rescue Exception => ex vcs.call_handlers unless vcs.nil? - LOG.debug { raise } - LOG.error $!.to_s.sub(/\.$/, '') unless $!.to_s == 'exit' + LOG.debug { raise ex } + LOG.error ex.to_s.sub(/\.$/, '') end end Index: vcs/lib/vcs/common_commit.rb --- vcs/lib/vcs/common_commit.rb (revision 231) +++ vcs/lib/vcs/common_commit.rb (working copy) @@ -80,7 +80,7 @@ def commit_failed LOG.info "#{COMMITED}: Contains your ChangeLog entry" if COMMITED.exist? LOG.error 'Aborting' - LOG.info 'You can rerun the same command to continue the commit' + LOG.info 'You can rerun the same command to resume the commit' raise 'Commit failed' end Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 231) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -44,7 +44,7 @@ attr_reader :file def initialize ( file ) @file = file - super("You must fill this file: `#{file.to_s}'") + super("You must fill this file: `#{file.to_s}' (and remove the first line)") end end @@ -61,6 +61,7 @@ # Already filled if ,ChangeLog.add exists and not begin by --- if cl.exist? + just_one_time { LOG.info "#{cl} already exists" } raise MustBeFilled, cl if cl.read =~ /\A---/ require 'erb' ls = [] Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 231) +++ vcs/lib/vcs/diff.rb (working copy) @@ -3,12 +3,24 @@ # License:: GNU General Public License (GPL). # Revision:: $Id$ +class Vcs + def diffw! ( *args ) + diff!(*args) + end +end # class Vcs + + class Svn + # A diff only for your eyes + def diffw! ( *args ) + diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args + end + def diffw_from_status! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| - next if file_st =~ /[?X\\,]/ + next if file_st =~ /[?X\\,D]/ next if file == 'ChangeLog' files << Pathname.new(file) end Index: vcs/NEWS --- vcs/NEWS (revision 231) +++ vcs/NEWS (working copy) @@ -1,5 +1,15 @@ New in 0.4 ...: + * Vcs extensions files: + - Protocol version: + You can now add `protocol_version "0.1"' in your extensions. Thus + you will be alert when the format will changes. + - Default commit: + By adding `default_commit :your_commit_method' you override the + default commit method with yours. So you can call `commit' and `ci', + but also your old aliases. Of course you can call the real commit + with `commit_' or `ci_'. + * Status & User Configuration File: >>>> ~/.vcsrc <<<< --- Index: vcs/lib/vcs/vcs.rb --- vcs/lib/vcs/vcs.rb (revision 231) +++ vcs/lib/vcs/vcs.rb (working copy) @@ -110,15 +110,19 @@ def #{m1} ( *args ) #{m2}(*args) end + unless method_defined? :#{m1} def #{m1}_ ( *args ) #{m2}_(*args) end + end def #{m1}! ( *args ) #{m2}!(*args) end + unless method_defined? :#{m1}! def #{m1}_! ( *args ) #{m2}_!(*args) end + end end_eval end @@ -275,29 +279,46 @@ @handlers.each { |meth| send(meth) } end - def self.add_conf_checker ( meth ) - @@checkers << meth - end - def call_conf_checkers @@checkers.each { |meth| send(meth) } end - def self.match ( regexps, file ) + class << self + + def add_conf_checker ( meth ) + @@checkers << meth + end + + def match ( regexps, file ) regexps.each do |re| return true if re.match(file) end return false end - def self.user_conf_global_ignore ( file ) + def user_conf_global_ignore ( file ) return false if user_conf.nil? or user_conf.global_ignore.nil? match(user_conf.global_ignore, file) end - def self.user_conf_global_unmask ( file ) + def user_conf_global_unmask ( file ) return false if user_conf.nil? or user_conf.global_unmask.nil? match(user_conf.global_unmask, file) end + # Here we can handle version conflicts with vcs extensions + def protocol_version ( aVersion ) + if aVersion != '0.1' + raise ArgumentError, "Bad protocol version #{aVersion} but 0.1 is needed" + end + end + + # Set the given method as default commit action, use commit_ for the old one + def default_commit ( meth ) + alias_command :commit, meth + alias_command :ci, meth + end + + end # class << self + end # class Vcs Index: vcs/test/options-suite.yml --- vcs/test/options-suite.yml (revision 231) +++ vcs/test/options-suite.yml (working copy) @@ -36,3 +36,18 @@ args: --mk-alias # Output will be compared to this regexp output: !re \A(^alias \w+=.* ;$)+ + + - Check the help option for svn: + command: <<pwd>>/../bin/vcs-svn + args : --help + error : "" + output : !re | + \Ausage: svn <subcommand> \[options\] \[args\] + Type 'svn help <subcommand>' for help on a specific subcommand\. + + Most subcommands take file and/or directory arguments, recursing + on the directories\. If no arguments are supplied to such a + command, it recurses on the current directory $inclusive$ by default\. + + Available subcommands: + (^ - .*$)+ Index: vcs/lrdetools.rb --- vcs/lrdetools.rb (revision 231) +++ vcs/lrdetools.rb (working copy) @@ -1,5 +1,7 @@ class Vcs + protocol_version '0.1' + def lrdetools_commit! ( *args ) common_commit!("[LrdeTools] <%= rev %>: <%= title %>", *args) do |subject| @@ -8,5 +10,6 @@ end alias_command :ltci, :lrdetools_commit + default_commit :lrdetools_commit end # class Vcs Index: vcs/lib/vcs/opt_parse.rb --- vcs/lib/vcs/opt_parse.rb (revision 231) +++ vcs/lib/vcs/opt_parse.rb (working copy) @@ -8,6 +8,8 @@ class OptParse + attr_reader :option_parser + def initialize @option_parser = @@option_parser.dup end @@ -20,6 +22,10 @@ @option_parser.parse argv end + def to_s + @option_parser.to_s + end + @@option_parser = OptionParser.new do |o| o.banner = "Usage: vcs [options] <file>*" Index: vcs/lib/vcs/message.rb --- vcs/lib/vcs/message.rb (revision 231) +++ vcs/lib/vcs/message.rb (working copy) @@ -7,20 +7,6 @@ require 'vcs/changelog' class Vcs - def diffw! ( *args ) - diff!(*args) - end -end # class Vcs - - -class Svn - def diffw! ( *args ) - diff! '--diff-cmd', 'diff', '-x', '-NPbuw', *args - end -end # class Svn - - -class Vcs @@message = Pathname.new(',message')

19 years, 3 months

[nolimips: 194] Introduce system libraries.

by Noe

https://svn.lrde.epita.fr/svn/nolimips ChangeLog | 17 ++++++ src/vm-tasks.cc | 3 + src/vm/Makefile.am | 3 + src/vm/cp0.hh | 5 + src/vm/cpu.cc | 74 +---------------------------- src/vm/cpu.hh | 24 +++------ src/vm/spim_system_library.cc | 103 +++++++++++++++++++++++++++++++++++++++++ src/vm/spim_system_library.hh | 47 ++++++++++++++++++ src/vm/spim_system_library.hxx | 35 +++++++++++++ src/vm/system_library.cc | 27 ++++++++++ src/vm/system_library.hh | 40 +++++++++++++++ src/vm/virtual_machine.cc | 4 - src/vm/virtual_machine.hh | 10 ++- 13 files changed, 303 insertions(+), 89 deletions(-) Index: trunk/ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Introduce system libraries. * src/vm/cpu.hh, src/vm/cpu.cc: Export mmu and cp0. Move syscalls' implementation to... * src/vm/system_library.hh, src/vm/system_library.cc, * src/vm/spim_system_library.hh, src/vm/spim_system_library.hxx, * src/vm/spim_system_library.cc: These new files. * src/vm/cp0.hh: Export fatal_exception flag. * src/vm/Makefile.am: Update accordingly. * src/vm/virtual_machine.hh, src/vm/virtual_machine.cc: Propagate system library to cpu. * src/vm-tasks.cc: Give a default system library to virtual machine. Index: trunk/src/vm/cp0.hh --- trunk/src/vm/cp0.hh (revision 193) +++ trunk/src/vm/cp0.hh (revision 194) @@ -165,6 +165,11 @@ exit_set(exit_runtime); } + void set_fatal_exception() + { + fatal_exception_ = true; + } + bool fatal_exception() const { return fatal_exception_; Index: trunk/src/vm/spim_system_library.cc --- trunk/src/vm/spim_system_library.cc (revision 0) +++ trunk/src/vm/spim_system_library.cc (revision 194) @@ -0,0 +1,103 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 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 "common.hh" + +#include "vm/spim_system_library.hh" +#include "vm/cpu.hh" +#include "vm/mmu.hh" + +namespace vm +{ + + SpimSystemLibrary::~SpimSystemLibrary() + {} + + void + SpimSystemLibrary::invoke(Cpu &cpu) + { + Mmu &mmu = cpu.get_mmu(); + + switch (cpu.get_register(Cpu::v0)) + { + // print_int (integer: $a0) + case 1: + ostr_ << cpu.get_register(Cpu::a0); + break; + + // print_string (buffer: $a0) + case 4: + for (int i = cpu.get_register(Cpu::a0); true; ++i) + { + char b = mmu.data_load_byte(i); + if (b == 0) + break; + ostr_ << b; + } + break; + + // read_string (buffer: $a0, length: $a1) + case 8: + { + int i = 0; + int c = 0; + for (; (i < cpu.get_register(Cpu::a1) - 1) + && (c != '\n') && (c != '\r'); + ++i) + { + c = istr_.get(); + if (istr_.eof()) + break; + mmu.data_store_byte(cpu.get_register(Cpu::a0) + i, c); + } + mmu.data_store_byte(cpu.get_register(Cpu::a0) + i, 0); + } + break; + + // sbrk (size: $a0) + case 9: + cpu.set_register(Cpu::v0, mmu.data_sbrk(cpu.get_register(Cpu::a0))); + break; + + // exit (status : $a0) + case 10: + { + cpu.get_cp0().set_fatal_exception(); + if (!exit_status) + exit_status = (exit_type) cpu.get_register(Cpu::a0); + } + break; + + // print_err (buffer: $a0) + case 15: + for (int i = cpu.get_register(Cpu::a0); true; ++i) + { + char b = mmu.data_load_byte(i); + if (b == 0) + break; + std::cerr << b; + } + break; + + default: + assertion(!"syscall: Not implemented yet"); + }; + ostr_.flush(); + } + +} // namespace vm Index: trunk/src/vm/cpu.hh --- trunk/src/vm/cpu.hh (revision 193) +++ trunk/src/vm/cpu.hh (revision 194) @@ -34,7 +34,6 @@ # include "inst/program.hh" # include "vm/mmu.hh" -# include "vm/cp0.hh" namespace vm { @@ -42,6 +41,9 @@ typedef int32_t register_type; typedef uint32_t uregister_type; + class Cp0; + class SystemLibrary; + /// Central Processor Unit abstraction class Cpu: protected inst::ConstVisitor @@ -68,10 +70,7 @@ \{ */ public: /// Construct a CPU. - Cpu(Mmu& mmu, - Cp0 &cp0, - std::istream& istr, - std::ostream& ostr); + Cpu(Mmu &mmu, Cp0 &cp0); /// Destroy a CPU. virtual ~Cpu(); /** \} */ @@ -178,6 +177,11 @@ return counters_[format]; } + Mmu &get_mmu() { return mmu_; } + Cp0 &get_cp0() { return cp0_; } + + void set_system_library(SystemLibrary *l) { system_library_ = l; } + protected: virtual void visit(const inst::Add& add); virtual void visit(const inst::Addi& addi); @@ -260,15 +264,7 @@ /// Unlimited registers. misc::Table<int, register_type> unlimited_; - - public: - bool get_halt() const { return halt_; } - protected: - bool halt_; - - std::istream& istr_; - std::ostream& ostr_; - + SystemLibrary *system_library_; protected: void call() Index: trunk/src/vm/spim_system_library.hxx --- trunk/src/vm/spim_system_library.hxx (revision 0) +++ trunk/src/vm/spim_system_library.hxx (revision 194) @@ -0,0 +1,35 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 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 VM_SPIM_SYSTEM_LIBRARY_HXX +# define VM_SPIM_SYSTEM_LIBRARY_HXX + +# include "vm/spim_system_library.hh" + +namespace vm +{ + + inline + SpimSystemLibrary::SpimSystemLibrary(std::istream &istr, + std::ostream &ostr): + istr_(istr), ostr_(ostr) + {} + +} // namespace vm + +#endif // !VM_SPIM_SYSTEM_LIBRARY_HH Index: trunk/src/vm/system_library.hh --- trunk/src/vm/system_library.hh (revision 0) +++ trunk/src/vm/system_library.hh (revision 194) @@ -0,0 +1,40 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 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 VM_SYSTEM_LIBRARY_HH +# define VM_SYSTEM_LIBRARY_HH + +namespace vm +{ + + class Cpu; + + class SystemLibrary + { + public: + SystemLibrary() + {} + virtual ~SystemLibrary(); + + public: + virtual void invoke(Cpu &cpu) = 0; + }; + +} // namespace vm + +#endif // !VM_SYSTEM_LIBRARY_HH Index: trunk/src/vm/virtual_machine.hh --- trunk/src/vm/virtual_machine.hh (revision 193) +++ trunk/src/vm/virtual_machine.hh (revision 194) @@ -36,6 +36,7 @@ namespace vm { + class SystemLibrary; /// Virtual Machine abstraction class VirtualMachine @@ -58,13 +59,11 @@ /** \name Constructor and destructor. \{ */ public: - VirtualMachine(mode_type mode = normal, - std::istream& istr = std::cin, - std::ostream& ostr = std::cout): + VirtualMachine(mode_type mode = normal): mode_(mode), status_(stop), mmu_(cp0_, memory_), - cpu_(mmu_, cp0_, istr, ostr) + cpu_(mmu_, cp0_) { } /** \} */ @@ -84,6 +83,9 @@ public: /// Load a program into memory. void load_program(const inst::Program& program); + + void set_system_library(SystemLibrary *l) { cpu_.set_system_library(l); } + protected: int main_offset_; // FIXME: Must disappear! Index: trunk/src/vm/Makefile.am --- trunk/src/vm/Makefile.am (revision 193) +++ trunk/src/vm/Makefile.am (revision 194) @@ -7,4 +7,7 @@ cpu.hh cpu.cc \ segment.hh \ memory.hh \ + system_library.hh system_library.cc \ + spim_system_library.hh spim_system_library.hxx \ + spim_system_library.cc \ virtual_machine.hh virtual_machine.cc Index: trunk/src/vm/cpu.cc --- trunk/src/vm/cpu.cc (revision 193) +++ trunk/src/vm/cpu.cc (revision 194) @@ -21,6 +21,7 @@ #include "common.hh" #include "vm/cpu.hh" +#include "vm/system_library.hh" #include "inst/all.hh" #include "inst/int_exp.hh" @@ -31,12 +32,9 @@ // -------------------------------------------------------------------------- // Constructor and destructor // -------------------------------------------------------------------------- - Cpu::Cpu(Mmu& mmu, - Cp0 &cp0, - std::istream& istr, - std::ostream& ostr): + Cpu::Cpu(Mmu &mmu, Cp0 &cp0): mmu_(mmu), cp0_(cp0), - istr_(istr), ostr_(ostr), + system_library_(0), check_callee_save_p_(false), trace_p_(false), bubble_(new inst::Sll(inst::Register(inst::Register::general, Cpu::zero), @@ -57,8 +55,6 @@ void Cpu::reset() { - halt_ = false; - // Initialize general purpose registers to 0. for (unsigned i = 0; i < 32; ++i) GPR_[i] = 0; @@ -689,68 +685,8 @@ void Cpu::visit(const inst::Syscall&) { - switch (get_register(Cpu::v0)) - { - // print_int (integer: $a0) - case 1: - ostr_ << get_register(Cpu::a0); - break; - - // print_string (buffer: $a0) - case 4: - for (int i = get_register(Cpu::a0); true; ++i) - { - char b = mmu_.data_load_byte(i); - if (b == 0) - break; - ostr_ << b; - } - break; - - // read_string (buffer: $a0, length: $a1) - case 8: - { - int i = 0; - int c = 0; - for (; (i < get_register(Cpu::a1) - 1) && (c != '\n') && (c != '\r'); - ++i) - { - c = istr_.get(); - if (istr_.eof()) - break; - mmu_.data_store_byte(get_register(Cpu::a0) + i, c); - } - mmu_.data_store_byte(get_register(Cpu::a0) + i, 0); - } - break; - - // sbrk (size: $a0) - case 9: - set_register(Cpu::v0, mmu_.data_sbrk(get_register(Cpu::a0))); - break; - - // exit (status : $a0) - case 10: - halt_ = true; - if (!exit_status) - exit_status = (exit_type) get_register(Cpu::a0); - break; - - // print_err (buffer: $a0) - case 15: - for (int i = get_register(Cpu::a0); true; ++i) - { - char b = mmu_.data_load_byte(i); - if (b == 0) - break; - std::cerr << b; - } - break; - - default: - assertion(!"syscall: Not implemented yet"); - }; - ostr_.flush(); + precondition(system_library_); + system_library_->invoke(*this); } } // namespace vm Index: trunk/src/vm/system_library.cc --- trunk/src/vm/system_library.cc (revision 0) +++ trunk/src/vm/system_library.cc (revision 194) @@ -0,0 +1,27 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 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 "vm/system_library.hh" + +namespace vm +{ + + SystemLibrary::~SystemLibrary() + {} + +} // namespace vm Index: trunk/src/vm/spim_system_library.hh --- trunk/src/vm/spim_system_library.hh (revision 0) +++ trunk/src/vm/spim_system_library.hh (revision 194) @@ -0,0 +1,47 @@ +// +// This file is part of Nolimips, a MIPS simulator with unlimited registers +// Copyright (C) 2005 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 VM_SPIM_SYSTEM_LIBRARY_HH +# define VM_SPIM_SYSTEM_LIBRARY_HH + +# include <iostream> + +# include "vm/system_library.hh" + +namespace vm +{ + + class SpimSystemLibrary: public SystemLibrary + { + public: + SpimSystemLibrary(std::istream &istr, std::ostream &ostr); + virtual ~SpimSystemLibrary(); + + public: + virtual void invoke(Cpu &cpu); + + protected: + std::istream &istr_; + std::ostream &ostr_; + }; + +} // namespace vm + +# include "vm/spim_system_library.hxx" + +#endif // !VM_SPIM_SYSTEM_LIBRARY_HH Index: trunk/src/vm/virtual_machine.cc --- trunk/src/vm/virtual_machine.cc (revision 193) +++ trunk/src/vm/virtual_machine.cc (revision 194) @@ -56,7 +56,7 @@ // FIXME: precondition on loaded program cpu_.set_pc(main_offset_); - while (! (cpu_.get_halt() || cp0_.fatal_exception())) + while (!cp0_.fatal_exception()) { cpu_.step(); cp0_.set_count(cp0_.get_count() + 1); @@ -79,7 +79,7 @@ { cpu_.step(); cp0_.set_count(cp0_.get_count() + 1); - if (cpu_.get_halt() || cp0_.fatal_exception()) + if (cp0_.fatal_exception()) { status_ = halt; std::cerr << "Program exited." << std::endl; Index: trunk/src/vm-tasks.cc --- trunk/src/vm-tasks.cc (revision 193) +++ trunk/src/vm-tasks.cc (revision 194) @@ -18,6 +18,7 @@ // #include "common.hh" +#include "vm/spim_system_library.hh" #include "vm/virtual_machine.hh" #include "parse-tasks.hh" @@ -33,9 +34,11 @@ void execute () { + vm::SpimSystemLibrary l(std::cin, std::cout); vm::VirtualMachine vm; vm.get_cpu().set_check_callee_save(check_callee_save_p); vm.get_cpu().set_trace(trace_exec_p); + vm.set_system_library(&l); vm.load_program(* parse::tasks::program); if (exit_status != exit_success) exit(exit_status);

19 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects