Changeset 5479

Timestamp:

Nov 5, 2006, 6:37:17 AM (18 years ago)

Author:

Gary Byers

Message:

%aref2, %aset2: call into kernel.

File:

• trunk/ccl/level-0/l0-array.lisp (modified) (2 diffs)

trunk/ccl/level-0/l0-array.lisp

@@ -576 +576 @@
                     (uvref data (the fixnum (+ offset rmi)))))))))))))
 
-(defun %2d-array-index (a x y)
-  (let* ((dim0 (%svref a target::arrayH.dim0-cell))
-         (dim1 (%svref a (1+ target::arrayH.dim0-cell))))
-      (declare (fixnum dim0 dim1))
-      (unless (and (typep x 'fixnum)
-                   (>= (the fixnum x) 0)
-                   (< (the fixnum x) dim0))
-        (%err-disp $XARROOB x a))
-      (unless (and (typep y 'fixnum)
-                   (>= (the fixnum y) 0)
-                   (< (the fixnum y) dim1))
-        (%err-disp $XARROOB y a))
-       (the fixnum (+ (the fixnum y) (the fixnum (* dim1 (the fixnum x)))))))
-
-(defun %aref2 (a x y)
-  (let* ((a-type (typecode a)))
-    (declare (fixnum a-type))
-    (unless (>= a-type target::subtag-arrayH)
-      (report-bad-arg a 'array))
-    (unless (and (= a-type target::subtag-arrayH)
-                 (= (the fixnum (%svref a target::arrayH.rank-cell)) 2))
-      (%err-disp $XNDIMS a 2))
-    (let* ((rmi (%2d-array-index a x y)))
-      (declare (fixnum rmi))
-      (multiple-value-bind (data offset) (%array-header-data-and-offset a)
-        (declare (fixnum offset))
-        (uvref data (the fixnum (+ rmi offset)))))))
+
+
+
 
 (defun aset (a &lexpr subs&val)
@@ -630 +606 @@
                         (setf (uvref data (the fixnum (+ offset rmi))) val)))))))))))))
 
-(defun %aset2 (a x y new)
-  (let* ((a-type (typecode a)))
-    (declare (fixnum a-type))
-    (unless (>= a-type target::subtag-arrayH)
-      (report-bad-arg a 'array))
-    (unless (and (= a-type target::subtag-arrayH)
-                 (= (the fixnum (%svref a target::arrayH.rank-cell)) 2))
-      (%err-disp $XNDIMS a 2))
-    (let* ((rmi (%2d-array-index a x y)))
-      (declare (fixnum rmi))
-      (multiple-value-bind (data offset) (%array-header-data-and-offset a)
-        (declare (fixnum offset))
-        (setf (uvref data (the fixnum (+ rmi offset))) new)))))
+
 
 (defun schar (s i)