movitz-cvs

movitz-cvs@common-lisp.net

2595 discussions

[movitz-cvs] CVS update: movitz/packages.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv22850 Modified Files: packages.lisp Log Message: Some new symbols in the muerte package. Date: Mon Mar 29 09:36:43 2004 Author: ffjeld Index: movitz/packages.lisp diff -u movitz/packages.lisp:1.10 movitz/packages.lisp:1.11 --- movitz/packages.lisp:1.10 Wed Mar 24 13:39:47 2004 +++ movitz/packages.lisp Mon Mar 29 09:36:43 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Nov 15 21:39:55 2003 ;;;; -;;;; $Id: packages.lisp,v 1.10 2004/03/24 18:39:47 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.11 2004/03/29 14:36:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1120,12 +1120,23 @@ #:package-object-internal-symbols #:package-object-external-symbols + #:map-heap-words + #:map-stack-words + #:malloc-clumps + #:malloc-cons-pointer + #:malloc-buffer-start + + #:%word-offset + #:%run-time-context-slot + #:shallow-copy + vector-element-type vector-element-size with-subvector-accessor svref%unsafe bvref-u16 object-location + location-in-object-p inline-malloc define-compile-time-variable define-primitive-function

1 0

[movitz-cvs] CVS update: movitz/losp/los0.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv21601 Modified Files: los0.lisp Log Message: Include los-gc, and install it when booting up. Date: Mon Mar 29 09:36:15 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.7 movitz/losp/los0.lisp:1.8 --- movitz/losp/los0.lisp:1.7 Thu Mar 25 20:53:53 2004 +++ movitz/losp/los0.lisp Mon Mar 29 09:36:15 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.7 2004/03/26 01:53:53 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.8 2004/03/29 14:36:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -39,7 +39,9 @@ muerte.mop muerte.debug #+ignore muerte.x86-pc.serial)) - + +(require :los0-gc) + (in-package muerte.init) (declaim (special muerte::*multiboot-data*)) @@ -838,12 +840,16 @@ (incf extended-memsize (io-port #x71 :unsigned-byte8)) (format t "Extended memory: ~D KB" extended-memsize)) +;;; (loop for i from #x40600 below #x80000 +;;; do (setf (memref i 0 0 :unsigned-byte32) #xababe13)) + + (install-los0-consing) + (let ((*repl-readline-context* (make-readline-context :history-size 16)) (*backtrace-stack-frame-barrier* (stack-frame-uplink (current-stack-frame))) #+ignore (*error-no-condition-for-debugger* t) (*debugger-function* #'los0-debugger) (*package* nil)) - (with-simple-restart (continue "Abort LOS0 boot-up initialization.") (setf *cpu-features* (find-cpu-features)) @@ -944,5 +950,5 @@ (#\esc (break "Under the bridge.")) (#\e (error "this is an error!")))))))) - + (genesis)

1 0

[movitz-cvs] CVS update: movitz/losp/los0-gc.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv16736 Added Files: los0-gc.lisp Log Message: Implementation of a simple GC architecture, used by los0. Date: Mon Mar 29 09:35:45 2004 Author: ffjeld

1 0

