- Projects

LT 105: p2s: Clean up
by Akim Demaille 21 Sep '04

21 Sep '04

Ce script est une *£&$ Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (Svn.env_to_preserve_dates): New. (Svn.changes_commit): Adjust. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 104) +++ prcs2svn/prcs2svn.py (working copy) @@ -571,6 +571,23 @@ self.change_keywords_(path) xchdir(pwd) + def env_to_preserve_dates (self): + "Return the environment assignment needed to preserve checkin dates." + res = "" + if infos.preserve_dates: + # FIXME: Well done! This way we are sure nothing will work + # properly if there are two concurrent runs. Use an env var! + fd = open ("/tmp/prcs2svn_time", "w+") + checkin_time = checkin_time[:checkin_time.rfind(" ")] + checkin_time = checkin_time[1:] + checkin_time = checkin_time[checkin_time.find(" ") + 1:] + fd.write (str (time.mktime ( + time.strptime (checkin_time, "%d %b %Y %H:%M:%S"))).split(".")[0]) + fd.close () + if infos.timelib_path: + res = "LD_LIBRARY_PATH=" + infos.timelib_path + " " + res += "LD_PRELOAD=libprcs2svntime.so " + return res # Commit Subversion changes. # Return 1 if a new version is really committed, else 0. @@ -580,19 +597,7 @@ # Do commit. # FIXME: `encoding' must be a command line option. self.change_keywords(self.workdir) - env = "" - if infos.preserve_dates: - fd = open ("/tmp/prcs2svn_time", "w+") - checkin_time = checkin_time[:checkin_time.rfind(" ")] - checkin_time = checkin_time[1:] - checkin_time = checkin_time[checkin_time.find(" ") + 1:] - fd.write(str(time.mktime( - time.strptime(checkin_time, "%d %b %Y %H:%M:%S"))).split(".")[0]) - fd.close() - env = "" - if len(infos.timelib_path) > 0: - env = "LD_LIBRARY_PATH=" + infos.timelib_path + " " - env += "LD_PRELOAD=libprcs2svntime.so " + env = self.env_to_preserve_dates () r = xtee (env + "svn commit --encoding latin1 " + \ "--username " + quote (checkin_login) + \ " --message " + quote (version_log))

1 0

LT 104: prcs2svn: 1 tmp dir
by Akim Demaille 21 Sep '04

21 Sep '04

