Adjust parser for hardware trap frames to account for extra object

pushed by microcode.

diff --git a/v7/src/runtime/conpar.scm b/v7/src/runtime/conpar.scm
index 0304596bbaa8d05eee4a9011313b436220d83cf2..16d593964a8d69e7a24dad9e1ea02f87d3d3746b 100644 (file)
--- a/v7/src/runtime/conpar.scm
+++ b/v7/src/runtime/conpar.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/conpar.scm,v 14.10 1989/10/26 06:45:54 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/conpar.scm,v 14.11 1989/12/07 05:35:31 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -472,7 +472,7 @@ MIT in each case. |#
                (loop (1+ size))
                (-1+ size)))))
   unspecific)
-
+\f
 (define stack-frame-types)
 (define stack-frame-type/compiled-return-address)
 (define stack-frame-type/return-to-interpreter)
@@ -506,7 +506,7 @@ MIT in each case. |#
                        true
                        length
                        parser/standard-next))
-\f
+
     (standard-frame 'RESTORE-TO-STATE-POINT 2 parser/restore-dynamic-state)
     (standard-frame 'RESTORE-FLUIDS 2 parser/restore-fluid-bindings)
     (standard-frame 'RESTORE-INTERRUPT-MASK 2 parser/restore-interrupt-mask)
@@ -520,7 +520,7 @@ MIT in each case. |#
     (standard-frame 'REENTER-COMPILED-CODE 2)
     (standard-frame 'COMPILER-INTERRUPT-RESTART 3)
     (standard-frame 'COMPILER-LINK-CACHES-RESTART 8)
-
+\f
     (standard-subproblem 'IN-PACKAGE-CONTINUE 2)
     (standard-subproblem 'ACCESS-CONTINUE 2)
     (standard-subproblem 'PRIMITIVE-COMBINATION-1-APPLY 2)
@@ -556,7 +556,6 @@ MIT in each case. |#
     (standard-subproblem 'COMPILER-DEFINITION-RESTART 5)
     (standard-subproblem 'COMPILER-ASSIGNMENT-TRAP-RESTART 5)
     (standard-subproblem 'MOVE-TO-ADJACENT-POINT 6)
-\f
     (standard-subproblem 'COMBINATION-SAVE-VALUE length/combination-save-value)
     (standard-subproblem 'REPEAT-PRIMITIVE length/repeat-primitive)
 
@@ -584,11 +583,12 @@ MIT in each case. |#
 
 (define-integrable hardware-trap/signal-index 1)
 (define-integrable hardware-trap/signal-name-index 2)
-(define-integrable hardware-trap/stack-index 3)
-(define-integrable hardware-trap/state-index 4)
-(define-integrable hardware-trap/pc-info1-index 5)
-(define-integrable hardware-trap/pc-info2-index 6)
-(define-integrable hardware-trap/extra-info-index 7)
+(define-integrable hardware-trap/code-index 3)
+(define-integrable hardware-trap/stack-index 4)
+(define-integrable hardware-trap/state-index 5)
+(define-integrable hardware-trap/pc-info1-index 6)
+(define-integrable hardware-trap/pc-info2-index 7)
+(define-integrable hardware-trap/extra-info-index 8)
 
 (define (length/hardware-trap stream offset)
   (let ((state (element-stream/ref stream hardware-trap/state-index))
@@ -630,19 +630,6 @@ MIT in each case. |#
                    stack-frame-type/hardware-trap)))
       (error "guarantee-hardware-trap-frame: invalid" frame)))
 \f
-(define word-size)
-
-(define (print-register block index name)
-  (let ((value
-        (let ((bit-string (bit-string-allocate word-size)))
-          (read-bits! block (* word-size (1+ index)) bit-string)
-          (bit-string->unsigned-integer bit-string))))
-    (newline)
-    (write-string "  ")
-    (write-string name)
-    (write-string " = ")
-    (write-string (number->string value 16))))
-
 (define (hardware-trap-frame/print-registers frame)
   (guarantee-hardware-trap-frame frame)
   (let ((block (stack-frame/ref frame hardware-trap/extra-info-index)))
@@ -659,6 +646,19 @@ MIT in each case. |#
                                                 (number->string i)))
                  (loop (1+ i)))))))))
 
+(define (print-register block index name)
+  (let ((value
+        (let ((bit-string (bit-string-allocate word-size)))
+          (read-bits! block (* word-size (1+ index)) bit-string)
+          (bit-string->unsigned-integer bit-string))))
+    (newline)
+    (write-string "  ")
+    (write-string name)
+    (write-string " = ")
+    (write-string (number->string value 16))))
+
+(define word-size)
+
 (define (hardware-trap-frame/print-stack frame)
   (guarantee-hardware-trap-frame frame)
   (let ((elements

diff --git a/v7/src/runtime/version.scm b/v7/src/runtime/version.scm
index 81ebc244157294c0409d5bce126caccbea8fa643..7e05115e5035d21afee8d78aac78f11b326b5c0d 100644 (file)
--- a/v7/src/runtime/version.scm
+++ b/v7/src/runtime/version.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.67 1989/11/15 02:47:09 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v7/src/runtime/version.scm,v 14.68 1989/12/07 05:36:28 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -45,7 +45,7 @@ MIT in each case. |#
                     '()))
   (add-system! microcode-system)
   (add-event-receiver! event:after-restore snarf-microcode-version!)
-  (add-identification! "Runtime" 14 67))
+  (add-identification! "Runtime" 14 68))
 
 (define microcode-system)
 

diff --git a/v8/src/runtime/conpar.scm b/v8/src/runtime/conpar.scm
index 06fb0ebac0c64aaaf660c7a6d3546ec746297d4c..cb98cf0daeb175538af45530cec0553022b96cfb 100644 (file)
--- a/v8/src/runtime/conpar.scm
+++ b/v8/src/runtime/conpar.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/conpar.scm,v 14.10 1989/10/26 06:45:54 cph Exp $
+$Header: /Users/cph/tmp/foo/mit-scheme/mit-scheme/v8/src/runtime/conpar.scm,v 14.11 1989/12/07 05:35:31 cph Exp $
 
 Copyright (c) 1988, 1989 Massachusetts Institute of Technology
 
@@ -472,7 +472,7 @@ MIT in each case. |#
                (loop (1+ size))
                (-1+ size)))))
   unspecific)
-
+\f
 (define stack-frame-types)
 (define stack-frame-type/compiled-return-address)
 (define stack-frame-type/return-to-interpreter)
@@ -506,7 +506,7 @@ MIT in each case. |#
                        true
                        length
                        parser/standard-next))
