Changeset 10156


Ignore:
Timestamp:
Jul 19, 2008, 10:34:56 PM (11 years ago)
Author:
rme
Message:

NEED-USE-EQL for x8632.

%%equalphash-structure, %%equalphash-array, %equalphash-aux: don't use
the #.(mixup-hash-code xx). (It messes up cross-compilation).

IMMEDIATE-P for x8632.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/level-0/l0-hash.lisp

    r9999 r10156  
    226226    (declare (fixnum typecode))
    227227    (or (= typecode target::subtag-macptr)
    228         #+ppc32-target
    229         (and (>= typecode ppc32::min-numeric-subtag)
    230              (<= typecode ppc32::max-numeric-subtag))
     228        #+(or ppc32-target x8632-target)
     229        (and (>= typecode target::min-numeric-subtag)
     230             (<= typecode target::max-numeric-subtag))
    231231        #+64-bit-target
    232232        (or (= typecode target::subtag-bignum)
     
    15261526      (when (<= (decf limit) 0)
    15271527        (setq hash (the fixnum (+ (the fixnum (rotate-hash-code hash))
    1528                                   #.(mixup-hash-code 11))))
     1528                                  (the fixnum (mixup-hash-code 11)))))
    15291529        (return)))
    15301530    (values hash addressp)))
     
    15581558        (when (<= (decf limit) 0)
    15591559          (setq hash (the fixnum (+ (the fixnum (rotate-hash-code hash))
    1560                                     #.(mixup-hash-code 11))))
     1560                                    (the fixnum (mixup-hash-code 11)))))
    15611561          (return))
    15621562        (incf offset))
     
    15651565(defun %%equalphash-aux (limit key)
    15661566  (if (<= limit 0)
    1567     #.(mixup-hash-code 11)
    1568     (if (null key) #.(mixup-hash-code 17)
     1567    (mixup-hash-code 11)
     1568    (if (null key) (mixup-hash-code 17)
    15691569        (cond ((consp key)
    15701570               (let ((hash 0)
     
    16171617(defun sxhash (s-expr)
    16181618  "Computes a hash code for S-EXPR and returns it as an integer."
    1619   (logand (sxhash-aux s-expr 7 17) most-positive-fixnum))
     1619  (logand (sxhash-aux s-expr 7 17) target::target-most-positive-fixnum))
    16201620
    16211621(defun sxhash-aux (expr counter key)
     
    16381638
    16391639
    1640 #+ppc32-target
     1640#+(or ppc32-target x8632-target)
    16411641(defun immediate-p (thing)
    16421642  (let* ((tag (lisptag thing)))
    16431643    (declare (fixnum tag))
    1644     (or (= tag ppc32::tag-fixnum)
    1645         (= tag ppc32::tag-imm))))
     1644    (or (= tag target::tag-fixnum)
     1645        (= tag target::tag-imm))))
    16461646
    16471647#+ppc64-target
Note: See TracChangeset for help on using the changeset viewer.