2004-09-21 Akim Demaille <akim(a)epita.fr> Have a single tmp dir for each run. * prcs2svn/prcs2svn.py (TempDir): New. Use it instead of tempfile functions. The calling convention is not nice, if someone can improve it (using class methods), be my guest. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 102) +++ prcs2svn/prcs2svn.py (working copy) @@ -14,6 +14,28 @@ ## ------------------------------------- +## Temporary directory +class TempDir: + + base = tempfile.mkdtemp ("", "prcs2svn") + + def mkdir (self, name): + dirname = os.path.join (self.base, name) + # Ignore rm errors: the file might be fresh. + shutil.rmtree (dirname, True) + os.mkdir (dirname) + return dirname + + def mkfile (self, name): + fname = os.path.join (self.base, name) + # Ignore rm errors: the file might be fresh. + shutil.rmtree (fname, True) + return (open (fname, "wb"), fname) + + def mksfile (self, name): + return tempfile.mkstemp ("", name, self.base) + +## ------------------------------------- ## Errors class AbstractError: @@ -429,7 +451,7 @@ svn_revision=""): self.prcs_project = prcs_project self.svn_project = svn_project - self.tmp = tempfile.mkdtemp(".diff", "prcs2svn") + self.tmp = TempDir().mkdir ("%s.prcs-%s.svn.diff" % (prcs_project, svn_project)) xchdir(self.tmp) if svn_revision != "": svn_revision = " -r " + svn_revision + " " @@ -527,7 +549,7 @@ if stat.S_ISDIR(st.st_mode): self.change_keywords_(os.path.join(path, f)) else: - tmp = tempfile.mkdtemp(".keywords", "prcs2svn") + tmp = TempDir().mkdir ("prcs2svn.keywords") atime = st[stat.ST_ATIME] mtime = st[stat.ST_MTIME] xcopy(f, tmp) @@ -555,9 +577,6 @@ def changes_commit(self, checkin_login, version_log, checkin_time, update=True): info("> Commit changes") # Write version log in a temporary file. - log_fd, log_path = tempfile.mkstemp(".log", "prcs2svn") - os.write(log_fd, version_log) - os.close(log_fd) # Do commit. # FIXME: `encoding' must be a command line option. self.change_keywords(self.workdir) @@ -575,13 +594,13 @@ env = "LD_LIBRARY_PATH=" + infos.timelib_path + " " env += "LD_PRELOAD=libprcs2svntime.so " r = xtee(env + "svn commit --encoding latin1 " + \ - "--username " + checkin_login + " --file " + log_path) + "--username " + quote (checkin_login) + \ + " --message " + quote (version_log)) if r > 0: self.revision += 1 # Refresh local copy (should be useless, may be a bug of svn). if update: xsystem("svn update") - xrm(log_path) # Replace symbolic links with the files they point to. def changes_apply_links_replace(self, diffs): @@ -628,15 +647,17 @@ backup = {} # Process the sorted list backward for copy consistency. for i in reversed(range(len(diffs.renamed))): + to = diffs.renamed[i][0] + frm = diffs.renamed[i][1] # Backup files that may be overwritten. - if os.path.exists(diffs.renamed[i][0]): + if os.path.exists (to): # Destination exists: PRCS renamed then added an homonym file. - bak_fd, bak_path = tempfile.mkstemp(".bak", "prcs2svn") + bak_fd, bak_path = TempDir().mksfile ("%s.bak" % to) os.close(bak_fd) - xmove(diffs.renamed[i][0], bak_path) - backup[diffs.renamed[i][0]] = bak_path + xmove (to, bak_path) + backup[to] = bak_path # FIXED: was copy(). - xmove(diffs.renamed[i][1], diffs.renamed[i][0]) + xmove (frm, to) # Do Subversion rename. for r in diffs.renamed: # Delete files that may be overwritten (--force is a joke). @@ -821,7 +842,7 @@ # Create workspace. def convert_init(self): self.svn = Svn() - self.topdir = tempfile.mkdtemp(".migrate", "prcs2svn") + self.topdir = TempDir().mkdir ("current-svn-checkout") self.workdir = os.path.join(self.topdir, infos.subdir) debug("> Create working directory: " + self.topdir) xchdir(self.topdir) @@ -1117,7 +1138,7 @@ if not infos.copy_prcs: return info("> Copy prcs repository") - tmp = tempfile.mkdtemp(".prcs", "prcs2svn") + tmp = TempDir().mkdir ("prcs-repository") pwd = os.getcwd() xchdir(tmp) for proj in infos.prcs_projects: @@ -1132,7 +1153,7 @@ def copy_svn_repository(self): if not infos.copy_svn: return - tmp = tempfile.mkdtemp(".svn", "prcs2svn") + tmp = TempDir().mkdir ("%s.svn-repo" % infos.svn_project) info("> Copy svn repository to " + tmp) new_repo = os.path.join(tmp, infos.svn_project) xmkdir(new_repo)

1 0

