Commit 2314bd6b authored by Frode Vatvedt Fjeld's avatar Frode Vatvedt Fjeld

*** empty log message ***

parent 7687ac9e
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Created at: Sun Oct 22 00:22:43 2000
;;;; Distribution: See the accompanying file COPYING. ;;;; Distribution: See the accompanying file COPYING.
;;;; ;;;;
;;;; $Id: image.lisp,v 1.92 2005/04/30 21:15:35 ffjeld Exp $ ;;;; $Id: image.lisp,v 1.93 2005/04/30 23:22:14 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -1586,6 +1586,7 @@ In sum this accounts for ~,1F%, or ~D bytes.~%;;~%" ...@@ -1586,6 +1586,7 @@ In sum this accounts for ~,1F%, or ~D bytes.~%;;~%"
(array expr) (array expr)
(cons (mapcar #'movitz-print expr)) (cons (mapcar #'movitz-print expr))
((or (satisfies movitz-null) movitz-run-time-context) nil) ((or (satisfies movitz-null) movitz-run-time-context) nil)
(movitz-unbound-value 'unbound)
(movitz-fixnum (movitz-fixnum
(movitz-fixnum-value expr)) (movitz-fixnum-value expr))
(movitz-std-instance expr) (movitz-std-instance expr)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Created at: Fri Dec 1 18:08:32 2000
;;;; Distribution: See the accompanying file COPYING. ;;;; Distribution: See the accompanying file COPYING.
;;;; ;;;;
;;;; $Id: los0.lisp,v 1.39 2005/04/18 07:08:42 ffjeld Exp $ ;;;; $Id: los0.lisp,v 1.40 2005/04/24 16:46:03 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -1317,35 +1317,13 @@ Can be used to measure the overhead of primitive function." ...@@ -1317,35 +1317,13 @@ Can be used to measure the overhead of primitive function."
data))) data)))
(muerte.ip4:tftp/ethernet-write :129.242.19.132 "movitz-screendump.txt" data (muerte.ip4:tftp/ethernet-write :129.242.19.132 "movitz-screendump.txt" data
:quiet t :quiet t
:mac (muerte.ip4::polling-arp ip4::*ip4-router* :mac (muerte.ip4::polling-arp
(lambda () muerte.ip4::*ip4-router*
(eql #\escape (muerte.x86-pc.keyboard:poll-char))))))) (lambda ()
(eql #\escape (muerte.x86-pc.keyboard:poll-char)))))))
(defun mumbojumbo (x)
(with-inline-assembly (:returns :eax)
(:compile-form (:result-mode :untagged-fixnum-ecx) x)
(:movl 0 :eax)
(:cmpl -1 :ecx)
(:jno 'no-overflow)
(:movl 4 :eax)
no-overflow))
(defvar *segment-descriptor-table*) (defvar *segment-descriptor-table*)
(defun threading ()
(let* ((thread (muerte::clone-run-time-context :name 'subthread))
(stack (make-array 1022 :element-type '(unsigned-byte 32))))
(setf (segment-descriptor *segment-descriptor-table* 8)
(segment-descriptor *segment-descriptor-table* (truncate (segment-register :fs) 8)))
(warn "Thread ~S FS base: ~S"
thread
(setf (segment-descriptor-base-location *segment-descriptor-table* 8)
(+ (object-location thread)
(muerte::location-physical-offset))))
(format *terminal-io* "~&Switching...")
(setf (segment-register :fs) (* 8 8))
(format *terminal-io* "ok.~%")
(values thread stack)))
(defun genesis () (defun genesis ()
;; (install-shallow-binding) ;; (install-shallow-binding)
...@@ -1358,7 +1336,7 @@ Can be used to measure the overhead of primitive function." ...@@ -1358,7 +1336,7 @@ Can be used to measure the overhead of primitive function."
(format t "Extended memory: ~D KB~%" extended-memsize) (format t "Extended memory: ~D KB~%" extended-memsize)
(idt-init) (idt-init)
(setf *segment-descriptor-table* ; Ensure we have a GDT with 16 entries, in static-space. (setf *segment-descriptor-table* ; Ensure we have a GDT with 16 entries, in static-space.
(muerte::install-global-segment-table (muerte::install-global-segment-table
(muerte::dump-global-segment-table :entries 16))) (muerte::dump-global-segment-table :entries 16)))
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org> ;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Fri Aug 24 11:39:37 2001 ;;;; Created at: Fri Aug 24 11:39:37 2001
;;;; ;;;;
;;;; $Id: procfs-image.lisp,v 1.22 2005/01/04 16:56:44 ffjeld Exp $ ;;;; $Id: procfs-image.lisp,v 1.23 2005/04/24 20:36:44 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -130,7 +130,9 @@ ...@@ -130,7 +130,9 @@
(map 'vector #'movitz-print (movitz-vector-symbolic-data expr))) (map 'vector #'movitz-print (movitz-vector-symbolic-data expr)))
(movitz-cons (movitz-cons
(cons (movitz-print (movitz-car expr)) (cons (movitz-print (movitz-car expr))
(movitz-print (movitz-cdr expr)))))) (movitz-print (movitz-cdr expr))))
(movitz-funobj
expr)))
(defmethod report-gdtr ((image bochs-image)) (defmethod report-gdtr ((image bochs-image))
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org> ;;;; Author: Frode Vatvedt Fjeld <frodef@acm.org>
;;;; Created at: Mon Aug 27 14:46:50 2001 ;;;; Created at: Mon Aug 27 14:46:50 2001
;;;; ;;;;
;;;; $Id: stream-image.lisp,v 1.11 2004/08/06 14:43:55 ffjeld Exp $ ;;;; $Id: stream-image.lisp,v 1.12 2005/04/20 06:51:57 ffjeld Exp $
;;;; ;;;;
;;;;------------------------------------------------------------------ ;;;;------------------------------------------------------------------
...@@ -70,9 +70,12 @@ ...@@ -70,9 +70,12 @@
(image-nil-object image)) (image-nil-object image))
(:symbol (:symbol
;; (warn "loading new symbol at ~S" word) ;; (warn "loading new symbol at ~S" word)
(setf (image-stream-position image) (if (= word #x7fffffff)
(- word (tag :symbol))) (make-instance 'movitz-unbound-value)
(read-binary 'movitz-symbol (image-stream image))) (progn
(setf (image-stream-position image)
(- word (tag :symbol)))
(read-binary 'movitz-symbol (image-stream image)))))
(:other (:other
(setf (image-stream-position image) (setf (image-stream-position image)
(+ 0 (extract-pointer word))) (+ 0 (extract-pointer word)))
......
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