mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-15 09:20:23 -07:00
Code Issues Projects Releases Packages Wiki Activity

copy-subarray is now inlined and used in arraylib.lsp

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2012-11-30 11:56:28 +01:00
parent 2e77344a54
commit ce449ab9e8
2 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmp/sysfun.lsp
View file

@ -190,6 +190,10 @@
(def-inline si:row-major-aset :unsafe ((array fixnum) fixnum fixnum) :fixnum
"(#0)->array.self.fix[#1]= #2")
(def-inline si:copy-subarray :always (array ext:array-index array ext:array-index
ext:array-index) array
"@0;(ecl_copy_subarray(#0,#1,#2,#3,#4),#0)")
(def-inline array-rank :unsafe (array) :fixnum
"@0;(((#0)->d.t == t_array)?(#0)->array.rank:1)")
(def-inline array-rank :always (array) :fixnum

23
src/lsp/arraylib.lsp
View file

@ -299,18 +299,7 @@ pointer is 0 already."
(i2 start2))
(declare (ext:array-index d1 d2 l i1 i2))
(if (null dims1)
#+ecl-min
(dotimes (i l)
(declare (ext:array-index i))
(row-major-aset dest i1 (row-major-aref orig i2))
(incf i1)
(incf i2))
#-ecl-min
(ffi::c-inline (dest i1 orig i2 l)
(array :fixnum array :fixnum :fixnum) :void
"ecl_copy_subarray(#0, #1, #2, #3, #4)"
:one-liner t
:side-effects t)
(copy-subarray dest i1 orig i2 l)
(let ((step1 (apply #'* dims1))
(step2 (apply #'* dims2)))
(declare (ext:array-index step1 step2))
@ -366,14 +355,8 @@ adjustable array."
(cond ((adjustable-array-p vec)
(adjust-array vec len))
((typep vec 'simple-array)
(let ((new-vec (make-array len :element-type
(array-element-type vec))))
(check-type len fixnum)
(locally (declare (optimize (speed 3) (safety 0) (space 0)) )
(dotimes (i len)
(declare (fixnum i))
(setf (aref new-vec i) (aref vec i))))
new-vec))
(let ((new-vec (make-array len :element-type (array-element-type vec))))
(copy-subarray new-vec 0 vec 0 len)))
((typep vec 'vector)
(setf (fill-pointer vec) len)
vec)