Changeset 13437

Timestamp:

Feb 6, 2010, 11:00:33 PM (15 years ago)

Author:

Gary Byers

Message:

An unsigned-byte of the native word size shifted right by a value

the number of bits in a native word is always 0.

Closes ticket:660.

File:

• trunk/source/compiler/nx1.lisp (modified) (2 diffs)

trunk/source/compiler/nx1.lisp

@@ -2190 +2190 @@
 (defnx1 nx1-symvector ((%symptr->symvector) (%symvector->symptr)) (arg)
   (make-acode (%nx1-default-operator) (nx1-form arg)))
-        
+
+
 (defnx1 nx1-ash (ash) (&whole call &environment env num amt)
   (let* ((unsigned-natural-type (target-word-size-case
@@ -2208 +2209 @@
                          (nx1-form num))
              (if (nx-form-typep num unsigned-natural-type env)
-               (make-acode (%nx1-operator natural-shift-right)
-                           (nx1-form num)
-                           (make-acode (%nx1-operator fixnum)
-                                       (min (1- max) (- amt))))
+               (if (< (- amt) max)
+                 (make-acode (%nx1-operator natural-shift-right)
+                             (nx1-form num)
+                             (make-acode (%nx1-operator fixnum)
+                                         (- amt)))
+                 (nx1-form `(progn (require-type ,num 'integer) 0) env))
                (nx1-treat-as-call call))))
           ((and (fixnump amt)