Changeset 10959


Ignore:
Timestamp:
Oct 3, 2008, 9:26:07 PM (11 years ago)
Author:
gb
Message:

Replace uses of target::nil-value with (CCL::TARGET-NIL-VALUE) and
target::t-value with (CCL::TARGET-T-VALUE).

This was very slightly hard to bootstrap (the new backend-lowmem-bias
had to be in effect and typically 0), so I'll start checking in images
in a minute.

Location:
trunk/source
Files:
35 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/PPC/PPC32/ppc32-arch.lisp

    r10816 r10959  
    134134
    135135
    136 (defconstant nil-value #x00003015)
     136(defconstant canonical-nil-value #x00003015)
    137137;;; T is almost adjacent to NIL: since NIL is a misaligned CONS, it spans
    138138;;; two doublewords.  The arithmetic difference between T and NIL is
     
    757757  (arch::make-target-arch :name :ppc32
    758758                          :lisp-node-size 4
    759                           :nil-value nil-value
     759                          :nil-value canonical-nil-value
    760760                          :fixnum-shift fixnumshift
    761761                          :most-positive-fixnum (1- (ash 1 (1- (- 32 fixnumshift))))
     
    885885;;;
    886886(defppc32archmacro ccl::%get-kernel-global (name)
    887   `(ccl::%fixnum-ref 0 (+ ppc32::nil-value
     887  `(ccl::%fixnum-ref 0 (+ ,(ccl::target-nil-value)
    888888                        ,(%kernel-global
    889889                          (if (ccl::quoted-form-p name)
     
    894894  `(ccl::%setf-macptr
    895895    ,dest
    896     (ccl::%fixnum-ref-macptr 0 (+ ppc32::nil-value
    897                                                 ,(%kernel-global
    898                                                   (if (ccl::quoted-form-p name)
    899                                                     (cadr name)
    900                                                     name))))))
     896    (ccl::%fixnum-ref-macptr 0 (+ ,(ccl::target-nil-value)
     897                                ,(%kernel-global
     898                                  (if (ccl::quoted-form-p name)
     899                                    (cadr name)
     900                                    name))))))
    901901
    902902(defppc32archmacro ccl::%target-kernel-global (name)
  • trunk/source/compiler/PPC/PPC32/ppc32-vinsns.lisp

    r10365 r10959  
    895895                                     (crf :crf)))
    896896  :again
    897   (cmpwi crf object ppc32::nil-value)
     897  (cmpwi crf object (target-nil-value))
    898898  (clrlwi tag object (- ppc32::nbits-in-word ppc32::nlisptagbits))
    899899  (beq crf :got-it)
     
    15111511                                   ())
    15121512  (rlwimi bits bits (- ppc32::least-significant-bit 27) 27 27) ; bits = 0000...X000X
    1513   (addi dest bits ppc32::nil-value))
     1513  (addi dest bits (target-nil-value)))
    15141514
    15151515(define-ppc32-vinsn invert-lowbit (((bits :u32))
     
    15951595(define-ppc32-vinsn eqnil->bit31 (((bits :u32))
    15961596                                  ((x t)))
    1597   (subi bits x ppc32::nil-value)
     1597  (subi bits x (target-nil-value))
    15981598  (cntlzw bits bits)
    15991599  (srwi bits bits 5))
     
    16091609(define-ppc32-vinsn nenil->bit31 (((bits :u32))
    16101610                                  ((x t)))
    1611   (subi bits x ppc32::nil-value)
     1611  (subi bits x (target-nil-value))
    16121612  (cntlzw bits bits)
    16131613  (srwi bits bits 5)
     
    17021702(define-ppc32-vinsn compare-to-nil (((crf :crf))
    17031703                                    ((arg0 t)))
    1704   (cmpwi crf arg0 ppc32::nil-value))
     1704  (cmpwi crf arg0 (target-nil-value)))
    17051705
    17061706(define-ppc32-vinsn compare-logical (((crf :crf))
     
    19551955(define-ppc32-vinsn %closure-code% (((dest :lisp))
    19561956                                    ())
    1957   (lwz dest (+ ppc32::symbol.vcell (ppc32::nrs-offset %closure-code%) ppc32::nil-value) 0))
     1957  (lwz dest (+ ppc32::symbol.vcell (ppc32::nrs-offset %closure-code%) (target-nil-value)) 0))
    19581958
    19591959
     
    22372237(define-ppc32-vinsn (load-nil :constant-ref) (((dest t))
    22382238                                              ())
    2239   (li dest ppc32::nil-value))
     2239  (li dest (target-nil-value)))
    22402240
    22412241(define-ppc32-vinsn (load-t :constant-ref) (((dest t))
    22422242                                            ())
    2243   (li dest (+ ppc32::t-offset ppc32::nil-value)))
     2243  (li dest (+ ppc32::t-offset (target-nil-value))))
    22442244
    22452245(define-ppc32-vinsn set-eq-bit (((dest :crf))
     
    25512551  (bne+ :ok)
    25522552  :bad
    2553   (li dest ppc32::nil-value)
     2553  (li dest (target-nil-value))
    25542554  (b :done)
    25552555  :ok
     
    34353435  ((:pred >= min 1)
    34363436   (mr ppc::arg_y ppc::arg_z))
    3437   (li ppc::arg_z ppc32::nil-value)
     3437  (li ppc::arg_z (target-nil-value))
    34383438  :done)
    34393439
     
    34513451  ((:pred >= min 1)
    34523452   (mr ppc::arg_x ppc::arg_z))
    3453   (li ppc::arg_y ppc32::nil-value)
     3453  (li ppc::arg_y (target-nil-value))
    34543454  (b :last)
    34553455  :one
     
    34613461  (mr ppc::arg_y ppc::arg_z)
    34623462  :last
    3463   (li ppc::arg_z ppc32::nil-value)
     3463  (li ppc::arg_z (target-nil-value))
    34643464  :done)
    34653465
     
    34953495  ((:pred >= min 1)
    34963496   (stwu ppc::arg_z -4 ppc::vsp))
    3497   (li ppc::arg_x ppc32::nil-value)
     3497  (li ppc::arg_x (target-nil-value))
    34983498  :last-2
    3499   (li ppc::arg_y ppc32::nil-value)
     3499  (li ppc::arg_y (target-nil-value))
    35003500  :last-1
    3501   (li ppc::arg_z ppc32::nil-value)
     3501  (li ppc::arg_z (target-nil-value))
    35023502  :done)
    35033503
     
    36393639                                 ((src (:lisp (:ne dest )))))
    36403640  (lwz dest (+ (ash 1 2) ppc32::misc-data-offset) src)
    3641   (tweqi dest ppc32::nil-value))
     3641  (tweqi dest (target-nil-value)))
    36423642                 
    36433643(define-ppc32-vinsn %natural+ (((dest :u32))
     
    37213721                                      (crf1 :crf)))
    37223722  (clrlwi tag src (- ppc32::nbits-in-word ppc32::nlisptagbits))
    3723   (cmpwi crf0 src ppc32::nil-value)
     3723  (cmpwi crf0 src (target-nil-value))
    37243724  (cmpwi crf1 tag ppc32::tag-misc)
    37253725  (beq crf0 :nilsym)
     
    37343734  (b :done)
    37353735  :nilsym
    3736   (li dest (+ ppc32::nilsym-offset ppc32::nil-value))
     3736  (li dest (+ ppc32::nilsym-offset (target-nil-value)))
    37373737  :done)
    37383738
  • trunk/source/compiler/PPC/PPC64/ppc64-arch.lisp

    r10816 r10959  
    704704    (if pos (* (1- pos) symbol.size))))
    705705
    706 (defconstant nil-value (+ #x3000 symbol.size fulltag-misc))
     706(defconstant canonical-nil-value (+ #x3000 symbol.size fulltag-misc))
    707707
    708708
     
    822822  (arch::make-target-arch :name :ppc64
    823823                          :lisp-node-size 8
    824                           :nil-value nil-value
     824                          :nil-value canonical-nil-value
    825825                          :fixnum-shift fixnumshift
    826826                          :most-positive-fixnum (1- (ash 1 (1- (- 64 fixnumshift))))
     
    951951;;;
    952952(defppc64archmacro ccl::%get-kernel-global (name)
    953   `(ccl::%fixnum-ref 0 (+ ppc64::nil-value
    954                                  ,(%kernel-global
    955                                    (if (ccl::quoted-form-p name)
    956                                      (cadr name)
    957                                      name)))))
     953  `(ccl::%fixnum-ref 0 (+ ,(ccl::target-nil-value)
     954                        ,(%kernel-global
     955                          (if (ccl::quoted-form-p name)
     956                            (cadr name)
     957                            name)))))
    958958
    959959(defppc64archmacro ccl::%get-kernel-global-ptr (name dest)
    960960  `(ccl::%setf-macptr
    961961    ,dest
    962     (ccl::%fixnum-ref-macptr 0 (+ ppc64::nil-value
    963                                  ,(%kernel-global
    964                                    (if (ccl::quoted-form-p name)
    965                                      (cadr name)
    966                                      name))))))
     962    (ccl::%fixnum-ref-macptr 0 (+ ,(ccl::target-nil-value)
     963                                ,(%kernel-global
     964                                  (if (ccl::quoted-form-p name)
     965                                    (cadr name)
     966                                    name))))))
    967967
    968968(defppc64archmacro ccl::%target-kernel-global (name)
  • trunk/source/compiler/PPC/PPC64/ppc64-vinsns.lisp

    r10365 r10959  
    10191019                                   (crfy :crf)))
    10201020  :again
    1021   (cmpdi crfx object ppc64::nil-value)
     1021  (cmpdi crfx object (target-nil-value))
    10221022  (clrldi tag object (- ppc64::nbits-in-word ppc64::ntagbits))
    10231023  (cmpdi crfy tag ppc64::fulltag-cons)
     
    14411441                                      ((tag :u8)
    14421442                                       (crf :crf)))
    1443   (cmpldi crf object ppc64::nil-value)
     1443  (cmpldi crf object (target-nil-value))
    14441444  (clrldi tag object (- ppc64::nbits-in-word ppc64::ntagbits))
    14451445  (beq crf :ok)
     
    15511551                                   ())
    15521552  (mulli bits bits ppc64::t-offset)
    1553   (addi dest bits ppc64::nil-value))
     1553  (addi dest bits (target-nil-value)))
    15541554
    15551555(define-ppc64-vinsn invert-lowbit (((bits :u64))
     
    16361636(define-ppc64-vinsn eqnil->bit31 (((bits :u64))
    16371637                                  ((x t)))
    1638   (subi bits x ppc64::nil-value)
     1638  (subi bits x (target-nil-value))
    16391639  (cntlzd bits bits)
    16401640  (srdi bits bits 6))
     
    16501650(define-ppc64-vinsn nenil->bit31 (((bits :u64))
    16511651                                  ((x t)))
    1652   (subi bits x ppc64::nil-value)
     1652  (subi bits x (target-nil-value))
    16531653  (cntlzd bits bits)
    16541654  (srdi bits bits 6)
     
    17431743(define-ppc64-vinsn compare-to-nil (((crf :crf))
    17441744                                    ((arg0 t)))
    1745   (cmpdi crf arg0 ppc64::nil-value))
     1745  (cmpdi crf arg0 (target-nil-value)))
    17461746
    17471747(define-ppc64-vinsn compare-logical (((crf :crf))
     
    19951995(define-ppc64-vinsn %closure-code% (((dest :lisp))
    19961996                                    ())
    1997   (ld dest (+ ppc64::symbol.vcell (ppc64::nrs-offset %closure-code%) ppc64::nil-value) 0))
     1997  (ld dest (+ ppc64::symbol.vcell (ppc64::nrs-offset %closure-code%) (target-nil-value)) 0))
    19981998
    19991999(define-ppc64-vinsn single-float-bits (((dest :u32))
     
    22282228(define-ppc64-vinsn (load-nil :constant-ref) (((dest t))
    22292229                                              ())
    2230   (li dest ppc64::nil-value))
     2230  (li dest (target-nil-value)))
    22312231
    22322232
    22332233(define-ppc64-vinsn (load-t :constant-ref) (((dest t))
    22342234                                            ())
    2235   (li dest (+ ppc64::t-offset ppc64::nil-value)))
     2235  (li dest (+ ppc64::t-offset (target-nil-value))))
    22362236
    22372237(define-ppc64-vinsn set-eq-bit (((dest :crf))
     
    25592559  (bne+ :ok)
    25602560  :bad
    2561   (li dest ppc64::nil-value)
     2561  (li dest (target-nil-value))
    25622562  (b :done)
    25632563  :ok
     
    34223422  ((:pred >= min 1)
    34233423   (mr ppc::arg_y ppc::arg_z))
    3424   (li ppc::arg_z ppc64::nil-value)
     3424  (li ppc::arg_z (target-nil-value))
    34253425  :done)
    34263426
     
    34383438  ((:pred >= min 1)
    34393439   (mr ppc::arg_x ppc::arg_z))
    3440   (li ppc::arg_y ppc64::nil-value)
     3440  (li ppc::arg_y (target-nil-value))
    34413441  (b :last)
    34423442  :one
     
    34483448  (mr ppc::arg_y ppc::arg_z)
    34493449  :last
    3450   (li ppc::arg_z ppc64::nil-value)
     3450  (li ppc::arg_z (target-nil-value))
    34513451  :done)
    34523452
     
    34823482  ((:pred >= min 1)
    34833483   (stdu ppc::arg_z -8 ppc::vsp))
    3484   (li ppc::arg_x ppc64::nil-value)
     3484  (li ppc::arg_x (target-nil-value))
    34853485  :last-2
    3486   (li ppc::arg_y ppc64::nil-value)
     3486  (li ppc::arg_y (target-nil-value))
    34873487  :last-1
    3488   (li ppc::arg_z ppc64::nil-value)
     3488  (li ppc::arg_z (target-nil-value))
    34893489  :done)
    34903490
     
    36323632                                 ((src (:lisp (:ne dest )))))
    36333633  (ld dest (+ (ash 1 ppc64::word-shift) ppc64::misc-data-offset) src)
    3634   (tdeqi dest ppc64::nil-value))
     3634  (tdeqi dest (target-nil-value)))
    36353635
    36363636(define-ppc64-vinsn %natural+ (((dest :u64))
  • trunk/source/compiler/PPC/ppc-lapmacros.lisp

    r10402 r10959  
    563563   (:ppc32
    564564    (let* ((offset (ppc32::%kernel-global sym)))
    565       `(lwz ,reg (+ ,offset ppc32::nil-value) 0)))
     565      `(lwz ,reg (+ ,offset (target-nil-value)) 0)))
    566566   (:ppc64
    567567    (let* ((offset (ppc64::%kernel-global sym)))
    568       `(ld ,reg (+ ,offset ppc64::nil-value) 0)))))
     568      `(ld ,reg (+ ,offset (target-nil-value)) 0)))))
    569569
    570570(defppclapmacro set-global (reg sym)
     
    572572   (:ppc32
    573573    (let* ((offset (ppc32::%kernel-global sym)))
    574       `(stw ,reg (+ ,offset ppc32::nil-value) 0)))
     574      `(stw ,reg (+ ,offset (target-nil-value)) 0)))
    575575   (:ppc64
    576576    (let* ((offset (ppc64::%kernel-global sym)))
    577       `(std ,reg (+ ,offset ppc64::nil-value) 0)))))
     577      `(std ,reg (+ ,offset (target-nil-value)) 0)))))
    578578
    579579;;; Set "dest" to those bits in "src" that are other than those that
     
    602602    `(progn
    603603      (rlwimi ,temp ,src 4 27 27)
    604       (addi ,dest ,temp ppc32::nil-value)))
     604      (addi ,dest ,temp (target-nil-value))))
    605605   (:ppc64
    606606    `(progn
    607607      (mulli ,temp ,src ppc64::t-offset) ; temp = ppc64::t-offset, or 0
    608       (addi ,dest ,temp ppc64::nil-value))))) ; dest = (src == 1), lisp-wise
     608      (addi ,dest ,temp (target-nil-value)))))) ; dest = (src == 1), lisp-wise
    609609
    610610(defppclapmacro eq0->boolean (dest src temp)
  • trunk/source/compiler/X86/X8632/x8632-arch.lisp

    r10936 r10959  
    374374;;; CONSP/RPLACA/RPLACD can check the tag and complain if the argument
    375375;;; is NIL.
    376 (defconstant nil-value (+ #x13000 fulltag-cons))
    377 (defconstant t-value (+ #x13008 fulltag-misc))
    378 (defconstant t-offset (- t-value nil-value))
     376(defconstant canonical-nil-value (+ #x13000 fulltag-cons))
     377(defconstant canonical-t-value (+ #x13008 fulltag-misc))
     378(defconstant t-offset (- canonical-t-value canonical-nil-value))
    379379
    380380(defconstant misc-bias fulltag-misc)
     
    10381038  (arch::make-target-arch :name :x8632
    10391039                          :lisp-node-size node-size
    1040                           :nil-value nil-value
     1040                          :nil-value canonical-nil-value
    10411041                          :fixnum-shift fixnumshift
    10421042                          :most-positive-fixnum target-most-positive-fixnum
     
    11671167;;;
    11681168(defx8632archmacro ccl::%get-kernel-global (name)
    1169   `(ccl::%fixnum-ref 0 (+ x8632::nil-value
     1169  `(ccl::%fixnum-ref 0 (+ ,(ccl::target-nil-value)
    11701170                        ,(%kernel-global
    11711171                          (if (ccl::quoted-form-p name)
     
    11761176  `(ccl::%setf-macptr
    11771177    ,dest
    1178     (ccl::%fixnum-ref-macptr 0 (+ x8632::nil-value
     1178    (ccl::%fixnum-ref-macptr 0 (+ ,(ccl::target-nil-value)
    11791179                                  ,(%kernel-global
    11801180                                    (if (ccl::quoted-form-p name)
  • trunk/source/compiler/X86/X8632/x8632-vinsns.lisp

    r10859 r10959  
    316316  ((:pred >= min 1)
    317317   (movl (:%l x8632::arg_z) (:%l x8632::arg_y)))
    318   (movl (:$l x8632::nil-value) (:%l x8632::arg_z))
     318  (movl (:$l (target-nil-value)) (:%l x8632::arg_z))
    319319  :done)
    320320
     
    332332  ((:pred >= min 1)
    333333   (pushl (:%l x8632::arg_z)))
    334   (movl (:$l x8632::nil-value) (:%l x8632::arg_y))
     334  (movl (:$l (target-nil-value)) (:%l x8632::arg_y))
    335335  (jmp :last)
    336336  :one
     
    340340  (movl (:%l x8632::arg_z) (:%l x8632::arg_y))
    341341  :last
    342   (movl (:$l x8632::nil-value) (:%l x8632::arg_z))
     342  (movl (:$l (target-nil-value)) (:%l x8632::arg_z))
    343343  :done)
    344344
     
    355355  :loop
    356356  (addl (:$b x8632::fixnumone) (:%l temp))
    357   (pushl (:$l x8632::nil-value))
     357  (pushl (:$l (target-nil-value)))
    358358  ((:pred < n 32)
    359359   (cmpl (:$b (:apply ash n x8632::fixnumshift)) (:%l temp)))
     
    423423                                                  ((frame-offset :u16const)
    424424                                                   (cur-vsp :u16const)))
    425   (cmpl (:$l x8632::nil-value) (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::ebp))))
     425  (cmpl (:$l (target-nil-value)) (:@ (:apply - (:apply + frame-offset x8632::word-size-in-bytes)) (:%l x8632::ebp))))
    426426
    427427(define-x8632-vinsn compare-value-cell-to-nil (()
    428428                                               ((vcell :lisp)))
    429   (cmpl (:$l x8632::nil-value) (:@ x8632::value-cell.value (:%l vcell))))
     429  (cmpl (:$l (target-nil-value)) (:@ x8632::value-cell.value (:%l vcell))))
    430430
    431431(define-x8632-vinsn lcell-load (((dest :lisp))
     
    465465(define-x8632-vinsn compare-to-nil (()
    466466                                    ((arg0 t)))
    467   (cmpl (:$l x8632::nil-value) (:%l arg0)))
     467  (cmpl (:$l (target-nil-value)) (:%l arg0)))
    468468
    469469(define-x8632-vinsn compare-to-t (()
    470470                                  ((arg0 t)))
    471   (cmpl (:$l x8632::t-value) (:%l arg0)))
     471  (cmpl (:$l (target-t-value)) (:%l arg0)))
    472472
    473473(define-x8632-vinsn ref-constant (((dest :lisp))
     
    551551  ;; special check for NIL (which is a distinguished CONS on x8632)
    552552  :resume
    553   (cmpl (:$l x8632::nil-value) (:%l object))
     553  (cmpl (:$l (target-nil-value)) (:%l object))
    554554  (je :bad)
    555555  (movl (:%l object) (:%l tag))
     
    569569  (cmpb (:$b x8632::fulltag-cons) (:%accb tag))
    570570  (setne (:%b x8632::ah))
    571   (cmpl (:$l x8632::nil-value) (:% object))
     571  (cmpl (:$l (target-nil-value)) (:% object))
    572572  (sete (:%b x8632::al))
    573573  (orb (:%b x8632::ah) (:%b x8632::al)))
     
    736736(define-x8632-vinsn (load-nil :constant-ref) (((dest t))
    737737                                              ())
    738   (movl (:$l x8632::nil-value) (:%l dest)))
     738  (movl (:$l (target-nil-value)) (:%l dest)))
    739739
    740740
    741741(define-x8632-vinsn (load-t :constant-ref) (((dest t))
    742742                                            ())
    743   (movl (:$l x8632::t-value) (:%l dest)))
     743  (movl (:$l (target-t-value)) (:%l dest)))
    744744
    745745;;; use something like this for the other extract-whatevers, too,
     
    824824                                     ((crbit :u8const))
    825825                                     ((temp :u32)))
    826   (movl (:$l x8632::t-value) (:%l temp))
     826  (movl (:$l (target-t-value)) (:%l temp))
    827827  (leal (:@ (- x8632::t-offset) (:%l temp)) (:%l dest))
    828828  (cmovccl (:$ub crbit) (:%l temp) (:%l dest)))
     
    15051505  (jmp :done)
    15061506  :push-loop
    1507   (pushl (:$l x8632::nil-value))
     1507  (pushl (:$l (target-nil-value)))
    15081508  (addl (:$b x8632::node-size) (:%l x8632::nargs))
    15091509  (subl (:$b x8632::node-size) (:%l imm))
     
    15481548(define-x8632-vinsn pass-multiple-values-symbol (()
    15491549                                                 ())
    1550   (pushl (:@ (+ x8632::nil-value (x8632::%kernel-global 'x86::ret1valaddr))))
     1550  (pushl (:@ (+ (target-nil-value) (x8632::%kernel-global 'x86::ret1valaddr))))
    15511551  (jmp (:@ x8632::symbol.fcell (:% x8632::fname))))
    15521552
     
    15691569  (jne :bad)
    15701570  :go
    1571   (pushl (:@ (+ x8632::nil-value (x8632::%kernel-global 'x86::ret1valaddr))))
     1571  (pushl (:@ (+ (target-nil-value) (x8632::%kernel-global 'x86::ret1valaddr))))
    15721572  (jmp (:%l x8632::fn))
    15731573  (:anchored-uuo-section :resume)
     
    24642464                                    ((tag :u8)))
    24652465  :again
    2466   (cmpl (:$l x8632::nil-value) (:%l object))
     2466  (cmpl (:$l (target-nil-value)) (:%l object))
    24672467  (je :got-it)
    24682468  (movl (:%l object) (:%l tag))
     
    27752775                                     ((tag :u8)))
    27762776  :resume
    2777   (cmpl (:$l x8632::nil-value) (:%l src))
     2777  (cmpl (:$l (target-nil-value)) (:%l src))
    27782778  (je :nilsym)
    27792779  (movl (:%l src) (:%l tag))
     
    27902790  (jmp :ok)
    27912791  :nilsym
    2792   (movl (:$l (+ x8632::nil-value x8632::nilsym-offset)) (:%l dest))
     2792  (movl (:$l (+ (target-nil-value) x8632::nilsym-offset)) (:%l dest))
    27932793  :ok
    27942794 
     
    34553455                                       ((temp :imm)
    34563456                                        (ra0 (:lisp #.x8632::ra0))))
    3457   (movl (:@ (+ x8632::nil-value (x8632::%kernel-global 'x86::ret1valaddr)))
     3457  (movl (:@ (+ (target-nil-value) (x8632::%kernel-global 'x86::ret1valaddr)))
    34583458        (:%l temp))
    34593459  (cmpl (:%l temp) (:%l ra0))
    34603460  (je :multiple)
    3461   (pushl (:@ (+ x8632::nil-value (x8632::%kernel-global 'x86::lexpr-return1v))))
     3461  (pushl (:@ (+ (target-nil-value) (x8632::%kernel-global 'x86::lexpr-return1v))))
    34623462  (jmp :finish)
    34633463  :multiple
    3464   (pushl (:@ (+ x8632::nil-value (x8632::%kernel-global 'x86::lexpr-return))))
     3464  (pushl (:@ (+ (target-nil-value) (x8632::%kernel-global 'x86::lexpr-return))))
    34653465  (pushl (:%l temp))
    34663466  :finish
     
    36333633  (cmpl (:$b (ash #xd800 -11))(:%l temp))
    36343634  :bad-if-eq
    3635   (movl (:$l x8632::nil-value) (:%l temp))
     3635  (movl (:$l (target-nil-value)) (:%l temp))
    36363636  (cmovel (:%l temp) (:%l dest))
    36373637  (je :done)
     
    36843684  (leal (:@ (:%l x8632::esp) (:%l x8632::nargs)) (:%l temp))
    36853685  (subl (:@ (:%l temp)) (:%l x8632::nargs))
    3686   (movl (:$l x8632::nil-value) (:%l result))
     3686  (movl (:$l (target-nil-value)) (:%l result))
    36873687  (jle :done)
    36883688  ;; I -think- that a CMOV would be safe here, assuming that N wasn't
     
    37533753  (movl (:@ (+ (ash 1 x8632::word-shift) x8632::misc-data-offset) (:%l src))
    37543754        (:%l dest))
    3755   (cmpl (:$l x8632::nil-value) (:%l dest))
     3755  (cmpl (:$l (target-nil-value)) (:%l dest))
    37563756  (je :bad)
    37573757
     
    38613861                                     (imm :imm)))
    38623862  (xorl (:%l imm) (:%l imm))
    3863   (movl (:$l x8632::nil-value) (:%l x8632::arg_y))
     3863  (movl (:$l (target-nil-value)) (:%l x8632::arg_y))
    38643864  :loop
    38653865  (rcmpl (:%l imm) (:%l nargs))
     
    38783878  (negb (:%b temp))
    38793879  (andl (:$b x8632::t-offset) (:%l temp))
    3880   (addl (:$l x8632::nil-value) (:%l temp))
     3880  (addl (:$l (target-nil-value)) (:%l temp))
    38813881  (pushl (:%l temp)))
    38823882
     
    38893889  (je :one)
    38903890  ;; none
    3891   (pushl (:$l x8632::nil-value))
    3892   (pushl (:$l x8632::nil-value))
     3891  (pushl (:$l (target-nil-value)))
     3892  (pushl (:$l (target-nil-value)))
    38933893  (jmp :done)
    38943894  :one
    3895   (pushl (:$l x8632::t-value))
    3896   (pushl (:$l x8632::nil-value))
     3895  (pushl (:$l (target-t-value)))
     3896  (pushl (:$l (target-nil-value)))
    38973897  (jmp :done)
    38983898  :two
    3899   (pushl (:$l x8632::t-value))
    3900   (pushl (:$l x8632::t-value))
     3899  (pushl (:$l (target-t-value)))
     3900  (pushl (:$l (target-t-value)))
    39013901  :done)
    39023902
  • trunk/source/compiler/X86/X8664/x8664-arch.lisp

    r10816 r10959  
    412412
    413413       
    414 (defconstant nil-value (+ #x13000 fulltag-nil))
    415 (defconstant t-value (+ #x13020 fulltag-symbol))
     414(defconstant canonical-nil-value (+ #x13000 fulltag-nil))
     415(defconstant canonical-t-value (+ #x13020 fulltag-symbol))
    416416(defconstant misc-bias fulltag-misc)
    417417(defconstant cons-bias fulltag-cons)
    418 (defconstant t-offset (- t-value nil-value))
     418(defconstant t-offset (- canonical-t-value canonical-nil-value))
    419419
    420420
     
    11391139  (arch::make-target-arch :name :x8664
    11401140                          :lisp-node-size 8
    1141                           :nil-value nil-value
     1141                          :nil-value canonical-nil-value
    11421142                          :fixnum-shift fixnumshift
    11431143                          :most-positive-fixnum (1- (ash 1 (1- (- 64 fixnumshift))))
     
    12721272;;;
    12731273(defx8664archmacro ccl::%get-kernel-global (name)
    1274   `(ccl::%fixnum-ref 0 (+ x8664::nil-value
     1274  `(ccl::%fixnum-ref 0 (+ ,(ccl::target-nil-value)
    12751275                        ,(%kernel-global
    12761276                         (if (ccl::quoted-form-p name)
     
    12811281  `(ccl::%setf-macptr
    12821282    ,dest
    1283     (ccl::%int-to-ptr (ccl::%fixnum-ref-natural 0 (+ x8664::nil-value
     1283    (ccl::%int-to-ptr (ccl::%fixnum-ref-natural 0 (+ ,(ccl::target-nil-value)
    12841284                                 ,(%kernel-global
    12851285                                   (if (ccl::quoted-form-p name)
  • trunk/source/compiler/X86/X8664/x8664-vinsns.lisp

    r10754 r10959  
    389389  ((:pred >= min 1)
    390390   (movq (:%q x8664::arg_z) (:%q x8664::arg_y)))
    391   (movq (:$l x8664::nil-value) (:%q x8664::arg_z))
     391  (movq (:$l (target-nil-value)) (:%q x8664::arg_z))
    392392  :done)
    393393
     
    408408  ((:pred >= min 1)
    409409   (movq (:%q x8664::arg_z) (:%q x8664::arg_x)))
    410   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     410  (movl (:$l (target-nil-value)) (:%l x8664::arg_y))
    411411  (jmp :last)
    412412  :one
     
    418418  (movq (:%q x8664::arg_z) (:%q x8664::arg_y))
    419419  :last
    420   (movq (:$l x8664::nil-value) (:%q x8664::arg_z))
     420  (movq (:$l (target-nil-value)) (:%q x8664::arg_z))
    421421  :done)
    422422
     
    456456  ((:pred >= min 1)
    457457   (pushq (:%q x8664::arg_z)))
    458   (movl (:$l x8664::nil-value) (:%l x8664::arg_x))
     458  (movl (:$l (target-nil-value)) (:%l x8664::arg_x))
    459459  :last-2
    460   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     460  (movl (:$l (target-nil-value)) (:%l x8664::arg_y))
    461461  :last-1
    462   (movl (:$l x8664::nil-value) (:%l x8664::arg_z))
     462  (movl (:$l (target-nil-value)) (:%l x8664::arg_z))
    463463  :done)
    464464
     
    479479  ((:pred >= n 16)
    480480   (cmpl (:$l (:apply ash n x8664::word-shift)) (:%l temp))) 
    481   (pushq (:$l x8664::nil-value))
     481  (pushq (:$l (target-nil-value)))
    482482  (jne :loop)
    483483  :done)
     
    593593(define-x8664-vinsn compare-to-t (()
    594594                                    ((arg0 t)))
    595   (cmpq (:$l x8664::t-value) (:%q arg0)))
     595  (cmpq (:$l (target-t-value)) (:%q arg0)))
    596596
    597597(define-x8664-vinsn ref-constant (((dest :lisp))
     
    846846(define-x8664-vinsn (load-nil :constant-ref) (((dest t))
    847847                                              ())
    848   (movl (:$l x8664::nil-value) (:%l dest)))
     848  (movl (:$l (target-nil-value)) (:%l dest)))
    849849
    850850
    851851(define-x8664-vinsn (load-t :constant-ref) (((dest t))
    852852                                            ())
    853   (movl(:$l x8664::t-value) (:%l dest)))
     853  (movl(:$l (target-t-value)) (:%l dest)))
    854854
    855855
     
    919919(define-x8664-vinsn cr-bit->boolean (((dest :lisp))
    920920                                     ((crbit :u8const)))
    921   (movl (:$l x8664::nil-value) (:%l dest))
     921  (movl (:$l (target-nil-value)) (:%l dest))
    922922  (cmovccl (:$ub crbit) (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l dest)) (:%l dest)))
    923923
     
    17101710  (jmp :done)
    17111711  :push-loop
    1712   (pushq (:$l x8664::nil-value))
     1712  (pushq (:$l (target-nil-value)))
    17131713  (addl (:$b x8664::node-size) (:%l x8664::nargs))
    17141714  (subl (:$b x8664::node-size) (:%l imm))
     
    17521752(define-x8664-vinsn pass-multiple-values-symbol (()
    17531753                                                 ())
    1754   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr))))
     1754  (pushq (:@ (+ (target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr))))
    17551755  (jmp (:@ x8664::symbol.fcell (:% x8664::fname))))
    17561756
     
    17671767  (jl :bad)
    17681768  (cmoveq (:@ x8664::symbol.fcell (:%q x8664::fname)) (:%q x8664::fn))
    1769   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr))))
     1769  (pushq (:@ (+ (target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr))))
    17701770  (jmp (:%q x8664::fn))
    17711771
     
    32583258                                     (imm :imm)))
    32593259  (xorl (:%l imm) (:%l imm))
    3260   (movl (:$l x8664::nil-value) (:%l x8664::arg_y))
     3260  (movl (:$l (target-nil-value)) (:%l x8664::arg_y))
    32613261  :loop
    32623262  (rcmpl (:%l imm) (:%l nargs))
     
    32723272                                        ((temp :u64)))
    32733273  (testl (:%l x8664::nargs) (:%l x8664::nargs))
    3274   (movl (:$l x8664::nil-value) (:%l temp))
     3274  (movl (:$l (target-nil-value)) (:%l temp))
    32753275  (cmovnel (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l temp)) (:%l temp))
    32763276  (pushq (:%q temp)))
     
    32813281                                         (temp1 :u64)))
    32823282  (rcmpl (:%l x8664::nargs) (:$b x8664::node-size))
    3283   (movl (:$l x8664::nil-value) (:%l temp0))
     3283  (movl (:$l (target-nil-value)) (:%l temp0))
    32843284  (movl (:%l temp0) (:%l temp1))
    32853285  (cmovael (:@ (+ x8664::t-offset x8664::symbol.vcell) (:%l temp0)) (:%l temp0))
     
    34083408                                       ()
    34093409                                       ((temp :imm)))
    3410   (movq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::ret1valaddr)))
     3410  (movq (:@ (+ (target-nil-value) (x8664::%kernel-global 'x86::ret1valaddr)))
    34113411        (:%q temp))
    34123412  (cmpq (:%q temp)
    34133413        (:%q x8664::ra0))
    34143414  (je :multiple)
    3415   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::lexpr-return1v))))
     3415  (pushq (:@ (+ (target-nil-value) (x8664::%kernel-global 'x86::lexpr-return1v))))
    34163416  (jmp :finish)
    34173417  :multiple
    3418   (pushq (:@ (+ x8664::nil-value (x8664::%kernel-global 'x86::lexpr-return))))
     3418  (pushq (:@ (+ (target-nil-value) (x8664::%kernel-global 'x86::lexpr-return))))
    34193419  (pushq (:%q temp))
    34203420  :finish
     
    35333533                                     ((tag :u8)))
    35343534  :begin
    3535   (movl (:$l (+ x8664::nil-value x8664::nilsym-offset)) (:%l tag))
     3535  (movl (:$l (+ (target-nil-value) x8664::nilsym-offset)) (:%l tag))
    35363536  (cmpb (:$b x8664::fulltag-nil) (:%b src))
    35373537  (cmoveq (:%q tag) (:%q dest))
     
    36393639  (cmpl (:$b (ash #xd800 -11))(:%l temp))
    36403640  :bad-if-eq
    3641   (movl (:$l x8664::nil-value) (:%l temp))
     3641  (movl (:$l (target-nil-value)) (:%l temp))
    36423642  (cmovel (:%l temp) (:%l dest))
    36433643  (je :done)
     
    36943694  (leaq (:@ (:%q x8664::rsp) (:%q x8664::nargs)) (:%q imm0))
    36953695  (subq (:@ (:%q imm0)) (:%q x8664::nargs))
    3696   (movl (:$l x8664::nil-value) (:%l result))
     3696  (movl (:$l (target-nil-value)) (:%l result))
    36973697  (jle :done)
    36983698  ;; I -think- that a CMOV would be safe here, assuming that N wasn't
  • trunk/source/compiler/X86/x86-lapmacros.lisp

    r10203 r10959  
    193193  (target-arch-case
    194194   (:x8632
    195     `(cmpl ($ x8632::nil-value) (%l ,reg)))
    196    (:x8664
    197     `(cmpb ($ (logand #xff x8664::nil-value)) (%b ,reg)))))
     195    `(cmpl ($ (target-nil-value)) (%l ,reg)))
     196   (:x8664
     197    `(cmpb ($ (logand #xff (target-nil-value))) (%b ,reg)))))
    198198
    199199(defx86lapmacro unbox-fixnum (src dest)
     
    331331  (target-arch-case
    332332   (:x8632
    333     `(movl (@ (+ x8632::nil-value ,(x8632::%kernel-global global))) (% ,reg)))
    334    (:x8664
    335     `(movq (@ (+ x8664::nil-value ,(x8664::%kernel-global global))) (% ,reg)))))
     333    `(movl (@ (+ (target-nil-value) ,(x8632::%kernel-global global))) (% ,reg)))
     334   (:x8664
     335    `(movq (@ (+ (target-nil-value) ,(x8664::%kernel-global global))) (% ,reg)))))
    336336
    337337(defx86lapmacro ref-global.l (global reg)
    338338  (target-arch-case
    339339   (:x8632
    340     `(movl (@ (+ x8632::nil-value ,(x8632::%kernel-global global))) (%l ,reg)))
    341    (:x8664
    342     `(movl (@ (+ x8664::nil-value ,(x8664::%kernel-global global))) (%l ,reg)))))
     340    `(movl (@ (+ (target-nil-value) ,(x8632::%kernel-global global))) (%l ,reg)))
     341   (:x8664
     342    `(movl (@ (+ (target-nil-value) ,(x8664::%kernel-global global))) (%l ,reg)))))
    343343
    344344(defx86lapmacro set-global (reg global)
    345345  (target-arch-case
    346346   (:x8632
    347     `(movl (% ,reg) (@ (+ x8632::nil-value ,(x8632::%kernel-global global)))))
    348    (:x8664
    349     `(movq (% ,reg) (@ (+ x8664::nil-value ,(x8664::%kernel-global global)))))))
     347    `(movl (% ,reg) (@ (+ (target-nil-value) ,(x8632::%kernel-global global)))))
     348   (:x8664
     349    `(movq (% ,reg) (@ (+ (target-nil-value) ,(x8664::%kernel-global global)))))))
    350350
    351351(defx86lapmacro macptr-ptr (src dest)
  • trunk/source/compiler/X86/x862.lisp

    r10740 r10959  
    13501350    (if (eq vreg :push)
    13511351      (progn
    1352         (! vpush-fixnum (target-arch-case
    1353                          (:x8632 x8632::nil-value)
    1354                          (:x8664 x8664::nil-value)))
     1352        (! vpush-fixnum (target-nil-value))
    13551353        (^))
    13561354      (progn
     
    13641362    (if (eq vreg :push)
    13651363      (progn
    1366         (! vpush-fixnum (target-arch-case
    1367                          (:x8632 x8632::t-value)
    1368                          (:x8664 x8664::t-value)))
     1364        (! vpush-fixnum (target-t-value))
    13691365        (^))
    13701366      (progn
     
    21352131    (if is-node
    21362132      (cond ((eq form *nx-nil*)
    2137              (arch::target-nil-value arch))
     2133             (target-nil-value))
    21382134            ((eq form *nx-t*)
    2139              (+ (arch::target-nil-value arch) (arch::target-t-offset arch)))
     2135             (+ (target-nil-value) (arch::target-t-offset arch)))
    21402136            (t
    21412137             (let* ((fixval (acode-fixnum-form-p form)))
  • trunk/source/level-0/PPC/PPC32/ppc32-bignum.lisp

    r5842 r10959  
    9898  (srwi imm0 imm0 5)
    9999  (rlwimi imm0 imm0 4 27 27)
    100   (addi arg_z imm0 ppc32::nil-value)
     100  (addi arg_z imm0 (target-nil-value))
    101101  (blr))
    102102
     
    169169  (srwi imm0 imm0 31)
    170170  (rlwimi imm0 imm0 4 27 27)
    171   (addi arg_z imm0 ppc32::nil-value)    ; return T if sign bit was clear before inversion
     171  (addi arg_z imm0 (target-nil-value))  ; return T if sign bit was clear before inversion
    172172  (blr))
    173173
     
    178178
    179179(defppclapfunction %add-with-carry ((r 12) (k 8) (c 4) (a 0) (i arg_x) (b arg_y) (j arg_z))
    180   (cmpwi cr1 j ppc32::nil-value)
    181   (cmpwi cr0 i ppc32::nil-value)
     180  (cmpwi cr1 j (target-nil-value))
     181  (cmpwi cr0 i (target-nil-value))
    182182  (lwz temp0 a vsp)
    183183  (unbox-fixnum imm1 temp0)
     
    211211;;; If I is NIL, A is a fixnum; likewise for J and B.
    212212(defppclapfunction %subtract-with-borrow ((r 12) (k 8) (borrow 4) (a 0) (i arg_x) (b arg_y) (j arg_z))
    213   (cmpwi cr0 i ppc32::nil-value)
    214   (cmpwi cr1 j ppc32::nil-value)
     213  (cmpwi cr0 i (target-nil-value))
     214  (cmpwi cr1 j (target-nil-value))
    215215  (lwz temp0 a vsp)
    216216  (unbox-fixnum imm2 b)
     
    783783  (subic. count count 4)
    784784  (bgt  @loop)
    785   (li arg_z ppc32::nil-value)
     785  (li arg_z (target-nil-value))
    786786  (blr)
    787787  @true
    788   (li arg_z (+ ppc32::nil-value  ppc32::t-offset))
     788  (li arg_z (+ (target-nil-value)  ppc32::t-offset))
    789789  (blr))
    790790
     
    842842    (unbox-fixnum  w1 fix)
    843843    (lwz w2 ppc32::misc-data-offset big)
    844     (cmpwi dest ppc32::nil-value)
     844    (cmpwi dest (target-nil-value))
    845845    (not w2 w2)
    846846    (and w1 w1 w2)
     
    859859    (unbox-fixnum  w1 fix)
    860860    (lwz w2 ppc32::misc-data-offset big)
    861     (cmpwi dest ppc32::nil-value)
     861    (cmpwi dest (target-nil-value))
    862862    (and w1 w1 w2)
    863863    (bne @store)
     
    875875    (unbox-fixnum  w1 fix)
    876876    (lwz w2 ppc32::misc-data-offset big)
    877     (cmpwi dest ppc32::nil-value)
     877    (cmpwi dest (target-nil-value))
    878878    (not w1 w1)
    879879    (and w1 w1 w2)
     
    11071107    (b @big)
    11081108    @more
    1109     (cmpwi :cr1 fixp ppc32::nil-value)
     1109    (cmpwi :cr1 fixp (target-nil-value))
    11101110    (cmpwi len '1)
    11111111    (beq :cr1 @big)  ; dont return fixnum
     
    15441544    (b @again)
    15451545    @done
    1546     (li arg_z ppc32::nil-value)
     1546    (li arg_z (target-nil-value))
    15471547    (blr)))
    15481548
  • trunk/source/level-0/PPC/ppc-def.lisp

    r9844 r10959  
    4646  (check-nargs 1)
    4747  (unbox-fixnum imm0 offset)
    48   (addi imm0 imm0 target::nil-value)
     48  (addi imm0 imm0 (target-nil-value))
    4949  (ldr arg_z 0 imm0)
    5050  (blr))
     
    5353  (check-nargs 2)
    5454  (unbox-fixnum imm0 offset)
    55   (addi imm0 imm0 target::nil-value)
     55  (addi imm0 imm0 (target-nil-value))
    5656  (str new-value 0 imm0)
    5757  (blr))
     
    6363  (check-nargs 2)
    6464  (unbox-fixnum imm0 offset)
    65   (addi imm0 imm0 target::nil-value)
     65  (addi imm0 imm0 (target-nil-value))
    6666  (ldr imm0 0 imm0)
    6767  (str imm0 target::macptr.address ptr)
     
    469469    (stfd fp1 16 imm2)
    470470    (restore-full-lisp-context)
    471     (li arg_z ppc32::nil-value)
     471    (li arg_z (target-nil-value))
    472472    (blr))
    473473 
     
    937937      (stfd fp1 16 imm2)
    938938      (restore-full-lisp-context)
    939       (li arg_z ppc32::nil-value)
     939      (li arg_z (target-nil-value))
    940940      (blr))
    941941    )
  • trunk/source/level-0/PPC/ppc-misc.lisp

    r10402 r10959  
    495495    (bne @again)
    496496    (isync)
    497     (li arg_z (+ target::t-offset target::nil-value))
     497    (li arg_z (+ target::t-offset (target-nil-value)))
    498498    (blr)
    499499    @lose
     
    504504
    505505(defppclapfunction set-%gcable-macptrs% ((ptr target::arg_z))
    506   (li imm0 (+ target::nil-value (target::kernel-global gcable-pointers)))
     506  (li imm0 (+ (target-nil-value) (target::kernel-global gcable-pointers)))
    507507  @again
    508508  (lrarx arg_y rzero imm0)
     
    516516;;; (It's decremented if it's currently negative, incremented otherwise.)
    517517(defppclapfunction %lock-gc-lock ()
    518   (li imm0 (+ target::nil-value (target::kernel-global gc-inhibit-count)))
     518  (li imm0 (+ (target-nil-value) (target::kernel-global gc-inhibit-count)))
    519519  @again
    520520  (lrarx arg_y rzero imm0)
     
    534534(defppclapfunction %unlock-gc-lock ()
    535535;;  (sync)
    536   (li imm0 (+ target::nil-value (target::kernel-global gc-inhibit-count)))
     536  (li imm0 (+ (target-nil-value) (target::kernel-global gc-inhibit-count)))
    537537  @again
    538538  (lrarx arg_y rzero imm0)
     
    711711@get0
    712712  (svref imm0 1 srv)
    713   (cmpwi cr0 imm0 target::nil-value)
     713  (cmpwi cr0 imm0 (target-nil-value))
    714714  (beq @get1)
    715715  (lwz save0 0 imm0)
    716716@get1
    717717  (svref imm0 2 srv)
    718   (cmpwi cr0 imm0 target::nil-value)
     718  (cmpwi cr0 imm0 (target-nil-value))
    719719  (beq @get2)
    720720  (lwz save1 0 imm0)
    721721@get2
    722722  (svref imm0 3 srv)
    723   (cmpwi cr0 imm0 target::nil-value)
     723  (cmpwi cr0 imm0 (target-nil-value))
    724724  (beq @get3)
    725725  (lwz save2 0 imm0)
    726726@get3
    727727  (svref imm0 4 srv)
    728   (cmpwi cr0 imm0 target::nil-value)
     728  (cmpwi cr0 imm0 (target-nil-value))
    729729  (beq @get4)
    730730  (lwz save3 0 imm0)
    731731@get4
    732732  (svref imm0 5 srv)
    733   (cmpwi cr0 imm0 target::nil-value)
     733  (cmpwi cr0 imm0 (target-nil-value))
    734734  (beq @get5)
    735735  (lwz save4 0 imm0)
    736736@get5
    737737  (svref imm0 6 srv)
    738   (cmpwi cr0 imm0 target::nil-value)
     738  (cmpwi cr0 imm0 (target-nil-value))
    739739  (beq @get6)
    740740  (lwz save5 0 imm0)
    741741@get6
    742742  (svref imm0 7 srv)
    743   (cmpwi cr0 imm0 target::nil-value)
     743  (cmpwi cr0 imm0 (target-nil-value))
    744744  (beq @get7)
    745745  (lwz save6 0 imm0)
    746746@get7
    747747  (svref imm0 8 srv)
    748   (cmpwi cr0 imm0 target::nil-value)
     748  (cmpwi cr0 imm0 (target-nil-value))
    749749  (beq @got)
    750750  (lwz save7 0 imm0)
     
    10121012
    10131013(defppclapfunction %atomic-pop-static-cons ()
    1014   (li imm0 (+ target::nil-value (target::kernel-global static-conses)))
     1014  (li imm0 (+ (target-nil-value) (target::kernel-global static-conses)))
    10151015  @again
    10161016  (lrarx arg_z rzero imm0)
    1017   (cmpri arg_z target::nil-value)
     1017  (cmpri arg_z (target-nil-value))
    10181018  (beq @lose)
    10191019  (%cdr arg_y arg_z)
  • trunk/source/level-0/PPC/ppc-pred.lisp

    r3062 r10959  
    6464  (bne cr1 @lose)
    6565  @win
    66   (li arg_z (+ ppc32::t-offset ppc32::nil-value))
     66  (li arg_z (+ ppc32::t-offset (target-nil-value)))
    6767  (blr)
    6868  @macptr
     
    7676  (beq cr0 @win)
    7777  @lose
    78   (li arg_z ppc32::nil-value)
     78  (li arg_z (target-nil-value))
    7979  (blr)
    8080  @bignum
     
    9494  (bne cr0 @lose)
    9595  (bne cr1 @bignum-next)
    96   (li arg_z (+ ppc32::t-offset ppc32::nil-value))
     96  (li arg_z (+ ppc32::t-offset (target-nil-value)))
    9797  (blr)
    9898  @node
     
    106106  (lwz y ppc32::misc-data-offset y)
    107107  (bl @tail)
    108   (cmpwi cr0 arg_z ppc32::nil-value)
     108  (cmpwi cr0 arg_z (target-nil-value))
    109109  (restore-full-lisp-context)
    110110  (vpop y)
     
    155155  (bne @lose)
    156156  @win
    157   (li arg_z (+ ppc64::nil-value ppc64::t-offset))
     157  (li arg_z (+ (target-nil-value) ppc64::t-offset))
    158158  (blr)
    159159  ;; Macptr objects can have different lengths, but their subtags must
     
    232232  (bge cr0 @go)
    233233  @lose
    234   (li arg_z ppc32::nil-value)
     234  (li arg_z (target-nil-value))
    235235  (blr)
    236236  @same
     
    261261  (mr y temp1)
    262262  (bl @top)
    263   (cmpwi :cr0 arg_z ppc32::nil-value
     263  (cmpwi :cr0 arg_z (target-nil-value)
    264264  (mr nfn fn)
    265265  (restore-full-lisp-context)           ; gets old fn to fn 
     
    271271  (b @top)
    272272  @win
    273   (li arg_z (+ ppc32::t-offset ppc32::nil-value))
     273  (li arg_z (+ ppc32::t-offset (target-nil-value)))
    274274  (blr))
    275275
     
    296296  (blr)
    297297  @win
    298   (li arg_z (+ ppc64::nil-value ppc64::t-offset))
     298  (li arg_z (+ (target-nil-value) ppc64::t-offset))
    299299  (blr)
    300300  @cons
  • trunk/source/level-0/PPC/ppc-symbol.lisp

    r7967 r10959  
    3030(defppclapfunction %function ((sym arg_z))
    3131  (check-nargs 1)
    32   (cmpwi cr1 sym ppc32::nil-value)
     32  (cmpwi cr1 sym (target-nil-value))
    3333  (let ((symptr temp0)
    3434        (symbol temp1)
    3535        (def arg_z))
    36     (li symptr (+ ppc32::nilsym-offset ppc32::nil-value))
     36    (li symptr (+ ppc32::nilsym-offset (target-nil-value)))
    3737    (mr symbol sym)
    3838    (if (:cr1 :ne)
     
    6868  #+ppc32-target
    6969  (progn
    70     (cmpwi cr0 arg_z ppc32::nil-value)
     70    (cmpwi cr0 arg_z (target-nil-value))
    7171    (if (:cr0 :eq)
    7272      (progn
    73         (li arg_z (+ ppc32::nilsym-offset ppc32::nil-value))
     73        (li arg_z (+ ppc32::nilsym-offset (target-nil-value)))
    7474        (blr))))
    7575  (trap-unless-typecode= arg_z target::subtag-symbol)
     
    8181  #+ppc32-target
    8282  (progn
    83     (li imm1 (+ ppc32::nilsym-offset ppc32::nil-value))
     83    (li imm1 (+ ppc32::nilsym-offset (target-nil-value)))
    8484    (cmpw cr0 imm1 symptr)
    8585    (if (:cr0 :eq)
  • trunk/source/level-0/PPC/ppc-utils.lisp

    r8250 r10959  
    497497  (li imm0 arch::gc-trap-function-gc)
    498498  (trlgei allocptr 0)
    499   (li arg_z target::nil-value)
     499  (li arg_z (target-nil-value))
    500500  (blr))
    501501
  • trunk/source/level-0/X86/X8632/x8632-bignum.lisp

    r10923 r10959  
    6060(defx8632lapfunction %digit-0-or-plusp ((bignum arg_y) (idx arg_z))
    6161  (movl (@ x8632::misc-data-offset (% bignum) (% idx)) (% imm0))
    62   (movl ($ x8632::nil-value) (% temp0))
     62  (movl ($ (target-nil-value)) (% temp0))
    6363  (leal (@ x8632::t-offset (% temp0)) (% arg_z))
    6464  (testl (% imm0) (% imm0))
     
    6969(defx8632lapfunction %bignum-oddp ((bignum arg_z))
    7070  (movl (@ x8632::misc-data-offset (% bignum)) (% imm0))
    71   (movl ($ x8632::nil-value) (% temp0))
     71  (movl ($ (target-nil-value)) (% temp0))
    7272  (leal (@ x8632::t-offset (% temp0)) (% arg_z))
    7373  (testb ($ 1) (% imm0.b))
     
    7878  (vector-length bignum imm0)
    7979  (movl (@ (- x8632::misc-data-offset 4) (% bignum) (% imm0)) (% imm0))
    80   (movl ($ x8632::nil-value) (% arg_z))
     80  (movl ($ (target-nil-value)) (% arg_z))
    8181  (lea (@ x8632::t-offset (% arg_z)) (% temp0))
    8282  (testl (% imm0) (% imm0))
     
    8787  (vector-length bignum imm0)
    8888  (movl (@ (- x8632::misc-data-offset 4) (% bignum) (% imm0)) (% imm0))
    89   (movl ($ x8632::nil-value) (% arg_z))
     89  (movl ($ (target-nil-value)) (% arg_z))
    9090  (lea (@ x8632::t-offset (% arg_z)) (% temp0))
    9191  (testl (% imm0) (% imm0))
     
    9999  (mark-as-imm temp0)
    100100  (unbox-fixnum b imm0)
    101   (cmpl ($ x8632::nil-value) (% j))
     101  (cmpl ($ (target-nil-value)) (% j))
    102102  ;; if j not nil, get b[j]
    103103  (cmovnel (@ x8632::misc-data-offset (% b) (% j)) (% imm0))
     
    105105  (unbox-fixnum arg_y temp0)
    106106  (movl (@ i (% esp)) (% arg_z))
    107   (cmpl ($ x8632::nil-value) (% arg_z))
     107  (cmpl ($ (target-nil-value)) (% arg_z))
    108108  ;; if i not nil, get a[i]
    109109  (cmovnel (@ x8632::misc-data-offset (% arg_y) (% arg_z)) (% temp0))
     
    130130        (cc mm4))
    131131    (unbox-fixnum b imm0)               ;assume j will be nil
    132     (cmpl ($ x8632::nil-value) (% j))
     132    (cmpl ($ (target-nil-value)) (% j))
    133133    ;; if j not nil, get b[j]
    134134    (cmovnel (@ x8632::misc-data-offset (% b) (% j)) (% imm0))
     
    138138    (movl (@ c (% esp)) (% temp0))
    139139    (unbox-fixnum arg_y imm0)           ;assume i will be nil
    140     (cmpl ($ x8632::nil-value) (% arg_z))
     140    (cmpl ($ (target-nil-value)) (% arg_z))
    141141    ;; if i not nil, get a[i]
    142142    (cmovnel (@ x8632::misc-data-offset (% arg_y) (% arg_z)) (% imm0))
     
    163163  (mark-as-imm temp0)
    164164  (unbox-fixnum b imm0)
    165   (cmpl ($ x8632::nil-value) (% j))
     165  (cmpl ($ (target-nil-value)) (% j))
    166166  (cmovnel (@ x8632::misc-data-offset (% b) (% j)) (% imm0))
    167167  (movl (@ a (% esp)) (% arg_y))
    168168  (unbox-fixnum arg_y temp0)
    169169  (movl (@ i (% esp)) (% arg_z))
    170   (cmpl ($ x8632::nil-value) (% arg_z))
     170  (cmpl ($ (target-nil-value)) (% arg_z))
    171171  (cmovnel (@ x8632::misc-data-offset (% arg_y) (% arg_z)) (% temp0))
    172172  ;; unboxed a or a[i] in temp0, unboxed b or b[j] in imm0
     
    189189        (ww mm4))
    190190    (unbox-fixnum b imm0)
    191     (cmpl ($ x8632::nil-value) (% j))
     191    (cmpl ($ (target-nil-value)) (% j))
    192192    ;; if j not nil, get b[j]
    193193    (cmovnel (@ x8632::misc-data-offset (% b) (% j)) (% imm0))
     
    197197    (movl (@ borrow (% esp)) (% temp0))
    198198    (unbox-fixnum arg_y imm0)
    199     (cmpl ($ x8632::nil-value) (% arg_z))
     199    (cmpl ($ (target-nil-value)) (% arg_z))
    200200    ;; if i not nil, get a[i]
    201201    (cmovnel (@ x8632::misc-data-offset (% arg_y) (% arg_z)) (% imm0))
     
    334334    @maybe-return-fixnum
    335335    ;; could use SETcc here to avoid one branch
    336     (cmpl ($ x8632::nil-value) (@ 0 (% esp))) ;return-fixnum-p
     336    (cmpl ($ (target-nil-value)) (@ 0 (% esp))) ;return-fixnum-p
    337337    (je @done)
    338338    (cmpl ($ x8632::one-digit-bignum-header)
     
    571571  (andl (% temp0) (% imm0))
    572572  (mark-as-node temp0)
    573   (cmpl ($ x8632::nil-value) (% dest))
     573  (cmpl ($ (target-nil-value)) (% dest))
    574574  (jne @store)
    575575  (box-fixnum imm0 arg_z)
     
    587587  (andl (% temp0) (% imm0))
    588588  (mark-as-node temp0)
    589   (cmpl ($ x8632::nil-value) (% dest))
     589  (cmpl ($ (target-nil-value)) (% dest))
    590590  (jne @store)
    591591  (box-fixnum imm0 arg_z)
     
    602602  (andl (% temp0) (% imm0))
    603603  (mark-as-node temp0)
    604   (cmpl ($ x8632::nil-value) (% dest))
     604  (cmpl ($ (target-nil-value)) (% dest))
    605605  (jne @store)
    606606  (box-fixnum imm0 arg_z)
     
    658658    (cmpl (% i) (% c))
    659659    (jg @loop)
    660     (movl ($ x8632::nil-value) (% arg_z))
     660    (movl ($ (target-nil-value)) (% arg_z))
    661661    (single-value-return 3)
    662662    @true
    663     (movl ($ x8632::t-value) (% arg_z))
     663    (movl ($ (target-t-value)) (% arg_z))
    664664    (single-value-return 3)))
    665665
  • trunk/source/level-0/X86/X8632/x8632-clos.lisp

    r10478 r10959  
    165165      (jmp @call)
    166166      @multiple
    167       (pushl (@ (+ x8632::nil-value (x8632::%kernel-global 'lexpr-return))))
     167      (pushl (@ (+ (target-nil-value) (x8632::%kernel-global 'lexpr-return))))
    168168      (movl (% imm0) (% ra0))
    169169      @call
     
    213213  (set-nargs 3)
    214214  (call-subprim .SPksignalerr)
    215   ;(movl ($ x8632::nil-value) (% arg_z))
     215  ;(movl ($ (target-nil-value)) (% arg_z))
    216216  (leave)
    217217  (single-value-return))
     
    236236      (jmp @call)
    237237      @multiple
    238       (pushl (@ (+ x8632::nil-value (x8632::%kernel-global 'lexpr-return))))
     238      (pushl (@ (+ (target-nil-value) (x8632::%kernel-global 'lexpr-return))))
    239239      (movl (% imm0) (% ra0))
    240240      @call
  • trunk/source/level-0/X86/X8632/x8632-def.lisp

    r10575 r10959  
    127127  (check-nargs 1)
    128128  (unbox-fixnum offset imm0)
    129   (movl (@ x8632::nil-value (% imm0)) (% arg_z))
     129  (movl (@ (target-nil-value) (% imm0)) (% arg_z))
    130130  (single-value-return))
    131131
     
    134134  (check-nargs 2)
    135135  (unbox-fixnum offset imm0)
    136   (movl (% arg_z) (@ x8632::nil-value (% imm0)))
     136  (movl (% arg_z) (@ (target-nil-value) (% imm0)))
    137137  (single-value-return))
    138138
     
    141141  (check-nargs 2)
    142142  (unbox-fixnum offset imm0)
    143   (movl (@ x8632::nil-value (% imm0)) (% imm0))
     143  (movl (@ (target-nil-value) (% imm0)) (% imm0))
    144144  (movl (% imm0) (@ x8632::macptr.address (% ptr)))
    145145  (single-value-return))
     
    236236  (single-value-return)
    237237  @fail
    238   (movl ($ x8632::nil-value) (% arg_z))
     238  (movl ($ (target-nil-value)) (% arg_z))
    239239  (single-value-return))
    240240
     
    251251  (single-value-return)
    252252  @fail
    253   (movl ($ x8632::nil-value) (% arg_z))
     253  (movl ($ (target-nil-value)) (% arg_z))
    254254  (single-value-return))
    255255
     
    270270(defx8632lapfunction %catch-top ((tcr arg_z))
    271271  (check-nargs 1)
    272   (movl ($ x8632::nil-value) (% arg_y))
     272  (movl ($ (target-nil-value)) (% arg_y))
    273273  (movl (:rcontext x8632::tcr.catch-top) (% arg_z))
    274274  (testb (%b arg_z) (%b arg_z))
  • trunk/source/level-0/X86/X8632/x8632-float.lisp

    r10575 r10959  
    542542  (movl (@ x8632::double-float.val-high (% n)) (% imm0))
    543543  (testl (% imm0) (% imm0))
    544   (movl ($ x8632::t-value) (% imm0))
    545   (movl ($ x8632::nil-value) (% arg_z))
     544  (movl ($ (target-t-value)) (% imm0))
     545  (movl ($ (target-nil-value)) (% arg_z))
    546546  (cmovll (% imm0) (% arg_z))
    547547  (single-value-return))
     
    550550  (movl (@ x8632::single-float.value (% n)) (% imm0))
    551551  (testl (% imm0) (% imm0))
    552   (movl ($ x8632::t-value) (% imm0))
    553   (movl ($ x8632::nil-value) (% arg_z))
     552  (movl ($ (target-t-value)) (% imm0))
     553  (movl ($ (target-nil-value)) (% arg_z))
    554554  (cmovll (% imm0) (% arg_z))
    555555  (single-value-return))
  • trunk/source/level-0/X86/X8632/x8632-misc.lisp

    r10575 r10959  
    333333  (cmpl (% imm0) (% esp))
    334334  @finish
    335   (movl ($ x8632::nil-value) (% arg_z))
     335  (movl ($ (target-nil-value)) (% arg_z))
    336336  (cmovnel (@ (- x8632::node-size) (% imm0)) (% arg_z))
    337337  (single-value-return))
     
    389389    (cmpxchgl (% new) (@ (% robject) (% imm1)))
    390390    (jne @again)
    391     (movl ($ x8632::t-value) (% arg_z))
     391    (movl ($ (target-t-value)) (% arg_z))
    392392    (mark-as-node temp0)
    393393    (single-value-return 4)
    394394    @lose
    395     (movl ($ x8632::nil-value) (% arg_z))
     395    (movl ($ (target-nil-value)) (% arg_z))
    396396    (mark-as-node temp0)
    397397    (single-value-return 4)))
     
    399399(defx8632lapfunction set-%gcable-macptrs% ((ptr arg_z))
    400400  @again
    401   (movl (@ (+ x8632::nil-value (x8632::kernel-global gcable-pointers))) (% eax))
     401  (movl (@ (+ (target-nil-value) (x8632::kernel-global gcable-pointers))) (% eax))
    402402  (movl (% eax) (@ x8632::xmacptr.link (% ptr)))
    403403  (lock)
    404   (cmpxchgl (% ptr) (@ (+ x8632::nil-value (x8632::kernel-global gcable-pointers))))
     404  (cmpxchgl (% ptr) (@ (+ (target-nil-value) (x8632::kernel-global gcable-pointers))))
    405405  (jne @again)
    406406  (single-value-return))
     
    410410(defx8632lapfunction %lock-gc-lock ()
    411411  @again
    412   (movl (@ (+ x8632::nil-value (x8632::kernel-global gc-inhibit-count))) (% eax))
     412  (movl (@ (+ (target-nil-value) (x8632::kernel-global gc-inhibit-count))) (% eax))
    413413  (lea (@ '-1 (% eax)) (% temp0))
    414414  (lea (@ '1 (% eax)) (% arg_z))
     
    416416  (cmovsl (% temp0) (% arg_z))
    417417  (lock)
    418   (cmpxchgl (% arg_z) (@ (+ x8632::nil-value (x8632::kernel-global gc-inhibit-count))))
     418  (cmpxchgl (% arg_z) (@ (+ (target-nil-value) (x8632::kernel-global gc-inhibit-count))))
    419419  (jnz @again)
    420420  (single-value-return))
     
    425425(defx8632lapfunction %unlock-gc-lock ()
    426426  @again
    427   (movl (@ (+ x8632::nil-value (x8632::kernel-global gc-inhibit-count)))
     427  (movl (@ (+ (target-nil-value) (x8632::kernel-global gc-inhibit-count)))
    428428        (% eax))
    429429  (lea (@ '1 (% eax)) (% temp0))
     
    432432  (cmovlel (% temp0) (% arg_z))
    433433  (lock)
    434   (cmpxchgl (% arg_z) (@ (+ x8632::nil-value (x8632::kernel-global gc-inhibit-count))))
     434  (cmpxchgl (% arg_z) (@ (+ (target-nil-value) (x8632::kernel-global gc-inhibit-count))))
    435435  (jne @again)
    436436  (cmpl ($ '-1) (% eax))
     
    664664  (setne (%b imm0))
    665665  (andl ($ x8632::t-offset) (%l imm0))
    666   (lea (@ x8632::nil-value (% imm0)) (% arg_z))
     666  (lea (@ (target-nil-value) (% imm0)) (% arg_z))
    667667  (single-value-return))
    668668
     
    700700  (movzbl (%b imm0) (%l imm0))
    701701  (testl (%l imm0) (%l imm0))
    702   (movl ($ target::nil-value) (%l arg_z))
     702  (movl ($ (target-nil-value)) (%l arg_z))
    703703  (cmovnel (@ (+ target::t-offset target::symbol.vcell) (% arg_z)) (%l arg_z))
    704704  (single-value-return))
     
    708708  (ud2a)
    709709  (:byte 6)
    710   (movl ($ target::nil-value) (%l arg_z))
     710  (movl ($ (target-nil-value)) (%l arg_z))
    711711  (single-value-return))
    712712
     
    717717  (movzbl (%b imm0) (%l imm0))
    718718  (testl (%l imm0) (%l imm0))
    719   (movl ($ target::nil-value) (%l arg_z))
     719  (movl ($ (target-nil-value)) (%l arg_z))
    720720  (cmovnel (@ (+ target::t-offset target::symbol.vcell) (% arg_z)) (%l arg_z))
    721721  (single-value-return))
     
    725725  (ud2a)
    726726  (:byte 8)
    727   (movl ($ target::nil-value) (%l arg_z))
     727  (movl ($ (target-nil-value)) (%l arg_z))
    728728  (single-value-return))
    729729
     
    766766(defx8632lapfunction %atomic-pop-static-cons ()
    767767  @again
    768   (movl (@ (+ x8632::nil-value (x8632::kernel-global static-conses))) (% eax))
    769   (testl ($ x8632::nil-value) (% eax))
     768  (movl (@ (+ (target-nil-value) (x8632::kernel-global static-conses))) (% eax))
     769  (testl ($ (target-nil-value)) (% eax))
    770770  (jz @lose)
    771771  (%cdr eax temp0)
    772772  (lock)
    773   (cmpxchgl (% temp0) (@ (+ x8632::nil-value (x8632::kernel-global static-conses))))
     773  (cmpxchgl (% temp0) (@ (+ (target-nil-value) (x8632::kernel-global static-conses))))
    774774  (jnz @again)
    775775  @lose
     
    785785  (cmpl (@ target::area.static-dnodes (% temp0)) (% imm0))
    786786  (leal (@ (% imm0) target::fixnumone) (% arg_z))
    787   (movl ($ target::nil-value) (%l imm0))
     787  (movl ($ (target-nil-value)) (%l imm0))
    788788  (cmovael (% imm0) (% arg_z))
    789789  (single-value-return))
  • trunk/source/level-0/X86/X8632/x8632-numbers.lisp

    r8975 r10959  
    122122(defx8632lapfunction called-for-mv-p ()
    123123  (movl (@ x8632::lisp-frame.return-address (% ebp)) (% imm0))
    124   (cmpl (% imm0) (@ (+ x8632::nil-value (x8632::kernel-global ret1valaddr))))
    125   (movl ($ x8632::t-value) (% imm0))
    126   (movl ($ x8632::nil-value) (% arg_z))
     124  (cmpl (% imm0) (@ (+ (target-nil-value) (x8632::kernel-global ret1valaddr))))
     125  (movl ($ (target-t-value)) (% imm0))
     126  (movl ($ (target-nil-value)) (% arg_z))
    127127  (cmove (% imm0) (% arg_z))
    128128  (single-value-return))
  • trunk/source/level-0/X86/X8632/x8632-pred.lisp

    r9562 r10959  
    4141  (je @ratio)
    4242  @lose
    43   (movl ($ x8632::nil-value) (% arg_z))
     43  (movl ($ (target-nil-value)) (% arg_z))
    4444  (single-value-return)
    4545  @double-float
     
    5151  (cmpl (% imm0) (@ x8632::double-float.value (% y)))
    5252  (jne @lose)
    53   (movl ($ x8632::t-value) (% arg_z))
     53  (movl ($ (target-t-value)) (% arg_z))
    5454  (single-value-return)
    5555  @macptr
     
    6060  @test
    6161  (cmpl (% imm0) (@ x8632::misc-data-offset (% y)))
    62   (movl ($ x8632::t-value) (%l imm0))
     62  (movl ($ (target-t-value)) (%l imm0))
    6363  (lea (@ (- x8632::t-offset) (% imm0)) (% arg_z))
    6464  (cmovel (%l imm0) (%l arg_z))
    6565  (single-value-return)
    6666  @win
    67   (movl ($ x8632::t-value) (% arg_z))
     67  (movl ($ (target-t-value)) (% arg_z))
    6868  (single-value-return)
    6969  @ratio
     
    8686  (jnz @tail)
    8787  ;; lose, again
    88   (movl ($ x8632::nil-value) (% arg_z))
     88  (movl ($ (target-nil-value)) (% arg_z))
    8989  (single-value-return)
    9090  @bignum
     
    102102  (sub ($ '1) (% temp0))
    103103  (jnz @bignum-next)
    104   (movl ($ x8632::t-value) (% arg_z))
     104  (movl ($ (target-t-value)) (% arg_z))
    105105  (single-value-return))
    106106
     
    126126  (je @misc)
    127127  @lose
    128   (movl ($ x8632::nil-value) (% arg_z))
     128  (movl ($ (target-nil-value)) (% arg_z))
    129129  (single-value-return)
    130130  @win
    131   (movl ($ x8632::t-value) (% arg_z))
     131  (movl ($ (target-t-value)) (% arg_z))
    132132  (single-value-return)
    133133  @cons
     
    155155  (restore-simple-frame)         
    156156  (jnz @top)
    157   (movl ($ x8632::nil-value) (% arg_z))
     157  (movl ($ (target-nil-value)) (% arg_z))
    158158  (single-value-return)
    159159  @misc
     
    172172  @won-with-eql
    173173  (restore-simple-frame)                ; discards pushed args
    174   (movl ($ x8632::t-value) (% arg_z))
     174  (movl ($ (target-t-value)) (% arg_z))
    175175  (single-value-return))
    176176
  • trunk/source/level-0/X86/X8632/x8632-symbol.lisp

    r10575 r10959  
    1212  (check-nargs 1)
    1313  (let ((symaddr temp0))
    14     (movl ($ (+ x8632::nil-value x8632::nilsym-offset)) (% symaddr))
     14    (movl ($ (+ (target-nil-value) x8632::nilsym-offset)) (% symaddr))
    1515    (cmp-reg-to-nil sym)
    1616    (cmovne (% sym) (% symaddr))
     
    2929(defx8632lapfunction %symbol->symptr ((sym arg_z))
    3030  (let ((tag imm0))
    31     (movl ($ (+ x8632::nil-value x8632::nilsym-offset)) (% tag))
     31    (movl ($ (+ (target-nil-value) x8632::nilsym-offset)) (% tag))
    3232    (cmp-reg-to-nil sym)
    3333    (cmove (% tag) (% sym))
     
    3939;;; If symptr is NILSYM, return NIL; else typecheck and return symptr
    4040(defx8632lapfunction %symptr->symbol ((symptr arg_z))
    41   (cmpl ($ (+ x8632::nil-value x8632::nilsym-offset)) (% symptr))
     41  (cmpl ($ (+ (target-nil-value) x8632::nilsym-offset)) (% symptr))
    4242  (jne @typecheck)
    43   (movl ($ x8632::nil-value) (% arg_z))
     43  (movl ($ (target-nil-value)) (% arg_z))
    4444  (single-value-return)
    4545  @typecheck
     
    7878(defx8632lapfunction %tcr-binding-location ((tcr arg_y) (sym arg_z))
    7979  (movl (@ x8632::symbol.binding-index (% sym)) (% temp0))
    80   (movl ($ x8632::nil-value) (% arg_z))
     80  (movl ($ (target-nil-value)) (% arg_z))
    8181  (rcmp (% temp0) (@ x8632::tcr.tlb-limit (% tcr)))
    8282  (movl (@ x8632::tcr.tlb-pointer (% tcr)) (% arg_y))
  • trunk/source/level-0/X86/X8632/x8632-utils.lisp

    r10741 r10959  
    151151    (cmpl (@ limit (% ebp)) (% obj))
    152152    (jb @loop)
    153     (movl ($ x8632::nil-value) (% arg_z))
     153    (movl ($ (target-nil-value)) (% arg_z))
    154154    (restore-simple-frame)
    155155    (single-value-return)))
     
    256256    (jb @loop)
    257257    @done
    258     (movl ($ x8632::nil-value) (% arg_z))
     258    (movl ($ (target-nil-value)) (% arg_z))
    259259    (restore-simple-frame)
    260260    (single-value-return)))
     
    282282  (movzbl (% imm0.b) (% imm0))
    283283  (movl (@ x8632::misc-data-offset (% temp1) (% imm0) 4) (% temp0))
    284   (cmpl ($ x8632::nil-value) (% temp0))
     284  (cmpl ($ (target-nil-value)) (% temp0))
    285285  (je @bad)
    286286  ;; functionp?
     
    309309  (ref-global tenured-area arg_z)
    310310  (test (% arg_z) (% arg_z))
    311   (cmovel (@ (+ x8632::nil-value (x8632::%kernel-global 'gc-count))) (% arg_z))
     311  (cmovel (@ (+ (target-nil-value) (x8632::%kernel-global 'gc-count))) (% arg_z))
    312312  (cmovnel (@ x8632::area.gc-count (% arg_z)) (% arg_z))
    313313  (single-value-return))
     
    378378  (movl ($ arch::gc-trap-function-use-lisp-heap-threshold) (% imm0))
    379379  (uuo-gc-trap)
    380   (movl ($ x8632::nil-value) (%l arg_z))
     380  (movl ($ (target-nil-value)) (%l arg_z))
    381381  (single-value-return))
    382382
     
    391391(defx8632lapfunction %kernel-import ((offset arg_z))
    392392  (unbox-fixnum arg_z imm0)
    393   (addl (@ (+ x8632::nil-value (x8632::%kernel-global 'kernel-imports))) (% imm0))
     393  (addl (@ (+ (target-nil-value) (x8632::%kernel-global 'kernel-imports))) (% imm0))
    394394  (movl (@ (% imm0)) (% imm0))
    395395  (box-fixnum imm0 arg_z)
     
    438438  (leal (@ '2 (% esp) (% nargs)) (% imm0))
    439439  (cmoval (% imm0) (% esp))
    440   (movl ($ x8632::t-value) (% arg_z))
     440  (movl ($ (target-t-value)) (% arg_z))
    441441  (push (% temp0))
    442442  (single-value-return))
     
    447447  (leal (@ '2 (% esp) (% nargs)) (% imm0))
    448448  (cmoval (% imm0) (% esp))
    449   (movl ($ x8632::nil-value) (% arg_z))
     449  (movl ($ (target-nil-value)) (% arg_z))
    450450  (push (% temp0))
    451451  (single-value-return))
  • trunk/source/level-0/X86/x86-clos.lisp

    r10145 r10959  
    183183      (jmp @call)
    184184      @multiple
    185       (pushq (@ (+ x8664::nil-value (x8664::%kernel-global 'lexpr-return))))
     185      (pushq (@ (+ (target-nil-value) (x8664::%kernel-global 'lexpr-return))))
    186186      (movq (% imm0) (% ra0))
    187187      @call
     
    236236  (set-nargs 3)
    237237  (call-subprim .SPksignalerr)
    238   ;(movq ($ x8664::nil-value) (% arg_z))
     238  ;(movq ($ (target-nil-value)) (% arg_z))
    239239  (leave)
    240240  (single-value-return))
     
    261261      (jmp @call)
    262262      @multiple
    263       (pushq (@ (+ x8664::nil-value (x8664::%kernel-global 'lexpr-return))))
     263      (pushq (@ (+ (target-nil-value) (x8664::%kernel-global 'lexpr-return))))
    264264      (movq (% imm0) (% ra0))
    265265      @call
  • trunk/source/level-0/X86/x86-def.lisp

    r10575 r10959  
    152152  (check-nargs 1)
    153153  (unbox-fixnum offset imm0)
    154   (movq (@ target::nil-value (% imm0)) (% arg_z))
     154  (movq (@ (target-nil-value) (% imm0)) (% arg_z))
    155155  (single-value-return))
    156156
     
    158158  (check-nargs 2)
    159159  (unbox-fixnum offset imm0)
    160   (movq (% arg_z) (@ target::nil-value (% imm0)))
     160  (movq (% arg_z) (@ (target-nil-value) (% imm0)))
    161161  (single-value-return))
    162162
     
    166166  (check-nargs 2)
    167167  (unbox-fixnum offset imm0)
    168   (movq (@ target::nil-value (% imm0)) (% imm0))
     168  (movq (@ (target-nil-value) (% imm0)) (% imm0))
    169169  (movq (% imm0) (@ x8664::macptr.address (% ptr)))
    170170  (single-value-return))
     
    260260  (single-value-return)
    261261  @fail
    262   (movl ($ x8664::nil-value) (% arg_z.l))
     262  (movl ($ (target-nil-value)) (% arg_z.l))
    263263  (single-value-return))
    264264
     
    276276  (single-value-return)
    277277  @fail
    278   (movl ($ x8664::nil-value) (% arg_z.l))
     278  (movl ($ (target-nil-value)) (% arg_z.l))
    279279  (single-value-return))
    280280
     
    297297(defx86lapfunction %catch-top ((tcr arg_z))
    298298  (check-nargs 1)
    299   (movl ($ x8664::nil-value) (%l arg_y))
     299  (movl ($ (target-nil-value)) (%l arg_y))
    300300  (movq (:rcontext x8664::tcr.catch-top) (% arg_z))
    301301  (testb (%b arg_z) (%b arg_z))
  • trunk/source/level-0/X86/x86-float.lisp

    r10575 r10959  
    432432  (movl (@ x8664::double-float.val-high (% n)) (% imm0.l))
    433433  (testl (% imm0.l) (% imm0.l))
    434   (movl ($ x8664::t-value) (% imm0.l))
    435   (movl ($ x8664::nil-value) (% arg_z.l))
     434  (movl ($ (target-t-value)) (% imm0.l))
     435  (movl ($ (target-nil-value)) (% arg_z.l))
    436436  (cmovlq (% imm0) (% arg_z))
    437437  (single-value-return))
     
    440440(defx86lapfunction %short-float-sign ((n arg_z))
    441441  (testq (% n) (% n))
    442   (movl ($ x8664::t-value) (% imm0.l))
    443   (movl ($ x8664::nil-value) (% arg_z.l))
     442  (movl ($ (target-t-value)) (% imm0.l))
     443  (movl ($ (target-nil-value)) (% arg_z.l))
    444444  (cmovlq (% imm0) (% arg_z))
    445445  (single-value-return))
  • trunk/source/level-0/X86/x86-misc.lisp

    r10575 r10959  
    339339  @room
    340340  (cmpq (% imm1) (% imm0))
    341   (movl ($ x8664::nil-value) (%l arg_z))
     341  (movl ($ (target-nil-value)) (%l arg_z))
    342342  (cmovneq (@ (- x8664::node-size) (% imm1)) (% arg_z))
    343343  (single-value-return))
     
    380380  (cmpxchgq (% new) (@ (% object) (% imm1)))
    381381  (jne @again)
    382   (movl ($ x8664::t-value) (%l arg_z))
     382  (movl ($ (target-t-value)) (%l arg_z))
    383383  (single-value-return 3)
    384384  @lose
    385   (movl ($ x8664::nil-value) (%l arg_z))
     385  (movl ($ (target-nil-value)) (%l arg_z))
    386386  (single-value-return 3))
    387387
    388388(defx86lapfunction set-%gcable-macptrs% ((ptr x8664::arg_z))
    389389  @again
    390   (movq (@ (+ x8664::nil-value (x8664::kernel-global gcable-pointers)))
     390  (movq (@ (+ (target-nil-value) (x8664::kernel-global gcable-pointers)))
    391391        (% rax))
    392392  (movq (% rax) (@ x8664::xmacptr.link (% ptr)))
    393393  (lock)
    394   (cmpxchgq (% ptr) (@ (+ x8664::nil-value (x8664::kernel-global gcable-pointers))))
     394  (cmpxchgq (% ptr) (@ (+ (target-nil-value) (x8664::kernel-global gcable-pointers))))
    395395  (jne @again)
    396396  (single-value-return))
     
    400400(defx86lapfunction %lock-gc-lock ()
    401401  @again
    402   (movq (@ (+ x8664::nil-value (x8664::kernel-global gc-inhibit-count))) (% rax))
     402  (movq (@ (+ (target-nil-value) (x8664::kernel-global gc-inhibit-count))) (% rax))
    403403  (lea (@ '-1 (% rax)) (% temp0))
    404404  (lea (@ '1 (% rax)) (% arg_z))
     
    406406  (cmovsq (% temp0) (% arg_z))
    407407  (lock)
    408   (cmpxchgq (% arg_z) (@ (+ x8664::nil-value (x8664::kernel-global gc-inhibit-count))))
     408  (cmpxchgq (% arg_z) (@ (+ (target-nil-value) (x8664::kernel-global gc-inhibit-count))))
    409409  (jnz @again)
    410410  (single-value-return))
     
    415415(defx86lapfunction %unlock-gc-lock ()
    416416  @again
    417   (movq (@ (+ x8664::nil-value (x8664::kernel-global gc-inhibit-count)))
     417  (movq (@ (+ (target-nil-value) (x8664::kernel-global gc-inhibit-count)))
    418418        (% rax))
    419419  (lea (@ '1 (% rax)) (% arg_x))
     
    422422  (cmovleq (% arg_x) (% arg_z))
    423423  (lock)
    424   (cmpxchgq (% arg_z) (@ (+ x8664::nil-value (x8664::kernel-global gc-inhibit-count))))
     424  (cmpxchgq (% arg_z) (@ (+ (target-nil-value) (x8664::kernel-global gc-inhibit-count))))
    425425  (jne @again)
    426426  (cmpq ($ '-1) (% rax))
     
    629629  (setne (%b imm0))
    630630  (andl ($ x8664::t-offset) (%l imm0))
    631   (lea (@ x8664::nil-value (% imm0)) (% arg_z))
     631  (lea (@ (target-nil-value) (% imm0)) (% arg_z))
    632632  (single-value-return))
    633633
     
    659659(defx86lapfunction %check-deferred-gc ()
    660660  (btq ($ (+ arch::tcr-flag-bit-pending-suspend target::fixnumshift)) (:rcontext x8664::tcr.flags))
    661   (movl ($ x8664::nil-value) (% arg_z.l))
     661  (movl ($ (target-nil-value)) (% arg_z.l))
    662662  (jae @done)
    663663  (ud2a)
    664664  (:byte 3)
    665   (movl ($ x8664::t-value) (% arg_z.l))
     665  (movl ($ (target-t-value)) (% arg_z.l))
    666666  @done
    667667  (single-value-return))
     
    680680  (movzbl (%b imm0) (%l imm0))
    681681  (testl (%l imm0) (%l imm0))
    682   (movl ($ target::nil-value) (%l arg_z))
     682  (movl ($ (target-nil-value)) (%l arg_z))
    683683  (cmovnel (@ (+ target::t-offset target::symbol.vcell) (% arg_z)) (%l arg_z))
    684684  (single-value-return))
     
    688688  (ud2a)
    689689  (:byte 6)
    690   (movl ($ target::nil-value) (%l arg_z))
     690  (movl ($ (target-nil-value)) (%l arg_z))
    691691  (single-value-return))
    692692
     
    697697  (movzbl (%b imm0) (%l imm0))
    698698  (testl (%l imm0) (%l imm0))
    699   (movl ($ target::nil-value) (%l arg_z))
     699  (movl ($ (target-nil-value)) (%l arg_z))
    700700  (cmovnel (@ (+ target::t-offset target::symbol.vcell) (% arg_z)) (%l arg_z))
    701701  (single-value-return))
     
    705705  (ud2a)
    706706  (:byte 8)
    707   (movl ($ target::nil-value) (%l arg_z))
     707  (movl ($ (target-nil-value)) (%l arg_z))
    708708  (single-value-return))
    709709
     
    869869(defx86lapfunction %atomic-pop-static-cons ()
    870870  @again
    871   (movq (@ (+ x8664::nil-value (x8664::kernel-global static-conses))) (% rax))
    872   (testq ($ x8664::nil-value) (% rax))
     871  (movq (@ (+ (target-nil-value) (x8664::kernel-global static-conses))) (% rax))
     872  (testq ($ (target-nil-value)) (% rax))
    873873  (jz @lose)
    874874  (%cdr rax temp0)
    875875  (lock)
    876   (cmpxchgq (% temp0) (@ (+ x8664::nil-value (x8664::kernel-global static-conses))))
     876  (cmpxchgq (% temp0) (@ (+ (target-nil-value) (x8664::kernel-global static-conses))))
    877877  (jnz @again)
    878878  @lose
     
    888888  (cmpq (@ target::area.static-dnodes (% temp0)) (% imm0))
    889889  (leaq (@ (% imm0) target::fixnumone) (% arg_z))
    890   (movl ($ target::nil-value) (%l imm0))
     890  (movl ($ (target-nil-value)) (%l imm0))
    891891  (cmovaeq (% imm0) (% arg_z))
    892892  (single-value-return))
  • trunk/source/level-0/X86/x86-pred.lisp

    r10145 r10959  
    6262  @test
    6363  (cmpq (% imm0) (% imm1))
    64   (movl ($ x8664::t-value) (%l imm0))
     64  (movl ($ (target-t-value)) (%l imm0))
    6565  (lea (@ (- x8664::t-offset) (% imm0)) (% arg_z))
    6666  (cmovel (%l imm0) (%l arg_z))
  • trunk/source/level-0/X86/x86-symbol.lisp

    r10575 r10959  
    3030  (check-nargs 1)
    3131  (let ((symaddr temp0))
    32     (movq ($ (+ x8664::nil-value x8664::nilsym-offset)) (% symaddr))
     32    (movq ($ (+ (target-nil-value) x8664::nilsym-offset)) (% symaddr))
    3333    (cmp-reg-to-nil sym)
    3434    (cmovneq (% sym) (% symaddr))
     
    4747(defx86lapfunction %symbol->symptr ((sym arg_z))
    4848  (let ((tag imm0))
    49     (movq ($ (+ x8664::nil-value x8664::nilsym-offset)) (% tag))
     49    (movq ($ (+ (target-nil-value) x8664::nilsym-offset)) (% tag))
    5050    (cmp-reg-to-nil sym)
    5151    (cmoveq (% tag) (% sym))
     
    6262  (uuo-error-reg-not-tag (% symptr) ($ x8664::fulltag-symbol))
    6363  @ok
    64   (cmpq ($ (+ x8664::nil-value x8664::nilsym-offset)) (% symptr))
     64  (cmpq ($ (+ (target-nil-value) x8664::nilsym-offset)) (% symptr))
    6565  (sete (% imm0.b))
    6666  (negb (% imm0.b))
  • trunk/source/level-0/X86/x86-utils.lisp

    r10690 r10959  
    8484  (andb (% imm1.b) (% imm0.b))
    8585  (andl ($ x8664::t-offset) (%l imm0))
    86   (lea (@ x8664::nil-value (% imm0)) (% arg_z))
     86  (lea (@ (target-nil-value) (% imm0)) (% arg_z))
    8787  (single-value-return))
    8888
     
    178178    (pop (% obj))
    179179    (pop (% fun))
    180     (movl ($ x8664::nil-value) (% arg_z.l))
     180    (movl ($ (target-nil-value)) (% arg_z.l))
    181181    (restore-simple-frame)
    182182    (single-value-return)))
     
    297297    (pop (% obj))
    298298    (pop (% fun))
    299     (movl ($ x8664::nil-value) (% arg_z.l))
     299    (movl ($ (target-nil-value)) (% arg_z.l))
    300300    (restore-simple-frame)
    301301    (single-value-return)))
     
    346346  (ref-global tenured-area arg_z)
    347347  (testq (% arg_z) (% arg_z))
    348   (cmoveq (@ (+ x8664::nil-value (x8664::%kernel-global 'gc-count))) (% arg_z))
     348  (cmoveq (@ (+ (target-nil-value) (x8664::%kernel-global 'gc-count))) (% arg_z))
    349349  (cmovneq (@ x8664::area.gc-count (% arg_z)) (% arg_z))
    350350  (single-value-return))
     
    430430  (movq ($ arch::gc-trap-function-use-lisp-heap-threshold) (% imm0))
    431431  (uuo-gc-trap)
    432   (movl ($ x8664::nil-value) (%l arg_z))
     432  (movl ($ (target-nil-value)) (%l arg_z))
    433433  (single-value-return))
    434434
     
    495495  (leaq (@ '2 (% rsp) (% nargs.q)) (% imm0))
    496496  (cmovaq (% imm0) (% rsp))
    497   (movl ($ x8664::t-value) (%l arg_z))
     497  (movl ($ (target-t-value)) (%l arg_z))
    498498  (push (% ra0))
    499499  (single-value-return))
     
    504504  (leaq (@ '2 (% rsp) (% nargs.q)) (% imm0))
    505505  (cmovaq (% imm0) (% rsp))
    506   (movl ($ x8664::nil) (%l arg_z))
     506  (movl ($ (target-nil-value)) (%l arg_z))
    507507  (push (% ra0))
    508508  (single-value-return))
  • trunk/source/level-1/ppc-trap-support.lisp

    r6390 r10959  
    504504              ((and (match-instr the-trap
    505505                                 (ppc-instruction-mask  :opcode :to :d)
    506                                  (ppc-lap-word (tweqi ?? ppc32::nil-value)))
     506                                 (ppc-lap-word (tweqi ?? (target-nil-value))))
    507507                    (setq instr (scan-for-instr
    508508                                 (ppc-instruction-mask :opcode :d)
     
    732732              ((and (match-instr the-trap
    733733                                 (ppc-instruction-mask  :opcode :to :d)
    734                                  (ppc-lap-word (tdeqi ?? ppc64::nil-value)))
     734                                 (ppc-lap-word (tdeqi ?? (target-nil-value))))
    735735                    (setq instr (scan-for-instr
    736736                                 (ppc-instruction-mask :opcode :ds :ds-xo)
  • trunk/source/objc-bridge/objc-support.lisp

    r10840 r10959  
    140140(defun setup-objc-exception-globals ()
    141141  (flet ((set-global (offset name)
    142            (setf (%get-ptr (%int-to-ptr (+ target::nil-value (%kernel-global-offset offset))))
     142           (setf (%get-ptr (%int-to-ptr (+ (target-nil-value) (%kernel-global-offset offset))))
    143143                 (foreign-symbol-address name))))
    144144    (set-global 'x86::objc-2-personality "___objc_personality_v0")
Note: See TracChangeset for help on using the changeset viewer.