0.pre7.80:

[sbcl.git] / src / compiler / alpha / insts.lisp

diff --git a/src/compiler/alpha/insts.lisp b/src/compiler/alpha/insts.lisp
index 1442cb7..277d010 100644 (file)
--- a/src/compiler/alpha/insts.lisp
+++ b/src/compiler/alpha/insts.lisp
@@ -440,7 +440,7 @@
 (define-instruction gentrap (segment code)
   (:printer call-pal ((palcode #xaa0000)))
   (:emitter
-   (emit-lword segment #x000080)
+   (emit-lword segment #x000081)        ;actually bugchk
    (emit-lword segment code)))
 
 (define-instruction-macro move (src dst)
@@ -537,17 +537,17 @@
        (emit-lword segment
                  (logior type
                          (ash (+ posn (component-header-length))
-                              (- type-bits word-shift)))))))
+                              (- n-widetag-bits word-shift)))))))
 
-(define-instruction function-header-word (segment)
+(define-instruction simple-fun-header-word (segment)
   (:cost 0)
   (:emitter
-   (emit-header-data segment function-header-type)))
+   (emit-header-data segment simple-fun-header-widetag)))
 
 (define-instruction lra-header-word (segment)
   (:cost 0)
   (:emitter
-   (emit-header-data segment return-pc-header-type)))
+   (emit-header-data segment return-pc-header-widetag)))
 
 (defun emit-compute-inst (segment vop dst src label temp calc)
   (declare (ignore temp))
@@ -592,7 +592,7 @@
   (:emitter
    (emit-compute-inst segment vop dst src label temp
                      #'(lambda (label posn delta-if-after)
-                         (- other-pointer-type
+                         (- other-pointer-lowtag
                             (label-position label posn delta-if-after)
                             (component-header-length))))))