Skip to content

R
riscv-gcc-1
Commit d4c4ae6f by Gabriel Dos Reis Committed by Gabriel Dos Reis
Options

valarray_array.h (__valarray_get_storage): New function. 

2000-07-15  Gabriel Dos Reis  <gdr@codesourcery.com>

	* bits/valarray_array.h (__valarray_get_storage): New function.
	(_Array<>::Array): Use it.
	* bits/std_valarray.h (valarray<>::valarray): Likewise.
	(valarray<>::resize): Likewise.  Tweak.
	* src/valarray-inst.cc (__valarray_product): Tweak.

From-SVN: r35053
parent 2c0accc9
Showing with 50 additions and 55 deletions
libstdc++-v3/ChangeLog
2000-07-15 Gabriel Dos Reis <gdr@codesourcery.com>
* bits/valarray_array.h (__valarray_get_storage): New function.
(_Array<>::Array): Use it.
* bits/std_valarray.h (valarray<>::valarray): Likewise.
(valarray<>::resize): Likewise. Tweak.
* src/valarray-inst.cc (__valarray_product): Tweak.
2000-07-11 Phil Edwards <pme@sourceware.cygnus.com> 2000-07-11 Phil Edwards <pme@sourceware.cygnus.com>
* docs: Update sourceware->sources in every HTML file. Minor updates. * docs: Update sourceware->sources in every HTML file. Minor updates.
......
libstdc++-v3/bits/std_valarray.h
...@@ -259,78 +259,61 @@ namespace std { ...@@ -259,78 +259,61 @@ namespace std {
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (size_t __n) inline valarray<_Tp>::valarray (size_t __n)
: _M_size(__n), : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__n * sizeof (_Tp))))
{ __valarray_default_construct(_M_data, _M_data + __n); } { __valarray_default_construct(_M_data, _M_data + __n); }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const _Tp& __t, size_t __n) inline valarray<_Tp>::valarray (const _Tp& __t, size_t __n)
: _M_size(__n), : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__n * sizeof (_Tp))))
{ __valarray_fill_construct (_M_data, _M_data + __n, __t); } { __valarray_fill_construct (_M_data, _M_data + __n, __t); }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const _Tp* __restrict__ __p, size_t __n) inline valarray<_Tp>::valarray (const _Tp* __restrict__ __p, size_t __n)
: _M_size(__n), : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__n * sizeof (_Tp))))
{ __valarray_copy_construct (__p, __p + __n, _M_data); } { __valarray_copy_construct (__p, __p + __n, _M_data); }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const valarray<_Tp>& __v) inline valarray<_Tp>::valarray (const valarray<_Tp>& __v)
: _M_size(__v._M_size), : _M_size(__v._M_size), _M_data(__valarray_get_storage<_Tp>(__v._M_size))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__v._M_size * sizeof (_Tp))))
{ __valarray_copy_construct (__v._M_data, __v._M_data + _M_size, _M_data); } { __valarray_copy_construct (__v._M_data, __v._M_data + _M_size, _M_data); }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const slice_array<_Tp>& __sa) inline valarray<_Tp>::valarray (const slice_array<_Tp>& __sa)
: _M_size(__sa._M_sz), : _M_size(__sa._M_sz), _M_data(__valarray_get_storage<_Tp>(__sa._M_sz))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__sa._M_sz * sizeof (_Tp))))
{ {
__valarray_copy_construct __valarray_copy_construct
(__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data)); (__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data));
} }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const gslice_array<_Tp>& __ga) inline valarray<_Tp>::valarray (const gslice_array<_Tp>& __ga)
: _M_size(__ga._M_index.size()), : _M_size(__ga._M_index.size()),
_M_data(static_cast<_Tp*__restrict__> _M_data(__valarray_get_storage<_Tp>(_M_size))
(__valarray_get_memory(_M_size * sizeof (_Tp))))
{ {
__valarray_copy_construct __valarray_copy_construct
(__ga._M_array, _Array<size_t>(__ga._M_index), (__ga._M_array, _Array<size_t>(__ga._M_index),
_Array<_Tp>(_M_data), _M_size); _Array<_Tp>(_M_data), _M_size);
} }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const mask_array<_Tp>& __ma) inline valarray<_Tp>::valarray (const mask_array<_Tp>& __ma)
: _M_size(__ma._M_sz), : _M_size(__ma._M_sz), _M_data(__valarray_get_storage<_Tp>(__ma._M_sz))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__ma._M_sz * sizeof (_Tp))))
{ {
__valarray_copy_construct __valarray_copy_construct
(__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size); (__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size);
} }
template<typename _Tp> template<typename _Tp>
inline valarray<_Tp>::valarray (const indirect_array<_Tp>& __ia) inline valarray<_Tp>::valarray (const indirect_array<_Tp>& __ia)
: _M_size(__ia._M_sz), : _M_size(__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_sz))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_get_memory(__ia._M_sz * sizeof (_Tp))))
{ {
__valarray_copy_construct __valarray_copy_construct
(__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size); (__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size);
} }
template<typename _Tp> template<class _Dom> template<typename _Tp> template<class _Dom>
inline valarray<_Tp>::valarray (const _Expr<_Dom, _Tp>& __e) inline valarray<_Tp>::valarray (const _Expr<_Dom, _Tp>& __e)
: _M_size(__e.size ()), : _M_size(__e.size ()), _M_data(__valarray_get_storage<_Tp>(_M_size))
_M_data(static_cast<_Tp*__restrict__>
(__valarray_copy_construct(_M_size * sizeof (_Tp))))
{ __valarray_copy_construct (__e, _M_size, _Array<_Tp>(_M_data)); } { __valarray_copy_construct (__e, _M_size, _Array<_Tp>(_M_data)); }
template<typename _Tp> template<typename _Tp>
...@@ -536,20 +519,17 @@ namespace std { ...@@ -536,20 +519,17 @@ namespace std {
inline void inline void
valarray<_Tp>::resize (size_t __n, _Tp __c) valarray<_Tp>::resize (size_t __n, _Tp __c)
{ {
if (_M_size != __n) { // This complication is so to make valarray<valarray<T> > work
__valarray_destroy_elements(_M_data, _M_data + _M_size); // even though it is not required by the standard. Nobody should
__valarray_release_memory(_M_data); // be saying valarray<valarray<T> > anyway. See the specs.
_M_size = __n; __valarray_destroy_elements(_M_data, _M_data + _M_size);
_M_data = static_cast<_Tp*__restrict__> if (_M_size != __n)
(__valarray_get_memory(__n * sizeof (_Tp))); {
__valarray_fill_construct(_M_data, _M_data + __n, __c); __valarray_release_memory(_M_data);
} _M_size = __n;
else { _M_data = __valarray_get_storage<_Tp>(__n);
// this is so to make valarray<valarray<T> > work
// even though it is not required by the standard.
__valarray_destroy_elements(_M_data, _M_data + _M_size);
__valarray_fill_construct(_M_data, _M_data + _M_size, __c);
} }
__valarray_fill_construct(_M_data, _M_data + __n, __c);
} }
template<typename _Tp> template<typename _Tp>
......
libstdc++-v3/bits/valarray_array.h
...@@ -50,6 +50,14 @@ namespace std ...@@ -50,6 +50,14 @@ namespace std
__valarray_get_memory(size_t __n) __valarray_get_memory(size_t __n)
{ return operator new(__n); } { return operator new(__n); }
template<typename _Tp>
inline _Tp*__restrict__
__valarray_get_storage(size_t __n)
{
return static_cast<_Tp*__restrict__>
(__valarray_get_memory(__n * sizeof(_Tp)));
}
// Return memory to the system // Return memory to the system
inline void inline void
__valarray_release_memory(void* __p) __valarray_release_memory(void* __p)
...@@ -352,7 +360,7 @@ namespace std ...@@ -352,7 +360,7 @@ namespace std
template<typename _Tp> template<typename _Tp>
inline inline
_Array<_Tp>::_Array (size_t __n) _Array<_Tp>::_Array (size_t __n)
: _M_data(__valarray_get_memory(__n * sizeof (_Tp))) : _M_data(__valarray_get_storage<_Tp>(__n))
{ __valarray_default_construct(_M_data, _M_data + __n); } { __valarray_default_construct(_M_data, _M_data + __n); }
template<typename _Tp> template<typename _Tp>
...@@ -366,7 +374,7 @@ namespace std ...@@ -366,7 +374,7 @@ namespace std
template<typename _Tp> template<typename _Tp>
inline inline
_Array<_Tp>::_Array (const _Tp* __restrict__ __b, size_t __s) _Array<_Tp>::_Array (const _Tp* __restrict__ __b, size_t __s)
: _M_data(__valarray_get_memory(__s * sizeof (_Tp))) : _M_data(__valarray_get_storage<_Tp>(__s))
{ __valarray_copy_construct(__b, __s, _M_data); } { __valarray_copy_construct(__b, __s, _M_data); }
template<typename _Tp> template<typename _Tp>
......
libstdc++-v3/src/valarray-inst.cc
...@@ -22,14 +22,13 @@ namespace std ...@@ -22,14 +22,13 @@ namespace std
inline size_t inline size_t
__valarray_product(const valarray<size_t>& __a) __valarray_product(const valarray<size_t>& __a)
{ {
typedef const size_t* __restrict__ _Tp;
const size_t __n = __a.size();
// XXX: This ugly cast is necessary because // XXX: This ugly cast is necessary because
// valarray::operator[]() const return a VALUE! // valarray::operator[]() const return a VALUE!
// Try to get the committee to correct that gross error. // Try to get the committee to correct that gross error.
typedef const size_t* __restrict__ _Tp;
size_t __n = __a.size() - 1;
valarray<size_t>& __t = const_cast<valarray<size_t>&>(__a); valarray<size_t>& __t = const_cast<valarray<size_t>&>(__a);
return __valarray_product(static_cast<_Tp>(&__t[0]), return __valarray_product(&__t[0], &__t[0] + __n);
static_cast<_Tp>(&__t[__n]));
} }
void __gslice_to_index(size_t __o, const valarray<size_t>& __l, void __gslice_to_index(size_t __o, const valarray<size_t>& __l,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment