X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fmove.lisp;h=ffe5885479faf5f0445899688e35c482fbcfc660;hb=104ee7ee303efa16e415f5e75df635ac54dba733;hp=e9901e7951a5994e9c2fe1dc378e0a070419277a;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git

diff --git a/src/compiler/alpha/move.lisp b/src/compiler/alpha/move.lisp
index e9901e7..ffe5885 100644
--- a/src/compiler/alpha/move.lisp
+++ b/src/compiler/alpha/move.lisp
@@ -1,24 +1,17 @@
-;;; -*- Package: ALPHA -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
-
-;;;
-;;; **********************************************************************
-;;;
-;;;    This file contains the MIPS VM definition of operand loading/saving and
-;;; the Move VOP.
-;;;
-;;; Written by Rob MacLachlan.
-;;; Conversion by Sean Hallgren.
-;;;
-(in-package "SB!VM")
+;;;; the Alpha VM definition of operand loading/saving and the Move VOP
 
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
 
+(in-package "SB!VM")
 
-(define-move-function (load-immediate 1) (vop x y)
+(define-move-fun (load-immediate 1) (vop x y)
   ((null zero immediate)
    (any-reg descriptor-reg))
   (let ((val (tn-value x)))
@@ -30,61 +23,60 @@
       (symbol
        (load-symbol y val))
       (character
-       (inst li (logior (ash (char-code val) type-bits) base-char-type)
+       (inst li (logior (ash (char-code val) n-widetag-bits) base-char-widetag)
 	     y)))))
 
-(define-move-function (load-number 1) (vop x y)
+(define-move-fun (load-number 1) (vop x y)
   ((zero immediate)
    (signed-reg unsigned-reg))
   (inst li (tn-value x) y))
 
-(define-move-function (load-base-char 1) (vop x y)
+(define-move-fun (load-base-char 1) (vop x y)
   ((immediate) (base-char-reg))
   (inst li (char-code (tn-value x)) y))
 
-(define-move-function (load-system-area-pointer 1) (vop x y)
+(define-move-fun (load-system-area-pointer 1) (vop x y)
   ((immediate) (sap-reg))
   (inst li (sap-int (tn-value x)) y))
 
-(define-move-function (load-constant 5) (vop x y)
+(define-move-fun (load-constant 5) (vop x y)
   ((constant) (descriptor-reg any-reg))
-  (loadw y code-tn (tn-offset x) other-pointer-type))
+  (loadw y code-tn (tn-offset x) other-pointer-lowtag))
 
-(define-move-function (load-stack 5) (vop x y)
+(define-move-fun (load-stack 5) (vop x y)
   ((control-stack) (any-reg descriptor-reg))
   (load-stack-tn y x))
 
-(define-move-function (load-number-stack 5) (vop x y)
+(define-move-fun (load-number-stack 5) (vop x y)
   ((base-char-stack) (base-char-reg))
   (let ((nfp (current-nfp-tn vop)))
     (loadw y nfp (tn-offset x))))
 
-(define-move-function (load-number-stack-64 5) (vop x y)
+(define-move-fun (load-number-stack-64 5) (vop x y)
   ((sap-stack) (sap-reg)
    (signed-stack) (signed-reg)
    (unsigned-stack) (unsigned-reg))
   (let ((nfp (current-nfp-tn vop)))
     (loadq y nfp (tn-offset x))))
 
-(define-move-function (store-stack 5) (vop x y)
+(define-move-fun (store-stack 5) (vop x y)
   ((any-reg descriptor-reg null zero) (control-stack))
   (store-stack-tn y x))
 
-(define-move-function (store-number-stack 5) (vop x y)
+(define-move-fun (store-number-stack 5) (vop x y)
   ((base-char-reg) (base-char-stack))
   (let ((nfp (current-nfp-tn vop)))
     (storew x nfp (tn-offset y))))
 
-(define-move-function (store-number-stack-64 5) (vop x y)
+(define-move-fun (store-number-stack-64 5) (vop x y)
   ((sap-reg) (sap-stack)
    (signed-reg) (signed-stack)
    (unsigned-reg) (unsigned-stack))
   (let ((nfp (current-nfp-tn vop)))
     (storeq x nfp (tn-offset y))))
-
 
-;;;; The Move VOP:
-;;;
+;;;; the MOVE VOP
+
 (define-vop (move)
   (:args (x :target y
 	    :scs (any-reg descriptor-reg zero null)
@@ -105,16 +97,14 @@
   (any-reg descriptor-reg zero null)
   (any-reg descriptor-reg))
 
-;;; Make Move the check VOP for T so that type check generation doesn't think
-;;; it is a hairy type.  This also allows checking of a few of the values in a
-;;; continuation to fall out.
-;;;
+;;; Make MOVE the check VOP for T so that type check generation
+;;; doesn't think it is a hairy type. This also allows checking of a
+;;; few of the values in a continuation to fall out.
 (primitive-type-vop move (:check) t)
 
-;;;    The Move-Argument VOP is used for moving descriptor values into another
-;;; frame for argument or known value passing.
-;;;
-(define-vop (move-argument)
+;;; The MOVE-ARG VOP is used for moving descriptor values into
+;;; another frame for argument or known value passing.
+(define-vop (move-arg)
   (:args (x :target y
 	    :scs (any-reg descriptor-reg null zero))
 	 (fp :scs (any-reg)
@@ -127,19 +117,16 @@
       (control-stack
        (storew x fp (tn-offset y))))))
 ;;;
-(define-move-vop move-argument :move-argument
+(define-move-vop move-arg :move-arg
   (any-reg descriptor-reg null zero)
   (any-reg descriptor-reg))
-
-
 
 ;;;; ILLEGAL-MOVE
 
-;;; This VOP exists just to begin the lifetime of a TN that couldn't be written
-;;; legally due to a type error.  An error is signalled before this VOP is
-;;; so we don't need to do anything (not that there would be anything sensible
-;;; to do anyway.)
-;;;
+;;; This VOP exists just to begin the lifetime of a TN that couldn't
+;;; be written legally due to a type error. An error is signalled
+;;; before this VOP is so we don't need to do anything (not that there
+;;; would be anything sensible to do anyway.)
 (define-vop (illegal-move)
   (:args (x) (type))
   (:results (y))
@@ -148,18 +135,16 @@
   (:save-p :compute-only)
   (:generator 666
     (error-call vop object-not-type-error x type)))
-
-
 
-;;;; Moves and coercions:
-
-;;; These MOVE-TO-WORD VOPs move a tagged integer to a raw full-word
-;;; representation.  Similarly, the MOVE-FROM-WORD VOPs converts a raw integer
-;;; to a tagged bignum or fixnum.
-
-;;; Arg is a fixnum, so just shift it.  We need a type restriction because some
-;;; possible arg SCs (control-stack) overlap with possible bignum arg SCs.
-;;;
+;;;; moves and coercions
+;;;;
+;;;; These MOVE-TO-WORD VOPs move a tagged integer to a raw full-word
+;;;; representation. Similarly, the MOVE-FROM-WORD VOPs converts a raw
+;;;; integer to a tagged bignum or fixnum.
+
+;;; Arg is a fixnum, so just shift it. We need a type restriction
+;;; because some possible arg SCs (control-stack) overlap with
+;;; possible bignum arg SCs.
 (define-vop (move-to-word/fixnum)
   (:args (x :scs (any-reg descriptor-reg)))
   (:results (y :scs (signed-reg unsigned-reg)))
@@ -194,12 +179,12 @@
     (inst sra x 2 y)
     (inst beq temp done)
 
-    (loadw header x 0 other-pointer-type)
-    (inst srl header (1+ type-bits) header)
-    (loadw y x bignum-digits-offset other-pointer-type)
+    (loadw header x 0 other-pointer-lowtag)
+    (inst srl header (1+ n-widetag-bits) header)
+    (loadw y x bignum-digits-offset other-pointer-lowtag)
     (inst beq header one)
 
-    (loadw header x (1+ bignum-digits-offset) other-pointer-type)
+    (loadw header x (1+ bignum-digits-offset) other-pointer-lowtag)
     (inst sll header 32 header)
     (inst mskll y 4 y)
     (inst bis header y y)
@@ -213,9 +198,8 @@
   (descriptor-reg) (signed-reg unsigned-reg))
 
 
-;;; Result is a fixnum, so we can just shift.  We need the result type
+;;; Result is a fixnum, so we can just shift. We need the result type
 ;;; restriction because of the control-stack ambiguity noted above.
-;;;
 (define-vop (move-from-word/fixnum)
   (:args (x :scs (signed-reg unsigned-reg)))
   (:results (y :scs (any-reg descriptor-reg)))
@@ -227,9 +211,8 @@
 (define-move-vop move-from-word/fixnum :move
   (signed-reg unsigned-reg) (any-reg descriptor-reg))
 
-;;; Result may be a bignum, so we have to check.  Use a worst-case cost to make
-;;; sure people know they may be number consing.
-;;;
+;;; Result may be a bignum, so we have to check. Use a worst-case cost
+;;; to make sure people know they may be number consing.
 (define-vop (move-from-signed)
   (:args (arg :scs (signed-reg unsigned-reg) :target x))
   (:results (y :scs (any-reg descriptor-reg)))
@@ -249,25 +232,24 @@
     (inst cmoveq temp 1 header)
     (inst not temp temp)
     (inst cmoveq temp 1 header)
-    (inst sll header type-bits header)
-    (inst bis header bignum-type header)
+    (inst sll header n-widetag-bits header)
+    (inst bis header bignum-widetag header)
       
     (pseudo-atomic (:extra (pad-data-block (+ bignum-digits-offset 3)))
-      (inst bis alloc-tn other-pointer-type y)
-      (storew header y 0 other-pointer-type)
-      (storew x y bignum-digits-offset other-pointer-type)
+      (inst bis alloc-tn other-pointer-lowtag y)
+      (storew header y 0 other-pointer-lowtag)
+      (storew x y bignum-digits-offset other-pointer-lowtag)
       (inst srl x 32 temp)
-      (storew temp y (1+ bignum-digits-offset) other-pointer-type))
+      (storew temp y (1+ bignum-digits-offset) other-pointer-lowtag))
     DONE))
       
 ;;;
 (define-move-vop move-from-signed :move
   (signed-reg) (descriptor-reg))
 
-
-;;; Check for fixnum, and possibly allocate one or two word bignum result.  Use
-;;; a worst-case cost to make sure people know they may be number consing.
-;;;
+;;; Check for fixnum, and possibly allocate one or two word bignum
+;;; result. Use a worst-case cost to make sure people know they may be
+;;; number consing.
 (define-vop (move-from-unsigned)
   (:args (arg :scs (signed-reg unsigned-reg) :target x))
   (:results (y :scs (any-reg descriptor-reg)))
@@ -284,24 +266,22 @@
     (inst cmovge x 2 temp)
     (inst srl x 31 temp1)
     (inst cmoveq temp1 1 temp)
-    (inst sll temp type-bits temp)
-    (inst bis temp bignum-type temp)
+    (inst sll temp n-widetag-bits temp)
+    (inst bis temp bignum-widetag temp)
 
     (pseudo-atomic (:extra (pad-data-block (+ bignum-digits-offset 3)))
-      (inst bis alloc-tn other-pointer-type y)
-      (storew temp y 0 other-pointer-type)
-      (storew x y bignum-digits-offset other-pointer-type)
+      (inst bis alloc-tn other-pointer-lowtag y)
+      (storew temp y 0 other-pointer-lowtag)
+      (storew x y bignum-digits-offset other-pointer-lowtag)
       (inst srl x 32 temp)
-      (storew temp y (1+ bignum-digits-offset) other-pointer-type))
+      (storew temp y (1+ bignum-digits-offset) other-pointer-lowtag))
     DONE))
 
 ;;;
 (define-move-vop move-from-unsigned :move
   (unsigned-reg) (descriptor-reg))
 
-
 ;;; Move untagged numbers.
-;;;
 (define-vop (word-move)
   (:args (x :target y
 	    :scs (signed-reg unsigned-reg)
@@ -317,10 +297,8 @@
 (define-move-vop word-move :move
   (signed-reg unsigned-reg) (signed-reg unsigned-reg))
 
-
 ;;; Move untagged number arguments/return-values.
-;;;
-(define-vop (move-word-argument)
+(define-vop (move-word-arg)
   (:args (x :target y
 	    :scs (signed-reg unsigned-reg))
 	 (fp :scs (any-reg)
@@ -334,12 +312,11 @@
       ((signed-stack unsigned-stack)
        (storeq x fp (tn-offset y))))))
 ;;;
-(define-move-vop move-word-argument :move-argument
+(define-move-vop move-word-arg :move-arg
   (descriptor-reg any-reg signed-reg unsigned-reg) (signed-reg unsigned-reg))
 
 
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged number to a
-;;; descriptor passing location.
-;;;
-(define-move-vop move-argument :move-argument
+;;; Use standard MOVE-ARG + coercion to move an untagged number
+;;; to a descriptor passing location.
+(define-move-vop move-arg :move-arg
   (signed-reg unsigned-reg) (any-reg descriptor-reg))