[nolimips: 126] Emulate `lui'
by Noe 20 Sep '04

20 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Emulate `lui' * dev/nolimips.xml: Add `lui' instruction. * src/vm/cpu.hh, src/vm/cpu.cc: Emulate `lui'. 2004-09-20 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 125) +++ src/vm/cpu.hh (revision 126) @@ -195,6 +195,7 @@ virtual void visit(const inst::Lb& lb); virtual void visit(const inst::Lbu& Lbu); virtual void visit(const inst::Lw& lw); + virtual void visit(const inst::Lui& lui); virtual void visit(const inst::Sb& sb); virtual void visit(const inst::Sw& sw); Index: src/vm/cpu.cc --- src/vm/cpu.cc (revision 125) +++ src/vm/cpu.cc (revision 126) @@ -365,6 +365,12 @@ // Move instructions // -------------------------------------------------------------------------- + void + Cpu::visit(const inst::Lui& lui) + { + set_register(lui.get_dest (), lui.get_imm () << 16); + } + // Store void Cpu::visit(const inst::Sb& sb) Index: dev/nolimips.xml --- dev/nolimips.xml (revision 125) +++ dev/nolimips.xml (revision 126) @@ -1026,6 +1026,19 @@ </syntax> </instruction> + <instruction opcode="lui" level="native" kind="load"> + <description>Move the constant imm into the upper half word of +dest.</description> + <format> + <attribute type="Register" name="dest"/> + <attribute type="Exp" name="imm"/> + </format> + <syntax> + <token kind="register" /> + <token kind="immediate" /> + </syntax> + </instruction> + <instruction opcode="li" level="pseudo" kind="load"> <description>Move the constant imm into dest.</description> <syntax alias="ori">

1 1

[nolimips: 124] Limit access to callee-save and caller-save registers.
by Noe 20 Sep '04

20 Sep '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Limit access to callee-save and caller-save registers. * dev/inst-solver-gen.py: Check use of callee-save and caller-save registers. * src/inst/inst-tasks.hh, src/inst/inst-tasks.cc: Add coresponding tasks. 2004-09-19 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/inst/inst-tasks.cc --- src/inst/inst-tasks.cc (revision 123) +++ src/inst/inst-tasks.cc (revision 124) @@ -39,6 +39,8 @@ prg_solve () { inst::ProgramSolver program_solver; + program_solver.set_max_callee_save(max_callee_save); + program_solver.set_max_caller_save(max_caller_save); program_solver.solve(* parse::tasks::program); if (exit_status != exit_success) exit (exit_status); Index: src/inst/inst-tasks.hh --- src/inst/inst-tasks.hh (revision 123) +++ src/inst/inst-tasks.hh (revision 124) @@ -37,6 +37,14 @@ "Resolve jump offsets and check bounds of immediates", prg_solve, "parse"); + INT_TASK_DECLARE ("callee-save", + "Set max number of callee-save registers", + max_callee_save, 8, 0, 8, + ""); + INT_TASK_DECLARE ("caller-save", + "Set max number of caller-save registers", + max_caller_save, 10, 0, 10, + ""); } // namespace tasks } // namespace inst Index: dev/inst-solver-gen.py --- dev/inst-solver-gen.py (revision 123) +++ dev/inst-solver-gen.py (revision 124) @@ -59,10 +59,24 @@ protected ExpVisitor { public: + ProgramSolver(): + program_(0), + max_callee_save_(8), max_caller_save_(10) + {} virtual ~ProgramSolver() {} public: + void set_max_callee_save(int max_callee_save) + { + max_callee_save_ = max_callee_save; + } + void set_max_caller_save(int max_caller_save) + { + max_caller_save_ = max_caller_save; + } + + public: void solve(Program &program) { program_ = &program; @@ -98,6 +112,9 @@ print """ protected: Program *program_; + + int max_callee_save_; + int max_caller_save_; }; } // namespace inst @@ -116,6 +133,7 @@ print license print """#include \"inst/program_solver.hh\" +#include \"vm/cpu.hh\" namespace inst { @@ -168,7 +186,6 @@ } } - void ProgramSolver::solve_cpu_register(Register &reg) const { @@ -176,8 +193,21 @@ { case Register::generic: reg.set_kind(Register::general); - break; case Register::general: + if ((reg.get_index() == vm::Cpu::t9 && max_caller_save_ < 10) + || (reg.get_index() == vm::Cpu::t8 && max_caller_save_ < 9) + || (vm::Cpu::t0 + max_caller_save_ - 1 < reg.get_index() + && reg.get_index() <= vm::Cpu::t7)) + { + std::cerr << \"Caller-save register limited.\" << std::endl; + exit_set(exit_solve); + } + else if (vm::Cpu::s0 + max_callee_save_ - 1 < reg.get_index() && + reg.get_index() <= vm::Cpu::s7) + { + std::cerr << \"Callee-save register limited.\" << std::endl; + exit_set(exit_solve); + } break; case Register::unlimited: if (!parse::unlimited_regs_p)

2 2

[Nolimips] Back To Life
by Noe 20 Sep '04

20 Sep '04

Yeaaaahhhh, I EVENTUALLY have the Net. And thus will I continue Nolimips' development. Quick road map: 1. limit access to native registers (see tc's caller-save); 2. add an ELF branch (encoder, loader, memory management redesign); 3. add everything that spim has and Nolimips does not; 4. implement libc-like system calls. -- Noe

2 2

LT: checkin: yaml
by Akim Demaille 20 Sep '04

20 Sep '04

Nicolas, peut-tu mettre ton expertise yaml perl au service de checkin pour qu'on ait un fichier de conf pour paramétrer "checkin", plutôt que des vars d'env ? Merci !

1 0

LT 103: checkin: getpwnam
by Akim Demaille 20 Sep '04

20 Sep '04

2004-09-20 Akim Demaille <akim(a)epita.fr> * src/checkin (get_user_info): Fix the use of getpwnam. * doc/lrdetools.texi: Space changes. Index: ChangeLog =================================================================== --- ChangeLog (revision 102) +++ ChangeLog (working copy) @@ -1,5 +1,10 @@ 2004-09-20 Akim Demaille <akim(a)epita.fr> + * src/checkin (get_user_info): Fix the use of getpwnam. + * doc/lrdetools.texi: Space changes. + +2004-09-20 Akim Demaille <akim(a)epita.fr> + * prcs2svn/prcs2svn.py (string_unescape): Remove, useless. * prcs2svn/prcs.py: s/$[a-z_]*$ * = *\1 *\+/\1 +=/. (ProjectScanner.get_token): Do not escape the strings! This is not Index: src/checkin =================================================================== --- src/checkin (revision 96) +++ src/checkin (working copy) @@ -128,7 +128,9 @@ $params{"FULLNAME"} = $ENV{"FULLNAME"}; if (not defined $params{"FULLNAME"}) { - $params{"FULLNAME"} = getpwnam $ENV{"USER"}[6]; + $params{"FULLNAME"} = + # Keep the Full Name, first ,-field. + (split /,/, (getpwnam $ENV{"USER"})[6])[0]; print STDERR "Warning: FULLNAME not set, using " . $params{"FULLNAME"} . " instead.\n"; } Index: doc/lrdetools.texi =================================================================== --- doc/lrdetools.texi (revision 96) +++ doc/lrdetools.texi (working copy) @@ -330,9 +330,9 @@ @node checkin @section @command{checkin} -@command{checkin} is a Perl script designed to work conjointly with CVS, -PRCS or Subversion. When launched, it produces diffs from the server -and creates a @file{ChangeLog} entry with each modified file. It then +@command{checkin} is designed to work conjointly with CVS, PRCS or +Subversion. When launched, it produces diffs from the server and +creates a @file{ChangeLog} entry with each modified file. It then launches your favorite text editor on the diff file and the @file{ChangeLog}, to allow you complete it. Once you have finished, it proposes you to write a particular comment. Then the checkin (or @@ -432,9 +432,9 @@ @node Using checkin @subsection Using @command{checkin} -@command{checkin} always start by doing a checkout or an update onto -the repository unless you told him explicitly not to do so. This -avoid dummy mistakes. +@command{checkin} always start by doing a checkout or an update onto the +repository unless you told him explicitly not to do so. This avoid dummy +mistakes. @command{checkin} generates the following files:

1 0

LT 102: Fix the handling of escapes...
by Akim Demaille 20 Sep '04

20 Sep '04

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> * prcs2svn/prcs2svn.py (string_unescape): Remove, useless. * prcs2svn/prcs.py: s/$[a-z_]*$ * = *\1 *\+/\1 +=/. (ProjectScanner.get_token): Do not escape the strings! This is not your business. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 101) +++ prcs2svn/prcs2svn.py (working copy) @@ -157,12 +157,6 @@ (e.g., via system calls).""" return "\"" + re.sub (r'(["\\$`])', r'\\\1', arg) + "\"" -## (Un)escape special chars in sh. -def string_unescape(s): - r = string.replace (s, "\$", "$") - r = string.replace (r, "\\\\", "\\") - return r - ## Print copy on debug stream and copy a file. def xcopy(src, dst): trace ("cp --force " + src + " " + dst) Index: prcs2svn/prcs.py --- prcs2svn/prcs.py (revision 96) +++ prcs2svn/prcs.py (working copy) @@ -40,9 +40,9 @@ dirs = dirname.split(os.sep) p = "" for d in dirs: - p = p + d + p += d dictionary[p] = True - p = p + os.sep + p += os.sep return dictionary ## Convert a list into a pretty string. @@ -50,9 +50,9 @@ res = "" i = len(l) for e in l: - res = res + str(e) + res += str(e) if i > 1: - res = res + " " + res += " " i = i - 1 return res @@ -61,9 +61,9 @@ res = "" for e in sx: if isinstance(e, list): - res = res + "(" + sexpr_to_string(e) +") " + res += "(" + sexpr_to_string(e) +") " else: - res = res + str(e) + " " + res += str(e) + " " return res ## Sort file names by path. @@ -122,7 +122,7 @@ ## Convert the project file into a string def __str__(self): res = ";; -*- Prcs -*-\n" - res = res + \ + res += \ "(Created-By-Prcs-Version " +\ list_to_string(self.created_by_prcs_version) + ")\n\n" +\ "(Project-Description \"" + self.description + "\")\n" +\ @@ -132,26 +132,26 @@ "(New-Version-Log\n\"" + self.new_version_log + "\")\n\n" +\ "(Checkin-Time \"" + self.checkin_time + "\")\n" +\ "(Checkin-Login " + self.checkin_login + ")\n\n" - res = res + "(Files\n" + "\n ;; ./" + "\n" + res += "(Files\n" + "\n ;; ./" + "\n" current_dir = "" for e in self.files: i = string.rfind(e[0], "/") if i != -1: dir = e[0][:i] if current_dir != dir: - res = res + "\n ;; ./" + dir + "/\n" + res += "\n ;; ./" + dir + "/\n" current_dir = dir - res = res + " (" + e[0] + " (" + list_to_string(e[1]) + ")" + res += " (" + e[0] + " (" + list_to_string(e[1]) + ")" if len(e) >= 3: - res = res + " " + e[2] - res = res + ")\n" - res = res + " )\n\n" - res = res + "(Populate-Ignore\n (\n" + res += " " + e[2] + res += ")\n" + res += " )\n\n" + res += "(Populate-Ignore\n (\n" if len(self.populate_ignore) > 0: for e in self.populate_ignore[0]: - res = res + " " + str(e) + "\n" - res = res + " )\n )\n\n" - res = res +\ + res += " " + str(e) + "\n" + res += " )\n )\n\n" + res +=\ "(Project-Keywords " +\ sexpr_to_string(self.project_keywords) +")\n\n" +\ "(Merge-Parents " +\ @@ -191,8 +191,8 @@ if c == '\\': c = self.getc() if c not in ['\\', '"']: - s = s + '\\' - s = s + c + s += '\\' + s += c c = self.getc() if c == "": return "" @@ -217,9 +217,7 @@ if (len(self.token) > 1 and c in [" ", ":", "(", ")"] and self.token[-1] == '\\'): self.token = self.token[:-1] - if c in ["\"", "$"]: - self.token = self.token + "\\" - self.token = self.token + c + self.token += c c = self.getc() self.ungetc() return self.token @@ -329,19 +327,19 @@ def __str__(self): res = "" for i in self.links: - res = res + i + "\t symbolic link\n" + res += i + "\t symbolic link\n" for i in self.added_dirs: - res = res + i + "\tadded directory\n" + res += i + "\tadded directory\n" for i in self.added_files: - res = res + i + "\tadded file\n" + res += i + "\tadded file\n" for i in self.renamed: - res = res + i[1] + "\trenamed from " + i[0] + "\n" + res += i[1] + "\trenamed from " + i[0] + "\n" for i in self.deleted_files: - res = res + i + "\tdeleted file\n" + res += i + "\tdeleted file\n" for i in self.deleted_dirs: - res = res + i + "\tdeleted directory\n" + res += i + "\tdeleted directory\n" for i in self.modified: - res = res + i + "\tmodified\n" + res += i + "\tmodified\n" return res

