Commit 26370953 authored by Frode Vatvedt Fjeld's avatar Frode Vatvedt Fjeld

Removed references to the old movitz-vector class.

parent eeba78c9
......@@ -9,7 +9,7 @@
;;;; Created at: Sun Oct 22 00:22:43 2000
;;;; Distribution: See the accompanying file COPYING.
;;;;
;;;; $Id: image.lisp,v 1.40 2004/06/29 23:16:43 ffjeld Exp $
;;;; $Id: image.lisp,v 1.41 2004/07/07 17:37:01 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -613,7 +613,7 @@
'(muerte.cl:null muerte.cl:cons muerte.cl:fixnum muerte.cl:symbol
muerte.cl:character muerte.cl:function muerte.cl:condition
muerte.cl:integer muerte.cl:ratio
muerte.cl:vector muerte.cl:string muerte.cl:array
muerte.cl:vector muerte.cl:string muerte.cl:bit-vector muerte.cl:array
muerte.cl:class muerte.cl:standard-class
muerte.cl:standard-generic-function
muerte:run-time-context
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Sun Feb 11 23:14:04 2001
;;;;
;;;; $Id: arrays.lisp,v 1.31 2004/07/08 11:30:14 ffjeld Exp $
;;;; $Id: arrays.lisp,v 1.32 2004/07/08 15:28:52 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -22,7 +22,7 @@
(in-package muerte)
(defun vector-element-type (object)
(memref object #.(bt:slot-offset 'movitz::movitz-vector 'movitz::element-type) 0
(memref object #.(bt:slot-offset 'movitz::movitz-basic-vector 'movitz::element-type) 0
:unsigned-byte8))
(defmacro vector-double-dispatch ((s1 s2) &rest clauses)
......@@ -44,12 +44,12 @@
(define-compiler-macro vector-element-type (object)
`(memref ,object 0
#.(bt:slot-offset 'movitz::movitz-vector 'movitz::element-type)
,(bt:slot-offset 'movitz::movitz-basic-vector 'movitz::element-type)
:unsigned-byte8))
(defun (setf vector-element-type) (numeric-element-type vector)
(check-type vector vector)
(setf (memref vector #.(bt:slot-offset 'movitz::movitz-vector 'movitz::element-type) 0
(setf (memref vector #.(bt:slot-offset 'movitz::movitz-basic-vector 'movitz::element-type) 0
:unsigned-byte8)
numeric-element-type))
......@@ -75,7 +75,7 @@
(movitz-accessor array movitz-basic-vector num-elements))))
(defun shrink-vector (vector new-size)
(set-movitz-accessor-u16 vector movitz-vector num-elements new-size)
(setf-movitz-accessor (vector movitz-basic-vector num-elements) new-size)
vector)
(define-compiler-macro %basic-vector-has-fill-pointer-p (vector)
......@@ -205,19 +205,19 @@
((do-it ()
`(with-inline-assembly (:returns :eax)
(:declare-label-set basic-vector-dispatcher
,(print (loop with x = (make-list 8 :initial-element 'unknown)
,(loop with x = (make-list 8 :initial-element 'unknown)
for et in '(:any-t :character :u8 :u32 :code :bit)
do (setf (elt x (bt:enum-value
'movitz::movitz-vector-element-type
et))
et)
finally (return x))))
finally (return x)))
(:compile-two-forms (:eax :ebx) array index)
(:movl (:eax ,movitz:+other-type-offset+) :ecx)
(:cmpb ,(movitz:tag :basic-vector) :cl)
(:jne '(:sub-program (not-vector)
(:compile-form (:result-mode :ignore)
(error "Not an array: ~S." array))))
;;; (:cmpb ,(movitz:tag :basic-vector) :cl)
;;; (:jne '(:sub-program (not-vector)
;;; (:compile-form (:result-mode :ignore)
;;; (error "Not an array: ~S." array))))
(:testb ,movitz:+movitz-fixnum-zmask+ :bl)
(:jnz '(:sub-program (illegal-index)
(:compile-form (:result-mode :ignore)
......@@ -387,7 +387,7 @@
(defun svref%unsafe (simple-vector index)
(with-inline-assembly (:returns :eax)
(:compile-two-forms (:eax :ebx) simple-vector index)
(:movl (:eax :ebx #.(bt:slot-offset 'movitz:movitz-vector 'movitz::data)) :eax)))
(:movl (:eax :ebx #.(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data)) :eax)))
(defun (setf svref%unsafe) (value simple-vector index)
(setf (svref%unsafe simple-vector index) value))
......@@ -745,7 +745,7 @@ and return accessors for that subsequence (fast & unsafe accessors, that is)."
(define-compiler-macro bvref-u16 (&whole form vector offset index &environment env)
(let ((actual-index (and (movitz:movitz-constantp index env)
(movitz::eval-form index env))))
(movitz:movitz-eval index env))))
(if (not (typep actual-index '(integer 0 *)))
`(bvref-u16-fallback ,vector ,offset ,index)
(let ((var (gensym)))
......@@ -754,11 +754,14 @@ and return accessors for that subsequence (fast & unsafe accessors, that is)."
(bvref-u16-fallback ,var ,offset ,index)
(with-inline-assembly (:returns :untagged-fixnum-ecx)
(:compile-two-forms (:eax :ecx) ,var ,offset)
(:shrl #.movitz::+movitz-fixnum-shift+ :ecx)
(:andl #xfffe :ecx)
(:cmpw :cx (:eax #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements)))
(:jbe '(:sub-program () (:int 69)))
(:movw (:eax :ecx ,(+ actual-index (bt:slot-offset 'movitz::movitz-vector 'movitz::data))) :cx)
(:cmpl (:eax ,(bt:slot-offset 'movitz::movitz-basic-vector
'movitz::num-elements))
:ecx)
(:jnc '(:sub-program () (:int 69)))
(:shrl ,movitz::+movitz-fixnum-shift+ :ecx)
(:movw (:eax :ecx ,(+ actual-index (bt:slot-offset 'movitz::movitz-basic-vector
'movitz::data)))
:cx)
(:xchgb :cl :ch))))))))
(defun bvref-u16-fallback (vector offset index)
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Fri Oct 24 09:50:41 2003
;;;;
;;;; $Id: inspect.lisp,v 1.13 2004/07/07 17:37:20 ffjeld Exp $
;;;; $Id: inspect.lisp,v 1.14 2004/07/08 15:23:15 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -249,19 +249,19 @@ The unit clump is 8 bytes, or two words."
(<= object-location
location
(+ -1 object-location
#.(movitz::movitz-type-word-size :movitz-vector)
#.(movitz::movitz-type-word-size 'movitz-basic-vector)
(* 2 (truncate (+ (array-dimension object 0) 7) 8)))))
(vector-u16
(<= object-location
location
(+ -1 object-location
#.(movitz::movitz-type-word-size :movitz-vector)
#.(movitz::movitz-type-word-size 'movitz-basic-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)
#.(movitz::movitz-type-word-size 'movitz-basic-vector)
(* 2 (truncate (+ (array-dimension object 0) 1) 2)))))
(structure-object
(<= object-location
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Tue Jul 23 14:29:10 2002
;;;;
;;;; $Id: los-closette.lisp,v 1.10 2004/04/21 15:07:27 ffjeld Exp $
;;;; $Id: los-closette.lisp,v 1.11 2004/05/24 14:59:08 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -871,7 +871,7 @@ is no unspecialized method was called."))
(:compile-form (:result-mode :eax) instance)
(:movl (:eax ,(bt:slot-offset 'movitz::movitz-std-instance 'movitz::slots))
:eax)
(:movl (:eax ,(+ (bt:slot-offset 'movitz::movitz-vector 'movitz::data)
(:movl (:eax ,(+ (bt:slot-offset 'movitz::movitz-basic-vector 'movitz::data)
(* location 4)))
:eax)
(:cmpl :eax ,(movitz::make-indirect-reference :edi (movitz::global-constant-offset 'unbound-value)))
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Wed Nov 12 18:33:02 2003
;;;;
;;;; $Id: run-time-context.lisp,v 1.5 2004/04/07 00:18:57 ffjeld Exp $
;;;; $Id: run-time-context.lisp,v 1.6 2004/04/19 15:05:01 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -78,7 +78,7 @@
(movitz:code-vector-word
`(with-inline-assembly (:returns :eax)
(:compile-form (:result-mode :eax) ,value)
(:leal (:eax ,(bt:slot-offset 'movitz:movitz-vector 'movitz::data)) :ecx)
(:leal (:eax ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data)) :ecx)
(:locally (:movl :ecx (:edi (:edi-offset ,slot-name))))))))))
(defun (setf %run-time-context-slot) (value slot-name &optional (context (current-run-time-context)))
......
......@@ -9,7 +9,7 @@
;;;; Created at: Fri Dec 8 11:07:53 2000
;;;; Distribution: See the accompanying file COPYING.
;;;;
;;;; $Id: typep.lisp,v 1.22 2004/07/08 11:30:41 ffjeld Exp $
;;;; $Id: typep.lisp,v 1.23 2004/07/08 15:28:12 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -76,29 +76,26 @@
(:leal (:eax ,(cl:- (movitz:tag :other))) :ecx)
(:testb 7 :cl)
(:branch-when :boolean-zf=0)
(:cmpb ,(movitz:tag tag-name)
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpb ,(movitz:tag tag-name) (:eax ,movitz:+other-type-offset+))
(:branch-when :boolean-zf=0))
(do-case (:boolean-branch-on-true :same :labels (other-typep-failed))
(:compile-form (:result-mode :eax) ,object)
(:leal (:eax ,(cl:- (movitz:tag :other))) :ecx)
(:testb 7 :cl)
(:jnz 'other-typep-failed)
(:cmpb ,(movitz:tag tag-name)
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpb ,(movitz:tag tag-name) (:eax ,movitz:+other-type-offset+))
(:branch-when :boolean-zf=1)
other-typep-failed)
(do-case (t :boolean-zf=1 :labels (other-typep-failed))
(:compile-form (:result-mode :eax) ,object)
(:leal (:eax ,(cl:- (movitz:tag :other))) :ecx)
(:leal (:eax ,movitz:+other-type-offset+) :ecx)
(:testb 7 :cl)
(:jnz 'other-typep-failed)
(:cmpb ,(movitz:tag tag-name)
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpb ,(movitz:tag tag-name) (:eax ,movitz:+other-type-offset+))
other-typep-failed)))
(make-basic-vector-typep (element-type)
(assert (= 1 (- (bt:slot-offset 'movitz::movitz-vector 'movitz::element-type)
(bt:slot-offset 'movitz::movitz-vector 'movitz::type))))
(assert (= 1 (- (bt:slot-offset 'movitz::movitz-basic-vector 'movitz::element-type)
(bt:slot-offset 'movitz::movitz-basic-vector 'movitz::type))))
(let ((type-code (dpb (bt:enum-value 'movitz::movitz-vector-element-type element-type)
(byte 8 8)
(movitz:tag :basic-vector))))
......@@ -108,16 +105,14 @@
(:leal (:eax ,(- (movitz::tag :other))) :ecx)
(:testb 7 :cl)
(:branch-when :boolean-zf=0)
(:cmpw ,type-code
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpw ,type-code (:eax ,movitz:+other-type-offset+))
(:branch-when :boolean-zf=0))
(do-case (:boolean-branch-on-true :same :labels (vector-typep-failed))
(:compile-form (:result-mode :eax) ,object)
(:leal (:eax ,(- (movitz::tag :other))) :ecx)
(:testb 7 :cl)
(:jnz 'vector-typep-failed)
(:cmpw ,type-code
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpw ,type-code (:eax ,movitz:+other-type-offset+))
(:branch-when :boolean-zf=1)
vector-typep-failed)
(do-case (t :boolean-zf=1 :labels (vector-typep-failed))
......@@ -125,8 +120,7 @@
(:leal (:eax ,(- (movitz::tag :other))) :ecx)
(:testb 7 :cl)
(:jnz 'vector-typep-failed)
(:cmpw ,type-code
(:eax ,(bt:slot-offset 'movitz::movitz-vector 'movitz::type)))
(:cmpw ,type-code (:eax ,movitz:+other-type-offset+))
vector-typep-failed))))
(make-function-typep (funobj-type)
(assert (= 1 (- (bt:slot-offset 'movitz::movitz-funobj 'movitz::funobj-type)
......
;;;;------------------------------------------------------------------
;;;;
;;;; 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 <frodef@acm.org>
;;;; Created at: Wed Nov 5 21:53:34 2003
;;;;
;;;; $Id: variables.lisp,v 1.4 2004/04/06 14:31:09 ffjeld Exp $
;;;; $Id: variables.lisp,v 1.5 2004/04/13 14:21:19 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Sat Nov 15 21:39:55 2003
;;;;
;;;; $Id: packages.lisp,v 1.27 2004/06/17 09:49:03 ffjeld Exp $
;;;; $Id: packages.lisp,v 1.28 2004/07/08 11:28:34 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -1329,7 +1329,6 @@
#:movitz-heap-object
#:movitz-basic-vector
#:movitz-vector
#:movitz-vector-num-elements
#:movitz-vector-element-type
#:movitz-vector-symbolic-data
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Fri Aug 24 11:39:37 2001
;;;;
;;;; $Id: procfs-image.lisp,v 1.7 2004/06/06 03:02:45 ffjeld Exp $
;;;; $Id: procfs-image.lisp,v 1.8 2004/06/29 23:15:47 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -118,7 +118,7 @@
(movitz-vector-symbolic-data expr)))
(movitz-fixnum
(movitz-fixnum-value expr))
((or movitz-vector movitz-basic-vector)
(movitz-basic-vector
(map 'vector #'movitz-print (movitz-vector-symbolic-data expr)))
(movitz-cons
(cons (movitz-print (movitz-car expr))
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Mon Aug 27 14:46:50 2001
;;;;
;;;; $Id: stream-image.lisp,v 1.6 2004/06/01 15:16:59 ffjeld Exp $
;;;; $Id: stream-image.lisp,v 1.7 2004/06/29 23:15:52 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -89,8 +89,6 @@
(read-binary 'movitz-funobj (image-stream image)))
(:basic-vector
(read-binary 'movitz-basic-vector (image-stream image)))
(:vector
(read-binary 'movitz-vector (image-stream image)))
(:defstruct
(read-binary 'movitz-struct (image-stream image)))
(:std-instance
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment