Changeset 13537 for release/1.4


Ignore:
Timestamp:
Mar 16, 2010, 7:06:02 PM (9 years ago)
Author:
rme
Message:

Merge r13437 (ash fix for ticket:660) from trunk to 1.4 branch.

Location:
release/1.4/source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • release/1.4/source

  • release/1.4/source/compiler

  • release/1.4/source/compiler/nx1.lisp

    r13534 r13537  
    21762176(defnx1 nx1-symvector ((%symptr->symvector) (%symvector->symptr)) (arg)
    21772177  (make-acode (%nx1-default-operator) (nx1-form arg)))
    2178        
     2178
     2179
    21792180(defnx1 nx1-ash (ash) (&whole call &environment env num amt)
    21802181  (let* ((unsigned-natural-type (target-word-size-case
     
    21942195                         (nx1-form num))
    21952196             (if (nx-form-typep num unsigned-natural-type env)
    2196                (make-acode (%nx1-operator natural-shift-right)
    2197                            (nx1-form num)
    2198                            (make-acode (%nx1-operator fixnum)
    2199                                        (min (1- max) (- amt))))
     2197               (if (< (- amt) max)
     2198                 (make-acode (%nx1-operator natural-shift-right)
     2199                             (nx1-form num)
     2200                             (make-acode (%nx1-operator fixnum)
     2201                                         (- amt)))
     2202                 (nx1-form `(progn (require-type ,num 'integer) 0) env))
    22002203               (nx1-treat-as-call call))))
    22012204          ((and (fixnump amt)
  • release/1.4/source/level-0/X86

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • release/1.4/source/lisp-kernel

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • release/1.4/source/scripts

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.