movitz-cvs

movitz-cvs@common-lisp.net

2595 discussions

[movitz-cvs] CVS update: movitz/losp/los0.lisp
by ffjeld＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv28358 Modified Files: los0.lisp Log Message: misc fiddling. Date: Mon Oct 31 10:18:08 2005 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.49 movitz/losp/los0.lisp:1.50 --- movitz/losp/los0.lisp:1.49 Sun Aug 28 23:13:30 2005 +++ movitz/losp/los0.lisp Mon Oct 31 10:18:08 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.49 2005/08/28 21:13:30 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.50 2005/10/31 09:18:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -872,10 +872,9 @@ (lambda (seconds) ;; A stupid busy-waiting sleeper. (check-type seconds (real 0 *)) - (let ((start-time (get-internal-run-time))) - (loop with start-time = (get-internal-run-time) - with end-time = (+ start-time (* seconds internal-time-units-per-second)) - while (< (get-internal-run-time) end-time))))) + (loop with start-time = (get-internal-run-time) + with end-time = (+ start-time (* seconds internal-time-units-per-second)) + while (< (get-internal-run-time) end-time)))) (values)) @@ -1207,7 +1206,7 @@ (assert (string= fasit x) () "Failed tesT. Fasit: ~S, X: ~S" fasit x))))) -(defun test-clc (&optional timeout no-timer) +(defun test-clc (&optional (timeout #xfffe) no-timer) (unless no-timer (test-timer timeout)) (loop @@ -1230,7 +1229,6 @@ ;;; (vector-push offset ts) ;;; (vector-push code-vector ts)))) ;;; (muerte::cli) - (pic8259-end-of-interrupt 0) (when (eql #\esc (muerte.x86-pc.keyboard:poll-char)) (break "Test-timer keyboard break.")) (with-inline-assembly (:returns :nothing) @@ -1260,6 +1258,7 @@ ((:gs-override) :movb #x20 (:ecx 159))) #+ignore (setf *timer-prevstack* *timer-stack* *timer-stack* (muerte::copy-current-control-stack)) + (pic8259-end-of-interrupt 0) (setf (pit8253-timer-mode 0) +pit8253-mode-single-timeout+ (pit8253-timer-count 0) (or timeout (+ base (random variation)))) ;;; (muerte::sti) @@ -1353,8 +1352,8 @@ (setf (global-segment-descriptor-table) (muerte::dump-global-segment-table :entries 16))) - (install-los0-consing :kb-size (* 10 1024)) #+ignore + (install-los0-consing :kb-size (* 2 1024)) (install-los0-consing :kb-size (max 50 (truncate (- extended-memsize 2048) 2)))) (let ((muerte::*error-no-condition-for-debugger* t)) @@ -1419,11 +1418,8 @@ (defun read (&optional input-stream eof-error-p eof-value recursive-p) (declare (ignore input-stream recursive-p)) - (let ((string (if *repl-readline-context* - (muerte.readline:contextual-readline *repl-readline-context*) - (muerte.readline:readline (make-string 256) *terminal-io*)))) + (let ((string (muerte.readline:contextual-readline *repl-readline-context*))) (simple-read-from-string string eof-error-p eof-value))) - #+ignore (defun ztstring (physical-address)

1 0

[movitz-cvs] CVS update: movitz/losp/lib/readline.lisp
by ffjeld＠common-lisp.net 31 Oct '05

31 Oct '05

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv28332 Modified Files: readline.lisp Log Message: For contextual-readline, make NIL designate a global context. Date: Mon Oct 31 10:17:08 2005 Author: ffjeld Index: movitz/losp/lib/readline.lisp diff -u movitz/losp/lib/readline.lisp:1.7 movitz/losp/lib/readline.lisp:1.8 --- movitz/losp/lib/readline.lisp:1.7 Thu Dec 9 15:16:13 2004 +++ movitz/losp/lib/readline.lisp Mon Oct 31 10:17:07 2005 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Nov 2 13:58:58 2001 ;;;; -;;;; $Id: readline.lisp,v 1.7 2004/12/09 14:16:13 ffjeld Exp $ +;;;; $Id: readline.lisp,v 1.8 2005/10/31 09:17:07 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -270,6 +270,8 @@ (make-readline-buffer :string (make-string line-length)))) context)) +(defvar *global-readline-context-state* nil) + (defun replace-buffer (to from) (setf (readline-buffer-cursor-position to) (readline-buffer-cursor-position from)) @@ -293,7 +295,10 @@ (with-accessors ((scratch readline-context-state-scratch) (buffers readline-context-state-buffers) (current-buffer readline-context-state-current-buffer)) - context + (or context + *global-readline-context-state* + (setf *global-readline-context-state* + (make-readline-context))) (let* ((edit-buffer current-buffer) (buffer (readline-buffer-string (aref buffers edit-buffer)))) (cond

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/typep.lisp
by ffjeld＠common-lisp.net 25 Oct '05

25 Oct '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv5735 Modified Files: typep.lisp Log Message: Fixed typep wrt. vectors of 16 and 32-bits element-types. Date: Tue Oct 25 21:27:46 2005 Author: ffjeld Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.51 movitz/losp/muerte/typep.lisp:1.52 --- movitz/losp/muerte/typep.lisp:1.51 Wed Aug 24 09:31:57 2005 +++ movitz/losp/muerte/typep.lisp Tue Oct 25 21:27:46 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.51 2005/08/24 07:31:57 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.52 2005/10/25 19:27:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -329,6 +329,8 @@ (make-other-typep :basic-vector)) ((movitz:movitz-subtypep et '(unsigned-byte 8)) (make-basic-vector-typep :u8)) + ((movitz:movitz-subtypep et '(unsigned-byte 16)) + (make-basic-vector-typep :u16)) ((movitz:movitz-subtypep et '(unsigned-byte 32)) (make-basic-vector-typep :u32)) ((movitz:movitz-subtypep et 'character)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/inspect.lisp
by ffjeld＠common-lisp.net 25 Oct '05

25 Oct '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv5708 Modified Files: inspect.lisp Log Message: Fixed bug in location-in-object-p wrt. vectors of word-sized elements. Date: Tue Oct 25 21:26:47 2005 Author: ffjeld Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.56 movitz/losp/muerte/inspect.lisp:1.57 --- movitz/losp/muerte/inspect.lisp:1.56 Sat Aug 27 00:38:07 2005 +++ movitz/losp/muerte/inspect.lisp Tue Oct 25 21:26:47 2005 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Oct 24 09:50:41 2003 ;;;; -;;;; $Id: inspect.lisp,v 1.56 2005/08/26 22:38:07 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.57 2005/10/25 19:26:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -402,13 +402,13 @@ location (+ -1 object-location (movitz-type-word-size 'movitz-basic-vector) - (* 2 (truncate (+ (array-dimension object 0) 1) 2))))) + (* 4 (truncate (+ (array-dimension object 0) 3) 4))))) (structure-object (<= object-location location (+ -1 object-location (movitz-type-word-size :movitz-struct) - (* 2 (truncate (+ (structure-object-length object) 1) 2)))))))) + (* 4 (truncate (+ (array-dimension object 0) 3) 4)))))))) (defun location-in-code-vector-p%unsafe (code-vector location) (and (<= (object-location code-vector) location)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/io-port.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv14485 Modified Files: io-port.lisp Log Message: Added ignorable declarations for with-io-register-syntax. Date: Sun Sep 18 18:21:25 2005 Author: ffjeld Index: movitz/losp/muerte/io-port.lisp diff -u movitz/losp/muerte/io-port.lisp:1.19 movitz/losp/muerte/io-port.lisp:1.20 --- movitz/losp/muerte/io-port.lisp:1.19 Sat Sep 17 00:48:06 2005 +++ movitz/losp/muerte/io-port.lisp Sun Sep 18 18:21:25 2005 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Mar 21 22:14:08 2001 ;;;; -;;;; $Id: io-port.lisp,v 1.19 2005/09/16 22:48:06 ffjeld Exp $ +;;;; $Id: io-port.lisp,v 1.20 2005/09/18 16:21:25 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -337,6 +337,7 @@ (let ((io-var (gensym "io-base-"))) `(let ((,io-var (check-the (unsigned-byte 16) ,io-base-form))) (let ((,name ,io-var)) + (declare (ignorable ,name)) (macrolet ((,name (offset &optional (type :unsigned-byte8)) `(io-port (+ ,',io-var ,offset) ,type))) ,@body)))))

1 0

[movitz-cvs] CVS update: movitz/compiler.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14470 Modified Files: compiler.lisp Log Message: Teached the compiler to add a constant to :untagged-fixnum-ecx. Date: Sun Sep 18 18:20:35 2005 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.164 movitz/compiler.lisp:1.165 --- movitz/compiler.lisp:1.164 Wed Sep 7 00:00:17 2005 +++ movitz/compiler.lisp Sun Sep 18 18:20:35 2005 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.164 2005/09/06 22:00:17 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.165 2005/09/18 16:20:35 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -7007,6 +7007,8 @@ ((eq :argument-stack (operator loc1)) `((:addl ,constant0 (:ebp ,(argument-stack-offset (binding-target term1)))))) + ((eq :untagged-fixnum-ecx (operator loc1)) + `((:addl ,(truncate constant0 +movitz-fixnum-factor+) :ecx))) (t (error "Don't know how to add this for loc1 ~S" loc1)))) ((and constant0 (integerp destination-location)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/arithmetic-macros.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv14444 Modified Files: arithmetic-macros.lisp Log Message: Added proper inlining of logand when the mask is a constant (unsigned-byte 32). Date: Sun Sep 18 18:20:05 2005 Author: ffjeld Index: movitz/losp/muerte/arithmetic-macros.lisp diff -u movitz/losp/muerte/arithmetic-macros.lisp:1.14 movitz/losp/muerte/arithmetic-macros.lisp:1.15 --- movitz/losp/muerte/arithmetic-macros.lisp:1.14 Sun Sep 18 17:58:05 2005 +++ movitz/losp/muerte/arithmetic-macros.lisp Sun Sep 18 18:20:04 2005 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 13:42:46 2004 ;;;; -;;;; $Id: arithmetic-macros.lisp,v 1.14 2005/09/18 15:58:05 ffjeld Exp $ +;;;; $Id: arithmetic-macros.lisp,v 1.15 2005/09/18 16:20:04 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -293,7 +293,18 @@ (case (length constant-folded-integers) (0 0) (1 (first constant-folded-integers)) - (2 `(no-macro-call logand ,(first constant-folded-integers) ,(second constant-folded-integers))) + (2 (cond + ((typep (first constant-folded-integers) + '(unsigned-byte 32)) + (let ((x (first constant-folded-integers))) + `(with-inline-assembly (:returns :untagged-fixnum-ecx + :type (unsigned-byte ,(integer-length x))) + (:compile-form (:result-mode :untagged-fixnum-ecx) + ,(second constant-folded-integers)) + (:andl ,x :ecx)))) + (t `(no-macro-call logand + ,(first constant-folded-integers) + ,(second constant-folded-integers))))) (t `(logand (logand ,(first constant-folded-integers) ,(second constant-folded-integers)) ,@(cddr constant-folded-integers))))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/integers.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv12001 Modified Files: integers.lisp Log Message: Changed the bytespec representation back to integers. The longest bignum is (expt 2 20) bits, so that's what we use for the position. Most bytespec's sizes will fit in the 9 bits remaining in a fixnum. Date: Sun Sep 18 17:58:10 2005 Author: ffjeld Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.118 movitz/losp/muerte/integers.lisp:1.119 --- movitz/losp/muerte/integers.lisp:1.118 Sun Sep 18 17:09:22 2005 +++ movitz/losp/muerte/integers.lisp Sun Sep 18 17:58:09 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.118 2005/09/18 15:09:22 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.119 2005/09/18 15:58:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1396,13 +1396,15 @@ ;;; bytes (defun byte (size position) - (cons size position)) + (check-type size positive-fixnum) + (let ((position (check-the (unsigned-byte 20) position))) + (+ position (ash size 20)))) (defun byte-size (bytespec) - (car bytespec)) + (ash bytespec -20)) (defun byte-position (bytespec) - (cdr bytespec)) + (ldb (byte 20 0) bytespec)) (defun logbitp (index integer) (check-type index positive-fixnum)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/arithmetic-macros.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv11984 Modified Files: arithmetic-macros.lisp Log Message: Changed the bytespec representation back to integers. The longest bignum is (expt 2 20) bits, so that's what we use for the position. Most bytespec's sizes will fit in the 9 bits remaining in a fixnum. Date: Sun Sep 18 17:58:06 2005 Author: ffjeld Index: movitz/losp/muerte/arithmetic-macros.lisp diff -u movitz/losp/muerte/arithmetic-macros.lisp:1.13 movitz/losp/muerte/arithmetic-macros.lisp:1.14 --- movitz/losp/muerte/arithmetic-macros.lisp:1.13 Sun Sep 18 17:09:15 2005 +++ movitz/losp/muerte/arithmetic-macros.lisp Sun Sep 18 17:58:05 2005 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 13:42:46 2004 ;;;; -;;;; $Id: arithmetic-macros.lisp,v 1.13 2005/09/18 15:09:15 ffjeld Exp $ +;;;; $Id: arithmetic-macros.lisp,v 1.14 2005/09/18 15:58:05 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -273,9 +273,11 @@ (cond ((and (movitz:movitz-constantp size env) (movitz:movitz-constantp position env)) - `(quote ,(cons (movitz:movitz-eval size env) - (movitz:movitz-eval position env)))) - (t `(cons ,size ,position)))) + (let ((size (movitz:movitz-eval size env)) + (position (movitz:movitz-eval position env))) + (check-type position (unsigned-byte 20)) + (+ position (ash size 20)))) + (t form))) (define-compiler-macro logand (&whole form &rest integers &environment env) (let ((constant-folded-integers (loop for x in integers

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/integers.lisp
by ffjeld＠common-lisp.net 18 Sep '05

18 Sep '05

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv8880 Modified Files: integers.lisp Log Message: Changed representation of bytespecs to be cons-cells. Date: Sun Sep 18 17:09:22 2005 Author: ffjeld Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.117 movitz/losp/muerte/integers.lisp:1.118 --- movitz/losp/muerte/integers.lisp:1.117 Sun Sep 18 16:42:21 2005 +++ movitz/losp/muerte/integers.lisp Sun Sep 18 17:09:22 2005 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.117 2005/09/18 14:42:21 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.118 2005/09/18 15:09:22 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1396,14 +1396,13 @@ ;;; bytes (defun byte (size position) - (check-type position (integer 0 #x3ff)) - (+ (* size #x400) position)) + (cons size position)) (defun byte-size (bytespec) - (values (truncate bytespec #x400))) + (car bytespec)) (defun byte-position (bytespec) - (rem bytespec #x400)) + (cdr bytespec)) (defun logbitp (index integer) (check-type index positive-fixnum) @@ -2082,7 +2081,6 @@ (:jnz 'count-loop))) (positive-bignum (bignum-logcount integer)))) - (defun dpb (newbyte bytespec integer) (logior (if (= 0 newbyte)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

movitz-cvs