1 0

LT 96: Make delete after merge optional
by Didier Verna 20 Sep '04

20 Sep '04

NOTE: This patch has been committed. The version below is informational only (whitespace differences have been removed). ChangeLog addition: 2004-09-15 Didier Verna <didier(a)lrde.epita.fr> * prcs2svn/prcs2svn.py (Informations.keep_deleted_files): New. * prcs2svn/prcs2svn.py (Main): New corresponding command-line option: "keep-deleted-files". * prcs2svn/prcs2svn.py (Prcs2svn.merge): Handle it. lrde-tools source patch: Diff command: svn diff --diff-cmd /usr/bin/diff -x "-u -t -b -B -w" Files affected: prcs2svn/prcs2svn.py Index: prcs2svn/prcs2svn.py =================================================================== --- prcs2svn/prcs2svn.py (revision 95) +++ prcs2svn/prcs2svn.py (working copy) @@ -213,6 +213,9 @@ # Where to write in svn project subdir = "" + # Delete files after a merge + keep_deleted_files = False + infos = Informations() # Keywords. @@ -978,6 +981,7 @@ prcsProject.prj_parser.parse(prcsProject.name + ".prj"), prcs_merge_parent[2:]) diffs = prcs.diff(prcsProject.prev_prj, prcsProject.prj) + if not infos.keep_deleted_files: # Fix tc's bug if prcs_merge_parent != prcsProject.prj.merge_parents[-1]: self.svn.changes_apply_files_directories_delete(diffs) @@ -1180,6 +1184,8 @@ infos.copy_prcs = True if o == "--copy-svn": infos.copy_svn = True + if o == "--keep-deleted-files": + infos.keep_deleted_files = True if o == "--svn-root": infos.svn_root = a if o == "--svn-project": @@ -1207,6 +1213,7 @@ print " [--trace=LEVEL] [--force] [--no-action]" print " [--copy-prcs]" print " [--copy-svn]" + print " [--keep-deleted-files]" print " [--preserve-dates]" print " [--svn-root=URL]" print " [--svn-project=NAME]" @@ -1237,6 +1244,7 @@ (useful when prcs repository is on nfs). --copy-svn copy svn repository of a project and extend this copy (need a svn root beginning with 'file' and not 'http'). + --keep-deleted-files preserve deleted files after a merge operation Subversion destination repository and project: --svn-root=URL set subversion repository root to URL -- Didier Verna, didier(a)lrde.epita.fr, http://www.lrde.epita.fr/~didier EPITA / LRDE, 14-16 rue Voltaire Tel.+33 (1) 44 08 01 85 94276 Le Kremlin-Bicêtre, France Fax.+33 (1) 53 14 59 22 didier(a)xemacs.org

