From ffjeld at common-lisp.net Mon Jan 12 14:19:00 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 09:19:00 -0500 Subject: [movitz-cvs] CVS update: Module imported: ia-x86 Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/home/ffjeld/ia-x86 Log Message: Imported to common-lisp.net Status: Vendor Tag: frodef Release Tags: start N ia-x86/codec.lisp N ia-x86/ia-x86.fasl N ia-x86/symtab.fasl N ia-x86/symtab.lisp N ia-x86/registers.lisp N ia-x86/read.lisp N ia-x86/prefixes.fasl N ia-x86/proglist.lisp N ia-x86/prefixes.lisp N ia-x86/postload.lisp N ia-x86/read.fasl N ia-x86/operands.lisp N ia-x86/instr-sub.lisp N ia-x86/codec.fasl N ia-x86/instr-string.lisp N ia-x86/instr-simd.lisp N ia-x86/instr-shift.lisp N ia-x86/registers.fasl N ia-x86/instr-push-pop.lisp N ia-x86/ia-x86.lisp N ia-x86/instr-mul-div.lisp N ia-x86/instr-mov.lisp N ia-x86/instr-mmx.lisp N ia-x86/instr-misc.lisp N ia-x86/operands.fasl N ia-x86/instr-fpu.lisp N ia-x86/instr-cmp.lisp N ia-x86/instr-branch.lisp N ia-x86/instr-bit.lisp N ia-x86/instr-and-or.lisp N ia-x86/instr-add.lisp N ia-x86/inline-data.fasl N ia-x86/inline-data.lisp N ia-x86/alignment.fasl N ia-x86/def-instr.lisp N ia-x86/system.lisp N ia-x86/assemble.lisp N ia-x86/proglist.fasl N ia-x86/def-instr.fasl N ia-x86/alignment.lisp I ia-x86/alignment.lisp~ N ia-x86/ia-x86.asd N ia-x86/packages.lisp N ia-x86/ia-x86-test.lisp N ia-x86/utilities.lisp N ia-x86/packages.fasl N ia-x86/postload.fasl No conflicts created by this import Date: Mon Jan 12 09:19:00 2004 Author: ffjeld New module ia-x86 added From ffjeld at common-lisp.net Mon Jan 12 14:25:41 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 09:25:41 -0500 Subject: [movitz-cvs] CVS update: ia-x86/alignment.fasl ia-x86/codec.fasl ia-x86/def-instr.fasl ia-x86/ia-x86.fasl ia-x86/inline-data.fasl ia-x86/operands.fasl ia-x86/packages.fasl ia-x86/postload.fasl ia-x86/prefixes.fasl ia-x86/proglist.fasl ia-x86/read.fasl ia-x86/registers.fasl ia-x86/symtab.fasl Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/home/ffjeld/src/ia-x86 Removed Files: alignment.fasl codec.fasl def-instr.fasl ia-x86.fasl inline-data.fasl operands.fasl packages.fasl postload.fasl prefixes.fasl proglist.fasl read.fasl registers.fasl symtab.fasl Log Message: removed fasls Date: Mon Jan 12 09:25:40 2004 Author: ffjeld From ffjeld at common-lisp.net Mon Jan 12 14:28:16 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 09:28:16 -0500 Subject: [movitz-cvs] CVS update: ia-x86/COPYING Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv32322 Added Files: COPYING Log Message: Added Date: Mon Jan 12 09:28:16 2004 Author: ffjeld From ffjeld at common-lisp.net Mon Jan 12 15:23:55 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 10:23:55 -0500 Subject: [movitz-cvs] CVS update: Module imported: ia-x86 Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/home/ffjeld/src/ia-x86 Log Message: Imported to common-lisp.net Status: Vendor Tag: frodef Release Tags: start N ia-x86/alignment.lisp N ia-x86/assemble.lisp N ia-x86/codec.lisp N ia-x86/def-instr.lisp N ia-x86/ia-x86-test.lisp N ia-x86/ia-x86.asd N ia-x86/ia-x86.lisp N ia-x86/inline-data.lisp N ia-x86/instr-add.lisp N ia-x86/instr-and-or.lisp N ia-x86/instr-bit.lisp N ia-x86/instr-branch.lisp N ia-x86/instr-cmp.lisp N ia-x86/instr-fpu.lisp N ia-x86/instr-misc.lisp N ia-x86/instr-mmx.lisp N ia-x86/instr-mov.lisp N ia-x86/instr-mul-div.lisp N ia-x86/instr-push-pop.lisp N ia-x86/instr-shift.lisp N ia-x86/instr-simd.lisp N ia-x86/instr-string.lisp N ia-x86/instr-sub.lisp N ia-x86/operands.lisp N ia-x86/packages.lisp N ia-x86/postload.lisp N ia-x86/prefixes.lisp N ia-x86/proglist.lisp N ia-x86/read.lisp N ia-x86/registers.lisp N ia-x86/symtab.lisp N ia-x86/system.lisp N ia-x86/utilities.lisp No conflicts created by this import Date: Mon Jan 12 10:23:55 2004 Author: ffjeld New module ia-x86 added From ffjeld at common-lisp.net Mon Jan 12 15:26:18 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 10:26:18 -0500 Subject: [movitz-cvs] CVS update: ia-x86/COPYING Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv28096 Added Files: COPYING Log Message: added COPYING Date: Mon Jan 12 10:26:17 2004 Author: ffjeld From ffjeld at common-lisp.net Mon Jan 12 19:41:49 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 14:41:49 -0500 Subject: [movitz-cvs] CVS update: ia-x86/ia-x86.asd Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv23985 Modified Files: ia-x86.asd Log Message: Patch from Nyef. Date: Mon Jan 12 14:41:49 2004 Author: ffjeld Index: ia-x86/ia-x86.asd diff -u ia-x86/ia-x86.asd:1.1.1.1 ia-x86/ia-x86.asd:1.2 --- ia-x86/ia-x86.asd:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/ia-x86.asd Mon Jan 12 14:41:49 2004 @@ -7,7 +7,7 @@ ;; Author: Nikodemus Siivola ;; Created at: Wed Oct 20 23:13:46 1999 ;; -;; $Id: ia-x86.asd,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;; $Id: ia-x86.asd,v 1.2 2004/01/12 19:41:49 ffjeld Exp $ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -32,7 +32,8 @@ (:file "read") (:file "codec") (:file "proglist") - (:file "def-instr"))) + (:file "def-instr") + (:file "postload"))) (defmethod perform :after ((o load-op) (c (eql (find-system :ia-x86)))) (when (y-or-n-p "Initialize instruction tables? It may take a while, ~ From jdzerins at common-lisp.net Mon Jan 12 20:02:52 2004 From: jdzerins at common-lisp.net (Janis Dzerins) Date: Mon, 12 Jan 2004 15:02:52 -0500 Subject: [movitz-cvs] CVS update: ia-x86/ia-x86.asd Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv23178 Modified Files: ia-x86.asd Log Message: Call INIT-INSTRUCTION-TABLES after loading instructions. Date: Mon Jan 12 15:02:52 2004 Author: jdzerins Index: ia-x86/ia-x86.asd diff -u ia-x86/ia-x86.asd:1.2 ia-x86/ia-x86.asd:1.3 --- ia-x86/ia-x86.asd:1.2 Mon Jan 12 14:41:49 2004 +++ ia-x86/ia-x86.asd Mon Jan 12 15:02:52 2004 @@ -7,7 +7,7 @@ ;; Author: Nikodemus Siivola ;; Created at: Wed Oct 20 23:13:46 1999 ;; -;; $Id: ia-x86.asd,v 1.2 2004/01/12 19:41:49 ffjeld Exp $ +;; $Id: ia-x86.asd,v 1.3 2004/01/12 20:02:52 jdzerins Exp $ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,7 +38,8 @@ (defmethod perform :after ((o load-op) (c (eql (find-system :ia-x86)))) (when (y-or-n-p "Initialize instruction tables? It may take a while, ~ espcially on memory starved boxes.") - (operate 'load-op :ia-x86-instr))) + (operate 'load-op :ia-x86-instr) + (funcall (intern "INIT-INSTRUCTION-TABLES" :ia-x86)))) (defclass conf-file (cl-source-file) ()) From ffjeld at common-lisp.net Mon Jan 12 20:22:52 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 12 Jan 2004 15:22:52 -0500 Subject: [movitz-cvs] CVS update: ia-x86/ia-x86.asd Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv31402 Modified Files: ia-x86.asd Log Message: Fixed to be symbol-case independent. Date: Mon Jan 12 15:22:52 2004 Author: ffjeld Index: ia-x86/ia-x86.asd diff -u ia-x86/ia-x86.asd:1.3 ia-x86/ia-x86.asd:1.4 --- ia-x86/ia-x86.asd:1.3 Mon Jan 12 15:02:52 2004 +++ ia-x86/ia-x86.asd Mon Jan 12 15:22:52 2004 @@ -7,14 +7,14 @@ ;; Author: Nikodemus Siivola ;; Created at: Wed Oct 20 23:13:46 1999 ;; -;; $Id: ia-x86.asd,v 1.3 2004/01/12 20:02:52 jdzerins Exp $ +;; $Id: ia-x86.asd,v 1.4 2004/01/12 20:22:52 ffjeld Exp $ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defpackage "IA-X86-SYSTEM" +(defpackage #:ia-x86-system (:use :cl :asdf)) -(in-package "IA-X86-SYSTEM") +(in-package #:ia-x86-system) (defsystem :ia-x86 :serial t ; FIXME: proper dependencies would be nice... @@ -39,7 +39,7 @@ (when (y-or-n-p "Initialize instruction tables? It may take a while, ~ espcially on memory starved boxes.") (operate 'load-op :ia-x86-instr) - (funcall (intern "INIT-INSTRUCTION-TABLES" :ia-x86)))) + (funcall (intern (string '#:init-instruction-tables) :ia-x86)))) (defclass conf-file (cl-source-file) ()) @@ -76,5 +76,5 @@ (operate 'test-op :ia-x86-test)) (defmethod perform ((o test-op) (c (eql (find-system :ia-x86-test)))) - (or (funcall (intern "DO-TESTS" :rt)) + (or (funcall (intern (string '#:do-tests) :rt)) (error "test-op failed"))) From ffjeld at common-lisp.net Tue Jan 13 10:53:41 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 05:53:41 -0500 Subject: [movitz-cvs] CVS update: Module imported: ia-x86 Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/home/ffjeld/movitz Log Message: Imported to common-lisp.net Status: Vendor Tag: frodef Release Tags: start I ia-x86/CVS C ia-x86/COPYING N ia-x86/assembly-syntax.lisp N ia-x86/bochsrc.txt N ia-x86/bootblock.lisp N ia-x86/browser.lisp N ia-x86/compiler-protocol.lisp N ia-x86/compiler-types.lisp N ia-x86/compiler.lisp N ia-x86/environment.lisp N ia-x86/eval.lisp N ia-x86/image.lisp N ia-x86/load.lisp N ia-x86/movitz-mode.el N ia-x86/movitz.lisp N ia-x86/multiboot.lisp U ia-x86/packages.lisp N ia-x86/parse.lisp N ia-x86/procfs-image.lisp N ia-x86/special-operators-cl.lisp N ia-x86/special-operators.lisp N ia-x86/storage-types.lisp N ia-x86/stream-image.lisp N ia-x86/udp6-send.py N ia-x86/los0-image N ia-x86/bootblock-id.txt I ia-x86/doc/CVS N ia-x86/doc/ChangeLog N ia-x86/doc/ideas.txt N ia-x86/doc/movitz.html I ia-x86/doc/report/CVS N ia-x86/doc/report/browser.eps N ia-x86/doc/report/browser.fig N ia-x86/doc/report/browser.pdf N ia-x86/doc/report/computer1.jpg N ia-x86/doc/report/computer2.gif N ia-x86/doc/report/computer2.png N ia-x86/doc/report/intro.fig N ia-x86/doc/report/movitz.tex N ia-x86/doc/report/screenshot.eps N ia-x86/doc/report/screenshot.fig N ia-x86/doc/report/screenshot.pdf I ia-x86/grub-bootloader/CVS N ia-x86/grub-bootloader/README N ia-x86/grub-bootloader/grub-bootloader.img N ia-x86/grub-bootloader/menu.txt I ia-x86/losp/CVS N ia-x86/losp/common-lisp.lisp N ia-x86/losp/los0.lisp I ia-x86/losp/lib/CVS N ia-x86/losp/lib/bcd.lisp N ia-x86/losp/lib/console.lisp N ia-x86/losp/lib/malloc-init.lisp N ia-x86/losp/lib/misc.lisp N ia-x86/losp/lib/named-integers.lisp N ia-x86/losp/lib/package.lisp N ia-x86/losp/lib/readline.lisp N ia-x86/losp/lib/repl.lisp N ia-x86/losp/lib/toplevel.lisp I ia-x86/losp/lib/net/CVS N ia-x86/losp/lib/net/arp.lisp N ia-x86/losp/lib/net/ethernet.lisp N ia-x86/losp/lib/net/ip4.lisp N ia-x86/losp/lib/net/ip6.lisp I ia-x86/losp/muerte/CVS N ia-x86/losp/muerte/arrays.lisp N ia-x86/losp/muerte/basic-functions.lisp N ia-x86/losp/muerte/basic-macros.lisp N ia-x86/losp/muerte/characters.lisp N ia-x86/losp/muerte/common-lisp.lisp N ia-x86/losp/muerte/conditions.lisp N ia-x86/losp/muerte/cons.lisp N ia-x86/losp/muerte/cpu-id.lisp N ia-x86/losp/muerte/defstruct.lisp N ia-x86/losp/muerte/environment.lisp N ia-x86/losp/muerte/equalp.lisp N ia-x86/losp/muerte/error.lisp N ia-x86/losp/muerte/eval.lisp N ia-x86/losp/muerte/format.lisp N ia-x86/losp/muerte/functions.lisp N ia-x86/losp/muerte/hash-tables.lisp N ia-x86/losp/muerte/inspect.lisp N ia-x86/losp/muerte/integers.lisp N ia-x86/losp/muerte/io-port.lisp N ia-x86/losp/muerte/lists.lisp N ia-x86/losp/muerte/loop.lisp N ia-x86/losp/muerte/los-closette-compiler.lisp N ia-x86/losp/muerte/los-closette.lisp N ia-x86/losp/muerte/memref.lisp N ia-x86/losp/muerte/more-macros.lisp N ia-x86/losp/muerte/packages.lisp N ia-x86/losp/muerte/primitive-functions.lisp N ia-x86/losp/muerte/print.lisp N ia-x86/losp/muerte/read.lisp N ia-x86/losp/muerte/restarts.lisp N ia-x86/losp/muerte/run-time-context.lisp N ia-x86/losp/muerte/segments.lisp N ia-x86/losp/muerte/sequences.lisp N ia-x86/losp/muerte/setf.lisp N ia-x86/losp/muerte/simple-streams.lisp N ia-x86/losp/muerte/streams.lisp N ia-x86/losp/muerte/strings.lisp N ia-x86/losp/muerte/symbols.lisp N ia-x86/losp/muerte/typep.lisp N ia-x86/losp/muerte/variables.lisp I ia-x86/losp/x86-pc/CVS N ia-x86/losp/x86-pc/all.lisp N ia-x86/losp/x86-pc/cmos.lisp N ia-x86/losp/x86-pc/debugger.lisp N ia-x86/losp/x86-pc/dp8390.lisp N ia-x86/losp/x86-pc/interrupt.lisp N ia-x86/losp/x86-pc/io-space.lisp N ia-x86/losp/x86-pc/keyboard.lisp N ia-x86/losp/x86-pc/memory.lisp N ia-x86/losp/x86-pc/ne2k.lisp N ia-x86/losp/x86-pc/package.lisp N ia-x86/losp/x86-pc/pci.lisp N ia-x86/losp/x86-pc/pic8259.lisp N ia-x86/losp/x86-pc/pit8253.lisp N ia-x86/losp/x86-pc/serial.lisp N ia-x86/losp/x86-pc/textmode-console.lisp N ia-x86/losp/x86-pc/textmode.lisp N ia-x86/losp/x86-pc/vga.lisp 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jfrodef:yesterday -jfrodef ia-x86 Date: Tue Jan 13 05:53:41 2004 Author: ffjeld New module ia-x86 added From ffjeld at common-lisp.net Tue Jan 13 11:02:32 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:02:32 -0500 Subject: [movitz-cvs] CVS update: ia-x86/packages.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv20096 Removed Files: packages.lisp Log Message: Fixing up previous erroneous import Date: Tue Jan 13 06:02:32 2004 Author: ffjeld From ffjeld at common-lisp.net Tue Jan 13 11:03:12 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:03:12 -0500 Subject: [movitz-cvs] CVS update: ia-x86/packages.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv20514 Added Files: packages.lisp Log Message: this is the one Date: Tue Jan 13 06:03:12 2004 Author: ffjeld Index: ia-x86/packages.lisp diff -u /dev/null ia-x86/packages.lisp:1.3 --- /dev/null Tue Jan 13 06:03:12 2004 +++ ia-x86/packages.lisp Tue Jan 13 06:03:12 2004 @@ -0,0 +1,99 @@ +;;;;------------------------------------------------------------------ +;;;; +;;;; Copyright (C) 20012000, 2002-2003, +;;;; Department of Computer Science, University of Troms?, Norway +;;;; +;;;; Filename: packages.lisp +;;;; Description: Operand representation. +;;;; Author: Frode Vatvedt Fjeld +;;;; Created at: Wed Feb 16 14:02:57 2000 +;;;; Distribution: See the accompanying file COPYING. +;;;; +;;;; $Id: packages.lisp,v 1.3 2004/01/13 11:03:12 ffjeld Exp $ +;;;; +;;;;------------------------------------------------------------------ + +(in-package "CL-USER") + +(defpackage "IA-X86" + (:use "COMMON-LISP") + (:export + #:init-instruction-tables + #:*cpu-mode* + #:decode-sub-stream + #:decode-read-octet + #:decode + #:def-instr + #:def-set + ;; operands + #:r/m8 + #:r/m16 + #:r/m32 + #:r8 + #:r16 + #:r32 + #:+r8 + #:+r16 + #:+r32 + #:pointer + #:simm8 + #:imm8 + #:imm16 + #:imm32 + #:rel8 + #:rel16 + #:rel32 + #:ptr16-16 + #:ptr16-32 + #:al + #:ax + #:eax + #:cl + #:dx + #:sreg + #:cs + #:ds + #:es + #:fs + #:gs + #:ss + #:m32real + #:m64real + #:m80real + #:m16int + #:m32int + ;; instruction class + #:instruction + #:instruction-operands + #:instruction-prefixes + ;; instruction prefixes + #:lock + #:repne + #:repz + #:cs-override + #:ds-override + #:es-override + #:fs-override + #:gs-override + #:ss-override + #:16-bit-operand + #:16-bit-address + #:*symtab-lookup* + ;; proglist + #:proglist-encode + #:make-label + ;; read + #:read-instruction + #:read-proglist + #:asm + ;; symtab + #:symtab-lookup-label + #:symtab-try-lookup-label + )) + +(defpackage "IA-X86-INSTR" + (:use "IA-X86") + (:import-from "COMMON-LISP" t nil defclass load eval compile) + (:documentation + "All the specialized classes for IA-X86 instructions are put into +this package, so that we may have instructions named 'and' etc.")) From ffjeld at common-lisp.net Tue Jan 13 11:04:34 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:04:34 -0500 Subject: [movitz-cvs] CVS update: ia-x86/packages.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv5121 Added Files: packages.lisp Log Message: more fixing up Date: Tue Jan 13 06:04:33 2004 Author: ffjeld From ffjeld at common-lisp.net Tue Jan 13 11:05:07 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:05:07 -0500 Subject: [movitz-cvs] CVS update: Module imported: movitz Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/home/ffjeld/movitz Log Message: Imported to common-lisp.net Status: Vendor Tag: frodef Release Tags: start I movitz/CVS N movitz/COPYING N movitz/assembly-syntax.lisp N movitz/bochsrc.txt N movitz/bootblock.lisp N movitz/browser.lisp N movitz/compiler-protocol.lisp N movitz/compiler-types.lisp N movitz/compiler.lisp N movitz/environment.lisp N movitz/eval.lisp N movitz/image.lisp N movitz/load.lisp N movitz/movitz-mode.el N movitz/movitz.lisp N movitz/multiboot.lisp N movitz/packages.lisp N movitz/parse.lisp N movitz/procfs-image.lisp N movitz/special-operators-cl.lisp N movitz/special-operators.lisp N movitz/storage-types.lisp N movitz/stream-image.lisp N movitz/udp6-send.py N movitz/los0-image N movitz/bootblock-id.txt I movitz/doc/CVS N movitz/doc/ChangeLog N movitz/doc/ideas.txt N movitz/doc/movitz.html I movitz/doc/report/CVS N movitz/doc/report/browser.eps N movitz/doc/report/browser.fig N movitz/doc/report/browser.pdf N movitz/doc/report/computer1.jpg N movitz/doc/report/computer2.gif N movitz/doc/report/computer2.png N movitz/doc/report/intro.fig N movitz/doc/report/movitz.tex N movitz/doc/report/screenshot.eps N movitz/doc/report/screenshot.fig N movitz/doc/report/screenshot.pdf I movitz/grub-bootloader/CVS N movitz/grub-bootloader/README N movitz/grub-bootloader/grub-bootloader.img N movitz/grub-bootloader/menu.txt I movitz/losp/CVS N movitz/losp/common-lisp.lisp N movitz/losp/los0.lisp I movitz/losp/lib/CVS N movitz/losp/lib/bcd.lisp N movitz/losp/lib/console.lisp N movitz/losp/lib/malloc-init.lisp N movitz/losp/lib/misc.lisp N movitz/losp/lib/named-integers.lisp N movitz/losp/lib/package.lisp N movitz/losp/lib/readline.lisp N movitz/losp/lib/repl.lisp N movitz/losp/lib/toplevel.lisp I movitz/losp/lib/net/CVS N movitz/losp/lib/net/arp.lisp N movitz/losp/lib/net/ethernet.lisp N movitz/losp/lib/net/ip4.lisp N movitz/losp/lib/net/ip6.lisp I movitz/losp/muerte/CVS N movitz/losp/muerte/arrays.lisp N movitz/losp/muerte/basic-functions.lisp N movitz/losp/muerte/basic-macros.lisp N movitz/losp/muerte/characters.lisp N movitz/losp/muerte/common-lisp.lisp N movitz/losp/muerte/conditions.lisp N movitz/losp/muerte/cons.lisp N movitz/losp/muerte/cpu-id.lisp N movitz/losp/muerte/defstruct.lisp N movitz/losp/muerte/environment.lisp N movitz/losp/muerte/equalp.lisp N movitz/losp/muerte/error.lisp N movitz/losp/muerte/eval.lisp N movitz/losp/muerte/format.lisp N movitz/losp/muerte/functions.lisp N movitz/losp/muerte/hash-tables.lisp N movitz/losp/muerte/inspect.lisp N movitz/losp/muerte/integers.lisp N movitz/losp/muerte/io-port.lisp N movitz/losp/muerte/lists.lisp N movitz/losp/muerte/loop.lisp N movitz/losp/muerte/los-closette-compiler.lisp N movitz/losp/muerte/los-closette.lisp N movitz/losp/muerte/memref.lisp N movitz/losp/muerte/more-macros.lisp N movitz/losp/muerte/packages.lisp N movitz/losp/muerte/primitive-functions.lisp N movitz/losp/muerte/print.lisp N movitz/losp/muerte/read.lisp N movitz/losp/muerte/restarts.lisp N movitz/losp/muerte/run-time-context.lisp N movitz/losp/muerte/segments.lisp N movitz/losp/muerte/sequences.lisp N movitz/losp/muerte/setf.lisp N movitz/losp/muerte/simple-streams.lisp N movitz/losp/muerte/streams.lisp N movitz/losp/muerte/strings.lisp N movitz/losp/muerte/symbols.lisp N movitz/losp/muerte/typep.lisp N movitz/losp/muerte/variables.lisp I movitz/losp/x86-pc/CVS N movitz/losp/x86-pc/all.lisp N movitz/losp/x86-pc/cmos.lisp N movitz/losp/x86-pc/debugger.lisp N movitz/losp/x86-pc/dp8390.lisp N movitz/losp/x86-pc/interrupt.lisp N movitz/losp/x86-pc/io-space.lisp N movitz/losp/x86-pc/keyboard.lisp N movitz/losp/x86-pc/memory.lisp N movitz/losp/x86-pc/ne2k.lisp N movitz/losp/x86-pc/package.lisp N movitz/losp/x86-pc/pci.lisp N movitz/losp/x86-pc/pic8259.lisp N movitz/losp/x86-pc/pit8253.lisp N movitz/losp/x86-pc/serial.lisp N movitz/losp/x86-pc/textmode-console.lisp N movitz/losp/x86-pc/textmode.lisp N movitz/losp/x86-pc/vga.lisp No conflicts created by this import Date: Tue Jan 13 06:05:07 2004 Author: ffjeld New module movitz added From ffjeld at common-lisp.net Tue Jan 13 11:13:13 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:13:13 -0500 Subject: [movitz-cvs] CVS update: Module imported: binary-types Message-ID: Update of /project/movitz/cvsroot/binary-types In directory common-lisp.net:/home/ffjeld/binary-types Log Message: Imported to common-lisp.net Status: Vendor Tag: frodef Release Tags: start N binary-types/binary-types.lisp N binary-types/Makefile N binary-types/example.lisp N binary-types/COPYING N binary-types/ChangeLog N binary-types/README N binary-types/README-bitfield N binary-types/type-hierarchy.ps N binary-types/type-hierarchy.pdf No conflicts created by this import Date: Tue Jan 13 06:13:13 2004 Author: ffjeld New module binary-types added From ffjeld at common-lisp.net Tue Jan 13 11:23:06 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:23:06 -0500 Subject: [movitz-cvs] CVS update: Module imported: public_html Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/home/ffjeld/tmp/public_html Log Message: Web-pages for common-lisp.net Status: Vendor Tag: frodef Release Tags: start N public_html/index.html No conflicts created by this import Date: Tue Jan 13 06:23:05 2004 Author: ffjeld New module public_html added From ffjeld at common-lisp.net Tue Jan 13 11:29:58 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:29:58 -0500 Subject: [movitz-cvs] CVS update: public_html/index.html Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv30305 Modified Files: index.html Log Message: Just replaced "sample" with "movitz". Date: Tue Jan 13 06:29:58 2004 Author: ffjeld Index: public_html/index.html diff -u public_html/index.html:1.1.1.1 public_html/index.html:1.2 --- public_html/index.html:1.1.1.1 Tue Jan 13 06:23:05 2004 +++ public_html/index.html Tue Jan 13 06:29:58 2004 @@ -3,15 +3,15 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - SAMPLE project + Movitz project
-

SAMPLE

-

A sample common-lisp.net project

+

Movitz

+

A movitz common-lisp.net project

Introduction

@@ -25,20 +25,20 @@
  • - SAMPLE
    for discussion, questions, etc.
  • + href="http://www.common-lisp.net/mailman/listinfo/movitz"> + Movitz
    for discussion, questions, etc.
  • - SAMPLE-devel
    for developers
  • + href="http://www.common-lisp.net/mailman/listinfo/movitz-devel"> + Movitz-devel
    for developers
  • - SAMPLE-cvs
    CVS log feed.
  • + href="http://www.common-lisp.net/mailman/listinfo/movitz-devel"> + Movitz-cvs
    CVS log feed.
  • - SAMPLE-announce
    for announcements.
  • + href="http://www.common-lisp.net/mailman/listinfo/movitz-devel"> + Movitz-announce
    for announcements.
@@ -49,12 +49,12 @@

CVS

You can + href="http://common-lisp.net/cgi-bin/viewcvs.cgi/movitz/?cvsroot=movitz"> browse our CVS repository or download the current development tree via anonymous cvs, as described here

From ffjeld at common-lisp.net Tue Jan 13 11:31:55 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:31:55 -0500 Subject: [movitz-cvs] CVS update: public_html/style.css Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/project/movitz/public_html Added Files: style.css Log Message: Copied from sample project. Date: Tue Jan 13 06:31:55 2004 Author: ffjeld From ffjeld at common-lisp.net Tue Jan 13 11:33:38 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:33:38 -0500 Subject: [movitz-cvs] CVS update: public_html/index.html Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv11648 Modified Files: index.html Log Message: fixes Date: Tue Jan 13 06:33:38 2004 Author: ffjeld Index: public_html/index.html diff -u public_html/index.html:1.2 public_html/index.html:1.3 --- public_html/index.html:1.2 Tue Jan 13 06:29:58 2004 +++ public_html/index.html Tue Jan 13 06:33:38 2004 @@ -54,7 +54,7 @@ anonymous cvs, as described here

From ffjeld at common-lisp.net Tue Jan 13 11:34:24 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 06:34:24 -0500 Subject: [movitz-cvs] CVS update: public_html/index.html Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv24426 Modified Files: index.html Log Message: *** empty log message *** Date: Tue Jan 13 06:34:24 2004 Author: ffjeld Index: public_html/index.html diff -u public_html/index.html:1.3 public_html/index.html:1.4 --- public_html/index.html:1.3 Tue Jan 13 06:33:38 2004 +++ public_html/index.html Tue Jan 13 06:34:24 2004 @@ -25,10 +25,6 @@
  • - Movitz
    for discussion, questions, etc.
  • -
  • - Movitz-devel
    for developers
  • From ffjeld at common-lisp.net Tue Jan 13 13:26:50 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 13 Jan 2004 08:26:50 -0500 Subject: [movitz-cvs] CVS update: public_html/index.html Message-ID: Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv26721 Modified Files: index.html Log Message: *** empty log message *** Date: Tue Jan 13 08:26:50 2004 Author: ffjeld Index: public_html/index.html diff -u public_html/index.html:1.4 public_html/index.html:1.5 --- public_html/index.html:1.4 Tue Jan 13 06:34:24 2004 +++ public_html/index.html Tue Jan 13 08:26:50 2004 @@ -45,9 +45,10 @@

    CVS

    You can -browse our CVS repository or download the current development tree via - anonymous cvs, as described here

    + href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=movitz#dirlist"> + browse our CVS repository or download the current development + tree via anonymous cvs, as described here

  • - Movitz-devel
    for developers
  • + Movitz-devel for developers
  • - Movitz-cvs
    CVS log feed.
  • + Movitz-cvs CVS log feed.
  • - Movitz-announce
    for announcements.
  • + Movitz-announce for announcements.
@@ -58,9 +58,9 @@

There are currently three modules in the repository:

    -
  • ia-x86
  • -
  • binary-types
  • -
  • movitz
  • +
  • ia-x86
  • +
  • binary-types
  • +
  • movitz

The former two are required for building and using the latter. @@ -73,12 +73,8 @@

- From ffjeld at common-lisp.net Wed Jan 14 22:22:31 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Wed, 14 Jan 2004 17:22:31 -0500 Subject: [movitz-cvs] CVS update: ia-x86/postload.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv18145 Modified Files: postload.lisp Log Message: Patch from jdz to avoid hitting CALL-ARGUMENTS-LIMIT in e.g. LW. Date: Wed Jan 14 17:22:30 2004 Author: ffjeld Index: ia-x86/postload.lisp diff -u ia-x86/postload.lisp:1.1.1.1 ia-x86/postload.lisp:1.2 --- ia-x86/postload.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/postload.lisp Wed Jan 14 17:22:30 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 20012000, 2003, +;;;; Copyright (C) 20012000, 2003-2004, ;;;; Department of Computer Science, University of Troms??, Norway ;;;; ;;;; Filename: postload.lisp @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 31 16:33:23 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: postload.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: postload.lisp,v 1.2 2004/01/14 22:22:30 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -23,7 +23,7 @@ (format t "~&;; ~A Longest lookup list (#x~2,'0X) has ~D elements.~%" prefix - (position #0=(apply #'max (map 'list #'length + (position #0=(reduce #'max (map 'list #'length table)) (map 'list #'length table)) From ffjeld at common-lisp.net Thu Jan 15 10:47:58 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 05:47:58 -0500 Subject: [movitz-cvs] CVS update: movitz/doc/ideas.txt Message-ID: Update of /project/movitz/cvsroot/movitz/doc In directory common-lisp.net:/tmp/cvs-serv31034 Modified Files: ideas.txt Log Message: Some ideas about function calling. Date: Thu Jan 15 05:47:58 2004 Author: ffjeld Index: movitz/doc/ideas.txt diff -u movitz/doc/ideas.txt:1.1.1.1 movitz/doc/ideas.txt:1.2 --- movitz/doc/ideas.txt:1.1.1.1 Tue Jan 13 06:05:01 2004 +++ movitz/doc/ideas.txt Thu Jan 15 05:47:57 2004 @@ -1,6 +1,6 @@ ###################################################################### ## -## Copyright (C) 2003, +## Copyright (C) 2003-2004, ## Department of Computer Science, University of Tromsoe, Norway. ## ## For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ## Author: Frode Vatvedt Fjeld ## Created at: Fri Dec 12 19:19:39 2003 ## -## $Id: ideas.txt,v 1.1.1.1 2004/01/13 11:05:01 ffjeld Exp $ +## $Id: ideas.txt,v 1.2 2004/01/15 10:47:57 ffjeld Exp $ ## ###################################################################### @@ -20,3 +20,27 @@ if we add one cache slot to each (caller) funobj. In many cases this would allow for a cache-size of 1 or 2, say. And it'd be possible to determine these cases dynamically. + + +** Function calls via symbols + + - It's a CPU-cache utilization problem that whenever a function is + called via a symbol, the entire symbol is likely to be loaded into + the cache (cache-lines are 32 bytes or more), whereas only the + function-value cell is likely to be used. If symbols are assigned + a small structure, like a cons cell, for holding their + function-value, then funcalls can go via this cell rather than the + symbol. If suchs cells are located cleverly wrt. CPU caching, a + substantial improvement in cache performance might be feasible. + + - The above idea can be taken one step further. Observe that a cons + cell such as described above will represent a mapping from a + symbol S to a function F. Now, we can represent this same mapping + by a funobj FS which is a copy of the funobj F, and with the same + code-vectors. This way, the entire indirect reference to get a + symbol's function-value can be eliminated in the normal case. The + cost is the space overhead of the funobj copies, and a somewhat + more complicated (setf symbol-function). I.e. it would have to + install in the old FS a code-vector that updates the caller + function's references to the new FS, before trampolining to the + new FS. The performance gain could be substantial. From ffjeld at common-lisp.net Thu Jan 15 13:18:29 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 08:18:29 -0500 Subject: [movitz-cvs] CVS update: binary-types/binary-types.lisp Message-ID: Update of /project/movitz/cvsroot/binary-types In directory common-lisp.net:/tmp/cvs-serv15098 Modified Files: binary-types.lisp Log Message: If you get this complaint from PCL: non-symbol and non-interned symbol slot name accessorsare not yet implemented you can set *ignore-hidden-slots-for-pcl* to true. This will disable a certain feature in a quite crude way, but it's not really a feature required to get Movitz going. Newer versions of PCL don't have this misfeature, it seems, so do update. Date: Thu Jan 15 08:18:29 2004 Author: ffjeld Index: binary-types/binary-types.lisp diff -u binary-types/binary-types.lisp:1.1.1.1 binary-types/binary-types.lisp:1.2 --- binary-types/binary-types.lisp:1.1.1.1 Tue Jan 13 06:13:13 2004 +++ binary-types/binary-types.lisp Thu Jan 15 08:18:29 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 200120001999, 2003, +;;;; Copyright (C) 200120001999, 2003-2004, ;;;; Department of Computer Science, University of Troms?, Norway ;;;; ;;;; Filename: binary-types.lisp @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 19 18:53:57 1999 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: binary-types.lisp,v 1.1.1.1 2004/01/13 11:13:13 ffjeld Exp $ +;;;; $Id: binary-types.lisp,v 1.2 2004/01/15 13:18:29 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -68,6 +68,10 @@ (in-package binary-types) +(defvar *ignore-hidden-slots-for-pcl* nil + "Really ugly hack to allow older PCL-infested lisps to work in the +precense of :map-binary-read-delayed.") + (defvar *binary-write-byte* #'common-lisp:write-byte "The low-level WRITE-BYTE function used by binary-types.") (defvar *binary-read-byte* #'common-lisp:read-byte @@ -611,7 +615,8 @@ :hidden-read-slot ',hidden-read-slot-name :tags ',tags) binslot-forms) - (when hidden-read-slot-name + (when (and hidden-read-slot-name + (not *ignore-hidden-slots-for-pcl*)) (push (list hidden-read-slot-name slot-name map-read-delayed bintype) hidden-slots)) (push bintype binslot-types)))) From ffjeld at common-lisp.net Thu Jan 15 16:13:00 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 11:13:00 -0500 Subject: [movitz-cvs] CVS update: movitz/parse.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29683 Modified Files: parse.lisp Log Message: Don't intern a symbol, intern its name. Date: Thu Jan 15 11:13:00 2004 Author: ffjeld Index: movitz/parse.lisp diff -u movitz/parse.lisp:1.1.1.1 movitz/parse.lisp:1.2 --- movitz/parse.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/parse.lisp Thu Jan 15 11:13:00 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:49:17 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: parse.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: parse.lisp,v 1.2 2004/01/15 16:13:00 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -222,11 +222,17 @@ (null (error "Illegal keyword formal: ~S" formal)) (symbol - (values formal (intern (string formal) :keyword) nil nil)) + (values formal + (intern (string formal) :keyword) + nil + nil)) (cons (if (consp (car formal)) (values (cadar formal) (caar formal) (second formal) (third formal)) - (values (car formal) (intern (car formal) :keyword) (second formal) (third formal)))))) + (values (car formal) + (intern (string (car formal)) :keyword) + (second formal) + (third formal)))))) (defun decode-aux-formal (formal) "Return variable-name and init-form." From ffjeld at common-lisp.net Thu Jan 15 16:38:53 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 11:38:53 -0500 Subject: [movitz-cvs] CVS update: movitz/compiler.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29669 Modified Files: compiler.lisp Log Message: Added function movitz-macro-expander-make-function which is supposed to take care of compiling (or not) all macro-expander code. Date: Thu Jan 15 11:38:52 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.1.1.1 movitz/compiler.lisp:1.2 --- movitz/compiler.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/compiler.lisp Thu Jan 15 11:38:52 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.2 2004/01/15 16:38:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -107,6 +107,16 @@ (when (slot-boundp object 'name) (write (movitz-funobj-name object) :stream stream))) object) + +(defun movitz-macro-expander-make-function (lambda-form + &key (name (gensym "macro-expander-")) + (type :unknown)) + "Make a lambda-form that is a macro-expander into a proper function." + (declare (ignore type)) + (check-type name symbol) + (if *compiler-compile-macro-expanders* + (compile name lambda-form) + (coerce lambda-form 'function))) (defun make-compiled-funobj (&rest args) (handler-bind (((or warning error) From ffjeld at common-lisp.net Thu Jan 15 16:40:34 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 11:40:34 -0500 Subject: [movitz-cvs] CVS update: movitz/special-operators-cl.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv15096 Modified Files: special-operators-cl.lisp Log Message: Use newly created movitz-macro-expander-make-function. Date: Thu Jan 15 11:40:34 2004 Author: ffjeld Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.1.1.1 movitz/special-operators-cl.lisp:1.2 --- movitz/special-operators-cl.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/special-operators-cl.lisp Thu Jan 15 11:40:33 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:31:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: special-operators-cl.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.2 2004/01/15 16:40:33 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -271,15 +271,18 @@ (loop for (name local-lambda-list . local-body) in macrolet-specs as cl-local-lambda-list = (translate-program local-lambda-list :muerte.cl :cl) as cl-local-body = (translate-program local-body :muerte.cl :cl) + as expander = `(lambda (form env) + (declare (ignorable env)) + (destructuring-bind ,cl-local-lambda-list + (translate-program (rest form) :muerte.cl :cl) + (translate-program (block ,name (let () , at cl-local-body)) + :cl :muerte.cl))) do (movitz-env-add-binding local-env (make-instance 'macro-binding :name name - :expander - `(lambda (form env) - (destructuring-bind ,cl-local-lambda-list - (translate-program (rest form) :muerte.cl :cl) - (translate-program (block ,name (let () , at cl-local-body)) - :cl :muerte.cl)))))) + :expander (movitz-macro-expander-make-function expander + :name name + :type :macrolet)))) (compiler-values-bind (&all body-values &code body-code) (compiler-call #'compile-implicit-progn :defaults forward From ffjeld at common-lisp.net Thu Jan 15 16:40:40 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 11:40:40 -0500 Subject: [movitz-cvs] CVS update: movitz/special-operators.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv15680 Modified Files: special-operators.lisp Log Message: Use newly created movitz-macro-expander-make-function. Date: Thu Jan 15 11:40:40 2004 Author: ffjeld Index: movitz/special-operators.lisp diff -u movitz/special-operators.lisp:1.1.1.1 movitz/special-operators.lisp:1.2 --- movitz/special-operators.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/special-operators.lisp Thu Jan 15 11:40:40 2004 @@ -8,7 +8,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Nov 24 16:22:59 2000 ;;;; -;;;; $Id: special-operators.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: special-operators.lisp,v 1.2 2004/01/15 16:40:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -344,19 +344,22 @@ (parse-docstring-declarations-and-body cl-macro-body 'cl:declare) (declare (ignore doc-string)) (setf (movitz-env-get access-fn :setf-expander nil) - (let ((form-formal (or wholevar (gensym))) - (env-formal (or envvar (gensym)))) - (if (null cl-lambda-list) - `(lambda (,form-formal ,env-formal) - (declare , at declarations) - (translate-program (block ,access-fn , at cl-body) :cl :muerte.cl)) - `(lambda (,form-formal ,env-formal) - (declare , at declarations) - (destructuring-bind ,cl-lambda-list - (translate-program (rest ,form-formal) :muerte.cl :cl) - (values-list - (translate-program (multiple-value-list (block ,access-fn , at cl-body)) - :cl :muerte.cl))))))))))) + (let* ((form-formal (or wholevar (gensym))) + (env-formal (or envvar (gensym))) + (expander (if (null cl-lambda-list) + `(lambda (,form-formal ,env-formal) + (declare (ignorable ,form-formal ,env-formal) + , at declarations) + (translate-program (block ,access-fn , at cl-body) :cl :muerte.cl)) + `(lambda (,form-formal ,env-formal) + (declare (ignorable ,form-formal ,env-formal) + , at declarations) + (destructuring-bind ,cl-lambda-list + (translate-program (rest ,form-formal) :muerte.cl :cl) + (values-list + (translate-program (multiple-value-list (block ,access-fn , at cl-body)) + :cl :muerte.cl))))))) + (movitz-macro-expander-make-function expander :type :setf))))))) (compiler-values ())) (define-special-operator muerte::defmacro-compile-time (&form form) @@ -396,9 +399,9 @@ (declare , at declarations) (translate-program (block ,name , at cl-body) :cl :muerte.cl))))))) (setf (movitz-macro-function name) - (if *compiler-compile-macro-expanders* - (compile expander-name expander-lambda) - expander-lambda))))))) + (movitz-macro-expander-make-function expander-lambda + :name expander-name + :type :defmacro))))))) (compiler-values ())) (define-special-operator muerte::define-compiler-macro-compile-time (&form form) @@ -438,9 +441,9 @@ ,form-formal ; declined (translate-program ,expansion-var :cl :muerte.cl))))))) (setf (movitz-compiler-macro-function operator-name nil) - (if *compiler-compile-macro-expanders* - (compile (make-symbol (format nil "~A-compiler-macro" name)) expander) - expander)))))))) + (movitz-macro-expander-make-function expander + :name (gensym (format nil "~A-compiler-macro-" name)) + :type :compiler-macro)))))))) (compiler-values ())) (define-special-operator muerte::with-inline-assembly-case From ffjeld at common-lisp.net Thu Jan 15 16:41:46 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 11:41:46 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/loop.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv19419 Modified Files: loop.lisp Log Message: Loop macro-expanders should call movitz-macroexpand etc. rather than cl:macroexpand etc. Date: Thu Jan 15 11:41:46 2004 Author: ffjeld Index: movitz/losp/muerte/loop.lisp diff -u movitz/losp/muerte/loop.lisp:1.1.1.1 movitz/losp/muerte/loop.lisp:1.2 --- movitz/losp/muerte/loop.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/loop.lisp Thu Jan 15 11:41:45 2004 @@ -244,7 +244,7 @@ (declare #+LISPM (ignore head-var user-head-var) ;use locatives, unconditionally update through the tail. ) - (setq form (macroexpand form env)) + (setq form (movitz::movitz-macroexpand form env)) (flet ((cdr-wrap (form n) (declare (fixnum n)) (do () ((<= n 4) (setq form `(,(case n @@ -772,7 +772,7 @@ (dolist (x l n) (incf n (estimate-code-size-1 x env)))))) ;;@@@@ ???? (declare (function list-size (list) fixnum)) (cond ((constantp x #+Genera env) 1) - ((symbolp x) (multiple-value-bind (new-form expanded-p) (macroexpand-1 x env) + ((symbolp x) (multiple-value-bind (new-form expanded-p) (movitz::movitz-macroexpand-1 x env) (if expanded-p (estimate-code-size-1 new-form env) 1))) ((atom x) 1) ;??? self-evaluating??? ((symbolp (car x)) @@ -808,7 +808,7 @@ ((eq fn 'return-from) (1+ (estimate-code-size-1 (third x) env))) ((or (special-operator-p fn) (member fn *estimate-code-size-punt*)) (throw 'estimate-code-size nil)) - (t (multiple-value-bind (new-form expanded-p) (macroexpand-1 x env) + (t (multiple-value-bind (new-form expanded-p) (movitz::movitz-macroexpand-1 x env) (if expanded-p (estimate-code-size-1 new-form env) (f 3)))))))) @@ -2126,7 +2126,7 @@ (and (consp x) (or (not (eq (car x) 'car)) (not (symbolp (cadr x))) - (not (symbolp (setq x (macroexpand x env))))) + (not (symbolp (setq x (movitz::movitz-macroexpand x env))))) (cons x nil))) (cdr val)) `(,val)))) From ffjeld at common-lisp.net Thu Jan 15 17:13:54 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:13:54 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/x86-pc/all.lisp movitz/losp/x86-pc/cmos.lisp movitz/losp/x86-pc/dp8390.lisp movitz/losp/x86-pc/interrupt.lisp movitz/losp/x86-pc/memory.lisp movitz/losp/x86-pc/ne2k.lisp movitz/losp/x86-pc/package.lisp movitz/losp/x86-pc/pic8259.lisp movitz/losp/x86-pc/pit8253.lisp movitz/losp/x86-pc/textmode-console.lisp movitz/losp/x86-pc/textmode.lisp movitz/losp/x86-pc/vga.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv31835 Modified Files: all.lisp cmos.lisp dp8390.lisp interrupt.lisp memory.lisp ne2k.lisp package.lisp pic8259.lisp pit8253.lisp textmode-console.lisp textmode.lisp vga.lisp Log Message: Cleaned up package muerte.x86-pc. Date: Thu Jan 15 12:13:53 2004 Author: ffjeld Index: movitz/losp/x86-pc/all.lisp diff -u movitz/losp/x86-pc/all.lisp:1.1.1.1 movitz/losp/x86-pc/all.lisp:1.2 --- movitz/losp/x86-pc/all.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/all.lisp Thu Jan 15 12:13:53 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2003, +;;;; Copyright (C) 2001-2004, ;;;; Department of Computer Science, University of Troms?, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,13 +10,11 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Sep 27 21:14:56 2001 ;;;; -;;;; $Id: all.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: all.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -(defpackage muerte.x86-pc) -(in-package muerte.x86-pc) - +(require :x86-pc/package) (require :x86-pc/memory) (require :x86-pc/keyboard) (require :x86-pc/vga) Index: movitz/losp/x86-pc/cmos.lisp diff -u movitz/losp/x86-pc/cmos.lisp:1.1.1.1 movitz/losp/x86-pc/cmos.lisp:1.2 --- movitz/losp/x86-pc/cmos.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/cmos.lisp Thu Jan 15 12:13:53 2004 @@ -10,18 +10,14 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 30 12:23:02 2002 ;;;; -;;;; $Id: cmos.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: cmos.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(require :x86-pc/package) (require :lib/named-integers) (require :lib/bcd) (provide :x86-pc/cmos) - -(defpackage muerte.x86-pc - (:use muerte.lib) - (:export rtc-register - cmos-register)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/dp8390.lisp diff -u movitz/losp/x86-pc/dp8390.lisp:1.1.1.1 movitz/losp/x86-pc/dp8390.lisp:1.2 --- movitz/losp/x86-pc/dp8390.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/dp8390.lisp Thu Jan 15 12:13:53 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Sep 18 12:21:36 2002 ;;;; -;;;; $Id: dp8390.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: dp8390.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,19 +18,6 @@ (require :x86-pc/io-space) (require :lib/net/ethernet) (provide :x86-pc/dp8390) - -(defpackage muerte.x86-pc.ne2k - (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) - (:export #:with-dp8390 - #:with-dp8390-dma - #:dp8390-initialize - #:dp8390-device - #:ring-start - #:ring-stop - #:io-base - #:ring-overflow-count - #:transmit-buffer - )) (in-package muerte.x86-pc.ne2k) Index: movitz/losp/x86-pc/interrupt.lisp diff -u movitz/losp/x86-pc/interrupt.lisp:1.1.1.1 movitz/losp/x86-pc/interrupt.lisp:1.2 --- movitz/losp/x86-pc/interrupt.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/interrupt.lisp Thu Jan 15 12:13:53 2004 @@ -10,19 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri May 4 18:08:50 2001 ;;;; -;;;; $Id: interrupt.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :x86-pc/pic8259) (provide :x86-pc/interrupt) - -(defpackage muerte.x86-pc - (:export idt-init - interrupt-handler - int-frame-ref - software-interrupt - *last-interrupt-frame*)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/memory.lisp diff -u movitz/losp/x86-pc/memory.lisp:1.1.1.1 movitz/losp/x86-pc/memory.lisp:1.2 --- movitz/losp/x86-pc/memory.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/memory.lisp Thu Jan 15 12:13:53 2004 @@ -10,15 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Oct 11 16:32:11 2001 ;;;; -;;;; $Id: memory.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: memory.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :x86-pc/package) (provide :x86-pc/memory) - -(defpackage muerte.x86-pc - (:export memory-size)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/ne2k.lisp diff -u movitz/losp/x86-pc/ne2k.lisp:1.1.1.1 movitz/losp/x86-pc/ne2k.lisp:1.2 --- movitz/losp/x86-pc/ne2k.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/ne2k.lisp Thu Jan 15 12:13:53 2004 @@ -10,20 +10,33 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 17 15:16:00 2002 ;;;; -;;;; $Id: ne2k.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: ne2k.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :x86-pc/package) + +(defpackage muerte.x86-pc.ne2k + (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) + (:export #:ne2k-probe + #:+ne2k-probe-addresses+ + + #:with-dp8390 + #:with-dp8390-dma + #:dp8390-initialize + #:dp8390-device + #:ring-start + #:ring-stop + #:io-base + #:ring-overflow-count + #:transmit-buffer + )) + (require :lib/net/ethernet) (require :x86-pc/dp8390) (provide :x86-pc/ne2k) -(defpackage muerte.x86-pc.ne2k - (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) - (:export #:ne2k-probe - #:+ne2k-probe-addresses+)) (in-package muerte.x86-pc.ne2k) Index: movitz/losp/x86-pc/package.lisp diff -u movitz/losp/x86-pc/package.lisp:1.1.1.1 movitz/losp/x86-pc/package.lisp:1.2 --- movitz/losp/x86-pc/package.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/package.lisp Thu Jan 15 12:13:53 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Oct 2 20:30:28 2001 ;;;; -;;;; $Id: package.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -28,4 +28,32 @@ #:with-io-space-lock #:make-io-space #:reset-device + #:memory-size + + #:vga-cursor-location + #:vga-crt-controller-register + #:vga-graphics-register + #:vga-memory-map + + #:rtc-register + #:cmos-register + + #:idt-init + #:interrupt-handler + #:int-frame-ref + #:software-interrupt + #:*last-interrupt-frame* + + #:pit8253-timer-mode + #:pit8253-timer-count + + #:+pit8253-frequency+ + #:+pit8253-nanosecond-period+ + + #:textmode-console + #:vga-text-console + + #:pic8259-irq-mask + #:pic8259-end-of-interrupt + #:init-pic8259 )) Index: movitz/losp/x86-pc/pic8259.lisp diff -u movitz/losp/x86-pc/pic8259.lisp:1.1.1.1 movitz/losp/x86-pc/pic8259.lisp:1.2 --- movitz/losp/x86-pc/pic8259.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/pic8259.lisp Thu Jan 15 12:13:53 2004 @@ -10,16 +10,11 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue May 22 15:23:01 2001 ;;;; -;;;; $Id: pic8259.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: pic8259.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (provide :x86-pc/pic8259) - -(defpackage muerte.x86-pc - (:export pic8259-irq-mask - pic8259-end-of-interrupt - init-pic8259)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/pit8253.lisp diff -u movitz/losp/x86-pc/pit8253.lisp:1.1.1.1 movitz/losp/x86-pc/pit8253.lisp:1.2 --- movitz/losp/x86-pc/pit8253.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/pit8253.lisp Thu Jan 15 12:13:53 2004 @@ -10,20 +10,13 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Jan 15 11:30:55 2002 ;;;; -;;;; $Id: pit8253.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: pit8253.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(require :x86-pc/package) (require :lib/named-integers) (provide :x86-pc/pit8253) - -(defpackage muerte.x86-pc - (:use muerte.cl muerte.lib) - (:export pit8253-timer-mode - pit8253-timer-count - - +pit8253-frequency+ - +pit8253-nanosecond-period+)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/textmode-console.lisp diff -u movitz/losp/x86-pc/textmode-console.lisp:1.1.1.1 movitz/losp/x86-pc/textmode-console.lisp:1.2 --- movitz/losp/x86-pc/textmode-console.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/textmode-console.lisp Thu Jan 15 12:13:53 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001, 2003, +;;;; Copyright (C) 2001, 2003-2004, ;;;; Department of Computer Science, University of Troms?, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Jul 8 15:13:24 2003 ;;;; -;;;; $Id: textmode-console.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: textmode-console.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,12 +18,7 @@ (require :x86-pc/textmode) (provide :x86-pc/textmode-console) -(defpackage muerte.x86-pc - (:export vga-text-console - )) - (in-package muerte.x86-pc) - (defclass vga-text-console (console stream) ((base Index: movitz/losp/x86-pc/textmode.lisp diff -u movitz/losp/x86-pc/textmode.lisp:1.1.1.1 movitz/losp/x86-pc/textmode.lisp:1.2 --- movitz/losp/x86-pc/textmode.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/textmode.lisp Thu Jan 15 12:13:53 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 9 15:38:56 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: textmode.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: textmode.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -19,11 +19,7 @@ (require :x86-pc/package) (require :x86-pc/keyboard) (require :lib/package) - (provide :x86-pc/textmode) - -(defpackage muerte.x86-pc - (:export textmode-console)) (in-package muerte.x86-pc) Index: movitz/losp/x86-pc/vga.lisp diff -u movitz/losp/x86-pc/vga.lisp:1.1.1.1 movitz/losp/x86-pc/vga.lisp:1.2 --- movitz/losp/x86-pc/vga.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/vga.lisp Thu Jan 15 12:13:53 2004 @@ -10,18 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 25 14:08:20 2001 ;;;; -;;;; $Id: vga.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: vga.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :x86-pc/package) (provide :x86-pc/vga) - -(defpackage muerte.x86-pc - (:export vga-cursor-location - vga-crt-controller-register - vga-graphics-register - vga-memory-map)) (in-package muerte.x86-pc) From ffjeld at common-lisp.net Thu Jan 15 17:34:50 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:34:50 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/lib/net/arp.lisp movitz/losp/lib/net/ethernet.lisp movitz/losp/lib/net/ip4.lisp movitz/losp/lib/net/ip6.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv6665/net Modified Files: arp.lisp ethernet.lisp ip4.lisp ip6.lisp Log Message: Fixed up package muerte.lib. Date: Thu Jan 15 12:34:50 2004 Author: ffjeld Index: movitz/losp/lib/net/arp.lisp diff -u movitz/losp/lib/net/arp.lisp:1.1.1.1 movitz/losp/lib/net/arp.lisp:1.2 --- movitz/losp/lib/net/arp.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/net/arp.lisp Thu Jan 15 12:34:49 2004 @@ -10,16 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Mar 20 15:01:15 2003 ;;;; -;;;; $Id: arp.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: arp.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :lib/net/ethernet) (provide :lib/net/arp) - -(defpackage muerte.ip4 - (:use muerte.cl muerte muerte.ethernet muerte.lib) - (:export )) (in-package muerte.ip4) Index: movitz/losp/lib/net/ethernet.lisp diff -u movitz/losp/lib/net/ethernet.lisp:1.1.1.1 movitz/losp/lib/net/ethernet.lisp:1.2 --- movitz/losp/lib/net/ethernet.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/net/ethernet.lisp Thu Jan 15 12:34:49 2004 @@ -10,45 +10,44 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 17 15:25:31 2002 ;;;; -;;;; $Id: ethernet.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: ethernet.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -(require :common-lisp) (require :lib/named-integers) (provide :lib/net/ethernet :load-priority 0) (defpackage muerte.ethernet - (:use muerte.cl muerte :muerte.lib) - (:export make-ethernet-packet - ether-destination - ether-source - ether-type - ethernet-device - transmit - receive - packet-error - packet - packet-available-p - mac-address - accept-broadcasts-p - accept-multicast-addresses - promiscuous-p - pprint-mac - ether-mac-vendor - format-ethernet-packet - ether-802.3-p - ether-802.3-llc-type - ether-802.3-llc-dsap - ether-802.3-llc-ssap - ether-802.3-snap-p - ether-802.3-snap-type - +source-mac+ - +destination-mac+ - +max-ethernet-frame-size+ - +min-ethernet-frame-size+ - +broadcast-address+)) + (:use muerte.cl muerte muerte.lib) + (:export #:make-ethernet-packet + #:ether-destination + #:ether-source + #:ether-type + #:ethernet-device + #:transmit + #:receive + #:packet-error + #:packet + #:packet-available-p + #:mac-address + #:accept-broadcasts-p + #:accept-multicast-addresses + #:promiscuous-p + #:pprint-mac + #:ether-mac-vendor + #:format-ethernet-packet + #:ether-802.3-p + #:ether-802.3-llc-type + #:ether-802.3-llc-dsap + #:ether-802.3-llc-ssap + #:ether-802.3-snap-p + #:ether-802.3-snap-type + #:+source-mac+ + #:+destination-mac+ + #:+max-ethernet-frame-size+ + #:+min-ethernet-frame-size+ + #:+broadcast-address+)) (in-package muerte.ethernet) Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.1.1.1 movitz/losp/lib/net/ip4.lisp:1.2 --- movitz/losp/lib/net/ip4.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/net/ip4.lisp Thu Jan 15 12:34:49 2004 @@ -10,21 +10,22 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -(provide :lib/net/ip4) - -;; (require :x86-pc/ne2k) +(require :lib/package) (require :lib/misc) -(require :lib/net/arp) +(require :lib/net/ethernet) +(provide :lib/net/ip4) (defpackage muerte.ip4 (:use muerte.cl muerte muerte.ethernet muerte.lib) (:export pprint-ip4 ip4-test ip4-free)) + +(require :lib/net/arp) (in-package muerte.ip4) Index: movitz/losp/lib/net/ip6.lisp diff -u movitz/losp/lib/net/ip6.lisp:1.1.1.1 movitz/losp/lib/net/ip6.lisp:1.2 --- movitz/losp/lib/net/ip6.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/lib/net/ip6.lisp Thu Jan 15 12:34:49 2004 @@ -10,36 +10,33 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Nov 14 17:25:31 2001 ;;;; -;;;; $Id: ip6.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: ip6.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -(require :common-lisp) (require :x86-pc/all) (require :x86-pc/pit8253) (require :x86-pc/ne2k) (require :lib/named-integers) (require :lib/misc) -(require :lib/malloc-init) (require :lib/net/ethernet) (provide :lib/net/ip6) (defpackage muerte.ip6 (:use muerte.cl muerte.lib muerte.x86-pc muerte.ethernet) - (:export - packet-version - packet-source - packet-destination - packet-length - packet-traffic-class - packet-next-header - packet-flow-label - packet-hop-limit + (:export #:packet-version + #:packet-source + #:packet-destination + #:packet-length + #:packet-traffic-class + #:packet-next-header + #:packet-flow-label + #:packet-hop-limit - pprint-ip6 - ip6-test - ip6-free - )) + #:pprint-ip6 + #:ip6-test + #:ip6-free + )) (in-package muerte.ip6) From ffjeld at common-lisp.net Thu Jan 15 17:34:49 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:34:49 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/lib/bcd.lisp movitz/losp/lib/console.lisp movitz/losp/lib/misc.lisp movitz/losp/lib/named-integers.lisp movitz/losp/lib/package.lisp movitz/losp/lib/readline.lisp movitz/losp/lib/repl.lisp movitz/losp/lib/toplevel.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv6665 Modified Files: bcd.lisp console.lisp misc.lisp named-integers.lisp package.lisp readline.lisp repl.lisp toplevel.lisp Log Message: Fixed up package muerte.lib. Date: Thu Jan 15 12:34:49 2004 Author: ffjeld Index: movitz/losp/lib/bcd.lisp diff -u movitz/losp/lib/bcd.lisp:1.1.1.1 movitz/losp/lib/bcd.lisp:1.2 --- movitz/losp/lib/bcd.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/bcd.lisp Thu Jan 15 12:34:49 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2002, +;;;; Copyright (C) 2001-2002, 2004, ;;;; Department of Computer Science, University of Troms?, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,15 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 30 14:03:57 2002 ;;;; -;;;; $Id: bcd.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: bcd.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(require :lib/package) (provide :lib/bcd) - -(defpackage muerte.lib - (:export bcd-to-integer - integer-to-bcd)) (in-package muerte.lib) Index: movitz/losp/lib/console.lisp diff -u movitz/losp/lib/console.lisp:1.1.1.1 movitz/losp/lib/console.lisp:1.2 --- movitz/losp/lib/console.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/console.lisp Thu Jan 15 12:34:49 2004 @@ -10,26 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Aug 14 18:14:16 2003 ;;;; -;;;; $Id: console.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: console.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(requore :lib/package) (provide :lib/console) - -(defpackage muerte.lib - (:use muerte) - (:export console - console-width - console-height - cursor-x - cursor-y - console-char - scroll-down - put-string - clear-line - clear-console - local-echo-p - with-saved-excursion)) (in-package muerte.lib) Index: movitz/losp/lib/misc.lisp diff -u movitz/losp/lib/misc.lisp:1.1.1.1 movitz/losp/lib/misc.lisp:1.2 --- movitz/losp/lib/misc.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/misc.lisp Thu Jan 15 12:34:49 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001, 2003, +;;;; Copyright (C) 2001, 2003-2004, ;;;; Department of Computer Science, University of Troms?, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon May 12 17:13:31 2003 ;;;; -;;;; $Id: misc.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: misc.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,12 +18,6 @@ (provide :lib/misc) (in-package muerte.lib) - -(defpackage muerte.lib - (:export checksum-octets - make-counter-u32 - u32-add - )) (defun checksum-octets (packet &optional (start 0) (end (length packet))) "Generate sum of 16-bit big-endian words for a sequence of octets." Index: movitz/losp/lib/named-integers.lisp diff -u movitz/losp/lib/named-integers.lisp:1.1.1.1 movitz/losp/lib/named-integers.lisp:1.2 --- movitz/losp/lib/named-integers.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/named-integers.lisp Thu Jan 15 12:34:49 2004 @@ -10,23 +10,13 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Jan 4 16:13:46 2002 ;;;; -;;;; $Id: named-integers.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: named-integers.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -;; (require :common-lisp) +(require :lib/package) (require :lib/malloc-init) (provide :lib/named-integers) - -(defpackage muerte.lib - (:use muerte.cl muerte) - (:export define-named-integer - named-integer-case - named-integer - integer-name - name->integer - names->integer - with-named-integers-syntax)) (in-package muerte.lib) Index: movitz/losp/lib/package.lisp diff -u movitz/losp/lib/package.lisp:1.1.1.1 movitz/losp/lib/package.lisp:1.2 --- movitz/losp/lib/package.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/package.lisp Thu Jan 15 12:34:49 2004 @@ -10,20 +10,61 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Sep 27 17:24:11 2002 ;;;; -;;;; $Id: package.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (defpackage muerte.lib - (:use muerte.cl) - (:export *scroll-offset* - cursor-x cursor-y - console-width console-height - console-char - scroll-down - clear-line - local-echo-p - with-saved-excursion)) + (:use muerte.cl muerte) + (:export #:*scroll-offset* + #:cursor-x cursor-y + #:console-width console-height + #:console-char + #:scroll-down + #:clear-line + #:local-echo-p + #:with-saved-excursion + + ;; :lib/bcd + #:bcd-to-integer + #:integer-to-bcd + + ;; :lib/console + #:console + #:console-width + #:console-height + #:cursor-x + #:cursor-y + #:console-char + #:scroll-down + #:put-string + #:clear-line + #:clear-console + #:local-echo-p + #:with-saved-excursion + + ;; :lib/misc + #:checksum-octets + #:make-counter-u32 + #:u32-add + + ;; :lib/named-integers + #:define-named-integer + #:named-integer-case + #:named-integer + #:integer-name + #:name->integer + #:names->integer + #:with-named-integers-syntax + + ;; :lib/repl + #:*repl-level* + #:*repl-prompter* + #:*repl-prompt-context* + #:*repl-print-format* + #:*repl-readline-context* + #:read-eval-print + )) (provide :lib/package) Index: movitz/losp/lib/readline.lisp diff -u movitz/losp/lib/readline.lisp:1.1.1.1 movitz/losp/lib/readline.lisp:1.2 --- movitz/losp/lib/readline.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/readline.lisp Thu Jan 15 12:34:49 2004 @@ -1,6 +1,6 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2003, +;;;; Copyright (C) 2001-2004, ;;;; Department of Computer Science, University of Troms?, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. @@ -10,11 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Nov 2 13:58:58 2001 ;;;; -;;;; $Id: readline.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: readline.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :common-lisp) +(require :lib/package) (provide :lib/readline) (defpackage muerte.readline Index: movitz/losp/lib/repl.lisp diff -u movitz/losp/lib/repl.lisp:1.1.1.1 movitz/losp/lib/repl.lisp:1.2 --- movitz/losp/lib/repl.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/repl.lisp Thu Jan 15 12:34:49 2004 @@ -10,20 +10,13 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 19 14:58:12 2003 ;;;; -;;;; $Id: repl.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: repl.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(require :lib/package) (require :lib/readline) (provide :lib/repl) - -(defpackage muerte.lib - (:export *repl-level* - *repl-prompter* - *repl-prompt-context* - *repl-print-format* - *repl-readline-context* - read-eval-print)) (in-package muerte.lib) Index: movitz/losp/lib/toplevel.lisp diff -u movitz/losp/lib/toplevel.lisp:1.1.1.1 movitz/losp/lib/toplevel.lisp:1.2 --- movitz/losp/lib/toplevel.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/toplevel.lisp Thu Jan 15 12:34:49 2004 @@ -10,17 +10,18 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Sep 5 15:56:26 2002 ;;;; -;;;; $Id: toplevel.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: toplevel.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ +(require :lib/package) (provide :lib/toplevel) (defpackage muerte.toplevel (:use muerte.cl muerte) - (:export define-toplevel-command - invoke-toplevel-command - *toplevel-commands*)) + (:export #:define-toplevel-command + #:invoke-toplevel-command + #:*toplevel-commands*)) (in-package muerte.toplevel) From ffjeld at common-lisp.net Thu Jan 15 17:36:20 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:36:20 -0500 Subject: [movitz-cvs] CVS update: movitz/image.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv16817 Modified Files: image.lisp Log Message: There is no package "excl" always. Date: Thu Jan 15 12:36:20 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.1.1.1 movitz/image.lisp:1.2 --- movitz/image.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/image.lisp Thu Jan 15 12:36:19 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.2 2004/01/15 17:36:19 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1378,9 +1378,10 @@ (movitz-print (movitz-funobj-code-vector funobj))))) (when verbose (pprint command) (terpri) (force-output)) - (if destination - (excl::run-shell-command (format nil "./udp6-send.py ~A 1 ~S" destination command)) - command)))) + command + #+allegro (if destination + (excl::run-shell-command (format nil "./udp6-send.py ~A 1 ~S" destination command)) + command)))) ;;; "Printer" From ffjeld at common-lisp.net Thu Jan 15 17:37:11 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:37:11 -0500 Subject: [movitz-cvs] CVS update: movitz/movitz-mode.el Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv21465 Modified Files: movitz-mode.el Log Message: Don't depend on my particular development directory. Date: Thu Jan 15 12:37:11 2004 Author: ffjeld Index: movitz/movitz-mode.el diff -u movitz/movitz-mode.el:1.1.1.1 movitz/movitz-mode.el:1.2 --- movitz/movitz-mode.el:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/movitz-mode.el Thu Jan 15 12:37:11 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Sep 27 18:12:17 2001 ;;;; -;;;; $Id: movitz-mode.el,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: movitz-mode.el,v 1.2 2004/01/15 17:37:11 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -108,7 +108,7 @@ (fi:eval-in-lisp "movitz::*bootblock-build*") display-shortcut) (call-process "/bin/sh" nil 0 nil "-c" - (format "cd ~/src/movitz && DISPLAY=\"%s\" ~/tmp/bochs-cvs/bochs -nocp > bochs-parameters" + (format "DISPLAY=\"%s\" ~/tmp/bochs-cvs/bochs -nocp > bochs-parameters" display-shortcut)))) (defun movitz-compile-file () From ffjeld at common-lisp.net Thu Jan 15 17:38:21 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:38:21 -0500 Subject: [movitz-cvs] CVS update: movitz/load.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv25570 Modified Files: load.lisp Log Message: Provided a rather crude loading mechanism for non-allegro. Works for me under cmucl. Date: Thu Jan 15 12:38:21 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.1.1.1 movitz/load.lisp:1.2 --- movitz/load.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/load.lisp Thu Jan 15 12:38:21 2004 @@ -1,33 +1,62 @@ - -(in-package :user) - -;; (load "../binary-types/binary-types") - -(compile-file #p"../binary-types/binary-types" :load-after-compile t) - -(let ((*default-pathname-defaults* #+mswindows #p"c:\\src\\read-elf32\\" - #+unix #p"~/src/ia-x86/")) - (load "system.lisp") - (compile-system :ia-x86) - (load-system :ia-x86) - (load-system :ia-x86-instr :interpreted t)) - -(ia-x86:init-instruction-tables) - -(let ((*default-pathname-defaults* #+mswindows #p"c:\\src\\read-elf32\\" - #+unix #p"~/src/read-elf32/")) - (load "Defsystem-allegro.lisp") - (load-system :elf32)) - -(compile-file #p"../infunix/procfs" :load-after-compile t) - -(load "packages.lisp") -(load "movitz.lisp") -(compile-system :movitz) -(load-system :movitz) - -#+allegro -(progn - (setf excl:*tenured-bytes-limit* #x2000000) - (setf (system::gsgc-parameter :generation-spread) 12) - (sys:resize-areas :new (* 16 1024 1024))) \ No newline at end of file +;;;;------------------------------------------------------------------ +;;;; +;;;; Copyright (C) 2003-2004, +;;;; Department of Computer Science, University of Tromsoe, Norway. +;;;; +;;;; For distribution policy, see the accompanying file COPYING. +;;;; +;;;; Filename: load.lisp +;;;; Description: +;;;; Author: Frode Vatvedt Fjeld +;;;; Created at: Thu Jan 15 18:40:58 2004 +;;;; +;;;; $Id: load.lisp,v 1.2 2004/01/15 17:38:21 ffjeld Exp $ +;;;; +;;;;------------------------------------------------------------------ + +(in-package :cl-user) + +(load (compile-file #p"../binary-types/binary-types")) + +(let ((*default-pathname-defaults* #p"../ia-x86/")) + #+cmu (let ((pwd (ext:default-directory))) + (progn + (unwind-protect + (progn + (setf (ext:default-directory) #p"../ia-x86/") + (load "load")) + (setf (ext:default-directory) pwd)))) + #-cmu (load "load")) + +(load (compile-file #p"../infunix/procfs")) + + +#+allegro (progn + (load "packages.lisp") + (load "movitz.lisp") + (excl:compile-system :movitz) + (excl:load-system :movitz) + (setf excl:*tenured-bytes-limit* #x2000000) + (setf (system::gsgc-parameter :generation-spread) 12) + (sys:resize-areas :new (* 16 1024 1024))) + +#-allegro (with-compilation-unit () + #+cmu (setf bt::*ignore-hidden-slots-for-pcl* t) + (mapcar (lambda (path) + (load (compile-file (make-pathname :name path :type "lisp") :print nil))) + '("packages" + "movitz" + "parse" + "eval" + "multiboot" + "bootblock" + "environment" + "compiler-types" + "compiler-protocol" + "storage-types" + "image" + "stream-image" + "procfs-image" + "assembly-syntax" + "compiler-protocol" + "compiler" "special-operators" "special-operators-cl"))) From ffjeld at common-lisp.net Thu Jan 15 17:39:18 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:39:18 -0500 Subject: [movitz-cvs] CVS update: ia-x86/load.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv4992 Added Files: load.lisp Log Message: Also some crude loading for non-allegro and non-asd users. Works for me with cmucl 18e. Date: Thu Jan 15 12:39:18 2004 Author: ffjeld From ffjeld at common-lisp.net Thu Jan 15 17:41:12 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:41:12 -0500 Subject: [movitz-cvs] CVS update: movitz/doc/report/.cvsignore Message-ID: Update of /project/movitz/cvsroot/movitz/doc/report In directory common-lisp.net:/tmp/cvs-serv14914 Added Files: .cvsignore Log Message: ignore TeX build files etc. Date: Thu Jan 15 12:41:12 2004 Author: ffjeld From ffjeld at common-lisp.net Thu Jan 15 17:43:28 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 12:43:28 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/x86-pc/ne2k.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv28032 Modified Files: ne2k.lisp Log Message: Require module :lib/net/ethernet because we use its package. Date: Thu Jan 15 12:43:28 2004 Author: ffjeld Index: movitz/losp/x86-pc/ne2k.lisp diff -u movitz/losp/x86-pc/ne2k.lisp:1.2 movitz/losp/x86-pc/ne2k.lisp:1.3 --- movitz/losp/x86-pc/ne2k.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/ne2k.lisp Thu Jan 15 12:43:28 2004 @@ -10,11 +10,12 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 17 15:16:00 2002 ;;;; -;;;; $Id: ne2k.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: ne2k.lisp,v 1.3 2004/01/15 17:43:28 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ (require :x86-pc/package) +(require :lib/net/ethernet) (defpackage muerte.x86-pc.ne2k (:use muerte.cl muerte muerte.lib muerte.x86-pc muerte.ethernet) From ffjeld at common-lisp.net Thu Jan 15 18:59:39 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 13:59:39 -0500 Subject: [movitz-cvs] CVS update: movitz/movitz.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv21920 Modified Files: movitz.lisp Log Message: Removed some garbage code lying around in here. Date: Thu Jan 15 13:59:39 2004 Author: ffjeld Index: movitz/movitz.lisp diff -u movitz/movitz.lisp:1.1.1.1 movitz/movitz.lisp:1.2 --- movitz/movitz.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/movitz.lisp Thu Jan 15 13:59:38 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:52:58 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: movitz.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: movitz.lisp,v 1.2 2004/01/15 18:59:38 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -108,27 +108,6 @@ (defmacro muerte::movitz-backquote (form) (un-backquote form 0)) - -(defun f1 (x) (cons 'f1 x)) -(defun f2 () (f1 'f2)) -(defun f3 () (cons (f1 'f3-arg) (f2))) -(defun f4 () (values)) -(defun f5 () (values 'val1 'val2 'val3 'val4)) - - -(defconstant xx (list 'a 'b 'c)) - -(defun pingle (val) - (case val - (1 'x) - (2 'y))) - -(let ((var 'top)) - (defun s1 (val) (setf var val)) - (defun r1 () - var) - (setf var 'bot) - (defun r2 () var)) #+allegro (excl:defsystem :movitz () From ffjeld at common-lisp.net Thu Jan 15 19:00:10 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 14:00:10 -0500 Subject: [movitz-cvs] CVS update: movitz/load.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29536 Modified Files: load.lisp Log Message: Removed loading of procfs stuff, since its not needed (at this stage of development, anyway). Date: Thu Jan 15 14:00:10 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.2 movitz/load.lisp:1.3 --- movitz/load.lisp:1.2 Thu Jan 15 12:38:21 2004 +++ movitz/load.lisp Thu Jan 15 14:00:09 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.2 2004/01/15 17:38:21 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.3 2004/01/15 19:00:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -19,16 +19,17 @@ (load (compile-file #p"../binary-types/binary-types")) (let ((*default-pathname-defaults* #p"../ia-x86/")) - #+cmu (let ((pwd (ext:default-directory))) + #+(or cmu sbcl) + (let ((pwd (ext:default-directory))) + (progn + (unwind-protect (progn - (unwind-protect - (progn - (setf (ext:default-directory) #p"../ia-x86/") - (load "load")) - (setf (ext:default-directory) pwd)))) - #-cmu (load "load")) + (setf (ext:default-directory) #p"../ia-x86/") + (load "load")) + (setf (ext:default-directory) pwd)))) + #-(or cmu sbcl) (load "load")) -(load (compile-file #p"../infunix/procfs")) +;; (load (compile-file #p"../infunix/procfs")) #+allegro (progn @@ -56,7 +57,7 @@ "storage-types" "image" "stream-image" - "procfs-image" + ;; "procfs-image" "assembly-syntax" "compiler-protocol" "compiler" "special-operators" "special-operators-cl"))) From ffjeld at common-lisp.net Thu Jan 15 19:40:58 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 14:40:58 -0500 Subject: [movitz-cvs] CVS update: movitz/bootblock.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv24384 Modified Files: bootblock.lisp Log Message: Don't assume a lambda-form can be funcalled. Date: Thu Jan 15 14:40:58 2004 Author: ffjeld Index: movitz/bootblock.lisp diff -u movitz/bootblock.lisp:1.1.1.1 movitz/bootblock.lisp:1.2 --- movitz/bootblock.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/bootblock.lisp Thu Jan 15 14:40:58 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:47:19 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: bootblock.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: bootblock.lisp,v 1.2 2004/01/15 19:40:58 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -341,6 +341,10 @@ (defparameter +message+ "Ok.") (defparameter +halt-message+ "Halt!") +(defun make-vga-string (string) + (loop for char across string + collect (complex (logior #x0700 (char-code char)) 2))) + (defun mkasm-loader (image-size load-address call-address) "Make the 32-bit loader." (assert (<= load-address call-address (+ load-address image-size)) () @@ -404,9 +408,7 @@ ;;; (:halt) ;;; (:jmp 'eternal) ; OS returned? ;; (% align 2) - i-am-32 (% fun ((lambda () - (loop for char across ,+message+ - collect (complex (logior #x0700 (char-code char)) 2))))) + i-am-32 (% fun (make-vga-string ,+message+)) ;;; halt-msg (% fun ((lambda () ;;; (loop for char across ,+halt-message+ ;;; collect (complex (logior #x4700 (char-code char)) 2))))) From ffjeld at common-lisp.net Thu Jan 15 20:02:16 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 15:02:16 -0500 Subject: [movitz-cvs] CVS update: movitz/bootblock.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv4202 Modified Files: bootblock.lisp Log Message: nyef says a bootblock should begin with a short jmp. Date: Thu Jan 15 15:02:16 2004 Author: ffjeld Index: movitz/bootblock.lisp diff -u movitz/bootblock.lisp:1.2 movitz/bootblock.lisp:1.3 --- movitz/bootblock.lisp:1.2 Thu Jan 15 14:40:58 2004 +++ movitz/bootblock.lisp Thu Jan 15 15:02:16 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:47:19 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: bootblock.lisp,v 1.2 2004/01/15 19:40:58 ffjeld Exp $ +;;;; $Id: bootblock.lisp,v 1.3 2004/01/15 20:02:16 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -85,6 +85,8 @@ "Image too large for 1.44 floppy geometry.") (ia-x86:read-proglist `( + (:jmp (:pc+ 0)) ; some BIOSes might check for this. + ;; ;; We are running at address #x7c00. ;; First we need to initialize the data segment From ffjeld at common-lisp.net Thu Jan 15 21:25:44 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Thu, 15 Jan 2004 16:25:44 -0500 Subject: [movitz-cvs] CVS update: movitz/bootblock.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv17472 Modified Files: bootblock.lisp Log Message: Removed some bogus comments. Date: Thu Jan 15 16:25:43 2004 Author: ffjeld Index: movitz/bootblock.lisp diff -u movitz/bootblock.lisp:1.3 movitz/bootblock.lisp:1.4 --- movitz/bootblock.lisp:1.3 Thu Jan 15 15:02:16 2004 +++ movitz/bootblock.lisp Thu Jan 15 16:25:43 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:47:19 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: bootblock.lisp,v 1.3 2004/01/15 20:02:16 ffjeld Exp $ +;;;; $Id: bootblock.lisp,v 1.4 2004/01/15 21:25:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -89,24 +89,16 @@ ;; ;; We are running at address #x7c00. - ;; First we need to initialize the data segment - ;; registers and the stack pointer. - ;; Having done this, we can reference variables in the bootblock - ;; and use the stack to hold local variables ;; (:xorw :ax :ax) - (:movw :ax :ds) ; Let data segment and extended segment) - (:movw :ax :es) ; point to #x7c00 -> Data - ; references will be to #x7c00 + offset) + (:movw :ax :ds) + (:movw :ax :es) (:movw #x9000 :ax) - (:movw :ax :ss) ; Let stack segment point to #xb000) + (:movw :ax :ss) (:movw #xfffc :bp) - (:leaw (:bp ,(- +stack-frame-size+)) :sp) ; and the stack pointer to #xfffe ->) - ; Make room for 10 bytes on the stack - - ; stack is at #x9fffe) + (:leaw (:bp ,(- +stack-frame-size+)) :sp) (:movw 'welcome :si) ; Print welcome message) (:call 'print) @@ -114,29 +106,21 @@ ;; Enable the A20 gate ;; (:call 'empty-8042) - (:movb #xd1 :al) ; Write ouput port + (:movb #xd1 :al) (:outb :al #x64) (:call 'empty-8042) - (:movb #xdf :al) ; Enable A20 address line + (:movb #xdf :al) (:outb :al #x60) (:call 'empty-8042) - + ;; + ;; Read sectors into memory + ;; + (:movw ,(+ 1 skip-sectors) (:bp ,+linear-sector+)) (:movl ,load-address (:bp ,+destination+)) -;;; -;;; read-loop -;;; -;;; (:movw 'track-end-msg :si) ; Print ')' to screen after each track -;;; (:call 'print) -;;; (:movw 'track-start-msg :si) ; Print '(' to screen for each track -;;; (:call 'print) -;;; -;;; read -;;; - read-loop (:cmpw ,last-sector (:bp ,+linear-sector+)) @@ -212,8 +196,6 @@ ;; read-done -;;; foo (:jmp 'foo) - motor-loop ; Wait for floppy motor (:btw 8 (#x43e)) (:jc 'motor-loop) @@ -313,10 +295,6 @@ track-start-msg (% format 8 "(") track-end-msg (% format 8 ")") ;; (% format 8 ")~% ") sector-msg (% format 8 "-") - -;;; integer-msg (% nformat "Int: ") -;;; integer-msg-int (% format "XXXX~% ") - (% align 16) gdt From ffjeld at common-lisp.net Fri Jan 16 11:54:16 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 06:54:16 -0500 Subject: [movitz-cvs] CVS update: ia-x86/alignment.lisp ia-x86/assemble.lisp ia-x86/codec.lisp ia-x86/def-instr.lisp ia-x86/ia-x86-test.lisp ia-x86/ia-x86.lisp ia-x86/inline-data.lisp ia-x86/instr-add.lisp ia-x86/instr-and-or.lisp ia-x86/instr-bit.lisp ia-x86/instr-branch.lisp ia-x86/instr-cmp.lisp ia-x86/instr-fpu.lisp ia-x86/instr-misc.lisp ia-x86/instr-mmx.lisp ia-x86/instr-mov.lisp ia-x86/instr-mul-div.lisp ia-x86/instr-push-pop.lisp ia-x86/instr-shift.lisp ia-x86/instr-simd.lisp ia-x86/instr-string.lisp ia-x86/instr-sub.lisp ia-x86/operands.lisp ia-x86/packages.lisp ia-x86/postload.lisp ia-x86/prefixes.lisp ia-x86/proglist.lisp ia-x86/read.lisp ia-x86/registers.lisp ia-x86/symtab.lisp ia-x86/system.lisp ia-x86/utilities.lisp Message-ID: Update of /project/movitz/cvsroot/ia-x86 In directory common-lisp.net:/tmp/cvs-serv30013 Modified Files: alignment.lisp assemble.lisp codec.lisp def-instr.lisp ia-x86-test.lisp ia-x86.lisp inline-data.lisp instr-add.lisp instr-and-or.lisp instr-bit.lisp instr-branch.lisp instr-cmp.lisp instr-fpu.lisp instr-misc.lisp instr-mmx.lisp instr-mov.lisp instr-mul-div.lisp instr-push-pop.lisp instr-shift.lisp instr-simd.lisp instr-string.lisp instr-sub.lisp operands.lisp packages.lisp postload.lisp prefixes.lisp proglist.lisp read.lisp registers.lisp symtab.lisp system.lisp utilities.lisp Log Message: Removed non-ASCII characters. Date: Fri Jan 16 06:54:14 2004 Author: ffjeld Index: ia-x86/alignment.lisp diff -u ia-x86/alignment.lisp:1.1.1.1 ia-x86/alignment.lisp:1.2 --- ia-x86/alignment.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/alignment.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001-2002, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Copyright (C) 2001-2002, 2004, +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Apr 10 12:47:08 2002 ;;;; -;;;; $Id: alignment.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: alignment.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -25,10 +25,10 @@ (ecase (first (alignment-type alignment)) (:code ;; For optimal performance across the Intel Architecture family, it is recommended that: - ;; ? Loop entry labels should be 16-byte aligned when less than eight bytes away from a + ;; * Loop entry labels should be 16-byte aligned when less than eight bytes away from a ;; 16-byte boundary. - ;; ? Labels that follow a conditional branch should not be aligned. - ;; ? Labels that follow an unconditional branch or function call should be 16-byte aligned + ;; * Labels that follow a conditional branch should not be aligned. + ;; * Labels that follow an unconditional branch or function call should be 16-byte aligned ;; when less than eight bytes away from a 16-byte boundary. (ecase (second (alignment-type alignment)) (:loop Index: ia-x86/assemble.lisp diff -u ia-x86/assemble.lisp:1.1.1.1 ia-x86/assemble.lisp:1.2 --- ia-x86/assemble.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/assemble.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-assemble.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Thu May 25 14:30:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: assemble.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: assemble.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,4 +18,4 @@ (defun read-operand (operand-spec) ) - \ No newline at end of file + Index: ia-x86/codec.lisp diff -u ia-x86/codec.lisp:1.1.1.1 ia-x86/codec.lisp:1.2 --- ia-x86/codec.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/codec.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002, 2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: codec.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Thu May 4 15:16:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: codec.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: codec.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/def-instr.lisp diff -u ia-x86/def-instr.lisp:1.1.1.1 ia-x86/def-instr.lisp:1.2 --- ia-x86/def-instr.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/def-instr.lisp Fri Jan 16 06:54:14 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Thu May 4 16:41:20 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: def-instr.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: def-instr.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -444,4 +444,4 @@ (list* form name (rest spec)))) ',name)) - \ No newline at end of file + Index: ia-x86/ia-x86-test.lisp diff -u ia-x86/ia-x86-test.lisp:1.1.1.1 ia-x86/ia-x86-test.lisp:1.2 --- ia-x86/ia-x86-test.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/ia-x86-test.lisp Fri Jan 16 06:54:14 2004 @@ -7,7 +7,7 @@ ;; Author: Nikodemus Siivola ;; Created at: Wed Oct 20 23:13:46 1999 ;; -;; $Id: ia-x86-test.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;; $Id: ia-x86-test.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Index: ia-x86/ia-x86.lisp diff -u ia-x86/ia-x86.lisp:1.1.1.1 ia-x86/ia-x86.lisp:1.2 --- ia-x86/ia-x86.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/ia-x86.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 200120001999, 2002, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 17 18:01:26 1999 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: ia-x86.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: ia-x86.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/inline-data.lisp diff -u ia-x86/inline-data.lisp:1.1.1.1 ia-x86/inline-data.lisp:1.2 --- ia-x86/inline-data.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/inline-data.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-inline-data.lisp ;;;; Description: Objects that represents inline data in assembly listings. @@ -9,7 +9,7 @@ ;;;; Created at: Mon Aug 21 10:35:46 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: inline-data.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: inline-data.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-add.lisp diff -u ia-x86/instr-add.lisp:1.1.1.1 ia-x86/instr-add.lisp:1.2 --- ia-x86/instr-add.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-add.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2003, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-add.lisp ;;;; Description: Addition-related instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Sat Jan 29 20:20:18 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-add.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-add.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-and-or.lisp diff -u ia-x86/instr-and-or.lisp:1.1.1.1 ia-x86/instr-and-or.lisp:1.2 --- ia-x86/instr-and-or.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-and-or.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-and-or.lisp ;;;; Description: Bitwise boolean operations. @@ -9,7 +9,7 @@ ;;;; Created at: Tue Feb 1 17:39:09 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-and-or.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-and-or.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-bit.lisp diff -u ia-x86/instr-bit.lisp:1.1.1.1 ia-x86/instr-bit.lisp:1.2 --- ia-x86/instr-bit.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-bit.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-bit.lisp ;;;; Description: Bit operations. @@ -9,7 +9,7 @@ ;;;; Created at: Tue Feb 1 20:03:30 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-bit.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-bit.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-branch.lisp diff -u ia-x86/instr-branch.lisp:1.1.1.1 ia-x86/instr-branch.lisp:1.2 --- ia-x86/instr-branch.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-branch.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2003, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-branch.lisp ;;;; Description: Branch instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Tue Feb 1 15:05:51 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-branch.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-branch.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-cmp.lisp diff -u ia-x86/instr-cmp.lisp:1.1.1.1 ia-x86/instr-cmp.lisp:1.2 --- ia-x86/instr-cmp.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-cmp.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-cmp.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Sat Jan 29 20:57:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-cmp.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-cmp.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -68,4 +68,4 @@ (:r #x0fb1 (r32 r/m32) :operand-mode :32-bit)) (def-instr cmpxchg8b (cmpxchg) - (:digit (#x0fc7 1) 0 (m64) :indirect t)) \ No newline at end of file + (:digit (#x0fc7 1) 0 (m64) :indirect t)) Index: ia-x86/instr-fpu.lisp diff -u ia-x86/instr-fpu.lisp:1.1.1.1 ia-x86/instr-fpu.lisp:1.2 --- ia-x86/instr-fpu.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-fpu.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-fpu.lisp ;;;; Description: FPU operations @@ -9,7 +9,7 @@ ;;;; Created at: Tue May 2 10:06:12 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-fpu.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-fpu.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-misc.lisp diff -u ia-x86/instr-misc.lisp:1.1.1.1 ia-x86/instr-misc.lisp:1.2 --- ia-x86/instr-misc.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-misc.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-misc.lisp ;;;; Description: Miscellaneous x86 instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Fri Jan 28 19:25:27 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-misc.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-misc.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-mmx.lisp diff -u ia-x86/instr-mmx.lisp:1.1.1.1 ia-x86/instr-mmx.lisp:1.2 --- ia-x86/instr-mmx.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-mmx.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-mmx.lisp ;;;; Description: MMX instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Wed Aug 2 14:26:16 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-mmx.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-mmx.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-mov.lisp diff -u ia-x86/instr-mov.lisp:1.1.1.1 ia-x86/instr-mov.lisp:1.2 --- ia-x86/instr-mov.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-mov.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, 2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-mov.lisp ;;;; Description: MOV instructions @@ -9,7 +9,7 @@ ;;;; Created at: Thu Jan 27 14:43:05 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-mov.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-mov.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-mul-div.lisp diff -u ia-x86/instr-mul-div.lisp:1.1.1.1 ia-x86/instr-mul-div.lisp:1.2 --- ia-x86/instr-mul-div.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-mul-div.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, 2002, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-mul-div.lisp ;;;; Description: Multiplication and division instructions @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 31 21:12:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-mul-div.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-mul-div.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-push-pop.lisp diff -u ia-x86/instr-push-pop.lisp:1.1.1.1 ia-x86/instr-push-pop.lisp:1.2 --- ia-x86/instr-push-pop.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-push-pop.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-push-pop.lisp ;;;; Description: Stack instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 31 20:28:50 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-push-pop.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-push-pop.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-shift.lisp diff -u ia-x86/instr-shift.lisp:1.1.1.1 ia-x86/instr-shift.lisp:1.2 --- ia-x86/instr-shift.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-shift.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-shift.lisp ;;;; Description: Shifting operations @@ -9,7 +9,7 @@ ;;;; Created at: Tue May 2 10:56:33 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-shift.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-shift.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-simd.lisp diff -u ia-x86/instr-simd.lisp:1.1.1.1 ia-x86/instr-simd.lisp:1.2 --- ia-x86/instr-simd.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-simd.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-simd.lisp ;;;; Description: Streaming SIMD instructions. @@ -9,7 +9,7 @@ ;;;; Created at: Thu Aug 3 18:15:02 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-simd.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-simd.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-string.lisp diff -u ia-x86/instr-string.lisp:1.1.1.1 ia-x86/instr-string.lisp:1.2 --- ia-x86/instr-string.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-string.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-instr-string.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Tue May 2 11:20:22 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-string.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-string.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/instr-sub.lisp diff -u ia-x86/instr-sub.lisp:1.1.1.1 ia-x86/instr-sub.lisp:1.2 --- ia-x86/instr-sub.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/instr-sub.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000-2002, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: instr-sub.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Tue Feb 1 14:16:58 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: instr-sub.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: instr-sub.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/operands.lisp diff -u ia-x86/operands.lisp:1.1.1.1 ia-x86/operands.lisp:1.2 --- ia-x86/operands.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/operands.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2003, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: operands.lisp ;;;; Description: Operand representation. @@ -9,7 +9,7 @@ ;;;; Created at: Wed Feb 16 14:02:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: operands.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: operands.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/packages.lisp diff -u ia-x86/packages.lisp:1.1 ia-x86/packages.lisp:1.2 --- ia-x86/packages.lisp:1.1 Tue Jan 13 06:04:33 2004 +++ ia-x86/packages.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2003, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: packages.lisp ;;;; Description: Operand representation. @@ -9,7 +9,7 @@ ;;;; Created at: Wed Feb 16 14:02:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: packages.lisp,v 1.1 2004/01/13 11:04:33 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/postload.lisp diff -u ia-x86/postload.lisp:1.2 ia-x86/postload.lisp:1.3 --- ia-x86/postload.lisp:1.2 Wed Jan 14 17:22:30 2004 +++ ia-x86/postload.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2003-2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: postload.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 31 16:33:23 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: postload.lisp,v 1.2 2004/01/14 22:22:30 ffjeld Exp $ +;;;; $Id: postload.lisp,v 1.3 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/prefixes.lisp diff -u ia-x86/prefixes.lisp:1.1.1.1 ia-x86/prefixes.lisp:1.2 --- ia-x86/prefixes.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/prefixes.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2003, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: prefixes.lisp ;;;; Description: X86 Instruction prefixes. @@ -9,7 +9,7 @@ ;;;; Created at: Tue Aug 15 22:34:30 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: prefixes.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: prefixes.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/proglist.lisp diff -u ia-x86/proglist.lisp:1.1.1.1 ia-x86/proglist.lisp:1.2 --- ia-x86/proglist.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/proglist.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002, 2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: proglist.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Mon May 15 13:43:55 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: proglist.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: proglist.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -353,4 +353,4 @@ (loop for oc on octet-list by #'cddr collect (let ((msb (first oc)) (lsb (or (second oc) 0))) - (dpb lsb (byte 8 8) msb)))) \ No newline at end of file + (dpb lsb (byte 8 8) msb)))) Index: ia-x86/read.lisp diff -u ia-x86/read.lisp:1.1.1.1 ia-x86/read.lisp:1.2 --- ia-x86/read.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/read.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 20012000, 2002-2003, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Copyright (C) 2000-2004, +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: read.lisp ;;;; Description: Functions for reading assembly expressions. @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jul 31 13:54:27 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: read.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: read.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/registers.lisp diff -u ia-x86/registers.lisp:1.1.1.1 ia-x86/registers.lisp:1.2 --- ia-x86/registers.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/registers.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-registers.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Tue Aug 1 10:24:59 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: registers.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: registers.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: ia-x86/symtab.lisp diff -u ia-x86/symtab.lisp:1.1.1.1 ia-x86/symtab.lisp:1.2 --- ia-x86/symtab.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/symtab.lisp Fri Jan 16 06:54:14 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: ia-x86-symtab.lisp ;;;; Description: Assembly symbolic lookups. @@ -9,7 +9,7 @@ ;;;; Created at: Tue Aug 22 10:01:38 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: symtab.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: symtab.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -49,4 +49,4 @@ (acons label value symtab)) (defun symtab-collapse-frames (symtab) - symtab) \ No newline at end of file + symtab) Index: ia-x86/system.lisp diff -u ia-x86/system.lisp:1.1.1.1 ia-x86/system.lisp:1.2 --- ia-x86/system.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/system.lisp Fri Jan 16 06:54:14 2004 @@ -1,14 +1,14 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Copyright (C) 19991998, -;; Department of Computer Science, University of Troms?, Norway +;; Department of Computer Science, University of Tromso, Norway ;; ;; Filename: Defsystem.lisp ;; Description: ACL defsystem calls relates files to eachother. ;; Author: Frode Vatvedt Fjeld ;; Created at: Wed Oct 20 23:13:46 1999 ;; -;; $Id: system.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;; $Id: system.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Index: ia-x86/utilities.lisp diff -u ia-x86/utilities.lisp:1.1.1.1 ia-x86/utilities.lisp:1.2 --- ia-x86/utilities.lisp:1.1.1.1 Mon Jan 12 10:23:55 2004 +++ ia-x86/utilities.lisp Fri Jan 16 06:54:14 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Sun Nov 2 14:51:21 EET 2003 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: utilities.lisp,v 1.1.1.1 2004/01/12 15:23:55 ffjeld Exp $ +;;;; $Id: utilities.lisp,v 1.2 2004/01/16 11:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Fri Jan 16 12:02:06 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 07:02:06 -0500 Subject: [movitz-cvs] CVS update: movitz/movitz.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv26376 Modified Files: movitz.lisp Log Message: Don't use () in macro lambda-list. Date: Fri Jan 16 07:02:06 2004 Author: ffjeld Index: movitz/movitz.lisp diff -u movitz/movitz.lisp:1.2 movitz/movitz.lisp:1.3 --- movitz/movitz.lisp:1.2 Thu Jan 15 13:59:38 2004 +++ movitz/movitz.lisp Fri Jan 16 07:02:05 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: movitz.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:52:58 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: movitz.lisp,v 1.2 2004/01/15 18:59:38 ffjeld Exp $ +;;;; $Id: movitz.lisp,v 1.3 2004/01/16 12:02:05 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -30,7 +30,8 @@ (defvar *default-image-init-file* #p"losp/los0.lisp") (defvar *default-image-file* #p"los0-image") -(defmacro with-movitz-syntax (() &body body) +(defmacro with-movitz-syntax (options &body body) + (declare (ignore options)) `(let ((*readtable* (copy-readtable))) (set-dispatch-macro-character #\# #\' (lambda (stream subchar arg) From ffjeld at common-lisp.net Fri Jan 16 14:51:59 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 09:51:59 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/lib/console.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv29824 Modified Files: console.lisp Log Message: typo. Date: Fri Jan 16 09:51:59 2004 Author: ffjeld Index: movitz/losp/lib/console.lisp diff -u movitz/losp/lib/console.lisp:1.2 movitz/losp/lib/console.lisp:1.3 --- movitz/losp/lib/console.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/console.lisp Fri Jan 16 09:51:59 2004 @@ -10,11 +10,11 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Aug 14 18:14:16 2003 ;;;; -;;;; $Id: console.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: console.lisp,v 1.3 2004/01/16 14:51:59 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ -(requore :lib/package) +(require :lib/package) (provide :lib/console) (in-package muerte.lib) From ffjeld at common-lisp.net Fri Jan 16 15:40:36 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 10:40:36 -0500 Subject: [movitz-cvs] CVS update: movitz/bootblock.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv21629 Modified Files: bootblock.lisp Log Message: Removed a comment that confused CLisp's reader (!) Date: Fri Jan 16 10:40:35 2004 Author: ffjeld Index: movitz/bootblock.lisp diff -u movitz/bootblock.lisp:1.4 movitz/bootblock.lisp:1.5 --- movitz/bootblock.lisp:1.4 Thu Jan 15 16:25:43 2004 +++ movitz/bootblock.lisp Fri Jan 16 10:40:35 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001,2000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: bootblock.lisp ;;;; Description: A simple, single-stage, floppy bootloader. @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:47:19 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: bootblock.lisp,v 1.4 2004/01/15 21:25:43 ffjeld Exp $ +;;;; $Id: bootblock.lisp,v 1.5 2004/01/16 15:40:35 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -293,7 +293,7 @@ entering (% format 8 "~% Enter..") error (% format 8 "Failed!)") track-start-msg (% format 8 "(") - track-end-msg (% format 8 ")") ;; (% format 8 ")~% ") + track-end-msg (% format 8 ")") sector-msg (% format 8 "-") (% align 16) @@ -330,8 +330,6 @@ (assert (<= load-address call-address (+ load-address image-size)) () "Call-address #x~X is not in range #x~X to #x~X." call-address load-address (+ load-address image-size)) -;;; (warn "Call-address: #x~X" call-address) -;;; (warn "Call-funobj: #x~X" call-funobj) (ia-x86:read-proglist `( ;; From ffjeld at common-lisp.net Fri Jan 16 16:22:43 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 11:22:43 -0500 Subject: [movitz-cvs] CVS update: movitz/load.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv28253 Modified Files: load.lisp Log Message: This loading appears to kind of work with cmucl 18e. Date: Fri Jan 16 11:22:42 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.3 movitz/load.lisp:1.4 --- movitz/load.lisp:1.3 Thu Jan 15 14:00:09 2004 +++ movitz/load.lisp Fri Jan 16 11:22:42 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.3 2004/01/15 19:00:09 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.4 2004/01/16 16:22:42 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -29,10 +29,8 @@ (setf (ext:default-directory) pwd)))) #-(or cmu sbcl) (load "load")) -;; (load (compile-file #p"../infunix/procfs")) - - #+allegro (progn + (load (compile-file #p"../infunix/procfs")) (load "packages.lisp") (load "movitz.lisp") (excl:compile-system :movitz) @@ -41,23 +39,30 @@ (setf (system::gsgc-parameter :generation-spread) 12) (sys:resize-areas :new (* 16 1024 1024))) -#-allegro (with-compilation-unit () - #+cmu (setf bt::*ignore-hidden-slots-for-pcl* t) - (mapcar (lambda (path) - (load (compile-file (make-pathname :name path :type "lisp") :print nil))) - '("packages" - "movitz" - "parse" - "eval" - "multiboot" - "bootblock" - "environment" - "compiler-types" - "compiler-protocol" - "storage-types" - "image" - "stream-image" - ;; "procfs-image" - "assembly-syntax" - "compiler-protocol" - "compiler" "special-operators" "special-operators-cl"))) +#-allegro (do () (nil) + (with-simple-restart (retry "Retry loading Movitz") + (return + (with-compilation-unit () + #+cmu (setf bt::*ignore-hidden-slots-for-pcl* t) + (mapcar (lambda (path) + (do () (nil) + (with-simple-restart (retry "Retry loading ~S" path) + (return + (load (compile-file (make-pathname :name path :type "lisp") + :print nil)))))) + '("packages" + "movitz" + "parse" + "eval" + "environment" + "compiler-types" + "compiler-protocol" + "storage-types" + "multiboot" + "bootblock" + "image" + "stream-image" + ;; "procfs-image" + "assembly-syntax" + "compiler-protocol" + "compiler" "special-operators" "special-operators-cl")))))) From ffjeld at common-lisp.net Fri Jan 16 18:22:37 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 13:22:37 -0500 Subject: [movitz-cvs] CVS update: movitz/load.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv22758 Modified Files: load.lisp Log Message: This seems to work for cmucl and sbcl. Date: Fri Jan 16 13:22:37 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.4 movitz/load.lisp:1.5 --- movitz/load.lisp:1.4 Fri Jan 16 11:22:42 2004 +++ movitz/load.lisp Fri Jan 16 13:22:37 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.4 2004/01/16 16:22:42 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.5 2004/01/16 18:22:37 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,16 +18,15 @@ (load (compile-file #p"../binary-types/binary-types")) -(let ((*default-pathname-defaults* #p"../ia-x86/")) - #+(or cmu sbcl) - (let ((pwd (ext:default-directory))) - (progn - (unwind-protect - (progn - (setf (ext:default-directory) #p"../ia-x86/") - (load "load")) - (setf (ext:default-directory) pwd)))) - #-(or cmu sbcl) (load "load")) +(let ((*default-pathname-defaults* (merge-pathnames #p"../ia-x86/"))) + #+(or cmu) (let ((pwd (ext:default-directory))) + (progn + (unwind-protect + (progn + (setf (ext:default-directory) #p"../ia-x86/") + (load "load")) + (setf (ext:default-directory) pwd)))) + #-(or cmu) (load "load")) #+allegro (progn (load (compile-file #p"../infunix/procfs")) @@ -65,4 +64,6 @@ ;; "procfs-image" "assembly-syntax" "compiler-protocol" - "compiler" "special-operators" "special-operators-cl")))))) + "compiler" + "special-operators" + "special-operators-cl")))))) From ffjeld at common-lisp.net Fri Jan 16 19:06:40 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 14:06:40 -0500 Subject: [movitz-cvs] CVS update: movitz/compiler.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv21516 Modified Files: compiler.lisp Log Message: Reordered some defclass forms. Date: Fri Jan 16 14:06:40 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.2 movitz/compiler.lisp:1.3 --- movitz/compiler.lisp:1.2 Thu Jan 15 11:38:52 2004 +++ movitz/compiler.lisp Fri Jan 16 14:06:40 2004 @@ -1,14 +1,14 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001,2000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Description: A simple lisp compiler. ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.2 2004/01/15 16:38:52 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.3 2004/01/16 19:06:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -29,6 +29,7 @@ (defvar *compiler-compile-macro-expanders* t) (defvar *compiling-function-name*) +(defvar muerte.cl:*compile-file-pathname* nil) (defun duplicatesp (list) "Returns TRUE iff at least one object occurs more than once in LIST." @@ -1797,8 +1798,6 @@ ;; :initarg :store-type :accessor binding-store-type))) -(defclass funobj-binding (function-binding) ()) -(defclass closure-binding (function-binding located-binding) ()) (defclass lexical-binding (variable-binding) ()) (defclass located-binding (lexical-binding) ()) @@ -1810,6 +1809,8 @@ :initarg :parent-funobj :reader function-binding-parent))) +(defclass funobj-binding (function-binding) ()) +(defclass closure-binding (function-binding located-binding) ()) (defclass lambda-binding (function-binding) ()) #+ignore From ffjeld at common-lisp.net Fri Jan 16 19:25:05 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 14:25:05 -0500 Subject: [movitz-cvs] CVS update: movitz/special-operators.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv28937 Modified Files: special-operators.lisp Log Message: Removed some dead comments. Date: Fri Jan 16 14:25:04 2004 Author: ffjeld Index: movitz/special-operators.lisp diff -u movitz/special-operators.lisp:1.2 movitz/special-operators.lisp:1.3 --- movitz/special-operators.lisp:1.2 Thu Jan 15 11:40:40 2004 +++ movitz/special-operators.lisp Fri Jan 16 14:25:04 2004 @@ -1,14 +1,14 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: special-operators.lisp ;;;; Description: Compilation of internal special operators. ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Nov 24 16:22:59 2000 ;;;; -;;;; $Id: special-operators.lisp,v 1.2 2004/01/15 16:40:40 ffjeld Exp $ +;;;; $Id: special-operators.lisp,v 1.3 2004/01/16 19:25:04 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -530,8 +530,9 @@ (list (register32-to-low8 returns)))) (setf (assembly-macro-expander :compile-arglist amenv) #'(lambda (expr) - (destructuring-bind (() &rest arg-forms) + (destructuring-bind (ignore &rest arg-forms) (cdr expr) + (declare (ignore ignore)) (setq side-effects t) (make-compiled-argument-forms arg-forms funobj env)))) (setf (assembly-macro-expander :compile-two-forms amenv) @@ -545,29 +546,11 @@ (setq side-effects t)) (setq modifies (modifies-union modifies sub-modifies)) code)))) -;;; #+ignore (setf (assembly-macro-expander :call-global-constant amenv) #'(lambda (expr) (destructuring-bind (name) (cdr expr) `((:globally (:call (:edi (:edi-offset ,name)))))))) -;;; #+ignore -;;; (setf (assembly-macro-expander :store-global-constant amenv) -;;; #'(lambda (expr) -;;; (assert side-effects () -;;; "Can't do :store-global-constant when :side-effects nil is declared.") -;;; (destructuring-bind (name source &key thread-local) -;;; (cdr expr) -;;; (let ((pf (if thread-local '((:fs-override))))) -;;; `((, at pf :movl ,source -;;; ,(make-indirect-reference :edi (global-constant-offset name)))))))) -;;; (setf (assembly-macro-expander :load-global-constant amenv) -;;; #'(lambda (expr) -;;; (destructuring-bind (name destination &key thread-local) -;;; (cdr expr) -;;; (let ((pf (if thread-local '((:fs-override))))) -;;; `((, at pf :movl ,(make-indirect-reference :edi (global-constant-offset name)) -;;; ,destination)))))) (setf (assembly-macro-expander :warn amenv) #'(lambda (expr) (apply #'warn (cdr expr)) @@ -577,39 +560,6 @@ (destructuring-bind (var reg &key (type t)) (cdr expr) `((:store-lexical ,(movitz-binding var env) ,reg :type ,type))))) -;;; (setf (assembly-macro-expander :locally amenv) -;;; (lambda (expr) -;;; (destructuring-bind (sub-instr) -;;; (cdr expr) -;;; (assembly-macroexpand (list (cond -;;; ((atom sub-instr) -;;; sub-instr) -;;; ((consp (car sub-instr)) -;;; (list* (append *compiler-local-segment-prefix* -;;; (car sub-instr)) -;;; (cdr sub-instr))) -;;; (t (list* *compiler-local-segment-prefix* -;;; sub-instr)))) -;;; amenv)))) -;;; (setf (assembly-macro-expander :globally amenv) -;;; (lambda (expr) -;;; (destructuring-bind (sub-instr) -;;; (cdr expr) -;;; (assembly-macroexpand (list (cond -;;; ((atom sub-instr) -;;; sub-instr) -;;; ((consp (car sub-instr)) -;;; (list* (append *compiler-global-segment-prefix* -;;; (car sub-instr)) -;;; (cdr sub-instr))) -;;; (t (list* *compiler-global-segment-prefix* -;;; sub-instr)))) -;;; amenv)))) -;;; (setf (assembly-macro-expander :edi-offset amenv) -;;; (lambda (expr) -;;; (destructuring-bind (name) -;;; (cdr expr) -;;; (list (global-constant-offset name))))) (let ((code (assembly-macroexpand inline-asm amenv))) (assert (not (and (not side-effects) (tree-search code '(:store-lexical)))) From ffjeld at common-lisp.net Fri Jan 16 19:45:37 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Fri, 16 Jan 2004 14:45:37 -0500 Subject: [movitz-cvs] CVS update: movitz/environment.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv17889 Modified Files: environment.lisp Log Message: Rewrote some really poorly written loop forms, and removed some dead code. Date: Fri Jan 16 14:45:36 2004 Author: ffjeld Index: movitz/environment.lisp diff -u movitz/environment.lisp:1.1.1.1 movitz/environment.lisp:1.2 --- movitz/environment.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/environment.lisp Fri Jan 16 14:45:36 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 2001,2000, 2002-2004 -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Copyright (C) 2000-2004 +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: environment.lisp ;;;; Description: Compiler environment. @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 3 11:40:15 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: environment.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: environment.lisp,v 1.2 2004/01/16 19:45:36 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -230,22 +230,11 @@ (defmethod num-dynamic-slots ((x unwind-protect-env)) 1) -(defclass simple-dynamic-env (with-things-on-stack-env) - () +(defclass simple-dynamic-env (with-things-on-stack-env) () (:documentation "An environment that installs one dynamic-env.")) (defmethod num-dynamic-slots ((x simple-dynamic-env)) 1) - -;;;(defmethod print-object ((object movitz-environment) stream) -;;; (print-unreadable-object (object stream) -;;; (maphash #'(lambda (name binding) -;;; (format stream " [~A: ~A]" -;;; name -;;; (and (slot-boundp binding 'location) -;;; (slot-value binding 'location)))) -;;; (movitz-environment-bindings object)))) - (defparameter *movitz-macroexpand-hook* #'(lambda (macro-function form environment) ;;; (warn "Expanding form ~W" form) @@ -294,23 +283,6 @@ (define-symbol-macro *movitz-global-environment* (image-global-environment *image*)) -;;;(defun movitz-environment-add-binding (environment variable binding &key replace) -;;; (warn "deprecated movitz-environment-add-binding called for ~S => ~S." variable binding) -;;; (assert (or (not (slot-boundp binding 'env)) -;;; (eq (binding-env binding) environment)) -;;; (binding) -;;; "Can't move a binding between environments!") -;;; (let ((bindings (movitz-environment-bindings environment))) -;;; (cond -;;; ((assoc variable bindings) -;;; (assert replace () -;;; (error "Variable ~S is multiple bound." variable)) -;;; (setf (cdr (assoc variable bindings)) binding)) -;;; (t (push (cons variable binding) -;;; (movitz-environment-bindings environment))))) -;;; (setf (binding-env binding) environment) -;;; (values)) - (defun movitz-env-add-binding (env binding &optional (variable (binding-name binding))) (check-type binding binding) (check-type variable symbol "a variable name") @@ -443,9 +415,10 @@ (defun movitz-env-get (symbol indicator &optional (default nil) (environment nil) (recurse-p t)) - (loop for env = (or environment *movitz-global-environment*) then (and recurse-p (movitz-environment-uplink env)) + (loop for env = (or environment *movitz-global-environment*) + then (and recurse-p (movitz-environment-uplink env)) + for plist = (and env (getf (movitz-environment-plists env) symbol)) while env - for plist = (getf (movitz-environment-plists env) symbol) do (let ((val (getf plist indicator '#0=#:not-found))) (unless (eq val '#0#) (return (values val env)))) @@ -523,8 +496,8 @@ (macro-binding-expander binding))) (loop for env = (or environment *movitz-global-environment*) then (movitz-environment-uplink env) + for val = (and env (gethash symbol (movitz-environment-function-cells env))) while env - for val = (gethash symbol (movitz-environment-function-cells env)) when val do (return (and (typep val 'movitz-macro) (movitz-macro-expander-function val)))))) @@ -544,10 +517,9 @@ (defun movitz-compiler-macro-function (name &optional environment) (loop for env = (or environment *movitz-global-environment*) then (movitz-environment-uplink env) + for val = (and env (getf (movitz-environment-compiler-macros env) name)) while env - for val = (getf (movitz-environment-compiler-macros env) name) - when val - do (return val))) + when val do (return val))) (defun (setf movitz-compiler-macro-function) (fun name &optional environment) (setf (getf (movitz-environment-compiler-macros (or environment From ffjeld at common-lisp.net Mon Jan 19 10:36:13 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 05:36:13 -0500 Subject: [movitz-cvs] CVS update: movitz/bootblock.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv15076 Modified Files: bootblock.lisp Log Message: Bootloader now doesn't load past the image. On physical floppies this makes no difference, but for VMWare and possibly also VirtualPC it does. Date: Mon Jan 19 05:36:13 2004 Author: ffjeld Index: movitz/bootblock.lisp diff -u movitz/bootblock.lisp:1.5 movitz/bootblock.lisp:1.6 --- movitz/bootblock.lisp:1.5 Fri Jan 16 10:40:35 2004 +++ movitz/bootblock.lisp Mon Jan 19 05:36:12 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Oct 9 20:47:19 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: bootblock.lisp,v 1.5 2004/01/16 15:40:35 ffjeld Exp $ +;;;; $Id: bootblock.lisp,v 1.6 2004/01/19 10:36:12 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -118,7 +118,7 @@ ;; Read sectors into memory ;; - (:movw ,(+ 1 skip-sectors) (:bp ,+linear-sector+)) + (:movw ,first-sector (:bp ,+linear-sector+)) (:movl ,load-address (:bp ,+destination+)) read-loop @@ -143,6 +143,12 @@ (:subb :cl :al) ; number of sectors (rest of track) (:incb :cl) (:addw :ax (:bp ,+linear-sector+)) ; update read pointer + (:movw (:bp ,+linear-sector+) :bx) ; subtract some if it's the last track. + (:subw ,last-sector :bx) + (:jc 'subtract-zero-sectors) + (:subw :bx :ax) + (:jz 'read-done) + subtract-zero-sectors (:movb 2 :ah) (:movw ,read-buffer-segment :bx) From ffjeld at common-lisp.net Mon Jan 19 11:23:43 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:43 -0500 Subject: [movitz-cvs] CVS update: movitz/doc/ChangeLog Message-ID: Update of /project/movitz/cvsroot/movitz/doc In directory common-lisp.net:/tmp/cvs-serv7968/doc Modified Files: ChangeLog Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:43 2004 Author: ffjeld Index: movitz/doc/ChangeLog diff -u movitz/doc/ChangeLog:1.1.1.1 movitz/doc/ChangeLog:1.2 --- movitz/doc/ChangeLog:1.1.1.1 Tue Jan 13 06:05:01 2004 +++ movitz/doc/ChangeLog Mon Jan 19 06:23:43 2004 @@ -1,3 +1,7 @@ +2004-01-19 Frode Vatvedt Fjeld + + * Fixed the bootloader slightly so it should now work with VMWare. + 2004-01-12 Frode Vatvedt Fjeld * Fixed the floppy bootloader so that it will work with BIOSes From ffjeld at common-lisp.net Mon Jan 19 11:23:43 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:43 -0500 Subject: [movitz-cvs] CVS update: movitz/assembly-syntax.lisp movitz/browser.lisp movitz/compiler-protocol.lisp movitz/compiler-types.lisp movitz/eval.lisp movitz/image.lisp movitz/load.lisp movitz/los0-image movitz/multiboot.lisp movitz/parse.lisp movitz/procfs-image.lisp movitz/special-operators-cl.lisp movitz/storage-types.lisp movitz/stream-image.lisp movitz/bootblock-id.txt Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv7968 Modified Files: assembly-syntax.lisp browser.lisp compiler-protocol.lisp compiler-types.lisp eval.lisp image.lisp load.lisp los0-image multiboot.lisp parse.lisp procfs-image.lisp special-operators-cl.lisp storage-types.lisp stream-image.lisp Removed Files: bootblock-id.txt Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:41 2004 Author: ffjeld Index: movitz/assembly-syntax.lisp diff -u movitz/assembly-syntax.lisp:1.1.1.1 movitz/assembly-syntax.lisp:1.2 --- movitz/assembly-syntax.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/assembly-syntax.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: assembly-syntax.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 9 17:34:37 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: assembly-syntax.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: assembly-syntax.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/browser.lisp diff -u movitz/browser.lisp:1.1.1.1 movitz/browser.lisp:1.2 --- movitz/browser.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/browser.lisp Mon Jan 19 06:23:41 2004 @@ -1,16 +1,16 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; ;;;; Filename: browser.lisp -;;;; Description: +;;;; Description: A CLIM browser/inspector of Movitz images. ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jun 14 15:14:35 2001 ;;;; -;;;; $Id: browser.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: browser.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/compiler-protocol.lisp diff -u movitz/compiler-protocol.lisp:1.1.1.1 movitz/compiler-protocol.lisp:1.2 --- movitz/compiler-protocol.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/compiler-protocol.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Oct 10 13:02:03 2001 ;;;; -;;;; $Id: compiler-protocol.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: compiler-protocol.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/compiler-types.lisp diff -u movitz/compiler-types.lisp:1.1.1.1 movitz/compiler-types.lisp:1.2 --- movitz/compiler-types.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/compiler-types.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Sep 10 00:40:07 2003 ;;;; -;;;; $Id: compiler-types.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: compiler-types.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/eval.lisp diff -u movitz/eval.lisp:1.1.1.1 movitz/eval.lisp:1.2 --- movitz/eval.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/eval.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: eval.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 2 17:45:05 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: eval.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/image.lisp diff -u movitz/image.lisp:1.2 movitz/image.lisp:1.3 --- movitz/image.lisp:1.2 Thu Jan 15 12:36:19 2004 +++ movitz/image.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001,2000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; Filename: image.lisp ;;;; Description: Construction of LispOS images. @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.2 2004/01/15 17:36:19 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.3 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/load.lisp diff -u movitz/load.lisp:1.5 movitz/load.lisp:1.6 --- movitz/load.lisp:1.5 Fri Jan 16 13:22:37 2004 +++ movitz/load.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2003-2004, -;;;; Department of Computer Science, University of Tromsoe, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.5 2004/01/16 18:22:37 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.6 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -38,6 +38,22 @@ (setf (system::gsgc-parameter :generation-spread) 12) (sys:resize-areas :new (* 16 1024 1024))) +#+clisp (load "packages") +#+clisp (defconstant movitz::&all 'movitz::&all) ; CLisp has this wonderful bug.. +#+clisp (defconstant movitz::&code 'movitz::&code) +#+clisp (defconstant movitz::&form 'movitz::&form) +#+clisp (defconstant movitz::&returns 'movitz::&returns) +#+clisp (defconstant movitz::&functional-p 'movitz::&functional-p) +#+clisp (defconstant movitz::&modifies 'movitz::&modifies) +#+clisp (defconstant movitz::&type 'movitz::&type) +#+clisp (defconstant movitz::&final-form 'movitz::&final-form) +#+clisp (defconstant movitz::&funobj 'movitz::&funobj) +#+clisp (defconstant movitz::&top-level-p 'movitz::&top-level-p) +#+clisp (defconstant movitz::&result-mode 'movitz::&result-mode) +#+clisp (defconstant movitz::&env 'movitz::&env) +#+clisp (defconstant movitz::&producer 'movitz::&producer) + + #-allegro (do () (nil) (with-simple-restart (retry "Retry loading Movitz") (return @@ -47,8 +63,8 @@ (do () (nil) (with-simple-restart (retry "Retry loading ~S" path) (return - (load (compile-file (make-pathname :name path :type "lisp") - :print nil)))))) + (load (or (compile-file path :print nil) + (error "Compile-file of ~S failed?" path))))))) '("packages" "movitz" "parse" Index: movitz/los0-image Index: movitz/multiboot.lisp diff -u movitz/multiboot.lisp:1.1.1.1 movitz/multiboot.lisp:1.2 --- movitz/multiboot.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/multiboot.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Jun 12 12:14:12 2002 ;;;; -;;;; $Id: multiboot.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: multiboot.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/parse.lisp diff -u movitz/parse.lisp:1.2 movitz/parse.lisp:1.3 --- movitz/parse.lisp:1.2 Thu Jan 15 11:13:00 2004 +++ movitz/parse.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: parse.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:49:17 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: parse.lisp,v 1.2 2004/01/15 16:13:00 ffjeld Exp $ +;;;; $Id: parse.lisp,v 1.3 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/procfs-image.lisp diff -u movitz/procfs-image.lisp:1.1.1.1 movitz/procfs-image.lisp:1.2 --- movitz/procfs-image.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/procfs-image.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Aug 24 11:39:37 2001 ;;;; -;;;; $Id: procfs-image.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: procfs-image.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.2 movitz/special-operators-cl.lisp:1.3 --- movitz/special-operators-cl.lisp:1.2 Thu Jan 15 11:40:33 2004 +++ movitz/special-operators-cl.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; -;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms??, Norway +;;;; Copyright (C) 2000-2004, +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: special-operators-cl.lisp ;;;; Description: Special operators in the COMMON-LISP package. @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:31:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: special-operators-cl.lisp,v 1.2 2004/01/15 16:40:33 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.3 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.1.1.1 movitz/storage-types.lisp:1.2 --- movitz/storage-types.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/storage-types.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2000-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: storage-types.lisp ;;;; Description: Physical storage structures for Movitz objects. @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: storage-types.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/stream-image.lisp diff -u movitz/stream-image.lisp:1.1.1.1 movitz/stream-image.lisp:1.2 --- movitz/stream-image.lisp:1.1.1.1 Tue Jan 13 06:04:59 2004 +++ movitz/stream-image.lisp Mon Jan 19 06:23:41 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Aug 27 14:46:50 2001 ;;;; -;;;; $Id: stream-image.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $ +;;;; $Id: stream-image.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Mon Jan 19 11:23:44 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:44 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/common-lisp.lisp movitz/losp/los0.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv7968/losp Modified Files: common-lisp.lisp los0.lisp Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:43 2004 Author: ffjeld Index: movitz/losp/common-lisp.lisp diff -u movitz/losp/common-lisp.lisp:1.1.1.1 movitz/losp/common-lisp.lisp:1.2 --- movitz/losp/common-lisp.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/common-lisp.lisp Mon Jan 19 06:23:43 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: common-lisp.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Tue Dec 5 18:33:01 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: common-lisp.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: common-lisp.lisp,v 1.2 2004/01/19 11:23:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.1.1.1 movitz/losp/los0.lisp:1.2 --- movitz/losp/los0.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/los0.lisp Mon Jan 19 06:23:43 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001,2000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: los0.lisp ;;;; Description: Top-level initialization file. @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.2 2004/01/19 11:23:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -19,6 +19,8 @@ (require :x86-pc/all) (require :x86-pc/io-space) (require :x86-pc/ne2k) +(require :x86-pc/floppy) + (require :lib/readline) (require :lib/toplevel) (require :lib/net/ip6) @@ -37,6 +39,12 @@ (in-package muerte.init) (declaim (special muerte::*multiboot-data*)) + +(defun test-floppy () + (muerte.x86-pc::fd-start-disk) ; to initialize the controller and spin the drive up. + (muerte.x86-pc::fd-cmd-seek 70) ; to seek to track 70. + (setf (muerte.x86-pc::fd-motor) nil)) ; to turn the drive and controller off. + (defun alist-get-expand (alist key) (let (cons) From ffjeld at common-lisp.net Mon Jan 19 11:23:45 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:45 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/lib/bcd.lisp movitz/losp/lib/console.lisp movitz/losp/lib/malloc-init.lisp movitz/losp/lib/misc.lisp movitz/losp/lib/named-integers.lisp movitz/losp/lib/package.lisp movitz/losp/lib/readline.lisp movitz/losp/lib/repl.lisp movitz/losp/lib/toplevel.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv7968/losp/lib Modified Files: bcd.lisp console.lisp malloc-init.lisp misc.lisp named-integers.lisp package.lisp readline.lisp repl.lisp toplevel.lisp Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:44 2004 Author: ffjeld Index: movitz/losp/lib/bcd.lisp diff -u movitz/losp/lib/bcd.lisp:1.2 movitz/losp/lib/bcd.lisp:1.3 --- movitz/losp/lib/bcd.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/bcd.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 30 14:03:57 2002 ;;;; -;;;; $Id: bcd.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: bcd.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/console.lisp diff -u movitz/losp/lib/console.lisp:1.3 movitz/losp/lib/console.lisp:1.4 --- movitz/losp/lib/console.lisp:1.3 Fri Jan 16 09:51:59 2004 +++ movitz/losp/lib/console.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Aug 14 18:14:16 2003 ;;;; -;;;; $Id: console.lisp,v 1.3 2004/01/16 14:51:59 ffjeld Exp $ +;;;; $Id: console.lisp,v 1.4 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/malloc-init.lisp diff -u movitz/losp/lib/malloc-init.lisp:1.1.1.1 movitz/losp/lib/malloc-init.lisp:1.2 --- movitz/losp/lib/malloc-init.lisp:1.1.1.1 Tue Jan 13 06:05:04 2004 +++ movitz/losp/lib/malloc-init.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Jan 9 15:57:22 2002 ;;;; -;;;; $Id: malloc-init.lisp,v 1.1.1.1 2004/01/13 11:05:04 ffjeld Exp $ +;;;; $Id: malloc-init.lisp,v 1.2 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/misc.lisp diff -u movitz/losp/lib/misc.lisp:1.2 movitz/losp/lib/misc.lisp:1.3 --- movitz/losp/lib/misc.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/misc.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon May 12 17:13:31 2003 ;;;; -;;;; $Id: misc.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: misc.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/named-integers.lisp diff -u movitz/losp/lib/named-integers.lisp:1.2 movitz/losp/lib/named-integers.lisp:1.3 --- movitz/losp/lib/named-integers.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/named-integers.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Jan 4 16:13:46 2002 ;;;; -;;;; $Id: named-integers.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: named-integers.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/package.lisp diff -u movitz/losp/lib/package.lisp:1.2 movitz/losp/lib/package.lisp:1.3 --- movitz/losp/lib/package.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/package.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Sep 27 17:24:11 2002 ;;;; -;;;; $Id: package.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/readline.lisp diff -u movitz/losp/lib/readline.lisp:1.2 movitz/losp/lib/readline.lisp:1.3 --- movitz/losp/lib/readline.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/readline.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Nov 2 13:58:58 2001 ;;;; -;;;; $Id: readline.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: readline.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/repl.lisp diff -u movitz/losp/lib/repl.lisp:1.2 movitz/losp/lib/repl.lisp:1.3 --- movitz/losp/lib/repl.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/repl.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 19 14:58:12 2003 ;;;; -;;;; $Id: repl.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: repl.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/toplevel.lisp diff -u movitz/losp/lib/toplevel.lisp:1.2 movitz/losp/lib/toplevel.lisp:1.3 --- movitz/losp/lib/toplevel.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/toplevel.lisp Mon Jan 19 06:23:44 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Sep 5 15:56:26 2002 ;;;; -;;;; $Id: toplevel.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: toplevel.lisp,v 1.3 2004/01/19 11:23:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Mon Jan 19 11:23:46 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:46 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/lib/net/arp.lisp movitz/losp/lib/net/ethernet.lisp movitz/losp/lib/net/ip4.lisp movitz/losp/lib/net/ip6.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv7968/losp/lib/net Modified Files: arp.lisp ethernet.lisp ip4.lisp ip6.lisp Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:46 2004 Author: ffjeld Index: movitz/losp/lib/net/arp.lisp diff -u movitz/losp/lib/net/arp.lisp:1.2 movitz/losp/lib/net/arp.lisp:1.3 --- movitz/losp/lib/net/arp.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/net/arp.lisp Mon Jan 19 06:23:45 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Mar 20 15:01:15 2003 ;;;; -;;;; $Id: arp.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: arp.lisp,v 1.3 2004/01/19 11:23:45 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/net/ethernet.lisp diff -u movitz/losp/lib/net/ethernet.lisp:1.2 movitz/losp/lib/net/ethernet.lisp:1.3 --- movitz/losp/lib/net/ethernet.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/net/ethernet.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 17 15:25:31 2002 ;;;; -;;;; $Id: ethernet.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: ethernet.lisp,v 1.3 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.2 movitz/losp/lib/net/ip4.lisp:1.3 --- movitz/losp/lib/net/ip4.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/net/ip4.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.3 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/lib/net/ip6.lisp diff -u movitz/losp/lib/net/ip6.lisp:1.2 movitz/losp/lib/net/ip6.lisp:1.3 --- movitz/losp/lib/net/ip6.lisp:1.2 Thu Jan 15 12:34:49 2004 +++ movitz/losp/lib/net/ip6.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Nov 14 17:25:31 2001 ;;;; -;;;; $Id: ip6.lisp,v 1.2 2004/01/15 17:34:49 ffjeld Exp $ +;;;; $Id: ip6.lisp,v 1.3 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Mon Jan 19 11:23:51 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:51 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/arrays.lisp movitz/losp/muerte/basic-functions.lisp movitz/losp/muerte/basic-macros.lisp movitz/losp/muerte/characters.lisp movitz/losp/muerte/common-lisp.lisp movitz/losp/muerte/conditions.lisp movitz/losp/muerte/cons.lisp movitz/losp/muerte/cpu-id.lisp movitz/losp/muerte/defstruct.lisp movitz/losp/muerte/environment.lisp movitz/losp/muerte/equalp.lisp movitz/losp/muerte/error.lisp movitz/losp/muerte/eval.lisp movitz/losp/muerte/format.lisp movitz/losp/muerte/functions.lisp movitz/losp/muerte/hash-tables.lisp movitz/losp/muerte/inspect.lisp movitz/losp/muerte/integers.lisp movitz/losp/muerte/io-port.lisp movitz/losp/muerte/lists.lisp movitz/losp/muerte/los-closette-compiler.lisp movitz/losp/muerte/los-closette.lisp movitz/losp/muerte/memref.lisp movitz/losp/muerte/more-macros.lisp movitz/losp/muerte/packages.lisp movitz/losp/muerte/primitive-functions.lisp movitz/losp/muerte/print.lisp movitz/losp/muerte/read.lisp movitz/losp/muerte/restarts.lisp movitz/losp/muerte/segments.lisp movitz/losp/muerte/sequences.lisp movitz/losp/muerte/setf.lisp movitz/losp/muerte/simple-streams.lisp movitz/losp/muerte/streams.lisp movitz/losp/muerte/strings.lisp movitz/losp/muerte/symbols.lisp movitz/losp/muerte/typep.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv7968/losp/muerte Modified Files: arrays.lisp basic-functions.lisp basic-macros.lisp characters.lisp common-lisp.lisp conditions.lisp cons.lisp cpu-id.lisp defstruct.lisp environment.lisp equalp.lisp error.lisp eval.lisp format.lisp functions.lisp hash-tables.lisp inspect.lisp integers.lisp io-port.lisp lists.lisp los-closette-compiler.lisp los-closette.lisp memref.lisp more-macros.lisp packages.lisp primitive-functions.lisp print.lisp read.lisp restarts.lisp segments.lisp sequences.lisp setf.lisp simple-streams.lisp streams.lisp strings.lisp symbols.lisp typep.lisp Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:47 2004 Author: ffjeld Index: movitz/losp/muerte/arrays.lisp diff -u movitz/losp/muerte/arrays.lisp:1.1.1.1 movitz/losp/muerte/arrays.lisp:1.2 --- movitz/losp/muerte/arrays.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/arrays.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Sun Feb 11 23:14:04 2001 ;;;; -;;;; $Id: arrays.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: arrays.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.1.1.1 movitz/losp/muerte/basic-functions.lisp:1.2 --- movitz/losp/muerte/basic-functions.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/basic-functions.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 4 18:41:57 2001 ;;;; -;;;; $Id: basic-functions.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.1.1.1 movitz/losp/muerte/basic-macros.lisp:1.2 --- movitz/losp/muerte/basic-macros.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/basic-macros.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: basic-macros.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/characters.lisp diff -u movitz/losp/muerte/characters.lisp:1.1.1.1 movitz/losp/muerte/characters.lisp:1.2 --- movitz/losp/muerte/characters.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/characters.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Feb 5 19:05:01 2001 ;;;; -;;;; $Id: characters.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: characters.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/common-lisp.lisp diff -u movitz/losp/muerte/common-lisp.lisp:1.1.1.1 movitz/losp/muerte/common-lisp.lisp:1.2 --- movitz/losp/muerte/common-lisp.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/common-lisp.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: common-lisp.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:41:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: common-lisp.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: common-lisp.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/conditions.lisp diff -u movitz/losp/muerte/conditions.lisp:1.1.1.1 movitz/losp/muerte/conditions.lisp:1.2 --- movitz/losp/muerte/conditions.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/conditions.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Nov 20 15:47:04 2002 ;;;; -;;;; $Id: conditions.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: conditions.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/cons.lisp diff -u movitz/losp/muerte/cons.lisp:1.1.1.1 movitz/losp/muerte/cons.lisp:1.2 --- movitz/losp/muerte/cons.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/cons.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: cons.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 15:25:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: cons.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: cons.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/cpu-id.lisp diff -u movitz/losp/muerte/cpu-id.lisp:1.1.1.1 movitz/losp/muerte/cpu-id.lisp:1.2 --- movitz/losp/muerte/cpu-id.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/cpu-id.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Apr 15 22:47:13 2002 ;;;; -;;;; $Id: cpu-id.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: cpu-id.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/defstruct.lisp diff -u movitz/losp/muerte/defstruct.lisp:1.1.1.1 movitz/losp/muerte/defstruct.lisp:1.2 --- movitz/losp/muerte/defstruct.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/defstruct.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: defstruct.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 22 13:10:59 2001 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: defstruct.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: defstruct.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/environment.lisp diff -u movitz/losp/muerte/environment.lisp:1.1.1.1 movitz/losp/muerte/environment.lisp:1.2 --- movitz/losp/muerte/environment.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/environment.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Sat Oct 20 00:41:57 2001 ;;;; -;;;; $Id: environment.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: environment.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/equalp.lisp diff -u movitz/losp/muerte/equalp.lisp:1.1.1.1 movitz/losp/muerte/equalp.lisp:1.2 --- movitz/losp/muerte/equalp.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/equalp.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Mar 13 17:09:08 2001 ;;;; -;;;; $Id: equalp.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: equalp.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/error.lisp diff -u movitz/losp/muerte/error.lisp:1.1.1.1 movitz/losp/muerte/error.lisp:1.2 --- movitz/losp/muerte/error.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/error.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Sat Sep 1 00:49:11 2001 ;;;; -;;;; $Id: error.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: error.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/eval.lisp diff -u movitz/losp/muerte/eval.lisp:1.1.1.1 movitz/losp/muerte/eval.lisp:1.2 --- movitz/losp/muerte/eval.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/eval.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Oct 19 21:15:12 2001 ;;;; -;;;; $Id: eval.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/format.lisp diff -u movitz/losp/muerte/format.lisp:1.1.1.1 movitz/losp/muerte/format.lisp:1.2 --- movitz/losp/muerte/format.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/format.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Sat Mar 23 01:18:36 2002 ;;;; -;;;; $Id: format.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: format.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/functions.lisp diff -u movitz/losp/muerte/functions.lisp:1.1.1.1 movitz/losp/muerte/functions.lisp:1.2 --- movitz/losp/muerte/functions.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/functions.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Mar 12 22:58:54 2002 ;;;; -;;;; $Id: functions.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: functions.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/hash-tables.lisp diff -u movitz/losp/muerte/hash-tables.lisp:1.1.1.1 movitz/losp/muerte/hash-tables.lisp:1.2 --- movitz/losp/muerte/hash-tables.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/hash-tables.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Feb 19 19:09:05 2001 ;;;; -;;;; $Id: hash-tables.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: hash-tables.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.1.1.1 movitz/losp/muerte/inspect.lisp:1.2 --- movitz/losp/muerte/inspect.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/inspect.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Oct 24 09:50:41 2003 ;;;; -;;;; $Id: inspect.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.1.1.1 movitz/losp/muerte/integers.lisp:1.2 --- movitz/losp/muerte/integers.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/integers.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: integers.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/io-port.lisp diff -u movitz/losp/muerte/io-port.lisp:1.1.1.1 movitz/losp/muerte/io-port.lisp:1.2 --- movitz/losp/muerte/io-port.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/io-port.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 21 22:14:08 2001 ;;;; -;;;; $Id: io-port.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: io-port.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/lists.lisp diff -u movitz/losp/muerte/lists.lisp:1.1.1.1 movitz/losp/muerte/lists.lisp:1.2 --- movitz/losp/muerte/lists.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/lists.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: lists.lisp ;;;; Description: @@ -9,7 +9,7 @@ ;;;; Created at: Tue Dec 5 18:40:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: lists.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: lists.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/los-closette-compiler.lisp diff -u movitz/losp/muerte/los-closette-compiler.lisp:1.1.1.1 movitz/losp/muerte/los-closette-compiler.lisp:1.2 --- movitz/losp/muerte/los-closette-compiler.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/los-closette-compiler.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Aug 29 13:15:11 2002 ;;;; -;;;; $Id: los-closette-compiler.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: los-closette-compiler.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/los-closette.lisp diff -u movitz/losp/muerte/los-closette.lisp:1.1.1.1 movitz/losp/muerte/los-closette.lisp:1.2 --- movitz/losp/muerte/los-closette.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/los-closette.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Jul 23 14:29:10 2002 ;;;; -;;;; $Id: los-closette.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: los-closette.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/memref.lisp diff -u movitz/losp/muerte/memref.lisp:1.1.1.1 movitz/losp/muerte/memref.lisp:1.2 --- movitz/losp/muerte/memref.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/memref.lisp Mon Jan 19 06:23:46 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Mar 6 21:25:49 2001 ;;;; -;;;; $Id: memref.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: memref.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/more-macros.lisp diff -u movitz/losp/muerte/more-macros.lisp:1.1.1.1 movitz/losp/muerte/more-macros.lisp:1.2 --- movitz/losp/muerte/more-macros.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/more-macros.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Jun 7 15:05:57 2002 ;;;; -;;;; $Id: more-macros.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/packages.lisp diff -u movitz/losp/muerte/packages.lisp:1.1.1.1 movitz/losp/muerte/packages.lisp:1.2 --- movitz/losp/muerte/packages.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/packages.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2002-2004 -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Aug 30 15:19:43 2001 ;;;; -;;;; $Id: packages.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/primitive-functions.lisp diff -u movitz/losp/muerte/primitive-functions.lisp:1.1.1.1 movitz/losp/muerte/primitive-functions.lisp:1.2 --- movitz/losp/muerte/primitive-functions.lisp:1.1.1.1 Tue Jan 13 06:05:05 2004 +++ movitz/losp/muerte/primitive-functions.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Oct 2 21:02:18 2001 ;;;; -;;;; $Id: primitive-functions.lisp,v 1.1.1.1 2004/01/13 11:05:05 ffjeld Exp $ +;;;; $Id: primitive-functions.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/print.lisp diff -u movitz/losp/muerte/print.lisp:1.1.1.1 movitz/losp/muerte/print.lisp:1.2 --- movitz/losp/muerte/print.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/print.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 3 11:48:19 2001 ;;;; -;;;; $Id: print.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: print.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/read.lisp diff -u movitz/losp/muerte/read.lisp:1.1.1.1 movitz/losp/muerte/read.lisp:1.2 --- movitz/losp/muerte/read.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/read.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Oct 17 21:50:42 2001 ;;;; -;;;; $Id: read.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: read.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/restarts.lisp diff -u movitz/losp/muerte/restarts.lisp:1.1.1.1 movitz/losp/muerte/restarts.lisp:1.2 --- movitz/losp/muerte/restarts.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/restarts.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Oct 28 09:27:13 2003 ;;;; -;;;; $Id: restarts.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: restarts.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/segments.lisp diff -u movitz/losp/muerte/segments.lisp:1.1.1.1 movitz/losp/muerte/segments.lisp:1.2 --- movitz/losp/muerte/segments.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/segments.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu May 8 14:25:06 2003 ;;;; -;;;; $Id: segments.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: segments.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/sequences.lisp diff -u movitz/losp/muerte/sequences.lisp:1.1.1.1 movitz/losp/muerte/sequences.lisp:1.2 --- movitz/losp/muerte/sequences.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/sequences.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 11 14:19:23 2001 ;;;; -;;;; $Id: sequences.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: sequences.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/setf.lisp diff -u movitz/losp/muerte/setf.lisp:1.1.1.1 movitz/losp/muerte/setf.lisp:1.2 --- movitz/losp/muerte/setf.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/setf.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Feb 8 20:43:20 2001 ;;;; -;;;; $Id: setf.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: setf.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/simple-streams.lisp diff -u movitz/losp/muerte/simple-streams.lisp:1.1.1.1 movitz/losp/muerte/simple-streams.lisp:1.2 --- movitz/losp/muerte/simple-streams.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/simple-streams.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Aug 29 13:39:43 2003 ;;;; -;;;; $Id: simple-streams.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: simple-streams.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/streams.lisp diff -u movitz/losp/muerte/streams.lisp:1.1.1.1 movitz/losp/muerte/streams.lisp:1.2 --- movitz/losp/muerte/streams.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/streams.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Jun 30 14:33:15 2003 ;;;; -;;;; $Id: streams.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: streams.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/strings.lisp diff -u movitz/losp/muerte/strings.lisp:1.1.1.1 movitz/losp/muerte/strings.lisp:1.2 --- movitz/losp/muerte/strings.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/strings.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Oct 19 17:05:25 2001 ;;;; -;;;; $Id: strings.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: strings.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/symbols.lisp diff -u movitz/losp/muerte/symbols.lisp:1.1.1.1 movitz/losp/muerte/symbols.lisp:1.2 --- movitz/losp/muerte/symbols.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/symbols.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 4 23:55:41 2001 ;;;; -;;;; $Id: symbols.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: symbols.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.1.1.1 movitz/losp/muerte/typep.lisp:1.2 --- movitz/losp/muerte/typep.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/typep.lisp Mon Jan 19 06:23:47 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 20012000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: typep.lisp ;;;; Description: Implements TYPEP and TYPECASE. @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Mon Jan 19 11:23:53 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 06:23:53 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/x86-pc/all.lisp movitz/losp/x86-pc/cmos.lisp movitz/losp/x86-pc/debugger.lisp movitz/losp/x86-pc/dp8390.lisp movitz/losp/x86-pc/interrupt.lisp movitz/losp/x86-pc/io-space.lisp movitz/losp/x86-pc/keyboard.lisp movitz/losp/x86-pc/memory.lisp movitz/losp/x86-pc/ne2k.lisp movitz/losp/x86-pc/package.lisp movitz/losp/x86-pc/pic8259.lisp movitz/losp/x86-pc/pit8253.lisp movitz/losp/x86-pc/textmode-console.lisp movitz/losp/x86-pc/textmode.lisp movitz/losp/x86-pc/vga.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv7968/losp/x86-pc Modified Files: all.lisp cmos.lisp debugger.lisp dp8390.lisp interrupt.lisp io-space.lisp keyboard.lisp memory.lisp ne2k.lisp package.lisp pic8259.lisp pit8253.lisp textmode-console.lisp textmode.lisp vga.lisp Log Message: Many minor edits. Removed non-ASCII characters etc. Date: Mon Jan 19 06:23:52 2004 Author: ffjeld Index: movitz/losp/x86-pc/all.lisp diff -u movitz/losp/x86-pc/all.lisp:1.2 movitz/losp/x86-pc/all.lisp:1.3 --- movitz/losp/x86-pc/all.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/all.lisp Mon Jan 19 06:23:51 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Sep 27 21:14:56 2001 ;;;; -;;;; $Id: all.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: all.lisp,v 1.3 2004/01/19 11:23:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/cmos.lisp diff -u movitz/losp/x86-pc/cmos.lisp:1.2 movitz/losp/x86-pc/cmos.lisp:1.3 --- movitz/losp/x86-pc/cmos.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/cmos.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 30 12:23:02 2002 ;;;; -;;;; $Id: cmos.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: cmos.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/debugger.lisp diff -u movitz/losp/x86-pc/debugger.lisp:1.1.1.1 movitz/losp/x86-pc/debugger.lisp:1.2 --- movitz/losp/x86-pc/debugger.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/debugger.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms??, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri Nov 22 10:09:18 2002 ;;;; -;;;; $Id: debugger.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: debugger.lisp,v 1.2 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/dp8390.lisp diff -u movitz/losp/x86-pc/dp8390.lisp:1.2 movitz/losp/x86-pc/dp8390.lisp:1.3 --- movitz/losp/x86-pc/dp8390.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/dp8390.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Sep 18 12:21:36 2002 ;;;; -;;;; $Id: dp8390.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: dp8390.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/interrupt.lisp diff -u movitz/losp/x86-pc/interrupt.lisp:1.2 movitz/losp/x86-pc/interrupt.lisp:1.3 --- movitz/losp/x86-pc/interrupt.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/interrupt.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Fri May 4 18:08:50 2001 ;;;; -;;;; $Id: interrupt.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/io-space.lisp diff -u movitz/losp/x86-pc/io-space.lisp:1.1.1.1 movitz/losp/x86-pc/io-space.lisp:1.2 --- movitz/losp/x86-pc/io-space.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/io-space.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue May 6 10:50:36 2003 ;;;; -;;;; $Id: io-space.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: io-space.lisp,v 1.2 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/keyboard.lisp diff -u movitz/losp/x86-pc/keyboard.lisp:1.1.1.1 movitz/losp/x86-pc/keyboard.lisp:1.2 --- movitz/losp/x86-pc/keyboard.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/x86-pc/keyboard.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Mon Sep 24 16:04:12 2001 ;;;; -;;;; $Id: keyboard.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: keyboard.lisp,v 1.2 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/memory.lisp diff -u movitz/losp/x86-pc/memory.lisp:1.2 movitz/losp/x86-pc/memory.lisp:1.3 --- movitz/losp/x86-pc/memory.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/memory.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Oct 11 16:32:11 2001 ;;;; -;;;; $Id: memory.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: memory.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/ne2k.lisp diff -u movitz/losp/x86-pc/ne2k.lisp:1.3 movitz/losp/x86-pc/ne2k.lisp:1.4 --- movitz/losp/x86-pc/ne2k.lisp:1.3 Thu Jan 15 12:43:28 2004 +++ movitz/losp/x86-pc/ne2k.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 17 15:16:00 2002 ;;;; -;;;; $Id: ne2k.lisp,v 1.3 2004/01/15 17:43:28 ffjeld Exp $ +;;;; $Id: ne2k.lisp,v 1.4 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/package.lisp diff -u movitz/losp/x86-pc/package.lisp:1.2 movitz/losp/x86-pc/package.lisp:1.3 --- movitz/losp/x86-pc/package.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/package.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Oct 2 20:30:28 2001 ;;;; -;;;; $Id: package.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: package.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/pic8259.lisp diff -u movitz/losp/x86-pc/pic8259.lisp:1.2 movitz/losp/x86-pc/pic8259.lisp:1.3 --- movitz/losp/x86-pc/pic8259.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/pic8259.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue May 22 15:23:01 2001 ;;;; -;;;; $Id: pic8259.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: pic8259.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/pit8253.lisp diff -u movitz/losp/x86-pc/pit8253.lisp:1.2 movitz/losp/x86-pc/pit8253.lisp:1.3 --- movitz/losp/x86-pc/pit8253.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/pit8253.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2002, 2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Jan 15 11:30:55 2002 ;;;; -;;;; $Id: pit8253.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: pit8253.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/textmode-console.lisp diff -u movitz/losp/x86-pc/textmode-console.lisp:1.2 movitz/losp/x86-pc/textmode-console.lisp:1.3 --- movitz/losp/x86-pc/textmode-console.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/textmode-console.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001, 2003-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Jul 8 15:13:24 2003 ;;;; -;;;; $Id: textmode-console.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: textmode-console.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/textmode.lisp diff -u movitz/losp/x86-pc/textmode.lisp:1.2 movitz/losp/x86-pc/textmode.lisp:1.3 --- movitz/losp/x86-pc/textmode.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/textmode.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001,2000, 2002-2004, -;;;; Department of Computer Science, University of Troms?, Norway +;;;; Department of Computer Science, University of Tromso, Norway ;;;; ;;;; Filename: textmode.lisp ;;;; Description: A primitive 80x25 text-mode console driver. @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 9 15:38:56 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: textmode.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: textmode.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ Index: movitz/losp/x86-pc/vga.lisp diff -u movitz/losp/x86-pc/vga.lisp:1.2 movitz/losp/x86-pc/vga.lisp:1.3 --- movitz/losp/x86-pc/vga.lisp:1.2 Thu Jan 15 12:13:53 2004 +++ movitz/losp/x86-pc/vga.lisp Mon Jan 19 06:23:52 2004 @@ -1,7 +1,7 @@ ;;;;------------------------------------------------------------------ ;;;; ;;;; Copyright (C) 2001-2004, -;;;; Department of Computer Science, University of Troms?, Norway. +;;;; Department of Computer Science, University of Tromso, Norway. ;;;; ;;;; For distribution policy, see the accompanying file COPYING. ;;;; @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 25 14:08:20 2001 ;;;; -;;;; $Id: vga.lisp,v 1.2 2004/01/15 17:13:53 ffjeld Exp $ +;;;; $Id: vga.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ From ffjeld at common-lisp.net Mon Jan 19 19:21:09 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 14:21:09 -0500 Subject: [movitz-cvs] CVS update: movitz/compiler.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv23969 Modified Files: compiler.lisp Log Message: A "fix" for SBCL's defconstant annoyance, according to nyef's patch. Date: Mon Jan 19 14:21:08 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.3 movitz/compiler.lisp:1.4 --- movitz/compiler.lisp:1.3 Fri Jan 16 14:06:40 2004 +++ movitz/compiler.lisp Mon Jan 19 14:21:08 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.3 2004/01/16 19:06:40 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.4 2004/01/19 19:21:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -867,7 +867,8 @@ load-priority (delete-file-p nil)) (handler-bind - (#+ignore ((or error warning) (lambda (c) + (#+sbcl (sb-ext:defconstant-uneql #'continue) + #+ignore ((or error warning) (lambda (c) (declare (ignore c)) (format *error-output* "~&;; In file ~S:" path)))) (unwind-protect From ffjeld at common-lisp.net Mon Jan 19 19:21:14 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Mon, 19 Jan 2004 14:21:14 -0500 Subject: [movitz-cvs] CVS update: movitz/load.lisp Message-ID: Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv25504 Modified Files: load.lisp Log Message: A "fix" for SBCL's defconstant annoyance, according to nyef's patch. Date: Mon Jan 19 14:21:14 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.6 movitz/load.lisp:1.7 --- movitz/load.lisp:1.6 Mon Jan 19 06:23:41 2004 +++ movitz/load.lisp Mon Jan 19 14:21:14 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.6 2004/01/19 11:23:41 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.7 2004/01/19 19:21:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -63,8 +63,10 @@ (do () (nil) (with-simple-restart (retry "Retry loading ~S" path) (return - (load (or (compile-file path :print nil) - (error "Compile-file of ~S failed?" path))))))) + (handler-bind + (#+sbcl (sb-ext:defconstant-uneql #'continue)) + (load (or (compile-file path :print nil) + (error "Compile-file of ~S failed?" path)))))))) '("packages" "movitz" "parse" From ffjeld at common-lisp.net Tue Jan 20 15:40:18 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 20 Jan 2004 10:40:18 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/io-port.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv24840 Modified Files: io-port.lisp Log Message: Started new io-port operator %io-port-read-succession. Date: Tue Jan 20 10:40:18 2004 Author: ffjeld Index: movitz/losp/muerte/io-port.lisp diff -u movitz/losp/muerte/io-port.lisp:1.2 movitz/losp/muerte/io-port.lisp:1.3 --- movitz/losp/muerte/io-port.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/io-port.lisp Tue Jan 20 10:40:18 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 21 22:14:08 2001 ;;;; -;;;; $Id: io-port.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: io-port.lisp,v 1.3 2004/01/20 15:40:18 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -183,6 +183,86 @@ (defun io-delay (&optional (x 1000)) (dotimes (i x) (with-inline-assembly (:returns :nothing) (:nop)))) + +(define-compiler-macro %io-port-read-succession (&whole form port object offset start end byte-size + &environment env) + (if (not (movitz:movitz-constantp byte-size env)) + form + (let ((byte-size (movitz:movitz-eval byte-size env))) + (cond + ((and (movitz:movitz-constantp offset env) + (movitz:movitz-constantp start env) + (movitz:movitz-constantp end env)) + (let* ((offset (movitz:movitz-eval offset env)) + (start (movitz:movitz-eval start env)) + (end (movitz:movitz-eval end env)) + (count (- end start))) + (check-type count (integer 0 #x10000)) + (case byte-size + (:32-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + (if (<= 1 count 20) + `(with-inline-assembly-case () + (do-case (t :eax :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-two-forms (:edx :ebx) ,port ,object) + (:andl ,(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl ,movitz::+movitz-fixnum-shift+ :edx) + ,@(loop for i from start below end + appending + `((:inl :dx :eax) + (:movl :eax (:ebx ,(+ offset (* 4 i)))))) + (:movl :ebx :eax))) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-two-forms (:edx :ebx) ,port ,object) + (:andl ,(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl ,movitz::+movitz-fixnum-shift+ :edx) + (:pushl ,(cl:* movitz::+movitz-fixnum-factor+ end)) ; keep end in (:esp) + (:movl ,(cl:* movitz::+movitz-fixnum-factor+ start) :ecx) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:inl :dx :eax) + (:addl 4 :ecx) + (:movl :eax (:ebx ,(+ offset -4) :ecx)) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop)))) + (t (error "~S byte-size ~S not implemented." (car form) byte-size))))) + ((and (movitz:movitz-constantp offset env)) + (let ((offset (movitz:movitz-eval offset env))) + (case byte-size + (:32-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:inl :dx :eax) + (:addl 4 :ecx) + (:movl :eax (:ebx ,(+ offset -4) :ecx)) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) + (t (error "~S byte-size ~S not implemented." (car form) byte-size))))) + (t (error "Not implemented.")))))) + +(defun %io-port-read-succession (port object offset start end byte-size) + (unless (= 2 offset) + (error "Only offset 2 implemented.")) + (ecase byte-size + (:32-bit + (%io-port-read-succession port object 2 start end :32-bit)))) + (defun io-port-read-sequence (sequence port type transfer-unit &key (start 0) end) (etypecase sequence From ffjeld at common-lisp.net Tue Jan 20 21:39:13 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 20 Jan 2004 16:39:13 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/io-port.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv19661 Modified Files: io-port.lisp Log Message: Added :8-bit and :16-bit bit to %io-port-read-succession. Date: Tue Jan 20 16:39:12 2004 Author: ffjeld Index: movitz/losp/muerte/io-port.lisp diff -u movitz/losp/muerte/io-port.lisp:1.3 movitz/losp/muerte/io-port.lisp:1.4 --- movitz/losp/muerte/io-port.lisp:1.3 Tue Jan 20 10:40:18 2004 +++ movitz/losp/muerte/io-port.lisp Tue Jan 20 16:39:10 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 21 22:14:08 2001 ;;;; -;;;; $Id: io-port.lisp,v 1.3 2004/01/20 15:40:18 ffjeld Exp $ +;;;; $Id: io-port.lisp,v 1.4 2004/01/20 21:39:10 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -232,6 +232,56 @@ ((and (movitz:movitz-constantp offset env)) (let ((offset (movitz:movitz-eval offset env))) (case byte-size + (:8-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :eax) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :ecx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :eax) + (:shrl #.movitz::+movitz-fixnum-shift+ :ecx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:inb :dx :al) + (:addl 1 :ecx) + (:movb :al (:ebx ,(+ offset -1) (:ecx 1))) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) + (:16-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :eax) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :ecx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :eax) + (:shrl #.movitz::+movitz-fixnum-shift+ :ecx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:inw :dx :ax) + (:addl 1 :ecx) + (:movw :ax (:ebx ,(+ offset -2) (:ecx 2))) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) (:32-bit (assert (= 4 movitz:+movitz-fixnum-factor+)) `(with-inline-assembly-case () @@ -254,14 +304,19 @@ (:popl :eax) ; increment :esp, and put a lispval in :eax. end-io-read-loop))) (t (error "~S byte-size ~S not implemented." (car form) byte-size))))) - (t (error "Not implemented.")))))) + (t (error "Variable offset not implemented.")))))) (defun %io-port-read-succession (port object offset start end byte-size) (unless (= 2 offset) (error "Only offset 2 implemented.")) - (ecase byte-size + (case byte-size + (:8-bit + (%io-port-read-succession port object 2 start end :8-bit)) + (:16-bit + (%io-port-read-succession port object 2 start end :16-bit)) (:32-bit - (%io-port-read-succession port object 2 start end :32-bit)))) + (%io-port-read-succession port object 2 start end :32-bit)) + (t (error "Unknown byte-size ~S." byte-size)))) (defun io-port-read-sequence (sequence port type transfer-unit &key (start 0) end) From ffjeld at common-lisp.net Tue Jan 20 21:53:12 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Tue, 20 Jan 2004 16:53:12 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/io-port.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv25475 Modified Files: io-port.lisp Log Message: Added %io-port-write-succession. Completely untested. Date: Tue Jan 20 16:53:11 2004 Author: ffjeld Index: movitz/losp/muerte/io-port.lisp diff -u movitz/losp/muerte/io-port.lisp:1.4 movitz/losp/muerte/io-port.lisp:1.5 --- movitz/losp/muerte/io-port.lisp:1.4 Tue Jan 20 16:39:10 2004 +++ movitz/losp/muerte/io-port.lisp Tue Jan 20 16:53:11 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Wed Mar 21 22:14:08 2001 ;;;; -;;;; $Id: io-port.lisp,v 1.4 2004/01/20 21:39:10 ffjeld Exp $ +;;;; $Id: io-port.lisp,v 1.5 2004/01/20 21:53:11 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -203,7 +203,7 @@ (assert (= 4 movitz:+movitz-fixnum-factor+)) (if (<= 1 count 20) `(with-inline-assembly-case () - (do-case (t :eax :labels (io-read-loop end-io-read-loop not-fixnum)) + (do-case (t :eax) (:compile-two-forms (:edx :ebx) ,port ,object) (:andl ,(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) (:shrl ,movitz::+movitz-fixnum-shift+ :edx) @@ -316,6 +316,140 @@ (%io-port-read-succession port object 2 start end :16-bit)) (:32-bit (%io-port-read-succession port object 2 start end :32-bit)) + (t (error "Unknown byte-size ~S." byte-size)))) + +(define-compiler-macro %io-port-write-succession (&whole form port object offset start end byte-size + &environment env) + (if (not (movitz:movitz-constantp byte-size env)) + form + (let ((byte-size (movitz:movitz-eval byte-size env))) + (cond + ((and (movitz:movitz-constantp offset env) + (movitz:movitz-constantp start env) + (movitz:movitz-constantp end env)) + (let* ((offset (movitz:movitz-eval offset env)) + (start (movitz:movitz-eval start env)) + (end (movitz:movitz-eval end env)) + (count (- end start))) + (check-type count (integer 0 #x10000)) + (case byte-size + (:32-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + (if (<= 1 count 20) + `(with-inline-assembly-case () + (do-case (t :eax) + (:compile-two-forms (:edx :ebx) ,port ,object) + (:andl ,(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl ,movitz::+movitz-fixnum-shift+ :edx) + ,@(loop for i from start below end + appending + `((:movl (:ebx ,(+ offset (* 4 i))) :eax) + (:outl :eax :dx))) + (:movl :ebx :eax))) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-two-forms (:edx :ebx) ,port ,object) + (:andl ,(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl ,movitz::+movitz-fixnum-shift+ :edx) + (:pushl ,(cl:* movitz::+movitz-fixnum-factor+ end)) ; keep end in (:esp) + (:movl ,(cl:* movitz::+movitz-fixnum-factor+ start) :ecx) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:addl 4 :ecx) + (:movl (:ebx ,(+ offset -4) :ecx) :eax) + (:outl :eax :dx) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop)))) + (t (error "~S byte-size ~S not implemented." (car form) byte-size))))) + ((and (movitz:movitz-constantp offset env)) + (let ((offset (movitz:movitz-eval offset env))) + (case byte-size + (:8-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :eax) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :ecx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :eax) + (:shrl #.movitz::+movitz-fixnum-shift+ :ecx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:addl 1 :ecx) + (:movb (:ebx ,(+ offset -1) (:ecx 1)) :al) + (:outb :al :dx) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) + (:16-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :eax) + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :ecx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :eax) + (:shrl #.movitz::+movitz-fixnum-shift+ :ecx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:addl 1 :ecx) + (:movw (:ebx ,(+ offset -2) (:ecx 2)) :ax) + (:outw :ax :dx) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) + (:32-bit + (assert (= 4 movitz:+movitz-fixnum-factor+)) + `(with-inline-assembly-case () + (do-case (t :ebx :labels (io-read-loop end-io-read-loop not-fixnum)) + (:compile-form (:result-mode :push) ,port) + (:compile-form (:result-mode :push) ,object) + (:compile-two-forms (:ecx :eax) ,start ,end) + (:popl :ebx) ; object + (:popl :edx) ; port + (:andl #.(cl:* #xffff movitz::+movitz-fixnum-factor+) :edx) + (:shrl #.movitz::+movitz-fixnum-shift+ :edx) + (:pushl :eax) ; keep end in (:esp) + io-read-loop + (:cmpl :ecx (:esp)) + (:jbe 'end-io-read-loop) + (:addl 4 :ecx) + (:movl (:ebx ,(+ offset -4) :ecx) :eax) + (:outl :eax :dx) + (:jmp 'io-read-loop) + (:popl :eax) ; increment :esp, and put a lispval in :eax. + end-io-read-loop))) + (t (error "~S byte-size ~S not implemented." (car form) byte-size))))) + (t (error "Variable offset not implemented.")))))) + +(defun %io-port-write-succession (port object offset start end byte-size) + (unless (= 2 offset) + (error "Only offset 2 implemented.")) + (case byte-size + (:8-bit + (%io-port-write-succession port object 2 start end :8-bit)) + (:16-bit + (%io-port-write-succession port object 2 start end :16-bit)) + (:32-bit + (%io-port-write-succession port object 2 start end :32-bit)) (t (error "Unknown byte-size ~S." byte-size)))) From ffjeld at common-lisp.net Wed Jan 21 22:02:10 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Wed, 21 Jan 2004 17:02:10 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/loop.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv10402 Modified Files: loop.lisp Log Message: Patch to loop from new-b. Date: Wed Jan 21 17:02:10 2004 Author: ffjeld Index: movitz/losp/muerte/loop.lisp diff -u movitz/losp/muerte/loop.lisp:1.2 movitz/losp/muerte/loop.lisp:1.3 --- movitz/losp/muerte/loop.lisp:1.2 Thu Jan 15 11:41:45 2004 +++ movitz/losp/muerte/loop.lisp Wed Jan 21 17:02:09 2004 @@ -151,7 +151,7 @@ #+ignore (if *loop-gentemp* (gentemp (string pref)) - (gensym))) + (gensym (string pref)))) @@ -1184,7 +1184,7 @@ (setq *loop-names* (list name nil)))) (defun loop-do-return () - (loop-pseudo-body (loop-construct-return (loop-get-form)))) + (loop-emit-body (loop-construct-return (loop-get-form)))) ) @@ -1752,7 +1752,7 @@ ((eq prep :upfrom) (setq dir ':up))) (multiple-value-setq (form start-constantp start-value) (loop-constant-fold-if-possible form indexv-type)) - (loop-make-iteration-variable indexv form indexv-type)) + (setq indexv (loop-make-iteration-variable indexv form indexv-type))) ((:upto :to :downto :above :below) (cond ((loop-tequal prep :upto) (setq inclusive-iteration (setq dir ':up))) ((loop-tequal prep :to) (setq inclusive-iteration t)) From ffjeld at common-lisp.net Wed Jan 28 20:26:01 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Wed, 28 Jan 2004 15:26:01 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/sequences.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv18237 Modified Files: sequences.lisp Log Message: Minor tweaks. Date: Wed Jan 28 15:26:00 2004 Author: ffjeld Index: movitz/losp/muerte/sequences.lisp diff -u movitz/losp/muerte/sequences.lisp:1.2 movitz/losp/muerte/sequences.lisp:1.3 --- movitz/losp/muerte/sequences.lisp:1.2 Mon Jan 19 06:23:47 2004 +++ movitz/losp/muerte/sequences.lisp Wed Jan 28 15:25:58 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 11 14:19:23 2001 ;;;; -;;;; $Id: sequences.lisp,v 1.2 2004/01/19 11:23:47 ffjeld Exp $ +;;;; $Id: sequences.lisp,v 1.3 2004/01/28 20:25:58 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -60,12 +60,12 @@ (list (do ((x sequence (cdr x)) (length 0 (1+ length))) - ((endp x) length))))) + ((null x) length))))) (defun length%list (sequence) - (do ((x sequence (cdr x)) - (length 0 (1+ length))) - ((endp x) length))) + (do ((length 0 (1+ length)) + (x sequence (cdr x))) + ((null x) length))) (defun elt (sequence index) (sequence-dispatch sequence @@ -181,7 +181,7 @@ (defun copy-seq (sequence) (subseq sequence 0)) -(defun position (item sequence &key from-end (test #'eql) test-not (start 0) end (key 'identity)) +(defun position (item sequence &key from-end (test #'eql) test-not (start 0) end (key 'identity)) (numargs-case (2 (item sequence) (sequence-dispatch sequence @@ -193,10 +193,9 @@ (when (eql (sequence-ref i) item) (return i))))) (list - (do ((p sequence (cdr p)) - (i 0 (1+ i))) - ((endp p) nil) - (when (eql (car p) item) + (do ((i 0 (1+ i))) + ((null sequence) nil) + (when (eql (pop sequence) item) (return i)))))) (t (item sequence &key from-end (test #'eql) test-not (start 0) end (key 'identity)) (with-funcallable (key) @@ -219,21 +218,21 @@ (list (cond ((not end) - (do ((p (nthcdr start sequence) (cdr p)) + (do ((p (nthcdr start sequence)) (i start (1+ i))) - ((endp p) nil) - (when (test (key (car p)) item) + ((null p) nil) + (when (test (key (pop p)) item) (return (if (not from-end) i - (let ((next-i (position item (cdr p) :key key :from-end t + (let ((next-i (position item p :key key :from-end t :test test :test-not test-not))) (if next-i (+ i 1 next-i ) i))))))) - (t (do ((p (nthcdr start sequence) (cdr p)) + (t (do ((p (nthcdr start sequence)) (i start (1+ i))) - ((or (endp p) (>= i end)) nil) - (when (test (key (car p)) item) + ((or (null p) (>= i end)) nil) + (when (test (key (pop p)) item) (return (if (not from-end) i - (let ((next-i (position item (cdr p) :end (- end 1 i) :from-end t + (let ((next-i (position item p :end (- end 1 i) :from-end t :key key :test test :test-not test-not))) (if next-i (+ i 1 next-i ) i))))))))))))))) @@ -250,10 +249,10 @@ (when (predicate (sequence-ref i)) (return i))))) (list - (do ((p sequence (cdr p)) + (do ((p sequence) (i 0 (1+ i))) - ((endp p)) - (when (predicate (car p)) + ((null p)) + (when (predicate (pop p)) (return i))))))) (t (predicate sequence &key (start 0) end (key 'identity) from-end) (with-funcallable (predicate) @@ -275,19 +274,20 @@ (list (cond (end - (do ((p (nthcdr start sequence) (cdr p)) + (do ((p (nthcdr start sequence)) (i start (1+ i))) - ((or (>= i end) (endp p))) - (when (predicate (key (car p))) + ((or (>= i end) (null p))) + (when (predicate (key (pop p))) (return (if (not from-end) i - (let ((next-i (position-if predicate (cdr p) :key key :from-end t :end (- end i 1)))) + (let ((next-i (position-if predicate p :key key + :from-end t :end (- end i 1)))) (if next-i (+ i 1 next-i) i))))))) - (t (do ((p (nthcdr start sequence) (cdr p)) + (t (do ((p (nthcdr start sequence)) (i start (1+ i))) - ((endp p)) - (when (predicate (key (car p))) + ((null p)) + (when (predicate (key (pop p))) (return (if (not from-end) i - (let ((next-i (position-if predicate (cdr p) :key key :from-end t))) + (let ((next-i (position-if predicate p :key key :from-end t))) (if next-i (+ i 1 next-i) i))))))))))))))) @@ -312,10 +312,10 @@ (defun reverse (sequence) (sequence-dispatch sequence (list - (do ((p sequence (cdr p)) - (r nil)) - ((endp p) r) - (push (car p) r))) + (let ((result nil)) + (dolist (x sequence) + (push x result)) + result)) (vector (nreverse (copy-seq sequence))))) From ffjeld at common-lisp.net Wed Jan 28 21:06:13 2004 From: ffjeld at common-lisp.net (Frode Vatvedt Fjeld) Date: Wed, 28 Jan 2004 16:06:13 -0500 Subject: [movitz-cvs] CVS update: movitz/losp/muerte/sequences.lisp Message-ID: Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv25889 Modified Files: sequences.lisp Log Message: Fill might concievably work now. Date: Wed Jan 28 16:06:11 2004 Author: ffjeld Index: movitz/losp/muerte/sequences.lisp diff -u movitz/losp/muerte/sequences.lisp:1.3 movitz/losp/muerte/sequences.lisp:1.4 --- movitz/losp/muerte/sequences.lisp:1.3 Wed Jan 28 15:25:58 2004 +++ movitz/losp/muerte/sequences.lisp Wed Jan 28 16:06:08 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld ;;;; Created at: Tue Sep 11 14:19:23 2001 ;;;; -;;;; $Id: sequences.lisp,v 1.3 2004/01/28 20:25:58 ffjeld Exp $ +;;;; $Id: sequences.lisp,v 1.4 2004/01/28 21:06:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -651,19 +651,20 @@ (apply 'map-for-list function first-sequence more-sequences)) (t (error "MAP not implemented.")))) -(defun fill (sequence item &key (start 0) (end (length sequence))) +(defun fill (sequence item &key (start 0) end) "=> sequence" (sequence-dispatch sequence (list - (do ((p (nthcdr start sequence)) + (do ((p (nthcdr start sequence) (cdr p)) (i start (1+ i))) - ((and end (>= i end))) + ((or (null p) (and end (>= i end)))) (setf (car p) item))) (vector - (with-subvector-accessor (sequence-ref sequence start end) - (do ((i start (1+ i))) - ((>= i end)) - (setf (sequence-ref i) item))))) + (let ((end (or end (length sequence)))) + (with-subvector-accessor (sequence-ref sequence start end) + (do ((i start (1+ i))) + ((>= i end)) + (setf (sequence-ref i) item)))))) sequence) (defun replace (sequence-1 sequence-2 &key (start1 0) end1 (start2 0) end2)