[movitz-cvs] CVS update: movitz/storage-types.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14048 Modified Files: storage-types.lisp Log Message: The wide-tag :infant-object should _not_ have the same low-tag as cons or null. Date: Mon Mar 29 09:35:17 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.14 movitz/storage-types.lisp:1.15 --- movitz/storage-types.lisp:1.14 Fri Mar 26 08:53:06 2004 +++ movitz/storage-types.lisp Mon Mar 29 09:35:17 2004 @@ -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.14 2004/03/26 13:53:06 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.15 2004/03/29 14:35:17 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -72,8 +72,8 @@ :funobj #x3a :std-instance #x40 :run-time-context #x50 - :infant-object #x65 :illegal #x13 + :infant-object #x23 ;; :simple-vector #x20 ;; :character-vector

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/typep.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv4801 Modified Files: typep.lisp Log Message: Add a compile-time assertion to the typep compiler-macro, ensuring consitency for the pointer type. Date: Mon Mar 29 09:34:20 2004 Author: ffjeld Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.4 movitz/losp/muerte/typep.lisp:1.5 --- movitz/losp/muerte/typep.lisp:1.4 Wed Mar 24 06:24:52 2004 +++ movitz/losp/muerte/typep.lisp Mon Mar 29 09:34:20 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.4 2004/03/24 11:24:52 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.5 2004/03/29 14:34:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -188,6 +188,8 @@ (tag5 (make-tag-typep :null)) (tag6 (make-tag-typep :other)) (pointer + (assert (equal (mapcar 'movitz::tag '(:cons :other :symbol)) + '(1 6 7))) `(with-inline-assembly-case () (do-case (t :boolean-zf=0 :labels (done)) (:compile-form (:result-mode :eax) ,object)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/inspect.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv25952 Modified Files: inspect.lisp Log Message: Some new functions required by GC functionality. Date: Mon Mar 29 09:33:29 2004 Author: ffjeld Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.4 movitz/losp/muerte/inspect.lisp:1.5 --- movitz/losp/muerte/inspect.lisp:1.4 Fri Mar 26 09:05:20 2004 +++ movitz/losp/muerte/inspect.lisp Mon Mar 29 09:33:29 2004 @@ -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.4 2004/03/26 14:05:20 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.5 2004/03/29 14:33:29 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -168,6 +168,24 @@ (when (member :catch types) (format t "~&catch: ~Z: ~S" tag tag)))))) +(defun shallow-copy (old) + "Allocate a new object that is similar to the old one." + (etypecase old + (cons + (cons (car old) (cdr old))) + (std-instance + (allocate-std-instance (std-instance-class old) + (std-instance-slots old))) + (symbol + (copy-symbol old t)) + (vector + (make-array (array-dimension old 0) + :element-type (array-element-type old) + :initial-contents old + :fill-pointer (fill-pointer old))) + (function + (copy-funobj old)) + )) (defun malloc-words (words) (malloc-clumps (1+ (truncate (1+ words) 2)))) @@ -182,3 +200,60 @@ (setf (memref x -6 (* i 2) :lisp) nil (memref x -2 (* i 2) :lisp) nil)) x)) + +(defun malloc-data-clumps (clumps) + "Allocate clumps for non-pointer data (i.e. doesn't require initialization)." + (malloc-clumps clumps)) + +(defun location-in-object-p (object location) + "Is location inside object?" + (let ((object-location (object-location object))) + (etypecase object + ((or number null character) + nil) + (cons + (<= object-location + location + (+ object-location 1))) + (symbol + (<= object-location + location + (+ -1 object-location #.(movitz::movitz-type-word-size :movitz-symbol)))) + (run-time-context + (<= object-location + location + (+ -1 object-location #.(movitz::movitz-type-word-size :movitz-constant-block)))) + (std-instance + (<= object-location + location + (+ -1 object-location #.(movitz::movitz-type-word-size :movitz-std-instance)))) + (function + (<= object-location + location + (+ -1 object-location + #.(movitz::movitz-type-word-size :movitz-funobj) + (funobj-num-constants object)))) + ((or vector-u8 string) + (<= object-location + location + (+ -1 object-location + #.(movitz::movitz-type-word-size :movitz-vector) + (* 2 (truncate (+ (array-dimension object 0) 7) 8))))) + (vector-u16 + (<= object-location + location + (+ -1 object-location + #.(movitz::movitz-type-word-size :movitz-vector) + (* 2 (truncate (+ (array-dimension object 0) 3) 4))))) + ((or vector-u32 simple-vector) + (<= object-location + location + (+ -1 object-location + #.(movitz::movitz-type-word-size :movitz-vector) + (* 2 (truncate (+ (array-dimension object 0) 1) 2))))) + (structure-object + (<= object-location + location + (+ -1 object-location + #.(movitz::movitz-type-word-size :movitz-struct) + (* 2 (truncate (+ (structure-object-length object) 1) 2))))))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/common-lisp.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv24561 Modified Files: common-lisp.lisp Log Message: Include muerte/scavenge. Date: Mon Mar 29 09:33:02 2004 Author: ffjeld Index: movitz/losp/muerte/common-lisp.lisp diff -u movitz/losp/muerte/common-lisp.lisp:1.2 movitz/losp/muerte/common-lisp.lisp:1.3 --- movitz/losp/muerte/common-lisp.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/common-lisp.lisp Mon Mar 29 09:33:01 2004 @@ -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.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: common-lisp.lisp,v 1.3 2004/03/29 14:33:01 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -47,6 +47,7 @@ (require :muerte/restarts) (require :muerte/conditions) (require :muerte/read) +(require :muerte/scavenge) (require :muerte/simple-streams) (require :muerte/io-port)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-functions.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv24011 Modified Files: basic-functions.lisp Log Message: Minor edits. Date: Mon Mar 29 09:32:40 2004 Author: ffjeld Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.7 movitz/losp/muerte/basic-functions.lisp:1.8 --- movitz/losp/muerte/basic-functions.lisp:1.7 Thu Mar 25 20:49:06 2004 +++ movitz/losp/muerte/basic-functions.lisp Mon Mar 29 09:32:40 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 4 18:41:57 2001 ;;;; -;;;; $Id: basic-functions.lisp,v 1.7 2004/03/26 01:49:06 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.8 2004/03/29 14:32:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -331,10 +331,10 @@ (getf (load-global-constant global-properties) property)) (define-compiler-macro object-location (object) + "The location is the object's address divided by fixnum-factor." `(with-inline-assembly (:returns :register) (:compile-form (:result-mode :register) ,object) (:andl ,(* -2 movitz::+movitz-fixnum-factor+) (:result-register)))) - (defun object-location (object) "The location is the object's address divided by fixnum-factor." @@ -355,4 +355,6 @@ (defun %word-offset (word offset) (%word-offset word offset)) + +

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/arrays.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv21953 Modified Files: arrays.lisp Log Message: Allocate (some) specialized arrays in terms of malloc-data-clumps rather than the old (deprecated) inline-malloc. Date: Mon Mar 29 09:32:12 2004 Author: ffjeld Index: movitz/losp/muerte/arrays.lisp diff -u movitz/losp/muerte/arrays.lisp:1.12 movitz/losp/muerte/arrays.lisp:1.13 --- movitz/losp/muerte/arrays.lisp:1.12 Sun Mar 28 11:20:44 2004 +++ movitz/losp/muerte/arrays.lisp Mon Mar 29 09:32:12 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sun Feb 11 23:14:04 2001 ;;;; -;;;; $Id: arrays.lisp,v 1.12 2004/03/28 16:20:44 ffjeld Exp $ +;;;; $Id: arrays.lisp,v 1.13 2004/03/29 14:32:12 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -505,45 +505,46 @@ (setf fill-pointer (if (integerp fill-pointer) fill-pointer dimensions)) (cond ((equal element-type 'character) - (let ((a (inline-malloc (+ #.(bt:sizeof 'movitz::movitz-vector) dimensions) - :other-tag :vector - :wide-other-tag #.(bt:enum-value 'movitz::movitz-vector-element-type - :character)))) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) + (let ((array (malloc-data-clumps (truncate (+ dimensions 7 8) 8)))) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) 0 :unsigned-byte16) 0) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) 0 :unsigned-byte16) dimensions) - (setf (fill-pointer a) fill-pointer) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::type) + 0 :unsigned-byte16) + #.(movitz:vector-type-tag :character)) + (check-type array string) + (setf (fill-pointer array) fill-pointer) (cond (initial-element (check-type initial-element character) (dotimes (i dimensions) - (setf (char%unsafe a i) initial-element))) + (setf (char array i) initial-element))) (initial-contents (dotimes (i dimensions) - (setf (char a i) (elt initial-contents i))))) - a)) + (setf (char array i) (elt initial-contents i))))) + array)) ((member element-type '(u8 (unsigned-byte 8)) :test #'equal) - (let ((a (inline-malloc (+ #.(bt:sizeof 'movitz::movitz-vector) dimensions) - :other-tag :vector - :wide-other-tag #.(bt:enum-value 'movitz::movitz-vector-element-type - :u8)))) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) + (let ((array (malloc-data-clumps (truncate (+ dimensions 7 8) 8)))) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) 0 :unsigned-byte16) 0) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) 0 :unsigned-byte16) dimensions) - (setf (fill-pointer a) fill-pointer) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::type) + 0 :unsigned-byte16) + #.(movitz:vector-type-tag :u8)) + (setf (fill-pointer array) fill-pointer) (cond (initial-element (dotimes (i dimensions) - (setf (aref a i) initial-element))) + (setf (aref array i) initial-element))) (initial-contents - (replace a initial-contents))) - a)) + (replace array initial-contents))) + array)) ((member element-type '(u32 (unsigned-byte 32)) :test #'equal) (let ((a (inline-malloc (+ #.(bt:sizeof 'movitz::movitz-vector) (* 4 dimensions)) :other-tag :vector

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/scavenge.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv14089 Added Files: scavenge.lisp Log Message: Utility functions for scavenging heap memory and stack memory for pointer references. Date: Mon Mar 29 09:30:22 2004 Author: ffjeld

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