Commit 5d48b48d authored by Frode Vatvedt Fjeld's avatar Frode Vatvedt Fjeld

Change the name "constant-block" to "run-time-context" so as to be

consistent. "Run-time-context" is the name that's I've been using in
newer documentation and code.
parent d6457e2b
......@@ -8,7 +8,7 @@
;;;; Created at: Wed Oct 25 12:30:49 2000
;;;; Distribution: See the accompanying file COPYING.
;;;;
;;;; $Id: compiler.lisp,v 1.84 2004/07/23 16:42:38 ffjeld Exp $
;;;; $Id: compiler.lisp,v 1.85 2004/07/24 01:32:06 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -499,6 +499,8 @@ Side-effects each binding's binding-store-type."
(setf (binding-store-type binding)
(cond
((not (null (type-analysis-thunks analysis)))
;;; (when (not (rest (type-analysis-thunks analysis)))
;;; (warn "One thunk: ~S for ~S" binding (first (type-analysis-thunks analysis))))
(multiple-value-list (type-specifier-encode t)))
(t (type-analysis-encoded-type analysis))))
#+ignore
......@@ -1520,7 +1522,7 @@ There is (propably) a bug in the peephole optimizer." recursive-count))
(when (instruction-is op :call)
(let ((x (global-constant-operand (second op))))
(flet ((try (name)
(and (eql x (slot-offset 'movitz-constant-block name))
(and (eql x (slot-offset 'movitz-run-time-context name))
name)))
(cond
((not x) nil)
......@@ -3555,7 +3557,7 @@ loading borrowed bindings."
((atom tree)
tree)
((eq :edi-offset (car tree))
(check-type (cadr tree) symbol "a Movitz constant-block label")
(check-type (cadr tree) symbol "a Movitz run-time-context label")
(+ (global-constant-offset (cadr tree))
(reduce #'+ (cddr tree))))
(t (cons (fix-edi-offset (car tree))
......
This diff is collapsed.
......@@ -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.31 2004/07/23 15:36:46 ffjeld Exp $
;;;; $Id: inspect.lisp,v 1.32 2004/07/27 09:19:14 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -303,7 +303,7 @@ Obviously, this correspondence is not guaranteed to hold e.g. across GC."
(run-time-context
(<= object-location
location
(+ -1 object-location #.(movitz::movitz-type-word-size :movitz-constant-block))))
(+ -1 object-location #.(movitz::movitz-type-word-size :movitz-run-time-context))))
(std-instance
(<= object-location
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.16 2004/07/20 23:51:10 ffjeld Exp $
;;;; $Id: los-closette.lisp,v 1.17 2004/07/24 01:30:49 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -993,10 +993,10 @@ next-emf as its target for call-next-method."
(defclass run-time-context (t)
()
(:metaclass built-in-class)
(:size #.(bt:sizeof 'movitz::movitz-constant-block))
(:slot-map #.(movitz::slot-map 'movitz::movitz-constant-block
(cl:+ (bt:slot-offset 'movitz::movitz-constant-block
'movitz::constant-block-start)
(:size #.(bt:sizeof 'movitz::movitz-run-time-context))
(:slot-map #.(movitz::slot-map 'movitz::movitz-run-time-context
(cl:+ (bt:slot-offset 'movitz::movitz-run-time-context
'movitz::run-time-context-start)
0))))
(defclass stream () ())
......
......@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Fri Jun 7 15:05:57 2002
;;;;
;;;; $Id: more-macros.lisp,v 1.15 2004/07/20 08:54:34 ffjeld Exp $
;;;; $Id: more-macros.lisp,v 1.16 2004/07/20 23:51:15 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -328,7 +328,8 @@ respect to multiple threads."
(equal context '(current-run-time-context))))
form
(let ((slot-name (movitz::eval-form slot-name env)))
(ecase (bt:binary-slot-type 'movitz::movitz-constant-block (intern (symbol-name slot-name) :movitz))
(ecase (bt:binary-slot-type 'movitz::movitz-run-time-context
(intern (symbol-name slot-name) :movitz))
(movitz::word
`(with-inline-assembly (:returns :eax)
(:locally (:movl (:edi (:edi-offset ,slot-name)) :eax))))
......
......@@ -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.9 2004/07/15 21:07:27 ffjeld Exp $
;;;; $Id: run-time-context.lisp,v 1.10 2004/07/20 08:54:48 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -48,7 +48,7 @@
(equal context '(current-run-time-context))))
form
(let ((slot-name (movitz:movitz-eval slot-name env)))
(ecase (bt:binary-slot-type 'movitz::movitz-constant-block (intern (symbol-name slot-name) :movitz))
(ecase (bt:binary-slot-type 'movitz::movitz-run-time-context (intern (symbol-name slot-name) :movitz))
(movitz:word
`(with-inline-assembly (:returns :eax)
(:compile-form (:result-mode :eax) ,value)
......@@ -114,8 +114,8 @@
(defun clone-run-time-context (&key (parent (current-run-time-context))
(name :anonymous))
(check-type parent run-time-context)
(let ((context (malloc-pointer-words #.(cl:truncate (bt:sizeof 'movitz::movitz-constant-block) 4))))
(memcopy context parent -6 0 0 #.(bt:sizeof 'movitz::movitz-constant-block)
(let ((context (malloc-pointer-words #.(cl:truncate (bt:sizeof 'movitz::movitz-run-time-context) 4))))
(memcopy context parent -6 0 0 #.(bt:sizeof 'movitz::movitz-run-time-context)
:unsigned-byte8)
(setf (%run-time-context-slot 'name context) name
(%run-time-context-slot 'self context) context)
......
......@@ -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.10 2004/07/22 00:28:06 ffjeld Exp $
;;;; $Id: procfs-image.lisp,v 1.11 2004/07/23 15:32:55 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -109,7 +109,7 @@
(cons (mapcar #'movitz-print expr))
((not movitz-object)
expr)
((or movitz-nil movitz-constant-block) nil)
((or movitz-nil movitz-run-time-context) nil)
(movitz-std-instance expr)
(movitz-symbol
(intern (movitz-print (movitz-symbol-name expr))))
......@@ -242,7 +242,7 @@
(defun current-dynamic-context ()
(slot-value (image-constant-block *image*) 'dynamic-env))
(slot-value (image-run-time-context *image*) 'dynamic-env))
(defun stack-ref-p (pointer)
(let ((top #xa0000)
......@@ -265,7 +265,7 @@
(stack-ref dynamic-context 4 0 :lisp))
(defun load-global-constant (slot-name)
(slot-value (image-constant-block *image*) slot-name))
(slot-value (image-run-time-context *image*) slot-name))
(defun image-eq (x y)
(eql (movitz-intern x) (movitz-intern y)))
......
......@@ -8,7 +8,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Fri Nov 24 16:22:59 2000
;;;;
;;;; $Id: special-operators.lisp,v 1.31 2004/07/20 12:40:07 ffjeld Exp $
;;;; $Id: special-operators.lisp,v 1.32 2004/07/24 01:30:32 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -632,7 +632,7 @@ The valid parameters are~{ ~S~}."
(cdr form)
(assert (not argument))
(compiler-values ()
:code `((:call (:edi ,(slot-offset 'movitz-constant-block if-name))))
:code `((:call (:edi ,(slot-offset 'movitz-run-time-context if-name))))
:returns :nothing)))
(define-special-operator inlined-not (&all forward &form form &result-mode result-mode)
......
......@@ -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.32 2004/07/24 01:30:40 ffjeld Exp $
;;;; $Id: storage-types.lisp,v 1.33 2004/07/27 09:13:36 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -621,7 +621,7 @@ integer (native lisp) value."
(assert (eq type 'word))
(cond
((eq 'muerte::unbound obj)
(binary-slot-value (image-constant-block *image*) 'unbound-function))
(binary-slot-value (image-run-time-context *image*) 'unbound-function))
((typep obj 'movitz-funobj)
(movitz-intern obj))
((symbolp obj)
......@@ -987,7 +987,7 @@ integer (native lisp) value."
(length
:binary-type lu16
:initarg :length
:accessor movitz-bignum-length
:accessor movitz-struct-length
:map-binary-write (lambda (x &optional type)
(declare (ignore type))
(check-type x (unsigned-byte 14))
......
......@@ -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.8 2004/07/08 18:53:38 ffjeld Exp $
;;;; $Id: stream-image.lisp,v 1.9 2004/07/23 15:34:36 ffjeld Exp $
;;;;
;;;;------------------------------------------------------------------
......@@ -51,7 +51,7 @@
(value)
"Unable to set memory-stream's file-position to #x~X." value))
(defmethod image-constant-block ((image stream-image))
(defmethod image-run-time-context ((image stream-image))
(movitz-word (image-register32 image :edi)))
(defmethod movitz-word-by-image ((image stream-image) word)
......@@ -65,11 +65,11 @@
(make-instance 'movitz-character :char (code-char (ldb (byte 8 8) word))))
(:null
#+ignore
(assert (= (- word (tag :null)) (image-constant-block-address image)) (word)
(assert (= (- word (tag :null)) (image-run-time-context-address image)) (word)
"The word #x~8,'0X has NIL tag but isn't NIL." word)
(setf (image-stream-position image) 0 #+ignore (- word (tag :null)))
(let ((object (read-binary 'movitz-constant-block (image-stream image))))
(setf (movitz-heap-object-word (movitz-constant-block-null-symbol object))
(let ((object (read-binary 'movitz-run-time-context (image-stream image))))
(setf (movitz-heap-object-word (movitz-run-time-context-null-symbol object))
word)
object))
(:symbol
......
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