-\f
+
     (standard-frame 'RESTORE-TO-STATE-POINT 2 parser/restore-dynamic-state)
     (standard-frame 'RESTORE-FLUIDS 2 parser/restore-fluid-bindings)
     (standard-frame 'RESTORE-INTERRUPT-MASK 2 parser/restore-interrupt-mask)
@@ -520,7 +520,7 @@ MIT in each case. |#
     (standard-frame 'REENTER-COMPILED-CODE 2)
     (standard-frame 'COMPILER-INTERRUPT-RESTART 3)
     (standard-frame 'COMPILER-LINK-CACHES-RESTART 8)
-
+\f
     (standard-subproblem 'IN-PACKAGE-CONTINUE 2)
     (standard-subproblem 'ACCESS-CONTINUE 2)
     (standard-subproblem 'PRIMITIVE-COMBINATION-1-APPLY 2)
@@ -556,7 +556,6 @@ MIT in each case. |#
     (standard-subproblem 'COMPILER-DEFINITION-RESTART 5)
     (standard-subproblem 'COMPILER-ASSIGNMENT-TRAP-RESTART 5)
     (standard-subproblem 'MOVE-TO-ADJACENT-POINT 6)
-\f
     (standard-subproblem 'COMBINATION-SAVE-VALUE length/combination-save-value)
     (standard-subproblem 'REPEAT-PRIMITIVE length/repeat-primitive)
 
@@ -584,11 +583,12 @@ MIT in each case. |#
 
 (define-integrable hardware-trap/signal-index 1)
 (define-integrable hardware-trap/signal-name-index 2)
-(define-integrable hardware-trap/stack-index 3)
-(define-integrable hardware-trap/state-index 4)
-(define-integrable hardware-trap/pc-info1-index 5)
-(define-integrable hardware-trap/pc-info2-index 6)
-(define-integrable hardware-trap/extra-info-index 7)
+(define-integrable hardware-trap/code-index 3)
+(define-integrable hardware-trap/stack-index 4)
+(define-integrable hardware-trap/state-index 5)
+(define-integrable hardware-trap/pc-info1-index 6)
+(define-integrable hardware-trap/pc-info2-index 7)
+(define-integrable hardware-trap/extra-info-index 8)
 
 (define (length/hardware-trap stream offset)
   (let ((state (element-stream/ref stream hardware-trap/state-index))
@@ -630,19 +630,6 @@ MIT in each case. |#
                    stack-frame-type/hardware-trap)))
       (error "guarantee-hardware-trap-frame: invalid" frame)))
 \f
-(define word-size)
-
-(define (print-register block index name)
-  (let ((value
-        (let ((bit-string (bit-string-allocate word-size)))
-          (read-bits! block (* word-size (1+ index)) bit-string)
-          (bit-string->unsigned-integer bit-string))))
-    (newline)
-    (write-string "  ")
-    (write-string name)
-    (write-string " = ")
-    (write-string (number->string value 16))))
-
 (define (hardware-trap-frame/print-registers frame)
   (guarantee-hardware-trap-frame frame)
   (let ((block (stack-frame/ref frame hardware-trap/extra-info-index)))
@@ -659,6 +646,19 @@ MIT in each case. |#
                                                 (number->string i)))
                  (loop (1+ i)))))))))
 
+(define (print-register block index name)
+  (let ((value
+        (let ((bit-string (bit-string-allocate word-size)))
+          (read-bits! block (* word-size (1+ index)) bit-string)
+          (bit-string->unsigned-integer bit-string))))
+    (newline)
+    (write-string "  ")
+    (write-string name)
+    (write-string " = ")
+    (write-string (number->string value 16))))
+
+(define word-size)
+
 (define (hardware-trap-frame/print-stack frame)
   (guarantee-hardware-trap-frame frame)
   (let ((elements