2 5

LT 101: prcs2svn failed on a file containing $$.
by Akim Demaille 20 Sep '04

20 Sep '04

Index: ChangeLog from Akim Demaille <akim(a)epita.fr> prcs2svn failed on a file containing $$. * prcs2svn/prcs2svn.py (quote): Escape shell special chars. Use it when calling chmod. Index: prcs2svn/prcs2svn.py --- prcs2svn/prcs2svn.py (revision 100) +++ prcs2svn/prcs2svn.py (working copy) @@ -152,9 +152,10 @@ trace ("rm -rf " + dir) shutil.rmtree (dir, True) -## Add quote for filename, directory's name, ... -def quote(path): - return "\"" + path + "\"" +def quote (arg): + """Escape ARG to be suitable as literal for shell invocation + (e.g., via system calls).""" + return "\"" + re.sub (r'(["\\$`])', r'\\\1', arg) + "\"" ## (Un)escape special chars in sh. def string_unescape(s): @@ -538,7 +539,7 @@ xcopy(f, tmp) fd_tmp = open (os.path.join (tmp, os.path.basename (f)), "r") # FIXME: in python, we should have that. - xsystem("chmod +w " + f) + xsystem("chmod +w " + quote (f)) fd_f = open(f, "w+") for l in fd_tmp: l = self.change_keywords_line(f, l)

1 0