# HG changeset patch
# User hgs
# Date 1286978958 -19800
# Node ID 28ccaba883f423b15d014ca5d97ead8f9505c207
# Parent a1e347446159db3fa8984e9c5fbf55aa4ec9a2c9
201039
diff -r a1e347446159 -r 28ccaba883f4 build.config.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build.config.xml Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/group/bld.inf
--- a/compressionlibs/ziplib/group/bld.inf Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/group/bld.inf Wed Oct 13 19:39:18 2010 +0530
@@ -48,7 +48,7 @@
PRJ_MMPFILES
ezlib.mmp
ezip.mmp
- #include "../test/oldezlib/group/BLD.INF"
+ #include "../test/oldezlib/group/bld.inf"
#include "../test/rtest/group/bld.inf"
#include "../test/tef/group/bld.inf"
#endif //ifndef TOOLS endif
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/group/libz/libz.mmp
--- a/compressionlibs/ziplib/group/libz/libz.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/group/libz/libz.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -28,6 +28,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
+VERSION 10.1
USERINCLUDE ../../inc
USERINCLUDE ../../src/zlib
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/group/libz/libz_build91.mmp
--- a/compressionlibs/ziplib/group/libz/libz_build91.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/group/libz/libz_build91.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -30,6 +30,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
+VERSION 10.1
USERINCLUDE ..\..\inc
USERINCLUDE ..\..\src\zlib
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/group/libz/libzcore.mmp
--- a/compressionlibs/ziplib/group/libz/libzcore.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/group/libz/libzcore.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -28,6 +28,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
+VERSION 10.1
USERINCLUDE ../../inc
USERINCLUDE ../../src/zlib
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/group/libz/libzcore_build91.mmp
--- a/compressionlibs/ziplib/group/libz/libzcore_build91.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/group/libz/libzcore_build91.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -30,6 +30,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
+VERSION 10.1
USERINCLUDE ..\..\inc
USERINCLUDE ..\..\src\zlib
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/rtest/group/ezdefect.mmp
--- a/compressionlibs/ziplib/test/rtest/group/ezdefect.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/rtest/group/ezdefect.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -13,7 +13,7 @@
// Description:
//
-TARGET ezdefect.exe
+TARGET ezdefect.exe //RTEST
TARGETTYPE exe
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/rtest/group/ezexample.mmp
--- a/compressionlibs/ziplib/test/rtest/group/ezexample.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/rtest/group/ezexample.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -15,7 +15,7 @@
//
//
-TARGET ezexample.exe
+TARGET ezexample.exe //RTEST
TARGETTYPE exe
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/rtest/group/ezlibtest.iby
--- a/compressionlibs/ziplib/test/rtest/group/ezlibtest.iby Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/rtest/group/ezlibtest.iby Wed Oct 13 19:39:18 2010 +0530
@@ -30,18 +30,17 @@
// Include the CP850 charconv plug-in in the ROM as it is needed by ziptest
#include
-// batch file that runs all automatic ezlib tests
data=ZSYSTEM\test\ezlibtests.bat test\ezlibtests.bat
-file=ABI_DIR\BUILD_DIR\ziptest.exe test\ziptest.exe
-file=ABI_DIR\BUILD_DIR\ezlibtest.exe test\ezlibtest.exe
+
+
file=ABI_DIR\BUILD_DIR\gzip.exe test\gzip.exe
file=ABI_DIR\BUILD_DIR\example.exe test\example.exe
file=ABI_DIR\BUILD_DIR\ezfile.exe test\ezfile.exe
-file=ABI_DIR\BUILD_DIR\ezdefect.exe test\ezdefect.exe
-file=ABI_DIR\BUILD_DIR\ezexample.exe test\ezexample.exe
-file=ABI_DIR\BUILD_DIR\gziptest.exe test\gziptest.exe
-file=ABI_DIR\BUILD_DIR\inflateprimetest.exe test\inflateprimetest.exe
+
+
+
+
data=EPOCROOT##epoc32\wins\c\test\zip\holymoley.jar test\zip\holymoley.jar
data=EPOCROOT##epoc32\wins\c\test\zip\rfc2459.zip test\zip\rfc2459.zip
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/rtest/group/ezlibtest.mmp
--- a/compressionlibs/ziplib/test/rtest/group/ezlibtest.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/rtest/group/ezlibtest.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -13,7 +13,7 @@
// Description:
//
-TARGET ezlibtest.exe
+TARGET ezlibtest.exe //RTEST
TARGETTYPE exe
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/rtest/group/inflateprimetest.mmp
--- a/compressionlibs/ziplib/test/rtest/group/inflateprimetest.mmp Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/rtest/group/inflateprimetest.mmp Wed Oct 13 19:39:18 2010 +0530
@@ -13,7 +13,7 @@
// Description:
//
-TARGET inflateprimetest.exe
+TARGET inflateprimetest.exe //RTEST
TARGETTYPE EXE
UID 0
VENDORID 0x70000001
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/tef/group/libztests.iby
--- a/compressionlibs/ziplib/test/tef/group/libztests.iby Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/tef/group/libztests.iby Wed Oct 13 19:39:18 2010 +0530
@@ -24,15 +24,6 @@
file=ABI_DIR\BUILD_DIR\tzlib.exe TEST\tzlib.exe
file=ABI_DIR\BUILD_DIR\ulibz.exe TEST\ulibz.exe
-//.script, .ini, .gz
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_zlib_suite.script \tef_ezlib2\te_zlib_suite.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_zlib.script \tef_ezlib2\te_zlib.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_zlib_auto.script \tef_ezlib2\te_zlib_auto.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_zlib_blocks.script \tef_ezlib2\te_zlib_blocks.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_zlib_advanced.script \tef_ezlib2\te_zlib_advanced.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_ulibz_suite.script \tef_ezlib2\te_ulibz_suite.script
-
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\tzlib.ini \tef_ezlib2\tzlib.ini
data = EPOCROOT##epoc32\data\z\tef_ezlib2\rit1.gz \tef_ezlib2\rit1.gz
data = EPOCROOT##epoc32\data\z\tef_ezlib2\concat.gz \tef_ezlib2\concat.gz
data = EPOCROOT##epoc32\data\z\tef_ezlib2\gzipped.gz \tef_ezlib2\gzipped.gz
diff -r a1e347446159 -r 28ccaba883f4 compressionlibs/ziplib/test/tef/group/te_ezlibeziptests.iby
--- a/compressionlibs/ziplib/test/tef/group/te_ezlibeziptests.iby Fri Sep 17 19:25:42 2010 +0530
+++ b/compressionlibs/ziplib/test/tef/group/te_ezlibeziptests.iby Wed Oct 13 19:39:18 2010 +0530
@@ -24,17 +24,6 @@
file = ABI_DIR\BUILD_DIR\Te_EZlibEZip.exe TEST\Te_EZlibEZip.exe
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_PerformanceTests.ini \tef_ezlib2\te_PerformanceTests.ini
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_backwardscompatibilitytests.ini \tef_ezlib2\te_backwardscompatibilitytests.ini
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_manual_backwardscompatibilitytests.ini \tef_ezlib2\te_manual_backwardscompatibilitytests.ini
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_manual_performancetests.ini \tef_ezlib2\te_manual_performancetests.ini
-
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_PerformanceTests.script \tef_ezlib2\te_PerformanceTests.Script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_backwardscompatibilitytests.script \tef_ezlib2\te_backwardscompatibilitytests.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_ezlibeziptests_suite.script \tef_ezlib2\te_ezlibeziptests_suite.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_manual_backwardscompatibilitytests.script \tef_ezlib2\te_manual_backwardscompatibilitytests.script
-data = EPOCROOT##epoc32\data\z\tef_ezlib2\te_manual_performancetests.script \tef_ezlib2\te_manual_performancetests.script
-
data = EPOCROOT##epoc32\data\z\test\ezlibeziptest_data\JpegImage.jpg \test\ezlibeziptest_data\JpegImage.jpg
data = EPOCROOT##epoc32\data\z\test\ezlibeziptest_data\GifImage.gif \test\ezlibeziptest_data\GifImage.gif
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp
--- a/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/group/openenv_libstdcpp.mrp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
component openenv_libstdcpp
source \sf\os\ossrv\genericopenlibs\cppstdlib
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/etc/msvcincl.dat
--- a/genericopenlibs/cppstdlib/stl/etc/msvcincl.dat Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/etc/msvcincl.dat Wed Oct 13 19:39:18 2010 +0530
@@ -1,309 +1,309 @@
-algo.h
-algobase.h
-algorith.h
-algorithm
-alloc.h
-bitset
-bitset.h
-bvector.h
-cassert
-cassert.h
-cctype
-cctype.h
-cerrno
-cerrno.h
-cfloat
-cfloat.h
-char_traits.h
-climits
-climits.h
-clocale
-clocale.h
-cmath
-cmath.h
-complex
-complex.h
-concept_checks.h
-configure
-configure.in
-csetjmp
-csetjmp.h
-csignal
-csignal.h
-cstdarg
-cstdarg.h
-cstddef
-cstddef.h
-cstdio
-cstdio.h
-cstdlib
-cstdlib.h
-cstring
-cstring.h
-ctime
-ctime.h
-ctype.h
-cwchar
-cwchar.h
-cwctype
-cwctype.h
-c_locale.h
-defalloc.h
-deque
-deque.h
-exceptio.h
-exception
-exception.h
-export
-fstream
-fstream.h
-function.h
-functional
-hashtable.h
-hash_map
-hash_map.h
-hash_set
-hash_set.h
-heap.h
-iomanip
-iomanip.h
-ios
-ios.h
-iosfwd
-iosfwd.h
-iostream
-iostream.h
-istream
-istream.h
-iterator
-iterator.h
-limits
-limits.h
-list
-list.h
-locale
-locale.h
-map
-map.h
-math.h
-mem.h
-memory
-memory.h
-mmemory.h
-msl_string.h
-multimap.h
-multiset.h
-new
-new.h
-numeric
-numeric.h
-numeric.h
-ostream
-ostream.h
-pair.h
-pthread.h
-pthread_alloc
-pthread_alloc.h
-queue
-queue.h
-rope
-rope.h
-set
-set.h
-setjmp.h
-signal.h
-slist
-slist.h
-sstream
-sstream.h
-stack
-stack.h
-stdarg.h
-stddef.h
-stddef.h
-stdexcep.h
-stdexcept
-stdio.h
-stdio_streambuf
-stdlib.h
-stdlib.h
-stlcomp.h
-stlconf.h.in
-stl_apcc.h
-stl_apple.bak.h
-stl_apple.h
-stl_as400.h
-stl_bc.h
-stl_como.h
-stl_confix.h
-stl_dec.h
-stl_dec_vms.h
-stl_fujitsu.h
-stl_gcc.h
-stl_hpacc.h
-stl_ibm.h
-stl_intel.h
-stl_kai.h
-stl_mlc.h
-stl_msvc.h
-stl_mwerks.h
-stl_mycomp.h
-stl_sco.h
-stl_select_lib.h
-stl_sgi.h
-stl_solaris.h
-stl_sunpro.h
-stl_symantec.h
-stl_tmpl.h
-stl_user_config.h
-stl_watcom.h
-stl_wince.h
-streambu.h
-streambuf
-streambuf.h
-string
-string.h
-strstrea.h
-strstream
-strstream.h
-tempbuf.h
-time.h
-tree.h
-typeinfo
-typeinfo.h
-type_traits.h
-utility
-utility.h
-valarray
-valarray.h
-vc_select_lib.h
-vector
-vector.h
-wchar.h
-wctype.h
-_abbrevs.h
-_algo.c
-_algo.h
-_algobase.c
-_algobase.h
-_alloc.c
-_alloc.h
-_alloc_old.h
-_auto_ptr.h
-_bitset.c
-_bitset.h
-_bvector.h
-_check_config.h
-_codecvt.h
-_collate.h
-_complex.c
-_complex.h
-_config.h
-_config_compat.h
-_config_compat_post.h
-_construct.h
-_ctraits_fns.h
-_ctype.h
-_cwchar.h
-_debug.c
-_debug.h
-_deque.c
-_deque.h
-_epilog.h
-_epilog.h
-_exception.h
-_fstream.c
-_fstream.h
-_function.h
-_function_base.h
-_hashtable.c
-_hashtable.h
-_hash_fun.h
-_hash_map.h
-_hash_set.h
-_heap.c
-_heap.h
-_ios.c
-_ios.h
-_iosfwd.h
-_ios_base.h
-_istream.c
-_istream.h
-_istreambuf_iterator.h
-_iterator.h
-_iterator.h
-_iterator_base.h
-_iterator_old.h
-_limits.c
-_limits.h
-_list.c
-_list.h
-_list.h
-_locale.h
-_map.h
-_messages_facets.h
-_mmap.h
-_monetary.c
-_monetary.h
-_msvc_warnings_off.h
-_null_stream.h
-_numeric.c
-_numeric.h
-_numpunct.h
-_num_get.c
-_num_get.h
-_num_put.c
-_num_put.h
-_ostream.c
-_ostream.h
-_ostreambuf_iterator.h
-_pair.h
-_prolog.h
-_pthread_alloc.h
-_ptrs_specialize.h
-_queue.h
-_range_errors.h
-_raw_storage_iter.h
-_relops.h
-_relops_cont.h
-_relops_template.h
-_rope.c
-_rope.h
-_set.h
-_set_operators.h
-_site_config.h
-_slist.c
-_slist.h
-_slist_base.c
-_slist_base.h
-_sparc_atomic.h
-_sstream.c
-_sstream.h
-_stack.h
-_stdio_file.h
-_stdio_file.h.new
-_streambuf.c
-_streambuf.h
-_streambuf_iterator.h
-_stream_iterator.h
-_string.c
-_string.h
-_string_fwd.c
-_string_fwd.h
-_string_hash.h
-_string_io.c
-_string_io.h
-_strstream.h
-_tempbuf.c
-_tempbuf.h
-_threads.c
-_threads.h
-_time_facets.c
-_time_facets.h
-_tree.c
-_tree.h
-_uninitialized.h
-_valarray.c
-_valarray.h
-_vector.c
-_vector.h
+algo.h
+algobase.h
+algorith.h
+algorithm
+alloc.h
+bitset
+bitset.h
+bvector.h
+cassert
+cassert.h
+cctype
+cctype.h
+cerrno
+cerrno.h
+cfloat
+cfloat.h
+char_traits.h
+climits
+climits.h
+clocale
+clocale.h
+cmath
+cmath.h
+complex
+complex.h
+concept_checks.h
+configure
+configure.in
+csetjmp
+csetjmp.h
+csignal
+csignal.h
+cstdarg
+cstdarg.h
+cstddef
+cstddef.h
+cstdio
+cstdio.h
+cstdlib
+cstdlib.h
+cstring
+cstring.h
+ctime
+ctime.h
+ctype.h
+cwchar
+cwchar.h
+cwctype
+cwctype.h
+c_locale.h
+defalloc.h
+deque
+deque.h
+exceptio.h
+exception
+exception.h
+export
+fstream
+fstream.h
+function.h
+functional
+hashtable.h
+hash_map
+hash_map.h
+hash_set
+hash_set.h
+heap.h
+iomanip
+iomanip.h
+ios
+ios.h
+iosfwd
+iosfwd.h
+iostream
+iostream.h
+istream
+istream.h
+iterator
+iterator.h
+limits
+limits.h
+list
+list.h
+locale
+locale.h
+map
+map.h
+math.h
+mem.h
+memory
+memory.h
+mmemory.h
+msl_string.h
+multimap.h
+multiset.h
+new
+new.h
+numeric
+numeric.h
+numeric.h
+ostream
+ostream.h
+pair.h
+pthread.h
+pthread_alloc
+pthread_alloc.h
+queue
+queue.h
+rope
+rope.h
+set
+set.h
+setjmp.h
+signal.h
+slist
+slist.h
+sstream
+sstream.h
+stack
+stack.h
+stdarg.h
+stddef.h
+stddef.h
+stdexcep.h
+stdexcept
+stdio.h
+stdio_streambuf
+stdlib.h
+stdlib.h
+stlcomp.h
+stlconf.h.in
+stl_apcc.h
+stl_apple.bak.h
+stl_apple.h
+stl_as400.h
+stl_bc.h
+stl_como.h
+stl_confix.h
+stl_dec.h
+stl_dec_vms.h
+stl_fujitsu.h
+stl_gcc.h
+stl_hpacc.h
+stl_ibm.h
+stl_intel.h
+stl_kai.h
+stl_mlc.h
+stl_msvc.h
+stl_mwerks.h
+stl_mycomp.h
+stl_sco.h
+stl_select_lib.h
+stl_sgi.h
+stl_solaris.h
+stl_sunpro.h
+stl_symantec.h
+stl_tmpl.h
+stl_user_config.h
+stl_watcom.h
+stl_wince.h
+streambu.h
+streambuf
+streambuf.h
+string
+string.h
+strstrea.h
+strstream
+strstream.h
+tempbuf.h
+time.h
+tree.h
+typeinfo
+typeinfo.h
+type_traits.h
+utility
+utility.h
+valarray
+valarray.h
+vc_select_lib.h
+vector
+vector.h
+wchar.h
+wctype.h
+_abbrevs.h
+_algo.c
+_algo.h
+_algobase.c
+_algobase.h
+_alloc.c
+_alloc.h
+_alloc_old.h
+_auto_ptr.h
+_bitset.c
+_bitset.h
+_bvector.h
+_check_config.h
+_codecvt.h
+_collate.h
+_complex.c
+_complex.h
+_config.h
+_config_compat.h
+_config_compat_post.h
+_construct.h
+_ctraits_fns.h
+_ctype.h
+_cwchar.h
+_debug.c
+_debug.h
+_deque.c
+_deque.h
+_epilog.h
+_epilog.h
+_exception.h
+_fstream.c
+_fstream.h
+_function.h
+_function_base.h
+_hashtable.c
+_hashtable.h
+_hash_fun.h
+_hash_map.h
+_hash_set.h
+_heap.c
+_heap.h
+_ios.c
+_ios.h
+_iosfwd.h
+_ios_base.h
+_istream.c
+_istream.h
+_istreambuf_iterator.h
+_iterator.h
+_iterator.h
+_iterator_base.h
+_iterator_old.h
+_limits.c
+_limits.h
+_list.c
+_list.h
+_list.h
+_locale.h
+_map.h
+_messages_facets.h
+_mmap.h
+_monetary.c
+_monetary.h
+_msvc_warnings_off.h
+_null_stream.h
+_numeric.c
+_numeric.h
+_numpunct.h
+_num_get.c
+_num_get.h
+_num_put.c
+_num_put.h
+_ostream.c
+_ostream.h
+_ostreambuf_iterator.h
+_pair.h
+_prolog.h
+_pthread_alloc.h
+_ptrs_specialize.h
+_queue.h
+_range_errors.h
+_raw_storage_iter.h
+_relops.h
+_relops_cont.h
+_relops_template.h
+_rope.c
+_rope.h
+_set.h
+_set_operators.h
+_site_config.h
+_slist.c
+_slist.h
+_slist_base.c
+_slist_base.h
+_sparc_atomic.h
+_sstream.c
+_sstream.h
+_stack.h
+_stdio_file.h
+_stdio_file.h.new
+_streambuf.c
+_streambuf.h
+_streambuf_iterator.h
+_stream_iterator.h
+_string.c
+_string.h
+_string_fwd.c
+_string_fwd.h
+_string_hash.h
+_string_io.c
+_string_io.h
+_strstream.h
+_tempbuf.c
+_tempbuf.h
+_threads.c
+_threads.h
+_time_facets.c
+_time_facets.h
+_tree.c
+_tree.h
+_uninitialized.h
+_valarray.c
+_valarray.h
+_vector.c
+_vector.h
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/aligned_buffer.h
--- a/genericopenlibs/cppstdlib/stl/src/aligned_buffer.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/aligned_buffer.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef ALIGNED_BUFFER_H
#define ALIGNED_BUFFER_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/allocators.cpp
--- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -766,7 +766,10 @@
struct __node_alloc_cleaner {
~__node_alloc_cleaner()
{
- __node_alloc_impl::_S_dealloc_call();
+ __node_alloc_impl::_S_dealloc_call();
+#ifndef _STLP_USE_LOCK_FREE_IMPLEMENTATION
+ std::_Node_Alloc_Lock::_S_lock._M_destroy();
+#endif//_STLP_USE_LOCK_FREE_IMPLEMENTATION
}
};
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/gen_dosc.pl
--- a/genericopenlibs/cppstdlib/stl/src/gen_dosc.pl Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/gen_dosc.pl Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
#!C:\Perl\bin
&do_c_header;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/iostream.cpp
--- a/genericopenlibs/cppstdlib/stl/src/iostream.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/iostream.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -447,6 +447,9 @@
_Destroy(ptr_wcerr);
_Destroy(ptr_wclog);
#endif
+ fclose(stdin);
+ fclose(stdout);
+ fclose(stderr);
}
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/stlport_prefix.h
--- a/genericopenlibs/cppstdlib/stl/src/stlport_prefix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/stlport_prefix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef STLPORT_PREFIX_H
#define STLPORT_PREFIX_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/string.cpp
--- a/genericopenlibs/cppstdlib/stl/src/string.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/string.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#include "stlport_prefix.h"
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/uint64.h
--- a/genericopenlibs/cppstdlib/stl/src/uint64.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/uint64.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// uint64.h
// minimal double precision unsigned int arithmetics for numeric_facets support.
// Written by Tsutomu Yoshida, Minokamo, Japan. 03/25/2000
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/vc_warning_disable.h
--- a/genericopenlibs/cppstdlib/stl/src/vc_warning_disable.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/vc_warning_disable.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This header is used to turn off warnings of Microsoft compilers generated.
* while building STLport.
* For compiling user code, see stlport/config/_msvc_warnings_off.h.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/src/warning_disable.h
--- a/genericopenlibs/cppstdlib/stl/src/warning_disable.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/warning_disable.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#if !defined (__ICL)
/* This header is used to turn off warnings of Microsoft compilers generated.
* while building STLport.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/rlocks.h
--- a/genericopenlibs/cppstdlib/stl/stlport/rlocks.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/rlocks.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#ifndef _STLP_misc_rlocks_h
# define _STLP_misc_rlocks_h
# if (__SUNPRO_CC >= 0x500 )
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stdiostream.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stdiostream.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stdiostream.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#ifndef _STLP_misc_stdiostream_h
# define _STLP_misc_stdiostream_h
# if (__SUNPRO_CC >= 0x500 )
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_alloc_old.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_alloc_old.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_alloc_old.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
template
class __simple_alloc {
typedef _Alloc __alloc_type;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_check_config.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_check_config.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_check_config.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// This file is reserved to site configuration purpose
// and should NEVER be overridden by user
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_config_compat_post.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_config_compat_post.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_config_compat_post.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*========================================== */
#ifdef _STLP_3_COMPATIBILITY
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_epilog.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_epilog.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_epilog.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* NOTE : this header has no guards and is MEANT for multiple inclusion!
* If you are using "header protection" option with your compiler,
* please also find #pragma which disables it and put it here, to
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_ioserr.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_ioserr.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_ioserr.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* This file is included in every header that needs the STLport library to be
* built; the header files mostly are the iostreams-headers. The file checks for
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_iosfwd.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_iosfwd.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_iosfwd.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _STLP_INTERNAL_IOSFWD
#define _STLP_INTERNAL_IOSFWD
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_prolog.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_prolog.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_prolog.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* NOTE : this header has no guards and is MEANT for multiple inclusion!
* If you are using "header protection" option with your compiler,
* please also find #pragma which disables it and put it here, to
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_ptrs_specialize.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_ptrs_specialize.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_ptrs_specialize.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _STLP_PTRS_SPECIALIZE_H
#define _STLP_PTRS_SPECIALIZE_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_relops_cont.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_relops_cont.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_relops_cont.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// This is an implementation file which
// is intended to be included multiple times with different _STLP_ASSOCIATIVE_CONTAINER
// setting
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_relops_hash_cont.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_relops_hash_cont.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_relops_hash_cont.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This is an implementation file which is intended to be included
* multiple times with different _STLP_TEMPLATE_CONTAINER settings.
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_string_io.c
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_string_io.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_string_io.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _STLP_STRING_IO_C
#define _STLP_STRING_IO_C
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_threads.h Wed Oct 13 19:39:18 2010 +0530
@@ -26,6 +26,12 @@
#ifndef _STLP_INTERNAL_THREADS_H
#define _STLP_INTERNAL_THREADS_H
+
+#ifdef __SYMBIAN32__
+#include // For atomic increment and decrement
+#endif
+
+
// Supported threading models are native SGI, pthreads, uithreads
// (similar to pthreads, but based on an earlier draft of the Posix
// threads standard), and Win32 threads. Uithread support by Jochen
@@ -464,13 +470,22 @@
#if defined (__DMC__)
public:
#endif
- _STLP_VOLATILE __stl_atomic_t _M_ref_count;
+ _STLP_VOLATILE __stl_atomic_t _M_ref_count;
#if defined (_STLP_THREADS) && \
(!defined (_STLP_ATOMIC_INCREMENT) || !defined (_STLP_ATOMIC_DECREMENT) || \
(defined (_STLP_WIN32_VERSION) && (_STLP_WIN32_VERSION <= 0x0400)))
# define _STLP_USE_MUTEX
- _STLP_mutex _M_mutex;
+ #ifndef __SYMBIAN32__
+ _STLP_mutex _M_mutex;
+ #else
+ #define KSizeofStlpMutex 12
+ /*
+ * Padding in order to ensure compatability.
+ * The pad size is the size of the _STLP_mutex structure
+ */
+ char _pad[KSizeofStlpMutex];
+ #endif
#endif
public:
@@ -484,14 +499,25 @@
__stl_atomic_t _M_decr() { return _STLP_ATOMIC_DECREMENT(&_M_ref_count); }
# else
# undef _STLP_USE_MUTEX
- __stl_atomic_t _M_incr() {
- _STLP_auto_lock l(_M_mutex);
- return ++_M_ref_count;
- }
- __stl_atomic_t _M_decr() {
- _STLP_auto_lock l(_M_mutex);
- return --_M_ref_count;
- }
+ #ifndef __SYMBIAN32__
+ __stl_atomic_t _M_incr() {
+ _STLP_auto_lock l(_M_mutex);
+ return ++_M_ref_count;
+ }
+ __stl_atomic_t _M_decr() {
+ _STLP_auto_lock l(_M_mutex);
+ return --_M_ref_count;
+ }
+ #else
+ __stl_atomic_t _M_incr() {
+ __e32_atomic_tas_ord32(&_M_ref_count, 0, 1, 1);
+ return _M_ref_count;
+ }
+ __stl_atomic_t _M_decr() {
+ __e32_atomic_tas_ord32(&_M_ref_count, 1, -1, 0);
+ return _M_ref_count;
+ }
+ #endif
# endif
#else /* No threads */
__stl_atomic_t _M_incr() { return ++_M_ref_count; }
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/_uninitialized.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_uninitialized.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_uninitialized.h Wed Oct 13 19:39:18 2010 +0530
@@ -333,7 +333,7 @@
template
inline _ForwardIter __uinit_aux_aux(_ForwardIter __first, _Size __n, const _Tp& /*__val */,
- const __true_type& /*_HasDefaultZero*/) {
+ const __true_type& /*_HasDefaultZero*/) {
memset((unsigned char*)__first, 0, __n * sizeof(_Tp));
return __first + __n;
}
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_aix.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_aix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_aix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "AIX"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_apcc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_apcc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_apcc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport config file for Apogee 4.x
#define _STLP_COMPILER "Apogee"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_apple.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_apple.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_apple.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* STLport configuration file
* It is internal STLport header - DO NOT include it directly
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_as400.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_as400.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_as400.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_auto_link.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_auto_link.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_auto_link.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* We do not use auto link feature when:
* - user asked not to use it (_STLP_DONT_USE_AUTO_LINK)
* - STLport is used only as a STL library (_STLP_NO_IOSTREAMS || _STLP_USE_NO_IOSTREAMS)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_como.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_como.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_como.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_cygwin.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_cygwin.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_cygwin.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#define _STLP_PLATFORM "Cygwin"
/* Glibc is the platform API */
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#define _STLP_COMPILER "Dec"
# define _STLP_HAS_SPECIFIC_PROLOG_EPILOG
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec_vms.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec_vms.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dec_vms.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// OpenVMS version
#define _STLP_COMPILER "Dec Vms"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_detect_dll_or_lib.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_detect_dll_or_lib.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_detect_dll_or_lib.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* File used to define macros:
* _STLP_USE_DYNAMIC_LIB: To signal use STLport as a dll or build of the
* STLport dlls.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_dm.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dm.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_dm.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file for Digital Mars C++
//#define _STLP_VERBOSE
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_epilog.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_epilog.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_epilog.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#if defined (_STLP_MSVC) || defined (__ICL) || defined (__BORLANDC__)
#if defined (__BORLANDC__)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_evc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_evc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_evc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* File to have Microsoft eMbedded Visual C++ 3.0 and .NET working with STLport
* May 2004
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_freebsd.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_freebsd.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_freebsd.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "Free BSD"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_gcc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_gcc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_gcc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* STLport configuration file
* It is internal STLport header - DO NOT include it directly
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpacc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpacc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpacc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpux.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpux.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_hpux.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef __stl_config__hpux_h
#define __stl_config__hpux_h
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_ibm.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_ibm.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_ibm.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* STLport configuration file
* It is internal STLport header - DO NOT include it directly
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_icc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_icc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_icc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
// A list of Intel compiler for Linux portion of STLport settings.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_intel.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_intel.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_intel.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_kai.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_kai.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_kai.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport config file for KAI C++ compiler
#if defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_linux.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_linux.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_linux.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef __stl_config__linux_h
#define __stl_config__linux_h
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_mac.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mac.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mac.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "Mac"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_macosx.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_macosx.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_macosx.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "Mac OS X"
#if defined (__BIG_ENDIAN__)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_mlc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mlc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mlc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_msvc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_msvc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_msvc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* STLport configuration file
* It is internal STLport header - DO NOT include it directly
* Microsoft Visual C++ 6.0, 7.0, 7.1, 8.0, ICL
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwccnlm.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwccnlm.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwccnlm.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwerks.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwerks.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_mwerks.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_netware.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_netware.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_netware.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "Novell Netware"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_openbsd.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_openbsd.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_openbsd.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#define _STLP_PLATFORM "Open BSD"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_prolog.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_prolog.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_prolog.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#if defined (_STLP_MSVC) || defined (__ICL)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_solaris.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_solaris.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_solaris.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef __stl_config__solaris_h
#define __stl_config__solaris_h
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_sunprocc.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_sunprocc.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_sunprocc.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_symantec.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_symantec.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_symantec.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* STLport configuration file
* It is internal STLport header - DO NOT include it directly
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_warnings_off.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_warnings_off.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_warnings_off.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This header turns off warnings that STLport headers generate for compiled
* user code.
*/
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/_watcom.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/_watcom.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/_watcom.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
// STLport configuration file
// It is internal STLport header - DO NOT include it directly
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/stl/config/compat.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/compat.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/compat.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* Compatibility section
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/fstream.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/fstream.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/fstream.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
using ::streambuf;
using ::ifstream;
using ::ofstream;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/iomanip.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/iomanip.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/iomanip.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
using ::setiosflags;
using ::resetiosflags;
// using ::setbase;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/iostream.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/iostream.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/iostream.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
using _STLP_OLD_IO_NAMESPACE::istream;
using _STLP_OLD_IO_NAMESPACE::ostream;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/ostream.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/ostream.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/ostream.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
using _STLP_OLD_IO_NAMESPACE::ostream;
using _STLP_OLD_IO_NAMESPACE::endl;
using _STLP_OLD_IO_NAMESPACE::ends;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/streambuf.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/streambuf.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/streambuf.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,18 +1,1 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
using ::streambuf;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/stlport/using/h/strstream.h
--- a/genericopenlibs/cppstdlib/stl/stlport/using/h/strstream.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/using/h/strstream.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
using _STLP_OLD_IO_NAMESPACE::strstreambuf;
using _STLP_OLD_IO_NAMESPACE::istrstream;
using _STLP_OLD_IO_NAMESPACE::ostrstream;
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/movable.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/movable.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/movable.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei2.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei2.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei2.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
*
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei3.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei3.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei3.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
* gcc 2.95.3
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei4.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei4.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei4.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
* gcc 2.95.3
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei5.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei5.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei5.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
* gcc 3.4.1
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei6.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei6.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei6.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
*
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/compiler/ttei7.cpp
--- a/genericopenlibs/cppstdlib/stl/test/compiler/ttei7.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/compiler/ttei7.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/*
* It is known that this code not compiled by following compilers:
*
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/bug.cpp
--- a/genericopenlibs/cppstdlib/stl/test/eh/bug.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/bug.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/descrip.mms
--- a/genericopenlibs/cppstdlib/stl/test/eh/descrip.mms Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/descrip.mms Wed Oct 13 19:39:18 2010 +0530
@@ -1,54 +1,54 @@
-# ;;; -*- Mode:makefile;-*-
-# Generated manually for MMS
-
-# point this to proper location
-STL_INCL= /include="../../stlport"
-
-
-# STL_INCL= -DEH_NO_SGI_STL
-
-.SUFFIXES .obj .cpp
-
-all : check
-
-AUX_LIST=TestClass.obj,main.obj,nc_alloc.obj,random_number.obj
-
-TEST_LIST=test_algo.obj,-
-test_algobase.obj,test_list.obj,test_slist.obj,-
-test_bit_vector.obj,test_vector.obj,-
-test_deque.obj,test_set.obj,test_map.obj,-
-test_hash_map.obj,test_hash_set.obj,test_rope.obj,-
-test_string.obj,test_bitset.obj,test_valarray.obj
-
-LIST=$(AUX_LIST),$(TEST_LIST)
-
-OBJECTS = $(LIST)
-EXECS = $(LIST:%.obj=%.exe)
-TESTS = $(LIST:%.obj=%.out)
-TEST_EXE = eh_test.exe
-TEST = eh_test.out
-
-CC = cxx
-CXX = $(CC)
-LINK = cxxlink
-
-# -std strict_ansi_errors
-
-CXXFLAGS = $(STL_INCL) /define=(__NO_USE_STD_IOSTREAM,EH_VECTOR_OPERATOR_NEW,EH_DELETE_HAS_THROW_SPEC)
-
-# This is to test with native STL
-# CXXFLAGS = +w2 -xildoff -D__STL_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
-
-
-LIBS =
-LIBSTDCXX =
-
-check : $(TEST)
-
-$(TEST) : $(OBJECTS)
- $(LINK)/exe=$(TEST_EXE) $(OBJECTS) $(LIBS)
- run $(TEST_EXE)
-
-.cpp.obj :
- $(CXX) $(CXXFLAGS) /obj=$@ $<
-
+# ;;; -*- Mode:makefile;-*-
+# Generated manually for MMS
+
+# point this to proper location
+STL_INCL= /include="../../stlport"
+
+
+# STL_INCL= -DEH_NO_SGI_STL
+
+.SUFFIXES .obj .cpp
+
+all : check
+
+AUX_LIST=TestClass.obj,main.obj,nc_alloc.obj,random_number.obj
+
+TEST_LIST=test_algo.obj,-
+test_algobase.obj,test_list.obj,test_slist.obj,-
+test_bit_vector.obj,test_vector.obj,-
+test_deque.obj,test_set.obj,test_map.obj,-
+test_hash_map.obj,test_hash_set.obj,test_rope.obj,-
+test_string.obj,test_bitset.obj,test_valarray.obj
+
+LIST=$(AUX_LIST),$(TEST_LIST)
+
+OBJECTS = $(LIST)
+EXECS = $(LIST:%.obj=%.exe)
+TESTS = $(LIST:%.obj=%.out)
+TEST_EXE = eh_test.exe
+TEST = eh_test.out
+
+CC = cxx
+CXX = $(CC)
+LINK = cxxlink
+
+# -std strict_ansi_errors
+
+CXXFLAGS = $(STL_INCL) /define=(__NO_USE_STD_IOSTREAM,EH_VECTOR_OPERATOR_NEW,EH_DELETE_HAS_THROW_SPEC)
+
+# This is to test with native STL
+# CXXFLAGS = +w2 -xildoff -D__STL_USE_NEWALLOC -DEH_NO_SGI_STL -DEH_NEW_HEADERS -DEH_VECTOR_OPERATOR_NEW -DEH_DELETE_HAS_THROW_SPEC
+
+
+LIBS =
+LIBSTDCXX =
+
+check : $(TEST)
+
+$(TEST) : $(OBJECTS)
+ $(LINK)/exe=$(TEST_EXE) $(OBJECTS) $(LIBS)
+ run $(TEST_EXE)
+
+.cpp.obj :
+ $(CXX) $(CXXFLAGS) /obj=$@ $<
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/locale.cpp
--- a/genericopenlibs/cppstdlib/stl/test/eh/locale.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/locale.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/mwerks_debug_prefix.h
--- a/genericopenlibs/cppstdlib/stl/test/eh/mwerks_debug_prefix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/mwerks_debug_prefix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
//mwerks_debug_prefix.h
#define _STLP_NO_FORCE_INSTANTIATE 1// for debugging
#define EH_VECTOR_OPERATOR_NEW 1
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_debug_prefix.h
--- a/genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_debug_prefix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_debug_prefix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
//mwerks_nosgi_debug_prefix.h
#define _STLP_NO_SGI_IOSTREAMS 1
#define _STLP_NO_FORCE_INSTANTIATE 1 // for debugging
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_prefix.h
--- a/genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_prefix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/mwerks_nosgi_prefix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
//mwerks_nosgi_prefix.h
#define _STLP_NO_SGI_IOSTREAMS 1
#define _STLP_NO_FORCE_INSTANTIATE 1 // for debugging
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/mwerks_prefix.h
--- a/genericopenlibs/cppstdlib/stl/test/eh/mwerks_prefix.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/mwerks_prefix.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
//mwerks_prefix.h
#define _STLP_NO_FORCE_INSTANTIATE 1// for debugging
#define EH_VECTOR_OPERATOR_NEW 1
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/eh/test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/eh/test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/eh/test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/group/bld.inf
--- a/genericopenlibs/cppstdlib/stl/test/group/bld.inf Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/group/bld.inf Wed Oct 13 19:39:18 2010 +0530
@@ -21,7 +21,7 @@
prj_testmmpfiles
stlport_test
stlport_unit_test
-stlport_extraExports
+//stlport_extraExports
PRJ_TESTEXPORTS
libstdcpp_tests.iby /epoc32/rom/include/libstdcpp_tests.iby
oe_autotest.iby /epoc32/rom/include/oe_autotest.iby
\ No newline at end of file
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/_template.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/_template.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/_template.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/accum_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/accum_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/accum_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/adj_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/adj_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/adj_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/advance_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/advance_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/advance_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/algorithm_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/algorithm_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/algorithm_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/allocator_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/allocator_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/allocator_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/bcompos_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/bcompos_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/bcompos_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include "unary.h"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/bind_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/bind_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/bind_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/binsert_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/binsert_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/binsert_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/bitset_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/bitset_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/bitset_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/bound_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/bound_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/bound_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/bsearch_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/bsearch_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/bsearch_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include "cppunit/cppunit_proxy.h"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/c_limits_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/c_limits_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/c_limits_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cctype_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cctype_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cctype_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cerrno_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cerrno_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cerrno_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cfloat_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cfloat_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cfloat_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/climits_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/climits_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/climits_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/clocale_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/clocale_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/clocale_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cmath_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cmath_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cmath_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/complex_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/complex_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/complex_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/config_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/config_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/config_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/copy_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/copy_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/copy_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/count_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/count_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/count_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include "cppunit/cppunit_proxy.h"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/csetjmp_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/csetjmp_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/csetjmp_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/csignal_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/csignal_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/csignal_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cstddef_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cstddef_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cstddef_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cstdio_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cstdio_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cstdio_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cstdlib_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cstdlib_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cstdlib_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cstring_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cstring_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cstring_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ctime_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ctime_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ctime_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ctype_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/ctype_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ctype_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/cwctype_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/cwctype_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/cwctype_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/deque_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/deque_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/deque_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/divides_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/divides_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/divides_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/epilog_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/epilog_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/epilog_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/equal_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/equal_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/equal_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/errno_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/errno_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/errno_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/exception_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/exception_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/exception_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/fadapter.h
--- a/genericopenlibs/cppstdlib/stl/test/unit/fadapter.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/fadapter.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _fadapter_h_
#define _fadapter_h_
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/fib.h
--- a/genericopenlibs/cppstdlib/stl/test/unit/fib.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/fib.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _fib_h
#define _fib_h
class Fibonacci
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/fill_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/fill_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/fill_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/find_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/find_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/find_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/finsert_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/finsert_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/finsert_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/float_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/float_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/float_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/foreach_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/foreach_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/foreach_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include "fadapter.h"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/fstream_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/fstream_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/fstream_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/full_streambuf.h
--- a/genericopenlibs/cppstdlib/stl/test/unit/full_streambuf.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/full_streambuf.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef _FULL_STREAM_H
#define _FULL_STREAM_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/func_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/func_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/func_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/functional_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/functional_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/functional_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/greater_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/greater_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/greater_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/heap_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/heap_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/heap_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/includes_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/includes_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/includes_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/innerprod_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/innerprod_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/innerprod_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/inplace_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/inplace_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/inplace_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ioiter_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ioiter_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ioiter_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#if !defined (STLPORT) || !defined (_STLP_USE_NO_IOSTREAMS)
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iomanip_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iomanip_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iomanip_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ios_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ios_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ios_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iosfwd_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iosfwd_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iosfwd_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iostream_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iostream_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iostream_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iota.h
--- a/genericopenlibs/cppstdlib/stl/test/unit/iota.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iota.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,7 @@
/*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
+ */
#ifndef IOTA_H
#define IOTA_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iota_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iota_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iota_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iso646_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/iso646_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iso646_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/istmit_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/istmit_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/istmit_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#if !defined (STLPORT) || !defined (_STLP_USE_NO_IOSTREAMS)
# include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/istream_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/istream_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/istream_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iter_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iter_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iter_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/iterator_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/iterator_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/iterator_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/less_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/less_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/less_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/lexcmp_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/lexcmp_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/lexcmp_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/limits_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/limits_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/limits_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/list_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/list_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/list_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/locale_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/locale_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/locale_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/locale_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/locale_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/locale_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,7 @@
/*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
+ */
#include
#if !defined (STLPORT) || !defined (_STLP_USE_NO_IOSTREAMS)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/logic_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/logic_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/logic_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/map_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/map_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/map_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/math_aux.h
--- a/genericopenlibs/cppstdlib/stl/test/unit/math_aux.h Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/math_aux.h Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#ifndef __MATH_AUX_H
#define __MATH_AUX_H
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/math_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/math_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/math_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/max_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/max_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/max_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/memory_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/memory_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/memory_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/merge_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/merge_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/merge_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/mfunptr_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/mfunptr_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/mfunptr_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/min_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/min_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/min_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/mismatch_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/mismatch_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/mismatch_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/modulus_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/modulus_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/modulus_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/multiset_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/multiset_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/multiset_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/mvctor_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/mvctor_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/mvctor_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,20 +1,7 @@
/*
* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
+ */
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/neq_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/neq_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/neq_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/new_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/new_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/new_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/nthelm_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/nthelm_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/nthelm_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/numeric_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/numeric_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/numeric_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ostmit_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ostmit_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ostmit_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#if !defined (STLPORT) || !defined (_STLP_USE_NO_IOSTREAMS)
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/partial_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/partial_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/partial_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/partition_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/partition_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/partition_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/perm_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/perm_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/perm_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ptr2_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ptr2_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ptr2_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/ptrspec_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/ptrspec_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/ptrspec_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#if defined (STLPORT) && !defined (_STLP_NO_EXTENSIONS)
@@ -42,7 +26,7 @@
CPPUNIT_TEST_SUITE_END();
protected:
- // this seems to be compile only test but...
+ /// this seems to be compile only test but...
void ptr_specialization_test();
template
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/queue_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/queue_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/queue_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/rawriter_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/rawriter_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/rawriter_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/resolve_name.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/resolve_name.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/resolve_name.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#define _STLP_DO_IMPORT_CSTD_FUNCTIONS
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/reviter_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/reviter_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/reviter_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/rotate_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/rotate_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/rotate_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/search_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/search_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/search_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/setjmp_header_test2.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/setjmp_header_test2.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/setjmp_header_test2.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/setunion_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/setunion_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/setunion_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/signal_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/signal_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/signal_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/sort_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/sort_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/sort_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/sstream_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/sstream_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/sstream_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stack_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/stack_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stack_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stdarg_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/stdarg_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stdarg_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stddef_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/stddef_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stddef_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stdexcept_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/stdexcept_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stdexcept_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stdio_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/stdio_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stdio_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/stdlib_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/stdlib_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/stdlib_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/streambuf_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/streambuf_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/streambuf_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/string_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/string_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/string_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/swap_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/swap_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/swap_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/test_errno.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/test_errno.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/test_errno.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
//We are including stdlib.h and stddef.h first because under MSVC
//those headers contains a errno macro definition without the underlying value
//definition.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/time_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/time_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/time_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/times_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/times_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/times_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/transform_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/transform_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/transform_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/type_traits_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/type_traits_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/type_traits_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include
#include
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/typeinfo_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/typeinfo_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/typeinfo_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/unique_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/unique_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/unique_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
#include
#include "cppunit/cppunit_proxy.h"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/utility_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/utility_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/utility_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/valarray_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/valarray_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/valarray_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/vector_header_test.cpp
--- a/genericopenlibs/cppstdlib/stl/test/unit/vector_header_test.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/vector_header_test.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/stl/test/unit/wctype_header_test.c
--- a/genericopenlibs/cppstdlib/stl/test/unit/wctype_header_test.c Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/test/unit/wctype_header_test.c Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
/* This test purpose is simply to check Standard header independancy that
* is to say that the header can be included alone without any previous
* include.
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cppstdlib/test/test-automate/stdcpptests_hw.bat
--- a/genericopenlibs/cppstdlib/test/test-automate/stdcpptests_hw.bat Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cppstdlib/test/test-automate/stdcpptests_hw.bat Wed Oct 13 19:39:18 2010 +0530
@@ -113,18 +113,7 @@
md c:\logs
-bad_typeid_cast.exe
-dynamic_cast_test_exe.exe
-exc_interwork.exe
-new_handler_test.exe
-oper_new_test.exe 20
-terminate_handler_test.exe
-typeinfo_test.exe
-uncaught_exception_test.exe
-unexpected_bad_exc_test.exe
-unexpected_handler_test.exe
-copy c:\eh_test.txt e:\
-copy c:\testreport_stdcpp.txt e:\
-copy c:\logs\libstdcpp_runtime_tests.log e:\libstdcpp_runtime_tests.log
-del e:\sys$rom.zip
+copy c:\testreport_stdcpp.txt f:\
+
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cstdlib/LINC/STDLIB.H
--- a/genericopenlibs/cstdlib/LINC/STDLIB.H Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cstdlib/LINC/STDLIB.H Wed Oct 13 19:39:18 2010 +0530
@@ -66,7 +66,7 @@
IMPORT_C int _epoc32_atexit (void (*_func)(void));
#ifdef EKA2
-void abort (void);
+IMPORT_C void abort (void);
#else
IMPORT_C void abort (void);
#endif
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cstdlib/LPOSIX/ABORT.C
--- a/genericopenlibs/cstdlib/LPOSIX/ABORT.C Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cstdlib/LPOSIX/ABORT.C Wed Oct 13 19:39:18 2010 +0530
@@ -44,7 +44,6 @@
-#include
#include /* for definition of _exit() */
/* #include */
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cstdlib/TSTLIB/TMISC.MMP
--- a/genericopenlibs/cstdlib/TSTLIB/TMISC.MMP Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cstdlib/TSTLIB/TMISC.MMP Wed Oct 13 19:39:18 2010 +0530
@@ -19,7 +19,7 @@
CAPABILITY ALL -TCB
-TARGET tmisc.exe
+TARGET tmisc_cstdlib.exe
TARGETTYPE exe
USERINCLUDE ../INC
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cstdlib/TSTLIB/TNETDB.MMP
--- a/genericopenlibs/cstdlib/TSTLIB/TNETDB.MMP Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cstdlib/TSTLIB/TNETDB.MMP Wed Oct 13 19:39:18 2010 +0530
@@ -15,7 +15,7 @@
//
//
-TARGET tnetdb.exe
+TARGET tnetdb_cstdlib.exe
#include "GENERIC.MMP"
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/cstdlib/TSTLIB/TPIPE.MMP
--- a/genericopenlibs/cstdlib/TSTLIB/TPIPE.MMP Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/cstdlib/TSTLIB/TPIPE.MMP Wed Oct 13 19:39:18 2010 +0530
@@ -18,7 +18,7 @@
OPTION CW -w off
TARGETTYPE exe
-TARGET tpipe.exe
+TARGET tpipe_cstdlib.exe
SOURCEPATH ../TSTLIB
SOURCE TPIPE.C
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/group/oeaddons_liboil.mrp
--- a/genericopenlibs/liboil/group/oeaddons_liboil.mrp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/liboil/group/oeaddons_liboil.mrp Wed Oct 13 19:39:18 2010 +0530
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
component oeaddons_liboil
source \sf\os\ossrv\genericopenlibs\liboil\
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/arm/math_vfp_asm.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/src/arm/math_vfp_asm.S Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2007
+ * Josep Torra . All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#if __VFP_FP__
+/*
+** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
+**
+** void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
+** void vfp_add_f64 (double *d, const double *s1, const double *s2, int n);
+** void vfp_divide_f32 (float *d, const float *s1, const float *s2, int n);
+** void vfp_divide_f64 (double *d, const double *s1, const double *s2, int n);
+** void vfp_multiply_f32 (float *d, const float *s1, const float *s2, int n);
+** void vfp_multiply_f64 (double *d, const double *s1, const double *s2, int n);
+** void vfp_subtract_f32 (float *d, const float *s1, const float *s2, int n);
+** void vfp_subtract_f64 (double *d, const double *s1, const double *s2, int n);
+**
+** d: $r0 | s1: $r1 | s2: $r2 | n: $r3 |
+**
+*/
+
+#define UNROLL_F32_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ ands ip, r3, #7; /* ip = n % 8 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmias r1!, {s0}; \
+ fldmias r2!, {s1}; \
+ ## finst ##s s2, s0, s1; \
+ fstmias r0!, {s2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 8 */ \
+ movs ip, r3, lsr #3; /* ip = n / 8 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #7; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ fldmias r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \
+ ## finst ##s s24, s8, s16; \
+ fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+#define UNROLL_F64_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ ands ip, r3, #3; /* ip = n % 3 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmiad r1!, {d0}; \
+ fldmiad r2!, {d1}; \
+ ## finst ##d d2, d0, d1; \
+ fstmiad r0!, {d2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 4 */ \
+ movs ip, r3, lsr #2; /* ip = n / 4 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #3; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmiad r1!, {d4, d5, d6, d7}; \
+ fldmiad r2!, {d8, d9, d10, d11}; \
+ ## finst ##d d12, d4, d8; \
+ fstmiad r0!, {d12, d13, d14, d15}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+.align 2
+UNROLL_F32_TEMPLATE(add_f32,fadd);
+UNROLL_F64_TEMPLATE(add_f64,fadd);
+
+UNROLL_F32_TEMPLATE(divide_f32,fdiv);
+UNROLL_F64_TEMPLATE(divide_f64,fdiv);
+
+UNROLL_F32_TEMPLATE(multiply_f32,fmul);
+UNROLL_F64_TEMPLATE(multiply_f64,fmul);
+
+UNROLL_F32_TEMPLATE(subtract_f32,fsub);
+UNROLL_F64_TEMPLATE(subtract_f64,fsub);
+
+#undef UNROLL_F32_TEMPLATE
+#undef UNROLL_F64_TEMPLATE
+
+/*
+**
+** void vfp_scalaradd_f32_ns (float *d, const float *s1, const float *s2_1, int n);
+** void vfp_scalaradd_f64_ns (double *d, const double *s1, const double *s2_1, int n);
+** void vfp_scalarmultiply_f32_ns (float *d, const float *s1, const float *s2_1, int n);
+** void vfp_scalarmultiply_f64_ns (double *d, const double *s1, const double *s2_1, int n);
+**
+** d: $r0 | s1: $r1 | s2_1: $r2 | n: $r3 |
+**
+*/
+#define UNROLL_F32_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ fldmias r2, {s1}; /* load scalar value */ \
+ ands ip, r3, #7; /* ip = n % 8 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmias r1!, {s0}; \
+ ## finst ##s s2, s0, s1; \
+ fstmias r0!, {s2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 8 */ \
+ movs ip, r3, lsr #3; /* ip = n / 8 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #7; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ ## finst ##s s24, s8, s1; \
+ fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+#define UNROLL_F64_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ fldmiad r2, {d1}; /* load scalar value */ \
+ ands ip, r3, #3; /* ip = n % 3 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmiad r1!, {d0}; \
+ ## finst ##d d2, d0, d1; \
+ fstmiad r0!, {d2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 4 */ \
+ movs ip, r3, lsr #2; /* ip = n / 4 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #3; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmiad r1!, {d4, d5, d6, d7}; \
+ ## finst ##d d12, d4, d1; \
+ fstmiad r0!, {d12, d13, d14, d15}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+UNROLL_F32_TEMPLATE(scalaradd_f32_ns,fadd);
+UNROLL_F64_TEMPLATE(scalaradd_f64_ns,fadd);
+
+UNROLL_F32_TEMPLATE(scalarmultiply_f32_ns,fmul);
+UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
+
+#undef UNROLL_F32_TEMPLATE
+#undef UNROLL_F64_TEMPLATE
+
+/*
+**
+** void vfp_abs_f32_f32_ns(float *d, const float *s, int n);
+** void vfp_abs_f64_f64_ns(double *d, const double *s, int n);
+** void vfp_negative_f32(float *d, const float *s, int n);
+** void vfp_negative_f64(double *d, const double *s, int n);
+**
+** d: $r0 | s: $r1 | n: $r2 |
+**
+*/
+#define UNROLL_F32_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ ands ip, r2, #7; /* ip = n % 8 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmias r1!, {s0}; \
+ ## finst ##s s2, s0; \
+ fstmias r0!, {s2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 8 */ \
+ movs ip, r2, lsr #3; /* ip = n / 8 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #7; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
+ ## finst ##s s24, s8; \
+ fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+#define UNROLL_F64_TEMPLATE(fname,finst) \
+ .global vfp_ ## fname ## ; \
+ vfp_ ## fname ## : \
+ stmdb sp!, {fp, lr}; /* save registers to stack */ \
+ ands ip, r2, #3; /* ip = n % 3 */ \
+ beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
+ vfp_ ## fname ## _loop1: \
+ fldmiad r1!, {d0}; \
+ ## finst ##d d2, d0; \
+ fstmiad r0!, {d2}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop1; \
+ vfp_ ## fname ## _unroll: /* unroll by 4 */ \
+ movs ip, r2, lsr #2; /* ip = n / 4 */ \
+ beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
+ fmrx lr, fpscr; /* read fpscr register into arm */\
+ mov fp, #3; \
+ orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
+ fmxr fpscr, fp; \
+ vfp_ ## fname ## _loop2: \
+ fldmiad r1!, {d4, d5, d6, d7}; \
+ ## finst ##d d12, d4; \
+ fstmiad r0!, {d12, d13, d14, d15}; \
+ subs ip, ip, #1; \
+ bne vfp_ ## fname ## _loop2; \
+ fmxr fpscr, lr; /* restore original fpscr */ \
+ vfp_ ## fname ## _end: \
+ ldmia sp!, {fp, pc}; /* recovering from stack and return */
+
+UNROLL_F32_TEMPLATE(abs_f32_f32_ns,fabs);
+UNROLL_F64_TEMPLATE(abs_f64_f64_ns,fabs);
+
+UNROLL_F32_TEMPLATE(negative_f32,fneg);
+UNROLL_F64_TEMPLATE(negative_f64,fneg);
+
+#undef UNROLL_F32_TEMPLATE
+#undef UNROLL_F64_TEMPLATE
+#endif
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/arm/math_vfp_asm.s
--- a/genericopenlibs/liboil/src/arm/math_vfp_asm.s Fri Sep 17 19:25:42 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2007
- * Josep Torra . All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if __VFP_FP__
-/*
-** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
-**
-** void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
-** void vfp_add_f64 (double *d, const double *s1, const double *s2, int n);
-** void vfp_divide_f32 (float *d, const float *s1, const float *s2, int n);
-** void vfp_divide_f64 (double *d, const double *s1, const double *s2, int n);
-** void vfp_multiply_f32 (float *d, const float *s1, const float *s2, int n);
-** void vfp_multiply_f64 (double *d, const double *s1, const double *s2, int n);
-** void vfp_subtract_f32 (float *d, const float *s1, const float *s2, int n);
-** void vfp_subtract_f64 (double *d, const double *s1, const double *s2, int n);
-**
-** d: $r0 | s1: $r1 | s2: $r2 | n: $r3 |
-**
-*/
-
-#define UNROLL_F32_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- ands ip, r3, #7; /* ip = n % 8 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
- fldmias r2!, {s1}; \
- ## finst ##s s2, s0, s1; \
- fstmias r0!, {s2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 8 */ \
- movs ip, r3, lsr #3; /* ip = n / 8 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #7; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
- fldmias r2!, {s16, s17, s18, s19, s20, s21, s22, s23}; \
- ## finst ##s s24, s8, s16; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-#define UNROLL_F64_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- ands ip, r3, #3; /* ip = n % 3 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
- fldmiad r2!, {d1}; \
- ## finst ##d d2, d0, d1; \
- fstmiad r0!, {d2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 4 */ \
- movs ip, r3, lsr #2; /* ip = n / 4 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #3; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
- fldmiad r2!, {d8, d9, d10, d11}; \
- ## finst ##d d12, d4, d8; \
- fstmiad r0!, {d12, d13, d14, d15}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-.align 2
-UNROLL_F32_TEMPLATE(add_f32,fadd);
-UNROLL_F64_TEMPLATE(add_f64,fadd);
-
-UNROLL_F32_TEMPLATE(divide_f32,fdiv);
-UNROLL_F64_TEMPLATE(divide_f64,fdiv);
-
-UNROLL_F32_TEMPLATE(multiply_f32,fmul);
-UNROLL_F64_TEMPLATE(multiply_f64,fmul);
-
-UNROLL_F32_TEMPLATE(subtract_f32,fsub);
-UNROLL_F64_TEMPLATE(subtract_f64,fsub);
-
-#undef UNROLL_F32_TEMPLATE
-#undef UNROLL_F64_TEMPLATE
-
-/*
-**
-** void vfp_scalaradd_f32_ns (float *d, const float *s1, const float *s2_1, int n);
-** void vfp_scalaradd_f64_ns (double *d, const double *s1, const double *s2_1, int n);
-** void vfp_scalarmultiply_f32_ns (float *d, const float *s1, const float *s2_1, int n);
-** void vfp_scalarmultiply_f64_ns (double *d, const double *s1, const double *s2_1, int n);
-**
-** d: $r0 | s1: $r1 | s2_1: $r2 | n: $r3 |
-**
-*/
-#define UNROLL_F32_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- fldmias r2, {s1}; /* load scalar value */ \
- ands ip, r3, #7; /* ip = n % 8 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
- ## finst ##s s2, s0, s1; \
- fstmias r0!, {s2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 8 */ \
- movs ip, r3, lsr #3; /* ip = n / 8 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #7; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
- ## finst ##s s24, s8, s1; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-#define UNROLL_F64_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- fldmiad r2, {d1}; /* load scalar value */ \
- ands ip, r3, #3; /* ip = n % 3 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
- ## finst ##d d2, d0, d1; \
- fstmiad r0!, {d2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 4 */ \
- movs ip, r3, lsr #2; /* ip = n / 4 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #3; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
- ## finst ##d d12, d4, d1; \
- fstmiad r0!, {d12, d13, d14, d15}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-UNROLL_F32_TEMPLATE(scalaradd_f32_ns,fadd);
-UNROLL_F64_TEMPLATE(scalaradd_f64_ns,fadd);
-
-UNROLL_F32_TEMPLATE(scalarmultiply_f32_ns,fmul);
-UNROLL_F64_TEMPLATE(scalarmultiply_f64_ns,fmul);
-
-#undef UNROLL_F32_TEMPLATE
-#undef UNROLL_F64_TEMPLATE
-
-/*
-**
-** void vfp_abs_f32_f32_ns(float *d, const float *s, int n);
-** void vfp_abs_f64_f64_ns(double *d, const double *s, int n);
-** void vfp_negative_f32(float *d, const float *s, int n);
-** void vfp_negative_f64(double *d, const double *s, int n);
-**
-** d: $r0 | s: $r1 | n: $r2 |
-**
-*/
-#define UNROLL_F32_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- ands ip, r2, #7; /* ip = n % 8 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmias r1!, {s0}; \
- ## finst ##s s2, s0; \
- fstmias r0!, {s2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 8 */ \
- movs ip, r2, lsr #3; /* ip = n / 8 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #7; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 8 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmias r1!, {s8, s9, s10, s11, s12, s13, s14, s15}; \
- ## finst ##s s24, s8; \
- fstmias r0!, {s24, s25, s26, s27, s28, s29, s30, s31}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-#define UNROLL_F64_TEMPLATE(fname,finst) \
- .global vfp_ ## fname ## ; \
- vfp_ ## fname ## : \
- stmdb sp!, {fp, lr}; /* save registers to stack */ \
- ands ip, r2, #3; /* ip = n % 3 */ \
- beq vfp_ ## fname ## _unroll; /* if ip == 0 goto prep_loop2 */ \
- vfp_ ## fname ## _loop1: \
- fldmiad r1!, {d0}; \
- ## finst ##d d2, d0; \
- fstmiad r0!, {d2}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop1; \
- vfp_ ## fname ## _unroll: /* unroll by 4 */ \
- movs ip, r2, lsr #2; /* ip = n / 4 */ \
- beq vfp_ ## fname ## _end; /* if ip == 0 goto finish */ \
- fmrx lr, fpscr; /* read fpscr register into arm */\
- mov fp, #3; \
- orr fp, lr, fp, lsl #16; /* set vector lenght to 4 */ \
- fmxr fpscr, fp; \
- vfp_ ## fname ## _loop2: \
- fldmiad r1!, {d4, d5, d6, d7}; \
- ## finst ##d d12, d4; \
- fstmiad r0!, {d12, d13, d14, d15}; \
- subs ip, ip, #1; \
- bne vfp_ ## fname ## _loop2; \
- fmxr fpscr, lr; /* restore original fpscr */ \
- vfp_ ## fname ## _end: \
- ldmia sp!, {fp, pc}; /* recovering from stack and return */
-
-UNROLL_F32_TEMPLATE(abs_f32_f32_ns,fabs);
-UNROLL_F64_TEMPLATE(abs_f64_f64_ns,fabs);
-
-UNROLL_F32_TEMPLATE(negative_f32,fneg);
-UNROLL_F64_TEMPLATE(negative_f64,fneg);
-
-#undef UNROLL_F32_TEMPLATE
-#undef UNROLL_F64_TEMPLATE
-#endif
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/deprecated/permute_c_Dep.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/src/deprecated/permute_c_Dep.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,314 @@
+/*
+ * LIBOIL - Library of Optimized Inner Loops
+ * Copyright (c) 2003,2004 David A. Schleef
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+//Portions Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include
+#include
+#include "liboil/simdpack/simdpack.h"
+#include
+
+static void
+permute_test (OilTest *test)
+{
+ int i;
+ int n = test->n;
+ int stride = oil_test_get_value (test, OIL_ARG_SSTR2);
+ uint8_t *ptr = (uint8_t *) oil_test_get_source_data (test, OIL_ARG_SRC2);
+
+ for(i=0;i
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-//Portions Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include
-#include
-#include "liboil/simdpack/simdpack.h"
-#include
-
-static void
-permute_test (OilTest *test)
-{
- int i;
- int n = test->n;
- int stride = oil_test_get_value (test, OIL_ARG_SSTR2);
- uint8_t *ptr = (uint8_t *) oil_test_get_source_data (test, OIL_ARG_SRC2);
-
- for(i=0;i=BC && BC>MIN_VEC will b to v_memcpy
+// (DST-SRC)<0 && (SRC-DST)< BC && BC>MIN_VEC must b to v_memcpy
+// (DST-SRC)<0 && BC0 && BC0 && (DST-SRC)< BC && BC>MIN_VEC must b to v_memmove
+// (DST-SRC)>0 && (SRC-DST)>=BC && BC>MIN_VEC will b to v_memmove
+
+// If you call memmove (or vec_memmove) and |DST-SRC|>=BC,
+// this code will branch to v_memcpy anyway for maximum performance.
+
+// Revision History:
+// Rev 0.0 Original Chuck Corley 02/03/03
+// Can still add dst, 128B loop, and aligned option
+// Rev 0.01 Fixed JY's seg-fault violation CJC 02/17/03
+// Rev 0.1 Added 128B loop and dst; cndtnlzd dcbz CJC 02/18/03
+// (Creating separate path for QW aligned didn't help much)
+// Rev 0.11 Small code schdling; chngd dst for memmove CJC 02/23/03
+// Rev 0.20 Eliminated alternate entry and cleanup CJC 02/27/03
+// Rev 0.21 Inproved loop branch targets for v_mempcy CJC 03/01/03
+// Rev 0.22 Experimented with dst (sent to H.) CJC 03/02/03
+// Rev 0.23 Substituted dcba for dcbz (sent to JY) CJC 03/08/03
+// Rev 0.24 Use two dst streams CJC 03/12/03
+// Rev 0.25 Fix for all compilers, cleanup, and release with
+// libmotovec.a rev 0.10 CJC 03/14/03
+// Rev 0.30 Fix for pre-empted destination (SNDF-DS) CJC 04/02/03
+//
+// Between Rev 0.25 and 0.30 the code was revised to store elements of
+// source at destination when first and/or last vector are less than 16
+// bytes. Areviewer at SNDF observed that loading the destination vector
+// for merging exposed the "uninvolved" destination bytes to incoherency
+// if an interrupt pre-empted this routine and modified the "uninvolved"
+// destination vector(s) while held in register for merging. It seems
+// like a low possibility but this revision is no longer subject to that
+// possibility. (It is also slightly faster than Rev 0.25.)
+// This is beta quality code; users are encouraged to make it faster.
+// ASSUMPTIONS:
+// Code is highly likely to be in the cache; data is not (streaming data)
+
+#define VRSV 256 // VRSAVE spr
+// Don't use vectors for BC <= MIN_VEC. Works only if MIN_VEC >= 16 bytes.
+#define MIN_VEC 16
+// Don't use Big_loop in v_memcpy for |dst-src|<= minimum overlap.
+#define MIN_OVL 128
+
+// Register useage
+#define Rt r0 // r0 when used as a temporary register
+
+#define DST r3 // entering: dst pointer; exiting: same dst pointer
+
+#define SRC r4 // entering: src ptr; then end of src range index (SRC+BC) in memmove
+
+#define BC r5 // entering: Byte_Count
+
+#define PCS r6 // save for partial checksum entering
+
+#define DMS r7 // dst - src initially
+#define BK r7 // BC - 1 +/- (n*16)
+
+// Codewarrior will put an unwelcome space as "lbzu r0,1(r7 )"
+// if you don't put the comment right after the r7. CJC 030314
+#define SM1 r8// src -1 for byte-by-byte forwards initially
+#define S r8 // src[28:31]
+#define SMD r8 // src[0:27]-dst[0:27]
+#define STR r8 // data stream touch block & stride info for Big_loop
+
+#define DM1 r9// dst -1 for byte-by-byte forwards initially
+#define D r9 // dst[28:31]
+#define DNX r9 // (dst+n*16)[28:31]
+#define BL r9 // second byte_kount index pointer
+
+#define SBC r10// src + byte count initially then src[28:31]
+#define BLK r10 // temporary data stream touch block & stride info
+#define DR r10 // (dst+16)[0:27]
+#define QW r10 // number of quad words (vectors)
+
+#define DBC r11// dst + byte count initially
+#define BLL r11 // temporary data stream touch block & stride info
+#define SBK r11 // (src+byte_count-1)
+#define SBR r11 // (src+byte_count-1)[0:27]
+#define DBK r11 // (dst+byte_count-1) then (dst+byte_count-1)[28:31]
+#define BIG r11 // QW/8 or 128 byte loop count
+#define SP8 r11 // SRC + n*128 (8 QWs) for data streaming after first call
+
+#define RSV r12 // storage for VRSAVE register if used
+
+#define VS0 v0 // src vector for permuting
+
+#define VS1 v1 // src vector for permuting
+
+#define VP3 v2 // d - s permute register
+
+#define VPS0 v3 // permuted source vector to store
+
+#define VPS1 v4 // 2nd permuted source vector to store
+
+#define VPS2 v5 // additional permuted src in Big loop
+
+#define VS2 v6 // src vector for permuting
+#define VPS3 v6 // additional permuted src in Big loop
+
+#define VS3 v7 // additional src load in Big loop
+#define VPS4 v7 // additional permuted src in Big loop
+
+#define VS4 v8 // additional src load in Big loop
+#define VPS5 v8 // additional permuted src in Big loop
+
+#define VS5 v9 // additional src load in Big loop
+#define VPS6 v9 // additional permuted src in Big loop
+
+#define VS6 v10 // additional src load in Big loop
+#define VPS7 v10 // additional permuted src in Big loop
+
+#define VS7 v11 // additional src load in Big loop
+
+// Conditionalize the use of dcba. It will help if the data is
+// not in cache and hurt if it is. Generally, except for small
+// benchmarks repeated many times, we assume data is not in cache
+// (data streaming) and using dcbz is a performance boost.
+#ifndef NO_DCBA
+#if defined(__GNUC__) || defined(__MWERKS__) || defined(_DIAB_TOOL)
+ // gcc and codewarrior and diab don't assemble dcba
+#define DCBK .long 0x7c033dec
+// dcba r3,r7 or dcba DST,BK
+#define DCBL .long 0x7c034dec
+// dcba r3,r9 or dcba DST,BL
+#else
+#ifdef __ghs__
+.macro DCBK
+.long 0x7c033dec
+.endm
+.macro DCBL
+.long 0x7c034dec
+.endm
+#else
+#define DCBK dcba DST,BK
+#define DCBL dcba DST,BL
+#endif // __ghs__
+#endif // __GNUC__ or __MWERKS__
+#else
+#define DCBK nop
+#define DCBL nop
+#endif // NO_DCBA
+
+// Conditionalize the use of dst (data stream touch). It will help
+// if the data is not in cache and hurt if it is (though not as badly
+// as dcbz). Generally, except for small benchmarks repeated many times,
+// we assume data is not in cache (data streaming) and using dst is a
+// performance boost.
+#ifndef NO_DST
+#define STRM_B dst SBC,BLL,0
+#define STRM_F dst SRC,BLK,0
+#define STRM_1 dst SP8,STR,1
+
+#else
+#define STRM_B nop
+#define STRM_F nop
+#define STRM_1 nop
+#endif
+
+// Condition register use
+// cr0[0:2] = (dst-src==0)? return: ((dst-src>0)? copy_bkwd, copy_fwd;);
+// then cr0[0:2] = (dst[28:31]-src[28:31]<0)? "shifting left", "shifting right";
+// cr1[0,2] = (BC == 0)? 1 : 0; (nothing to move)
+// then cr1[2] = (DST[28:31] == 0)? 1 : 0; (D0 left justified)
+// then cr1[2] = ((DBK = DST+BC-1)[28:31] = 0xF)? 1 : 0; (DN right justified)
+// cr5[0,2] = (|DST-SRC|<=MIN_OVL)?1:0; (Overlap too small for Big loop?)
+// cr6[1,2] = (DST-SRC>=BC)?1:0; (Okay for v_memmove to copy forward?)
+// then cr6[2] = (QW == 0)? 1 : 0; (Any full vectors to move?)
+// then cr6[1] = (QW > 4)? 1 : 0; (>4 vectors to move?)
+// then cr6[3] = (third store[27] == 1)? 1: 0; (cache line alignment)
+// then cr6[3] = (last store[27] == 1)? 1: 0; (last store odd?)
+// cr7[2] = (BC>MIN_VEC)?1:0; (BC big enough to warrant vectors)
+// then cr7[0:3] = (DST+16)[0:27]-DST (How many bytes (iff <16) in first vector?)
+// then cr7[1] = (QW > 14)? 1 : 0; (>14 vectors to move?)
+// then cr7[0:3] = (DST+BC)[0:27] (How many bytes (iff <16) in last vector?)
+
+ .text
+#ifdef __MWERKS__
+ .align 32
+#else
+ .align 5
+#endif
+
+#ifdef LIBMOTOVEC
+ .globl memmove
+memmove:
+ nop // IU1 Compilers forget first label
+ .globl memcpy
+memcpy:
+#else
+ .globl vec_memmove
+vec_memmove:
+ nop // IU1 Only way I know to preserve both labels
+ .globl _vec_memcpy
+_vec_memcpy:
+#endif
+ subf. DMS,SRC,DST // IU1 Compute dst-src difference
+ cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count moves
+ cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
+
+ addi SM1,SRC,-1 // IU1 Pre-bias and duplicate src for fwd
+ addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
+ add SBC,SRC,BC // IU1 Pre-bias and duplicate src for bkwd
+ beqlr // return if DST = SRC
+
+ add DBC,DST,BC // IU1 Pre-bias and duplicate destination
+ subf Rt,DST,SRC // IU1 Form |DST-SRC| if DST-SRC<0
+ beqlr cr1 // return if BC = 0
+
+ bgt Cpy_bkwd // b if DST-SRC>0 (have to copy backward)
+ cmpi cr5,0,Rt,MIN_OVL // IU1 (|DST-SRC|>128)?1:0; for v_memcpy
+ bgt cr7,v_memcpy // b if BC>MIN_VEC (okay to copy vectors fwd)
+
+// Copy byte-by-byte forwards if DST-SRC<0 and BC<=MIN_VEC
+ mtctr BC // i=BC; do ...;i--; while (i>0)
+Byte_cpy_fwd:
+ lbzu Rt,1(SM1) // LSU * ++(DST-1) = * ++(SRC-1)
+ stbu Rt,1(DM1) // LSU
+ bdnz Byte_cpy_fwd
+
+ blr
+ nop // IU1 Improve next label as branch target
+Cpy_bkwd:
+ cmpi cr5,0,DMS,MIN_OVL // IU1 ((DST-SRC)>128)?1:0; for v_memcpy
+ cmp cr6,0,DMS,BC // IU1 cr6[1,2]=(DST-SRC>=BC)?1:0;
+ bgt cr7,v_memmove // b if BC>MIN_VEC (copy vectors bkwd)
+// Copy byte-by-byte backwards if DST-SRC>0 and BC<=MIN_VEC
+ mtctr BC // i=BC; do ...;i--; while (i>0)
+Byte_cpy_bwd:
+ lbzu Rt,-1(SBC) // LSU * --(DST+BC) = * --(SRC+BC)
+ stbu Rt,-1(DBC) // LSU Store it
+ bdnz Byte_cpy_bwd
+ blr
+
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+
+v_memmove:
+// Byte count < MIN_VEC bytes will have been copied by scalar code above,
+// so this will not deal with small block moves < MIN_VEC.
+
+// For systems using VRSAVE, define VRSAVE=1 when compiling. For systems
+// that don't, make sure VRSAVE is undefined.
+#ifdef VRSAVE
+ mfspr RSV,VRSV // IU2 Get current VRSAVE contents
+#endif
+ rlwinm S,SRC,0,28,31 // IU1 Save src address bits s[28:31]
+ rlwinm D,DST,0,28,31 // IU1 D = dst[28:31]
+ bge cr6,MC_entry // b to v_memcpy if DST-SRC>=BC (fwd copy OK)
+
+#ifdef VRSAVE
+ oris Rt,RSV,0xfff0 // IU1 Or in registers used by this routine
+#endif
+ lis BLL,0x010c // IU1 Stream 12 blocks of 16 bytes
+ subf. SMD,D,S // IU1 if S-D<0 essentially shifting right
+
+#ifdef VRSAVE
+ mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
+#endif
+ lvsr VP3,0,DMS // LSU Permute vector for dst - src shft right
+ ori BLL,BLL,0xffe0 // IU1 Stream stride -32B
+
+ STRM_B // LSU Start data stream at SRC+BC
+ addi SBK,SBC,-1 // IU1 Address of last src byte
+ bgt Rt_shft // Bytes from upper vector = (s-d>0)?s-d:16+s-d;
+ addi SMD,SMD,16 // IU1 Save 16-(d-s)
+Rt_shft:
+
+ rlwinm SBR,SBK,0,0,27 // IU1 (SRC+BC-1)[0:27]
+ addi BK,BC,-1 // IU1 Initialize byte index
+
+ subf Rt,SBR,SBC // IU1 How many bytes in first source?
+ add DBK,DST,BK // IU1 Address of last dst byte
+ addi DR,DST,16 // IU1 Address of second dst vector
+
+ subf. SMD,Rt,SMD // IU1 if bytes in 1st src>Bytes in 1st permute
+ rlwinm Rt,DBK,0,28,31 // IU1 (DST+BC-1)[28:31]
+ rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
+
+// If there are more useful bytes in the upper vector of a permute pair than we
+// will get in the first permute, the first loaded vector needs to be in the
+// lower half of the permute pair. The upper half is a don't care then.
+ blt Get_bytes_rt // b if shifting left (D-S>=0)
+
+ lvx VS1,SRC,BK // LSU Get SN load started
+// Comments numbering source and destination assume single path through the
+// code executing each instruction once. For vec_memmove, an example would
+// be the call memmove(BASE+0x0F, BASE+0x2F, 82). N = 6 in that case.
+ addi SRC,SRC,-16 // IU1 Decrement src base (to keep BK useful)
+
+Get_bytes_rt: // Come here to get VS0 & Don't care what VS1 is
+ lvx VS0,SRC,BK // LSU Get SN-1 (SN if D-S<0) in lower vector
+ subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
+ cmpi cr7,0,Rt,0xF // IU1 Is Dn right justified?
+
+ cmpi cr1,0,D,0 // IU1 Is D0 left justified?
+ rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
+ add Rt,DST,BC // IU1 Refresh the value of DST+BC
+
+ cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
+ vperm VPS0,VS0,VS1,VP3 // VPU Align SN-1 and SN to DN
+ vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
+ beq cr7,Rt_just // b if DN is right justified
+
+ mtcrf 0x01,Rt // IU2 Put final vector byte count in cr7
+ rlwinm DBK,DBK,0,0,27 // IU1 Address of first byte of final vector
+ li D,0 // IU1 Initialize an index pointer
+ bnl cr7,Only_1W_bkwd // b if there was only one or zero words to store
+
+ stvewx VPS0,DBK,D // LSU store word 1 of two or three
+ addi D,D,4 // IU1 increment index
+
+ stvewx VPS0,DBK,D // LSU store word 2 of two or three
+ addi D,D,4 // IU1 increment index
+Only_1W_bkwd:
+ bng cr7,Only_2W_bkwd // b if there were only two or zero words to store
+
+ stvewx VPS0,DBK,D // LSU store word 3 of three if necessary
+ addi D,D,4 // IU1 increment index
+Only_2W_bkwd:
+ bne cr7,Only_B_bkwd // b if there are no half words to store
+
+ stvehx VPS0,DBK,D // LSU store one halfword if necessary
+ addi D,D,2 // IU1 increment index
+Only_B_bkwd:
+ bns cr7,All_done_bkwd // b if there are no bytes to store
+
+ stvebx VPS0,DBK,D // LSU store one byte if necessary
+ b All_done_bkwd
+
+Rt_just:
+ stvx VPS0,DST,BK // LSU Store 16 bytes at DN
+All_done_bkwd:
+ addi BK,BK,-16 // IU1 Decrement destination byte count
+
+ ble cr6,Last_load // b if no Quad words to do
+ mtctr QW // IU2 for (i=0;i<=QW;i++)-execution serializng
+ cmpi cr6,0,QW,4 // IU1 Check QW>4
+QW_loop:
+ lvx VS0,SRC,BK // LSU Get SN-2 (or SN-1 if ADJ==0)
+
+ vperm VPS0,VS0,VS1,VP3 // VPU Align SN-2 and SN-1 to DN-1
+ vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at DN-1
+ addi BK,BK,-16 // IU1 Decrement byte kount
+ bdnzf 25,QW_loop // b if 4 or less quad words to do
+
+ add DNX,DST,BK // IU1 address of next store (DST+BC-1-16)
+ bgt cr6,GT_4QW // b if >4 quad words left
+
+Last_load: // if D-S>=0, next load will be from same address as last
+ blt No_ld_bkwd // b if shifting right (S-D>=0)
+ addi SRC,SRC,16 // IU1 recorrect source if it was decremented
+No_ld_bkwd:
+ lvx VS0,0,SRC // LSU Get last source SN-6 (guaranteed S0)
+// Current 16 bytes is the last; we're done.
+ dss 0 // Data stream stop
+ vperm VPS0,VS0,VS1,VP3 // VPU Align SN-6 and SN-5 to DN-6
+ subfic D,DST,16 // IU1 How many bytes in first destination?
+ beq cr1,Lt_just // b if last destination is left justified
+
+ mtcrf 0x01,D // IU2 Put byte count remaining in cr7
+ li D,0 // IU1 Initialize index pointer
+ bns cr7,No_B_bkwd // b if only even number of bytes to store
+
+ stvebx VPS0,DST,D // LSU store first byte at DST+0
+ addi D,D,1 // IU1 increment index
+No_B_bkwd:
+ bne cr7,No_H_bkwd // b if only words to store
+ stvehx VPS0,DST,D // LSU store halfword at DST+0/1
+ addi D,D,2 // IU1 increment index
+
+No_H_bkwd:
+ bng cr7,No_W1_bkwd // b if exactly zero or two words to store
+ stvewx VPS0,DST,D // LSU store word 1 of one or three
+ addi D,D,4 // IU1 increment index
+
+No_W1_bkwd:
+ bnl cr7,No_W2_bkwd // b if there was only one word to store
+ stvewx VPS0,DST,D // LSU store word 1 of two or 2 of three
+ addi D,D,4 // IU1 increment index
+
+ stvewx VPS0,DST,D // LSU store word 2 of two or 3 of three
+ b No_W2_bkwd
+
+Lt_just:
+ stvx VPS0,0,DST // LSU Store 16 bytes at final dst addr D0
+No_W2_bkwd:
+#ifdef VRSAVE
+ mtspr VRSV,RSV // IU1 Restore VRSAVE
+#endif
+ blr // Return destination address from entry
+
+GT_4QW: // Do once if next store is to even half of cache line, else twice
+
+ lvx VS0,SRC,BK // LSU Get SN-3 (or SN-2)
+ mtcrf 0x02,DNX // IU2 cr6[3]=((DST+BC-1)[27]==1)?1:0;
+
+ vperm VPS0,VS0,VS1,VP3 // VPU Align SN-3 and SN-2 to Dn-2
+ vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
+ addi DNX,DNX,-16 // IU1 Prepare to update cr6 next loop
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at DN-2
+ vor VS3,VS0,VS0 // VIU Make a copy of lower vector
+ addi BK,BK,-16 // IU1 Decrement byte count by 16
+ bdnzt 27,GT_4QW // b if next store is to upper (odd) half of CL
+// At this point next store will be to even address.
+
+ lis STR,0x102 // IU1 Stream 2 blocks of 16 bytes
+ mtcrf 0x02,DST // IU2 cr6[3]=(DST[27]==1)?1:0; (DST odd?)
+ addi BL,BK,-16 // IU1 Create an alternate byte count - 16
+
+ ori STR,STR,0xffe0 // IU1 Stream stride -32B
+ addi SP8,SRC,-64 // IU1 Starting address for data stream touch
+ bso cr6,B32_bkwd // b if DST[27] == 1; i.e, final store is odd
+
+ bdnz B32_bkwd // decrement counter for last odd QW store
+B32_bkwd: // Should be at least 2 stores remaining and next 2 are cache aligned
+ lvx VS2,SRC,BK // LSU Get SN-4 (or SN-3)
+ addi SP8,SP8,-32 // IU1 Next starting address for data stream touch
+
+ lvx VS1,SRC,BL // LSU Get SN-5 (or SN-4)
+ vperm VPS0,VS2,VS3,VP3 // VPU Align SN-4 and SN-3 to DN-3
+
+ STRM_1 // LSU Stream 64 byte blocks ahead of loads
+
+ DCBL // LSU allocate next cache line
+
+ vperm VPS1,VS1,VS2,VP3 // VPU Align SN-5 and SN-4 to DN-4
+ vor VS3,VS1,VS1 // VIU1 Move SN-5 to SN-3
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at DN-3
+ addi BK,BL,-16 // IU1 Decrement byte count
+ bdz Nxt_loc_bkwd // always decrement and branch to next instr
+
+Nxt_loc_bkwd:
+ stvx VPS1,DST,BL // LSU Store 16 bytes at DN-4
+ addi BL,BK,-16 // IU1 Decrement alternate byte count
+ bdnz B32_bkwd // b if there are at least two more QWs to do
+
+ bns cr6,One_odd_QW // b if there was one more odd QW to store
+ b Last_load
+
+// Come here with two more loads and two stores to do
+One_odd_QW:
+ lvx VS1,SRC,BK // LSU Get SN-6 (or SN-5)
+
+ vperm VPS1,VS1,VS3,VP3 // VPU Align SN-6 and SN-5 to DN-5
+
+ stvx VPS1,DST,BK // LSU Store 16 bytes at DN-5
+
+ b Last_load
+
+// End of memmove in AltiVec
+
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+v_memcpy:
+// Byte count < MIN_VEC bytes will have been copied by scalar code above,
+// so this will not deal with small block moves < MIN_VEC.
+
+#ifdef VRSAVE
+ mfspr RSV,VRSV // IU2 Get current VRSAVE contents
+#endif
+ rlwinm S,SRC,0,28,31 // IU1 Save src address bits s[28:31]
+ rlwinm D,DST,0,28,31 // IU1 D = dst[28:31]
+
+MC_entry: // enter here from memmove if DST-SRC>=BC; this should be faster
+#ifdef VRSAVE
+ oris Rt,RSV,0xfff0 // IU1 Or in registers used by this routine
+#endif
+ lis BLK,0x010c // IU1 Stream 12 blocks of 16 bytes
+
+ subf. S,S,D // IU1 if D-S<0 essentially shifting left
+
+#ifdef VRSAVE
+ mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
+#endif
+ lvsr VP3,0,DMS // LSU Permute vector for dst - src shft right
+ ori BLK,BLK,32 // IU1 Stream stride 32B
+
+ STRM_F // LSU Start data stream 0 at SRC
+ addi DR,DST,16 // IU1 Address of second dst vector
+ addi DBK,DBC,-1 // IU1 Address of last dst byte
+
+// If D-S<0 we are "kinda" shifting left with the right shift permute vector
+// loaded to VP3 and we need both S0 and S1 to permute. If D-S>=0 then the
+// first loaded vector needs to be in the upper half of the permute pair and
+// the lower half is a don't care then.
+ bge Ld_bytes_rt // b if shifting right (D-S>=0)
+
+ lvx VS0,0,SRC // LSU Get S0 load started
+// Comments numbering source and destination assume single path through the
+// code executing each instruction once. For vec_memcpy, an example would
+// be the call memcpy(BASE+0x1E, BASE+0x1F, 259). N = 16 in that case.
+ addi SRC,SRC,16 // IU1 Increment src base (to keep BK useful)
+
+Ld_bytes_rt: // Come here to get VS1 & Don't care what VS0 is
+ lvx VS1,0,SRC // LSU Get S1 (or S0 if D-S>=0) in upper vector
+ rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
+ cmpi cr1,0,D,0 // IU1 Is D0 left justified?
+
+ subf Rt,DST,DR // IU1 How many bytes in first destination?
+ subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
+ li BK,0 // IU1 Initialize byte kount index
+
+ mtcrf 0x01,Rt // IU2 Put bytes in 1st dst in cr7
+ rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
+ vperm VPS0,VS0,VS1,VP3 // VPU Align S0 and S1 to D0
+
+ vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
+ beq cr1,Left_just // b if D0 is left justified
+
+ bns cr7,No_B_fwd // b if only even number of bytes to store
+
+ stvebx VPS0,DST,BK // LSU store first byte at DST+0
+ addi BK,BK,1 // IU1 increment index
+No_B_fwd:
+ bne cr7,No_H_fwd // b if only words to store
+
+ stvehx VPS0,DST,BK // LSU store halfword at DST+0/1
+ addi BK,BK,2 // IU1 increment index
+No_H_fwd:
+ bng cr7,No_W1_fwd // b if exactly zero or two words to store
+
+ stvewx VPS0,DST,BK // LSU store word 1 of one or three
+ addi BK,BK,4 // IU1 increment index
+
+No_W1_fwd:
+ bnl cr7,No_W2_fwd // b if there was only one word to store
+ stvewx VPS0,DST,BK // LSU store word 1 of two or 2 of three
+ addi BK,BK,4 // IU1 increment index
+
+ stvewx VPS0,DST,BK // LSU store word 2 of two or 3 of three
+ b No_W2_fwd
+
+Left_just:
+ stvx VPS0,0,DST // LSU Store 16 bytes at D0
+No_W2_fwd:
+ rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
+ cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
+
+ li BK,16 // IU1 Re-initialize byte kount index
+ cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
+ cmpi cr7,0,QW,14 // IU1 Check QW>14
+ ble cr6,Last_ld_fwd // b if no Quad words to do
+
+ mtctr QW // IU2 for (i=0;i<=QW;i++)
+ cmpi cr6,0,QW,4 // IU1 Check QW>4
+QW_fwd_loop:
+ lvx VS1,SRC,BK // LSU Get S2 (or S1)
+
+ vperm VPS0,VS0,VS1,VP3 // VPU Align S1 and S2 to D1
+ vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at D1(+n*16 where n<4)
+ addi BK,BK,16 // IU1 Increment byte kount index
+ bdnzf 25,QW_fwd_loop // b if 4 or less quad words to do
+
+ add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
+ addi QW,QW,-1 // IU1 One more QW stored by now
+ bgt cr6,GT_4QW_fwd // b if >4 quad words left
+
+Last_ld_fwd: // Next 16 bytes is the last; we're done.
+ add DBC,DST,BC // IU1 Recompute address of last dst byte + 1
+ add SBC,SRC,BC // IU1 Recompute address of last src byte + 1
+ bge No_ld_fwd // b if shifting right (D-S>=0)
+
+ addi SBC,SBC,-16 // IU1 if D-S>=0 we didn't add 16 to src
+No_ld_fwd:
+ mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
+ addi DBK,DBC,-1 // IU1 Recompute address of last dst byte
+ addi Rt,SBC,-1 // IU1 Recompute address of last src byte
+
+// If D-S<0 we have already loaded all the source vectors.
+// If D-S>=0 then the first loaded vector went to the upper half of the permute
+// pair and we need one more vector. (This may be a duplicate.)
+
+ lvx VS1,0,Rt // LSU Get last source S14 (guaranteed SN)
+
+#ifndef NO_DST
+ dss 0 // Data stream 0 stop
+
+ dss 1 // Data stream 1 stop
+#endif
+ vperm VPS0,VS0,VS1,VP3 // VPU Align S13 and S14 to D14
+ beq cr1,Rt_just_fwd // b if last destination is right justified
+
+ rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
+ li D,0 // IU1 Initialize index pointer
+ bnl cr7,Only_1W_fwd // b if there was only one or zero words to store
+
+ stvewx VPS0,DBK,D // LSU store word 1 of two or three
+ addi D,D,4 // IU1 increment index
+
+ stvewx VPS0,DBK,D // LSU store word 2 of two or three
+ addi D,D,4 // IU1 increment index
+Only_1W_fwd:
+ bng cr7,Only_2W_fwd // b if there were only two or zero words to store
+
+ stvewx VPS0,DBK,D // LSU store word 3 of three if necessary
+ addi D,D,4 // IU1 increment index
+Only_2W_fwd:
+ bne cr7,Only_B_fwd // b if there are no half words to store
+
+ stvehx VPS0,DBK,D // LSU store one halfword if necessary
+ addi D,D,2 // IU1 increment index
+Only_B_fwd:
+ bns cr7,All_done_fwd // b if there are no bytes to store
+
+ stvebx VPS0,DBK,D // LSU store one byte if necessary
+ b All_done_fwd
+
+Rt_just_fwd:
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at D14
+All_done_fwd:
+#ifdef VRSAVE
+ mtspr VRSV,RSV // IU1 Restore VRSAVE
+#endif
+ blr // Return destination address from entry
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
+
+ lvx VS1,SRC,BK // LSU Get S3 (or S2)
+ addi QW,QW,-1 // IU1 Keeping track of QWs stored
+ mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
+
+ addi DNX,DNX,16 // IU1 Update cr6 for next loop
+ addi Rt,QW,-2 // IU1 Insure at least 2 QW left after big loop
+
+ vperm VPS0,VS0,VS1,VP3 // VPU Align S2 and S3 to D2
+ vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at D2
+ addi BK,BK,16 // IU1 Increment byte count by 16
+ bdnzf 27,GT_4QW_fwd // b if next store is to lower (even) half of CL
+// At this point next store will be to even address.
+
+ mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
+ lis STR,0x104 // IU1 Stream 4 blocks of 16 bytes
+ addi BL,BK,16 // IU1 Create an alternate byte kount + 32
+
+ ori STR,STR,32 // IU1 Stream stride 32B
+#ifndef NO_BIG_LOOP
+ rlwinm BIG,Rt,29,3,31 // IU1 QW/8 big loops to do
+
+ rlwinm Rt,Rt,0,0,28 // IU1 How many QWs will be done in big loop
+ bgt cr7,Big_loop // b if QW > 14
+#endif
+No_big_loop:
+// We need the ctr register to reflect an even byte count before entering
+// the next block - faster to decrement than to reload.
+
+ addi SP8,SRC,256 // IU1 Starting address for data stream touch
+ xoris STR,STR,0x6 // IU1 Reset stream to 2 blocks of 16 bytes
+ bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
+
+ bdnz B32_fwd // decrement counter for last QW store odd
+
+B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
+ lvx VS1,SRC,BK // LSU Get S12
+ addi SP8,SP8,32 // IU1 Next starting address for data stream touch
+
+ lvx VS2,SRC,BL // LSU Get S13
+ vperm VPS1,VS0,VS1,VP3 // VPU Align S11 and S12 to D11
+
+ STRM_1 // LSU Stream 64 byte blocks ahead of loads
+
+ DCBK // LSU then Kill instead of RWITM
+
+ vperm VPS0,VS1,VS2,VP3 // VPU Align S12 and S13 to D12
+ vor VS0,VS2,VS2 // VIU1 Move S13 to S11
+
+ stvx VPS1,DST,BK // LSU Store 16 bytes at D11
+ addi BK,BL,16 // IU1 Increment byte count
+ bdz Nxt_loc_fwd // always decrement and branch to next instr
+
+Nxt_loc_fwd:
+ stvx VPS0,DST,BL // LSU Store 16 bytes at D12
+ addi BL,BK,16 // IU1 Increment alternate byte count
+ bdnz B32_fwd // b if there are at least two more QWs to do
+
+ bso cr6,One_even_QW // b if there is one even and one odd QW to store
+ b Last_ld_fwd // b if last store is to even address
+
+// Come here with two more loads and two stores to do
+One_even_QW:
+ lvx VS1,SRC,BK // LSU Get S14 (or S13 if if D-S>=0)
+
+ vperm VPS0,VS0,VS1,VP3 // VPU Align S13 and S14 to D13
+ vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
+
+ stvx VPS0,DST,BK // LSU Store 16 bytes at D13
+ addi BK,BK,16 // IU1 Increment byte count
+
+ b Last_ld_fwd
+
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+Big_loop:
+ subf QW,Rt,QW // IU1 Should be 2-7 QWs left after big loop
+ blt cr5,No_big_loop // b back if |DST-SRC|<128; Big_loop won't work.
+ mtctr BIG // IU2 loop for as many 128B loops as possible
+ addi SP8,SRC,256 // IU1 Starting address for data stream touch
+
+Loop_of_128B: // Come here with QW>=10 and next store even; VS0 last load
+ lvx VS1,SRC,BK // LSU Get S4 (or S3 if D-S>=0)
+ addi BL,BK,32 // IU1 Increment Byte_Kount+16 by 32
+ addi SP8,SP8,128 // IU1 increment address for data stream touch
+
+ lvx VS3,SRC,BL // LSU Get S6 (or S5)
+ addi BL,BL,32 // IU1 Increment Byte_Kount+48 by 32
+
+ lvx VS5,SRC,BL // LSU Get S8 (or S7)
+ addi BL,BL,32 // IU1 Increment Byte_Kount+80 by 32
+
+ lvx VS7,SRC,BL // LSU Get S10 (or S9)
+ addi BL,BK,16 // IU1 Increment Byte_Kount+16 by 16
+
+ lvx VS2,SRC,BL // LSU Get S5 (or S4)
+ addi BL,BL,32 // IU1 Increment Byte_Kount+32 by 32
+
+ lvx VS4,SRC,BL // LSU Get S7 (or S6)
+ addi BL,BL,32 // IU1 Increment Byte_Kount+64 by 32
+
+ lvx VS6,SRC,BL // LSU Get S9 (or S8)
+ addi BL,BL,32 // IU1 Increment Byte_Kount+96 by 32
+ vperm VPS0,VS0,VS1,VP3 // VPU
+
+ lvx VS0,SRC,BL // LSU Get S11 (or S10)
+ vperm VPS1,VS1,VS2,VP3 // VPU
+
+ STRM_1 // LSU Stream 4 32B blocks, stride 32B
+
+ DCBK // LSU then Kill instead of RWITM
+
+ stvx VPS0,DST,BK // LSU Store D3
+ addi BK,BK,16 // IU1 Increment Byte_Kount+16 by 16
+ vperm VPS2,VS2,VS3,VP3 // VPU
+
+ stvx VPS1,DST,BK // LSU Store D4
+ addi BK,BK,16 // IU1 Increment Byte_Kount+32 by 16
+ vperm VPS3,VS3,VS4,VP3 // VPU
+
+ DCBK // LSU then Kill instead of RWITM
+
+ stvx VPS2,DST,BK // LSU Store D5
+ addi BK,BK,16 // IU1 Increment Byte_Kount+48 by 16
+ vperm VPS4,VS4,VS5,VP3 // VPU
+
+ stvx VPS3,DST,BK // LSU Store D6
+ addi BK,BK,16 // IU1 Increment Byte_Kount+64 by 16
+ vperm VPS5,VS5,VS6,VP3 // VPU
+
+ DCBK // LSU then Kill instead of RWITM
+
+ stvx VPS4,DST,BK // LSU Store D7
+ addi BK,BK,16 // IU1 Increment Byte_Kount+80 by 16
+ vperm VPS6,VS6,VS7,VP3 // VPU
+
+ stvx VPS5,DST,BK // LSU Store D8
+ addi BK,BK,16 // IU1 Increment Byte_Kount+96 by 16
+ vperm VPS7,VS7,VS0,VP3 // VPU
+
+ DCBK // LSU then Kill instead of RWITM
+
+ stvx VPS6,DST,BK // LSU Store D9
+ addi BK,BK,16 // IU1 Increment Byte_Kount+112 by 16
+
+ stvx VPS7,DST,BK // LSU Store D10
+ addi BK,BK,16 // IU1 Increment Byte_Kount+128 by 16
+ bdnz Loop_of_128B // b if ctr > 0 (QW/8 still > 0)
+
+ mtctr QW // IU1 Restore QW remaining to counter
+ addi BL,BK,16 // IU1 Create an alternate byte kount + 16
+ bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
+
+ bdnz B32_fwd // b and decrement counter for last QW store odd
+ // One of the above branches should have taken
+
+// End of memcpy in AltiVec
+
+// bcopy works like memcpy, but the source and destination operands are reversed.
+// Following will just reverse the operands and branch to memcpy.
+
+#ifdef LIBMOTOVEC
+ .globl bcopy
+bcopy:
+#else
+ .globl vec_bcopy
+vec_bcopy:
+#endif
+ mr Rt,DST // temp storage for what is really source address (r3)
+ mr DST,SRC // swap destination address to r3 to match memcpy dst
+ mr SRC,Rt // Complete swap of destination and source for memcpy
+#ifdef LIBMOTOVEC
+ b memcpy // b to memcpy with correct args in r3 and r4
+#else
+ b _vec_memcpy // b to vec_memcpy with correct args in r3 and r4
+#endif
+// End of bcopy in AltiVec
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/motovec/vec_memcpy.s
--- a/genericopenlibs/liboil/src/motovec/vec_memcpy.s Fri Sep 17 19:25:42 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,876 +0,0 @@
-//------------------------------------------------------------------
-// file: vec_memcpy.S
-// AltiVec enabled version of memcpy and bcopy
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// Copyright Motorola, Inc. 2003
-// ALL RIGHTS RESERVED
-//
-// You are hereby granted a copyright license to use, modify, and
-// distribute the SOFTWARE so long as this entire notice is retained
-// without alteration in any modified and/or redistributed versions,
-// and that such modified versions are clearly identified as such.
-// No licenses are granted by implication, estoppel or otherwise under
-// any patents or trademarks of Motorola, Inc.
-//
-// The SOFTWARE is provided on an "AS IS" basis and without warranty.
-// To the maximum extent permitted by applicable law, MOTOROLA DISCLAIMS
-// ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING IMPLIED
-// WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-// PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH
-// REGARD TO THE SOFTWARE (INCLUDING ANY MODIFIED VERSIONS
-// THEREOF) AND ANY ACCOMPANYING WRITTEN MATERIALS.
-//
-// To the maximum extent permitted by applicable law, IN NO EVENT SHALL
-// MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER
-// (INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOSS OF
-// BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
-// INFORMATION, OR OTHER PECUNIARY LOSS) ARISING OF THE USE OR
-// INABILITY TO USE THE SOFTWARE. Motorola assumes no responsibility
-// for the maintenance and support of the SOFTWARE.
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// extern void * memcpy(void *dst, const void *src, size_t len);
-// Returns:
-// void *dst
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// extern void * memmove( void *dst, const void *src, size_t len );
-// Copies len characters from src to dst and returns the value of
-// dst. Works correctly for overlapping memory regions.
-// - Harbison&Steele 4th ed (corrected as to return)
-// Returns:
-// void *dst
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// extern void * bcopy(const void *src, void *dst, size_t len);
-// Returns:
-// void *dst
-//------------------------------------------------------------------
-
-// memcpy and memmove are combined into one entry point here because of
-// the similarity of operation and need to create fool-proof code.
-// The following conditions determine what is "fool proof":
-//
-// if: then single entry:
-// (DST-SRC)<0 && (SRC-DST)>=BC && BC>MIN_VEC will b to v_memcpy
-// (DST-SRC)<0 && (SRC-DST)< BC && BC>MIN_VEC must b to v_memcpy
-// (DST-SRC)<0 && BC0 && BC0 && (DST-SRC)< BC && BC>MIN_VEC must b to v_memmove
-// (DST-SRC)>0 && (SRC-DST)>=BC && BC>MIN_VEC will b to v_memmove
-
-// If you call memmove (or vec_memmove) and |DST-SRC|>=BC,
-// this code will branch to v_memcpy anyway for maximum performance.
-
-// Revision History:
-// Rev 0.0 Original Chuck Corley 02/03/03
-// Can still add dst, 128B loop, and aligned option
-// Rev 0.01 Fixed JY's seg-fault violation CJC 02/17/03
-// Rev 0.1 Added 128B loop and dst; cndtnlzd dcbz CJC 02/18/03
-// (Creating separate path for QW aligned didn't help much)
-// Rev 0.11 Small code schdling; chngd dst for memmove CJC 02/23/03
-// Rev 0.20 Eliminated alternate entry and cleanup CJC 02/27/03
-// Rev 0.21 Inproved loop branch targets for v_mempcy CJC 03/01/03
-// Rev 0.22 Experimented with dst (sent to H.) CJC 03/02/03
-// Rev 0.23 Substituted dcba for dcbz (sent to JY) CJC 03/08/03
-// Rev 0.24 Use two dst streams CJC 03/12/03
-// Rev 0.25 Fix for all compilers, cleanup, and release with
-// libmotovec.a rev 0.10 CJC 03/14/03
-// Rev 0.30 Fix for pre-empted destination (SNDF-DS) CJC 04/02/03
-//
-// Between Rev 0.25 and 0.30 the code was revised to store elements of
-// source at destination when first and/or last vector are less than 16
-// bytes. Areviewer at SNDF observed that loading the destination vector
-// for merging exposed the "uninvolved" destination bytes to incoherency
-// if an interrupt pre-empted this routine and modified the "uninvolved"
-// destination vector(s) while held in register for merging. It seems
-// like a low possibility but this revision is no longer subject to that
-// possibility. (It is also slightly faster than Rev 0.25.)
-// This is beta quality code; users are encouraged to make it faster.
-// ASSUMPTIONS:
-// Code is highly likely to be in the cache; data is not (streaming data)
-
-#define VRSV 256 // VRSAVE spr
-// Don't use vectors for BC <= MIN_VEC. Works only if MIN_VEC >= 16 bytes.
-#define MIN_VEC 16
-// Don't use Big_loop in v_memcpy for |dst-src|<= minimum overlap.
-#define MIN_OVL 128
-
-// Register useage
-#define Rt r0 // r0 when used as a temporary register
-
-#define DST r3 // entering: dst pointer; exiting: same dst pointer
-
-#define SRC r4 // entering: src ptr; then end of src range index (SRC+BC) in memmove
-
-#define BC r5 // entering: Byte_Count
-
-#define PCS r6 // save for partial checksum entering
-
-#define DMS r7 // dst - src initially
-#define BK r7 // BC - 1 +/- (n*16)
-
-// Codewarrior will put an unwelcome space as "lbzu r0,1(r7 )"
-// if you don't put the comment right after the r7. CJC 030314
-#define SM1 r8// src -1 for byte-by-byte forwards initially
-#define S r8 // src[28:31]
-#define SMD r8 // src[0:27]-dst[0:27]
-#define STR r8 // data stream touch block & stride info for Big_loop
-
-#define DM1 r9// dst -1 for byte-by-byte forwards initially
-#define D r9 // dst[28:31]
-#define DNX r9 // (dst+n*16)[28:31]
-#define BL r9 // second byte_kount index pointer
-
-#define SBC r10// src + byte count initially then src[28:31]
-#define BLK r10 // temporary data stream touch block & stride info
-#define DR r10 // (dst+16)[0:27]
-#define QW r10 // number of quad words (vectors)
-
-#define DBC r11// dst + byte count initially
-#define BLL r11 // temporary data stream touch block & stride info
-#define SBK r11 // (src+byte_count-1)
-#define SBR r11 // (src+byte_count-1)[0:27]
-#define DBK r11 // (dst+byte_count-1) then (dst+byte_count-1)[28:31]
-#define BIG r11 // QW/8 or 128 byte loop count
-#define SP8 r11 // SRC + n*128 (8 QWs) for data streaming after first call
-
-#define RSV r12 // storage for VRSAVE register if used
-
-#define VS0 v0 // src vector for permuting
-
-#define VS1 v1 // src vector for permuting
-
-#define VP3 v2 // d - s permute register
-
-#define VPS0 v3 // permuted source vector to store
-
-#define VPS1 v4 // 2nd permuted source vector to store
-
-#define VPS2 v5 // additional permuted src in Big loop
-
-#define VS2 v6 // src vector for permuting
-#define VPS3 v6 // additional permuted src in Big loop
-
-#define VS3 v7 // additional src load in Big loop
-#define VPS4 v7 // additional permuted src in Big loop
-
-#define VS4 v8 // additional src load in Big loop
-#define VPS5 v8 // additional permuted src in Big loop
-
-#define VS5 v9 // additional src load in Big loop
-#define VPS6 v9 // additional permuted src in Big loop
-
-#define VS6 v10 // additional src load in Big loop
-#define VPS7 v10 // additional permuted src in Big loop
-
-#define VS7 v11 // additional src load in Big loop
-
-// Conditionalize the use of dcba. It will help if the data is
-// not in cache and hurt if it is. Generally, except for small
-// benchmarks repeated many times, we assume data is not in cache
-// (data streaming) and using dcbz is a performance boost.
-#ifndef NO_DCBA
-#if defined(__GNUC__) || defined(__MWERKS__) || defined(_DIAB_TOOL)
- // gcc and codewarrior and diab don't assemble dcba
-#define DCBK .long 0x7c033dec
-// dcba r3,r7 or dcba DST,BK
-#define DCBL .long 0x7c034dec
-// dcba r3,r9 or dcba DST,BL
-#else
-#ifdef __ghs__
-.macro DCBK
-.long 0x7c033dec
-.endm
-.macro DCBL
-.long 0x7c034dec
-.endm
-#else
-#define DCBK dcba DST,BK
-#define DCBL dcba DST,BL
-#endif // __ghs__
-#endif // __GNUC__ or __MWERKS__
-#else
-#define DCBK nop
-#define DCBL nop
-#endif // NO_DCBA
-
-// Conditionalize the use of dst (data stream touch). It will help
-// if the data is not in cache and hurt if it is (though not as badly
-// as dcbz). Generally, except for small benchmarks repeated many times,
-// we assume data is not in cache (data streaming) and using dst is a
-// performance boost.
-#ifndef NO_DST
-#define STRM_B dst SBC,BLL,0
-#define STRM_F dst SRC,BLK,0
-#define STRM_1 dst SP8,STR,1
-
-#else
-#define STRM_B nop
-#define STRM_F nop
-#define STRM_1 nop
-#endif
-
-// Condition register use
-// cr0[0:2] = (dst-src==0)? return: ((dst-src>0)? copy_bkwd, copy_fwd;);
-// then cr0[0:2] = (dst[28:31]-src[28:31]<0)? "shifting left", "shifting right";
-// cr1[0,2] = (BC == 0)? 1 : 0; (nothing to move)
-// then cr1[2] = (DST[28:31] == 0)? 1 : 0; (D0 left justified)
-// then cr1[2] = ((DBK = DST+BC-1)[28:31] = 0xF)? 1 : 0; (DN right justified)
-// cr5[0,2] = (|DST-SRC|<=MIN_OVL)?1:0; (Overlap too small for Big loop?)
-// cr6[1,2] = (DST-SRC>=BC)?1:0; (Okay for v_memmove to copy forward?)
-// then cr6[2] = (QW == 0)? 1 : 0; (Any full vectors to move?)
-// then cr6[1] = (QW > 4)? 1 : 0; (>4 vectors to move?)
-// then cr6[3] = (third store[27] == 1)? 1: 0; (cache line alignment)
-// then cr6[3] = (last store[27] == 1)? 1: 0; (last store odd?)
-// cr7[2] = (BC>MIN_VEC)?1:0; (BC big enough to warrant vectors)
-// then cr7[0:3] = (DST+16)[0:27]-DST (How many bytes (iff <16) in first vector?)
-// then cr7[1] = (QW > 14)? 1 : 0; (>14 vectors to move?)
-// then cr7[0:3] = (DST+BC)[0:27] (How many bytes (iff <16) in last vector?)
-
- .text
-#ifdef __MWERKS__
- .align 32
-#else
- .align 5
-#endif
-
-#ifdef LIBMOTOVEC
- .globl memmove
-memmove:
- nop // IU1 Compilers forget first label
- .globl memcpy
-memcpy:
-#else
- .globl vec_memmove
-vec_memmove:
- nop // IU1 Only way I know to preserve both labels
- .globl _vec_memcpy
-_vec_memcpy:
-#endif
- subf. DMS,SRC,DST // IU1 Compute dst-src difference
- cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count moves
- cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
-
- addi SM1,SRC,-1 // IU1 Pre-bias and duplicate src for fwd
- addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
- add SBC,SRC,BC // IU1 Pre-bias and duplicate src for bkwd
- beqlr // return if DST = SRC
-
- add DBC,DST,BC // IU1 Pre-bias and duplicate destination
- subf Rt,DST,SRC // IU1 Form |DST-SRC| if DST-SRC<0
- beqlr cr1 // return if BC = 0
-
- bgt Cpy_bkwd // b if DST-SRC>0 (have to copy backward)
- cmpi cr5,0,Rt,MIN_OVL // IU1 (|DST-SRC|>128)?1:0; for v_memcpy
- bgt cr7,v_memcpy // b if BC>MIN_VEC (okay to copy vectors fwd)
-
-// Copy byte-by-byte forwards if DST-SRC<0 and BC<=MIN_VEC
- mtctr BC // i=BC; do ...;i--; while (i>0)
-Byte_cpy_fwd:
- lbzu Rt,1(SM1) // LSU * ++(DST-1) = * ++(SRC-1)
- stbu Rt,1(DM1) // LSU
- bdnz Byte_cpy_fwd
-
- blr
- nop // IU1 Improve next label as branch target
-Cpy_bkwd:
- cmpi cr5,0,DMS,MIN_OVL // IU1 ((DST-SRC)>128)?1:0; for v_memcpy
- cmp cr6,0,DMS,BC // IU1 cr6[1,2]=(DST-SRC>=BC)?1:0;
- bgt cr7,v_memmove // b if BC>MIN_VEC (copy vectors bkwd)
-// Copy byte-by-byte backwards if DST-SRC>0 and BC<=MIN_VEC
- mtctr BC // i=BC; do ...;i--; while (i>0)
-Byte_cpy_bwd:
- lbzu Rt,-1(SBC) // LSU * --(DST+BC) = * --(SRC+BC)
- stbu Rt,-1(DBC) // LSU Store it
- bdnz Byte_cpy_bwd
- blr
-
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-
-v_memmove:
-// Byte count < MIN_VEC bytes will have been copied by scalar code above,
-// so this will not deal with small block moves < MIN_VEC.
-
-// For systems using VRSAVE, define VRSAVE=1 when compiling. For systems
-// that don't, make sure VRSAVE is undefined.
-#ifdef VRSAVE
- mfspr RSV,VRSV // IU2 Get current VRSAVE contents
-#endif
- rlwinm S,SRC,0,28,31 // IU1 Save src address bits s[28:31]
- rlwinm D,DST,0,28,31 // IU1 D = dst[28:31]
- bge cr6,MC_entry // b to v_memcpy if DST-SRC>=BC (fwd copy OK)
-
-#ifdef VRSAVE
- oris Rt,RSV,0xfff0 // IU1 Or in registers used by this routine
-#endif
- lis BLL,0x010c // IU1 Stream 12 blocks of 16 bytes
- subf. SMD,D,S // IU1 if S-D<0 essentially shifting right
-
-#ifdef VRSAVE
- mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
-#endif
- lvsr VP3,0,DMS // LSU Permute vector for dst - src shft right
- ori BLL,BLL,0xffe0 // IU1 Stream stride -32B
-
- STRM_B // LSU Start data stream at SRC+BC
- addi SBK,SBC,-1 // IU1 Address of last src byte
- bgt Rt_shft // Bytes from upper vector = (s-d>0)?s-d:16+s-d;
- addi SMD,SMD,16 // IU1 Save 16-(d-s)
-Rt_shft:
-
- rlwinm SBR,SBK,0,0,27 // IU1 (SRC+BC-1)[0:27]
- addi BK,BC,-1 // IU1 Initialize byte index
-
- subf Rt,SBR,SBC // IU1 How many bytes in first source?
- add DBK,DST,BK // IU1 Address of last dst byte
- addi DR,DST,16 // IU1 Address of second dst vector
-
- subf. SMD,Rt,SMD // IU1 if bytes in 1st src>Bytes in 1st permute
- rlwinm Rt,DBK,0,28,31 // IU1 (DST+BC-1)[28:31]
- rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
-
-// If there are more useful bytes in the upper vector of a permute pair than we
-// will get in the first permute, the first loaded vector needs to be in the
-// lower half of the permute pair. The upper half is a don't care then.
- blt Get_bytes_rt // b if shifting left (D-S>=0)
-
- lvx VS1,SRC,BK // LSU Get SN load started
-// Comments numbering source and destination assume single path through the
-// code executing each instruction once. For vec_memmove, an example would
-// be the call memmove(BASE+0x0F, BASE+0x2F, 82). N = 6 in that case.
- addi SRC,SRC,-16 // IU1 Decrement src base (to keep BK useful)
-
-Get_bytes_rt: // Come here to get VS0 & Don't care what VS1 is
- lvx VS0,SRC,BK // LSU Get SN-1 (SN if D-S<0) in lower vector
- subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
- cmpi cr7,0,Rt,0xF // IU1 Is Dn right justified?
-
- cmpi cr1,0,D,0 // IU1 Is D0 left justified?
- rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
- add Rt,DST,BC // IU1 Refresh the value of DST+BC
-
- cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
- vperm VPS0,VS0,VS1,VP3 // VPU Align SN-1 and SN to DN
- vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
- beq cr7,Rt_just // b if DN is right justified
-
- mtcrf 0x01,Rt // IU2 Put final vector byte count in cr7
- rlwinm DBK,DBK,0,0,27 // IU1 Address of first byte of final vector
- li D,0 // IU1 Initialize an index pointer
- bnl cr7,Only_1W_bkwd // b if there was only one or zero words to store
-
- stvewx VPS0,DBK,D // LSU store word 1 of two or three
- addi D,D,4 // IU1 increment index
-
- stvewx VPS0,DBK,D // LSU store word 2 of two or three
- addi D,D,4 // IU1 increment index
-Only_1W_bkwd:
- bng cr7,Only_2W_bkwd // b if there were only two or zero words to store
-
- stvewx VPS0,DBK,D // LSU store word 3 of three if necessary
- addi D,D,4 // IU1 increment index
-Only_2W_bkwd:
- bne cr7,Only_B_bkwd // b if there are no half words to store
-
- stvehx VPS0,DBK,D // LSU store one halfword if necessary
- addi D,D,2 // IU1 increment index
-Only_B_bkwd:
- bns cr7,All_done_bkwd // b if there are no bytes to store
-
- stvebx VPS0,DBK,D // LSU store one byte if necessary
- b All_done_bkwd
-
-Rt_just:
- stvx VPS0,DST,BK // LSU Store 16 bytes at DN
-All_done_bkwd:
- addi BK,BK,-16 // IU1 Decrement destination byte count
-
- ble cr6,Last_load // b if no Quad words to do
- mtctr QW // IU2 for (i=0;i<=QW;i++)-execution serializng
- cmpi cr6,0,QW,4 // IU1 Check QW>4
-QW_loop:
- lvx VS0,SRC,BK // LSU Get SN-2 (or SN-1 if ADJ==0)
-
- vperm VPS0,VS0,VS1,VP3 // VPU Align SN-2 and SN-1 to DN-1
- vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at DN-1
- addi BK,BK,-16 // IU1 Decrement byte kount
- bdnzf 25,QW_loop // b if 4 or less quad words to do
-
- add DNX,DST,BK // IU1 address of next store (DST+BC-1-16)
- bgt cr6,GT_4QW // b if >4 quad words left
-
-Last_load: // if D-S>=0, next load will be from same address as last
- blt No_ld_bkwd // b if shifting right (S-D>=0)
- addi SRC,SRC,16 // IU1 recorrect source if it was decremented
-No_ld_bkwd:
- lvx VS0,0,SRC // LSU Get last source SN-6 (guaranteed S0)
-// Current 16 bytes is the last; we're done.
- dss 0 // Data stream stop
- vperm VPS0,VS0,VS1,VP3 // VPU Align SN-6 and SN-5 to DN-6
- subfic D,DST,16 // IU1 How many bytes in first destination?
- beq cr1,Lt_just // b if last destination is left justified
-
- mtcrf 0x01,D // IU2 Put byte count remaining in cr7
- li D,0 // IU1 Initialize index pointer
- bns cr7,No_B_bkwd // b if only even number of bytes to store
-
- stvebx VPS0,DST,D // LSU store first byte at DST+0
- addi D,D,1 // IU1 increment index
-No_B_bkwd:
- bne cr7,No_H_bkwd // b if only words to store
- stvehx VPS0,DST,D // LSU store halfword at DST+0/1
- addi D,D,2 // IU1 increment index
-
-No_H_bkwd:
- bng cr7,No_W1_bkwd // b if exactly zero or two words to store
- stvewx VPS0,DST,D // LSU store word 1 of one or three
- addi D,D,4 // IU1 increment index
-
-No_W1_bkwd:
- bnl cr7,No_W2_bkwd // b if there was only one word to store
- stvewx VPS0,DST,D // LSU store word 1 of two or 2 of three
- addi D,D,4 // IU1 increment index
-
- stvewx VPS0,DST,D // LSU store word 2 of two or 3 of three
- b No_W2_bkwd
-
-Lt_just:
- stvx VPS0,0,DST // LSU Store 16 bytes at final dst addr D0
-No_W2_bkwd:
-#ifdef VRSAVE
- mtspr VRSV,RSV // IU1 Restore VRSAVE
-#endif
- blr // Return destination address from entry
-
-GT_4QW: // Do once if next store is to even half of cache line, else twice
-
- lvx VS0,SRC,BK // LSU Get SN-3 (or SN-2)
- mtcrf 0x02,DNX // IU2 cr6[3]=((DST+BC-1)[27]==1)?1:0;
-
- vperm VPS0,VS0,VS1,VP3 // VPU Align SN-3 and SN-2 to Dn-2
- vor VS1,VS0,VS0 // VIU1 Move lower vector to upper
- addi DNX,DNX,-16 // IU1 Prepare to update cr6 next loop
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at DN-2
- vor VS3,VS0,VS0 // VIU Make a copy of lower vector
- addi BK,BK,-16 // IU1 Decrement byte count by 16
- bdnzt 27,GT_4QW // b if next store is to upper (odd) half of CL
-// At this point next store will be to even address.
-
- lis STR,0x102 // IU1 Stream 2 blocks of 16 bytes
- mtcrf 0x02,DST // IU2 cr6[3]=(DST[27]==1)?1:0; (DST odd?)
- addi BL,BK,-16 // IU1 Create an alternate byte count - 16
-
- ori STR,STR,0xffe0 // IU1 Stream stride -32B
- addi SP8,SRC,-64 // IU1 Starting address for data stream touch
- bso cr6,B32_bkwd // b if DST[27] == 1; i.e, final store is odd
-
- bdnz B32_bkwd // decrement counter for last odd QW store
-B32_bkwd: // Should be at least 2 stores remaining and next 2 are cache aligned
- lvx VS2,SRC,BK // LSU Get SN-4 (or SN-3)
- addi SP8,SP8,-32 // IU1 Next starting address for data stream touch
-
- lvx VS1,SRC,BL // LSU Get SN-5 (or SN-4)
- vperm VPS0,VS2,VS3,VP3 // VPU Align SN-4 and SN-3 to DN-3
-
- STRM_1 // LSU Stream 64 byte blocks ahead of loads
-
- DCBL // LSU allocate next cache line
-
- vperm VPS1,VS1,VS2,VP3 // VPU Align SN-5 and SN-4 to DN-4
- vor VS3,VS1,VS1 // VIU1 Move SN-5 to SN-3
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at DN-3
- addi BK,BL,-16 // IU1 Decrement byte count
- bdz Nxt_loc_bkwd // always decrement and branch to next instr
-
-Nxt_loc_bkwd:
- stvx VPS1,DST,BL // LSU Store 16 bytes at DN-4
- addi BL,BK,-16 // IU1 Decrement alternate byte count
- bdnz B32_bkwd // b if there are at least two more QWs to do
-
- bns cr6,One_odd_QW // b if there was one more odd QW to store
- b Last_load
-
-// Come here with two more loads and two stores to do
-One_odd_QW:
- lvx VS1,SRC,BK // LSU Get SN-6 (or SN-5)
-
- vperm VPS1,VS1,VS3,VP3 // VPU Align SN-6 and SN-5 to DN-5
-
- stvx VPS1,DST,BK // LSU Store 16 bytes at DN-5
-
- b Last_load
-
-// End of memmove in AltiVec
-
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-v_memcpy:
-// Byte count < MIN_VEC bytes will have been copied by scalar code above,
-// so this will not deal with small block moves < MIN_VEC.
-
-#ifdef VRSAVE
- mfspr RSV,VRSV // IU2 Get current VRSAVE contents
-#endif
- rlwinm S,SRC,0,28,31 // IU1 Save src address bits s[28:31]
- rlwinm D,DST,0,28,31 // IU1 D = dst[28:31]
-
-MC_entry: // enter here from memmove if DST-SRC>=BC; this should be faster
-#ifdef VRSAVE
- oris Rt,RSV,0xfff0 // IU1 Or in registers used by this routine
-#endif
- lis BLK,0x010c // IU1 Stream 12 blocks of 16 bytes
-
- subf. S,S,D // IU1 if D-S<0 essentially shifting left
-
-#ifdef VRSAVE
- mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
-#endif
- lvsr VP3,0,DMS // LSU Permute vector for dst - src shft right
- ori BLK,BLK,32 // IU1 Stream stride 32B
-
- STRM_F // LSU Start data stream 0 at SRC
- addi DR,DST,16 // IU1 Address of second dst vector
- addi DBK,DBC,-1 // IU1 Address of last dst byte
-
-// If D-S<0 we are "kinda" shifting left with the right shift permute vector
-// loaded to VP3 and we need both S0 and S1 to permute. If D-S>=0 then the
-// first loaded vector needs to be in the upper half of the permute pair and
-// the lower half is a don't care then.
- bge Ld_bytes_rt // b if shifting right (D-S>=0)
-
- lvx VS0,0,SRC // LSU Get S0 load started
-// Comments numbering source and destination assume single path through the
-// code executing each instruction once. For vec_memcpy, an example would
-// be the call memcpy(BASE+0x1E, BASE+0x1F, 259). N = 16 in that case.
- addi SRC,SRC,16 // IU1 Increment src base (to keep BK useful)
-
-Ld_bytes_rt: // Come here to get VS1 & Don't care what VS0 is
- lvx VS1,0,SRC // LSU Get S1 (or S0 if D-S>=0) in upper vector
- rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
- cmpi cr1,0,D,0 // IU1 Is D0 left justified?
-
- subf Rt,DST,DR // IU1 How many bytes in first destination?
- subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
- li BK,0 // IU1 Initialize byte kount index
-
- mtcrf 0x01,Rt // IU2 Put bytes in 1st dst in cr7
- rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
- vperm VPS0,VS0,VS1,VP3 // VPU Align S0 and S1 to D0
-
- vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
- beq cr1,Left_just // b if D0 is left justified
-
- bns cr7,No_B_fwd // b if only even number of bytes to store
-
- stvebx VPS0,DST,BK // LSU store first byte at DST+0
- addi BK,BK,1 // IU1 increment index
-No_B_fwd:
- bne cr7,No_H_fwd // b if only words to store
-
- stvehx VPS0,DST,BK // LSU store halfword at DST+0/1
- addi BK,BK,2 // IU1 increment index
-No_H_fwd:
- bng cr7,No_W1_fwd // b if exactly zero or two words to store
-
- stvewx VPS0,DST,BK // LSU store word 1 of one or three
- addi BK,BK,4 // IU1 increment index
-
-No_W1_fwd:
- bnl cr7,No_W2_fwd // b if there was only one word to store
- stvewx VPS0,DST,BK // LSU store word 1 of two or 2 of three
- addi BK,BK,4 // IU1 increment index
-
- stvewx VPS0,DST,BK // LSU store word 2 of two or 3 of three
- b No_W2_fwd
-
-Left_just:
- stvx VPS0,0,DST // LSU Store 16 bytes at D0
-No_W2_fwd:
- rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
- cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
-
- li BK,16 // IU1 Re-initialize byte kount index
- cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
- cmpi cr7,0,QW,14 // IU1 Check QW>14
- ble cr6,Last_ld_fwd // b if no Quad words to do
-
- mtctr QW // IU2 for (i=0;i<=QW;i++)
- cmpi cr6,0,QW,4 // IU1 Check QW>4
-QW_fwd_loop:
- lvx VS1,SRC,BK // LSU Get S2 (or S1)
-
- vperm VPS0,VS0,VS1,VP3 // VPU Align S1 and S2 to D1
- vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at D1(+n*16 where n<4)
- addi BK,BK,16 // IU1 Increment byte kount index
- bdnzf 25,QW_fwd_loop // b if 4 or less quad words to do
-
- add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
- addi QW,QW,-1 // IU1 One more QW stored by now
- bgt cr6,GT_4QW_fwd // b if >4 quad words left
-
-Last_ld_fwd: // Next 16 bytes is the last; we're done.
- add DBC,DST,BC // IU1 Recompute address of last dst byte + 1
- add SBC,SRC,BC // IU1 Recompute address of last src byte + 1
- bge No_ld_fwd // b if shifting right (D-S>=0)
-
- addi SBC,SBC,-16 // IU1 if D-S>=0 we didn't add 16 to src
-No_ld_fwd:
- mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
- addi DBK,DBC,-1 // IU1 Recompute address of last dst byte
- addi Rt,SBC,-1 // IU1 Recompute address of last src byte
-
-// If D-S<0 we have already loaded all the source vectors.
-// If D-S>=0 then the first loaded vector went to the upper half of the permute
-// pair and we need one more vector. (This may be a duplicate.)
-
- lvx VS1,0,Rt // LSU Get last source S14 (guaranteed SN)
-
-#ifndef NO_DST
- dss 0 // Data stream 0 stop
-
- dss 1 // Data stream 1 stop
-#endif
- vperm VPS0,VS0,VS1,VP3 // VPU Align S13 and S14 to D14
- beq cr1,Rt_just_fwd // b if last destination is right justified
-
- rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
- li D,0 // IU1 Initialize index pointer
- bnl cr7,Only_1W_fwd // b if there was only one or zero words to store
-
- stvewx VPS0,DBK,D // LSU store word 1 of two or three
- addi D,D,4 // IU1 increment index
-
- stvewx VPS0,DBK,D // LSU store word 2 of two or three
- addi D,D,4 // IU1 increment index
-Only_1W_fwd:
- bng cr7,Only_2W_fwd // b if there were only two or zero words to store
-
- stvewx VPS0,DBK,D // LSU store word 3 of three if necessary
- addi D,D,4 // IU1 increment index
-Only_2W_fwd:
- bne cr7,Only_B_fwd // b if there are no half words to store
-
- stvehx VPS0,DBK,D // LSU store one halfword if necessary
- addi D,D,2 // IU1 increment index
-Only_B_fwd:
- bns cr7,All_done_fwd // b if there are no bytes to store
-
- stvebx VPS0,DBK,D // LSU store one byte if necessary
- b All_done_fwd
-
-Rt_just_fwd:
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at D14
-All_done_fwd:
-#ifdef VRSAVE
- mtspr VRSV,RSV // IU1 Restore VRSAVE
-#endif
- blr // Return destination address from entry
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
-
- lvx VS1,SRC,BK // LSU Get S3 (or S2)
- addi QW,QW,-1 // IU1 Keeping track of QWs stored
- mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
-
- addi DNX,DNX,16 // IU1 Update cr6 for next loop
- addi Rt,QW,-2 // IU1 Insure at least 2 QW left after big loop
-
- vperm VPS0,VS0,VS1,VP3 // VPU Align S2 and S3 to D2
- vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at D2
- addi BK,BK,16 // IU1 Increment byte count by 16
- bdnzf 27,GT_4QW_fwd // b if next store is to lower (even) half of CL
-// At this point next store will be to even address.
-
- mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
- lis STR,0x104 // IU1 Stream 4 blocks of 16 bytes
- addi BL,BK,16 // IU1 Create an alternate byte kount + 32
-
- ori STR,STR,32 // IU1 Stream stride 32B
-#ifndef NO_BIG_LOOP
- rlwinm BIG,Rt,29,3,31 // IU1 QW/8 big loops to do
-
- rlwinm Rt,Rt,0,0,28 // IU1 How many QWs will be done in big loop
- bgt cr7,Big_loop // b if QW > 14
-#endif
-No_big_loop:
-// We need the ctr register to reflect an even byte count before entering
-// the next block - faster to decrement than to reload.
-
- addi SP8,SRC,256 // IU1 Starting address for data stream touch
- xoris STR,STR,0x6 // IU1 Reset stream to 2 blocks of 16 bytes
- bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
-
- bdnz B32_fwd // decrement counter for last QW store odd
-
-B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
- lvx VS1,SRC,BK // LSU Get S12
- addi SP8,SP8,32 // IU1 Next starting address for data stream touch
-
- lvx VS2,SRC,BL // LSU Get S13
- vperm VPS1,VS0,VS1,VP3 // VPU Align S11 and S12 to D11
-
- STRM_1 // LSU Stream 64 byte blocks ahead of loads
-
- DCBK // LSU then Kill instead of RWITM
-
- vperm VPS0,VS1,VS2,VP3 // VPU Align S12 and S13 to D12
- vor VS0,VS2,VS2 // VIU1 Move S13 to S11
-
- stvx VPS1,DST,BK // LSU Store 16 bytes at D11
- addi BK,BL,16 // IU1 Increment byte count
- bdz Nxt_loc_fwd // always decrement and branch to next instr
-
-Nxt_loc_fwd:
- stvx VPS0,DST,BL // LSU Store 16 bytes at D12
- addi BL,BK,16 // IU1 Increment alternate byte count
- bdnz B32_fwd // b if there are at least two more QWs to do
-
- bso cr6,One_even_QW // b if there is one even and one odd QW to store
- b Last_ld_fwd // b if last store is to even address
-
-// Come here with two more loads and two stores to do
-One_even_QW:
- lvx VS1,SRC,BK // LSU Get S14 (or S13 if if D-S>=0)
-
- vperm VPS0,VS0,VS1,VP3 // VPU Align S13 and S14 to D13
- vor VS0,VS1,VS1 // VIU1 Move upper vector to lower
-
- stvx VPS0,DST,BK // LSU Store 16 bytes at D13
- addi BK,BK,16 // IU1 Increment byte count
-
- b Last_ld_fwd
-
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-Big_loop:
- subf QW,Rt,QW // IU1 Should be 2-7 QWs left after big loop
- blt cr5,No_big_loop // b back if |DST-SRC|<128; Big_loop won't work.
- mtctr BIG // IU2 loop for as many 128B loops as possible
- addi SP8,SRC,256 // IU1 Starting address for data stream touch
-
-Loop_of_128B: // Come here with QW>=10 and next store even; VS0 last load
- lvx VS1,SRC,BK // LSU Get S4 (or S3 if D-S>=0)
- addi BL,BK,32 // IU1 Increment Byte_Kount+16 by 32
- addi SP8,SP8,128 // IU1 increment address for data stream touch
-
- lvx VS3,SRC,BL // LSU Get S6 (or S5)
- addi BL,BL,32 // IU1 Increment Byte_Kount+48 by 32
-
- lvx VS5,SRC,BL // LSU Get S8 (or S7)
- addi BL,BL,32 // IU1 Increment Byte_Kount+80 by 32
-
- lvx VS7,SRC,BL // LSU Get S10 (or S9)
- addi BL,BK,16 // IU1 Increment Byte_Kount+16 by 16
-
- lvx VS2,SRC,BL // LSU Get S5 (or S4)
- addi BL,BL,32 // IU1 Increment Byte_Kount+32 by 32
-
- lvx VS4,SRC,BL // LSU Get S7 (or S6)
- addi BL,BL,32 // IU1 Increment Byte_Kount+64 by 32
-
- lvx VS6,SRC,BL // LSU Get S9 (or S8)
- addi BL,BL,32 // IU1 Increment Byte_Kount+96 by 32
- vperm VPS0,VS0,VS1,VP3 // VPU
-
- lvx VS0,SRC,BL // LSU Get S11 (or S10)
- vperm VPS1,VS1,VS2,VP3 // VPU
-
- STRM_1 // LSU Stream 4 32B blocks, stride 32B
-
- DCBK // LSU then Kill instead of RWITM
-
- stvx VPS0,DST,BK // LSU Store D3
- addi BK,BK,16 // IU1 Increment Byte_Kount+16 by 16
- vperm VPS2,VS2,VS3,VP3 // VPU
-
- stvx VPS1,DST,BK // LSU Store D4
- addi BK,BK,16 // IU1 Increment Byte_Kount+32 by 16
- vperm VPS3,VS3,VS4,VP3 // VPU
-
- DCBK // LSU then Kill instead of RWITM
-
- stvx VPS2,DST,BK // LSU Store D5
- addi BK,BK,16 // IU1 Increment Byte_Kount+48 by 16
- vperm VPS4,VS4,VS5,VP3 // VPU
-
- stvx VPS3,DST,BK // LSU Store D6
- addi BK,BK,16 // IU1 Increment Byte_Kount+64 by 16
- vperm VPS5,VS5,VS6,VP3 // VPU
-
- DCBK // LSU then Kill instead of RWITM
-
- stvx VPS4,DST,BK // LSU Store D7
- addi BK,BK,16 // IU1 Increment Byte_Kount+80 by 16
- vperm VPS6,VS6,VS7,VP3 // VPU
-
- stvx VPS5,DST,BK // LSU Store D8
- addi BK,BK,16 // IU1 Increment Byte_Kount+96 by 16
- vperm VPS7,VS7,VS0,VP3 // VPU
-
- DCBK // LSU then Kill instead of RWITM
-
- stvx VPS6,DST,BK // LSU Store D9
- addi BK,BK,16 // IU1 Increment Byte_Kount+112 by 16
-
- stvx VPS7,DST,BK // LSU Store D10
- addi BK,BK,16 // IU1 Increment Byte_Kount+128 by 16
- bdnz Loop_of_128B // b if ctr > 0 (QW/8 still > 0)
-
- mtctr QW // IU1 Restore QW remaining to counter
- addi BL,BK,16 // IU1 Create an alternate byte kount + 16
- bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
-
- bdnz B32_fwd // b and decrement counter for last QW store odd
- // One of the above branches should have taken
-
-// End of memcpy in AltiVec
-
-// bcopy works like memcpy, but the source and destination operands are reversed.
-// Following will just reverse the operands and branch to memcpy.
-
-#ifdef LIBMOTOVEC
- .globl bcopy
-bcopy:
-#else
- .globl vec_bcopy
-vec_bcopy:
-#endif
- mr Rt,DST // temp storage for what is really source address (r3)
- mr DST,SRC // swap destination address to r3 to match memcpy dst
- mr SRC,Rt // Complete swap of destination and source for memcpy
-#ifdef LIBMOTOVEC
- b memcpy // b to memcpy with correct args in r3 and r4
-#else
- b _vec_memcpy // b to vec_memcpy with correct args in r3 and r4
-#endif
-// End of bcopy in AltiVec
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/motovec/vec_memset.S
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/src/motovec/vec_memset.S Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,553 @@
+//------------------------------------------------------------------
+// file: vec_memset.S
+// AltiVec enabled version of memset and bzero and cacheable_memzero
+//------------------------------------------------------------------
+
+//------------------------------------------------------------------
+// Copyright Motorola, Inc. 2002
+// ALL RIGHTS RESERVED
+//
+// You are hereby granted a copyright license to use, modify, and
+// distribute the SOFTWARE so long as this entire notice is retained
+// without alteration in any modified and/or redistributed versions,
+// and that such modified versions are clearly identified as such.
+// No licenses are granted by implication, estoppel or otherwise under
+// any patents or trademarks of Motorola, Inc.
+//
+// The SOFTWARE is provided on an "AS IS" basis and without warranty.
+// To the maximum extent permitted by applicable law, MOTOROLA DISCLAIMS
+// ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING IMPLIED
+// WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
+// PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH
+// REGARD TO THE SOFTWARE (INCLUDING ANY MODIFIED VERSIONS
+// THEREOF) AND ANY ACCOMPANYING WRITTEN MATERIALS.
+//
+// To the maximum extent permitted by applicable law, IN NO EVENT SHALL
+// MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER
+// (INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOSS OF
+// BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
+// INFORMATION, OR OTHER PECUNIARY LOSS) ARISING OF THE USE OR
+// INABILITY TO USE THE SOFTWARE. Motorola assumes no responsibility
+// for the maintenance and support of the SOFTWARE.
+//------------------------------------------------------------------
+
+//------------------------------------------------------------------
+// extern void *memset( void *ptr, int val, size_t len );
+// Copies val into each of len characters beginning at ptr.
+// - Harbison&Steele 4th ed
+// (despite val being an int, this memset assumes it is never
+// more than a byte. That seems to be correct from all the
+// memset functions I've seen but I don't know if ANSI allows
+// anthing longer. Chuck Corley 12/21/02)
+// Returns:
+// void * ptr
+//------------------------------------------------------------------
+
+//------------------------------------------------------------------
+// extern void * bzero( char *ptr, int len);
+// Copies 0 into each of len characters at ptr.
+// - Harbison&Steele 4th ed
+// Returns:
+// void * ptr
+//------------------------------------------------------------------
+
+// Revision History:
+// Rev 0.0 Original Chuck Corley 02/09/03
+// Could benefit from changes added to memcpy
+// Rev 0.1 Revised per memcpy Rev 0.30 Chuck Corley 05/01/03
+//
+// This is beta quality code; users are encouraged to make it faster.
+// ASSUMPTIONS:
+// Code is highly likely to be in the cache; data is not (streaming data)
+// Zero fill could be quite likely.
+// Moving fill byte from GPR to VR as below faster than stw->lvebx via stack
+
+#define VRSV 256 // VRSAVE spr
+// Don't use vectors for BC <= MIN_VEC. Works only if MIN_VEC >= 16 bytes.
+#define MIN_VEC 16
+
+// Register useage
+#define Rt r0 // r0 when used as a temporary register
+
+#define DST r3 // entering: dest pointer; exiting: same dest pointer
+
+#define FILL r4 // entering: fill char then fill word
+
+#define BC r5 // entering: Byte_Count then remaining Byte_Count
+
+#define DBC r6// dst + byte count
+
+#define BK r7 // BC - 1 +/- (n*16)
+
+#define Fsh r8 // fill byte shifted right one nibble
+
+#define DM1 r9// dst -1 for byte-by-byte backwards initially
+#define D r9 // (dst+16)[0:27] - dst[28:31]
+#define DNX r9 // (dst+n*16)[28:31]
+#define BL r9 // second byte_kount index pointer
+
+#define DR r10 // (dst+16)[0:27]
+#define QW r10 // number of cache lines
+
+#define DBK r11 // (dst+byte_count-1) then (dst+byte_count-1)[28:31]
+
+#define RSV r12 // storage for VRSAVE register if used
+
+// Condition register use (not including temporary cr0)
+// cr0[2] = (FILL==0)?
+// cr1[0,2] = (BC == 0)? 1 : 0; (nothing to move)
+// then cr1[2] = (DST[28:31] == 0)? 1 : 0; (D0 left justified)
+// then cr1[2] = ((DBK = DST+BC-1)[28:31] = 0xF)? 1 : 0; (DN right justified)
+// cr6[2] = (QW == 0)? 1 : 0;
+// then cr6[1] = (QW > 4)? 1 : 0; (>4 vectors to move?)
+// then cr6[3] = (third store[27] == 1)? 1: 0; (cache line alignment)
+// then cr6[3] = (last store[27] == 1)? 1: 0; (last store odd?)
+// cr7[2] = (BC>MIN_VEC)?1:0; (BC big enough to warrant vectors)
+// then cr7[0:3] = (DST+16)[0:27]-DST (How many bytes (iff <16) in first vector?)
+// then cr7[0:3] = (DST+BC)[0:27] (How many bytes (iff <16) in last vector?)
+
+// Conditionalize the use of dcba. It will help if the data is
+// not in cache and hurt if it is. Generally, except for small
+// benchmarks repeated many times, we assume data is not in cache
+// (data streaming) and using dcba is a performance boost.
+// We use dcba which will noop to non-cacheable memory rather than
+// dcbz which will cause an aligment exception.
+#ifndef NO_DCBA
+#if defined(__GNUC__) || defined(__MWERKS__) || defined(_DIAB_TOOL)
+ // gcc and codewarrior and diab don't assemble dcba
+#define DCBK .long 0x7c033dec
+// dcba r3,r7 or dcba DST,BK
+#else
+#ifdef __ghs__
+.macro DCBK
+.long 0x7c033dec
+.endm
+#else
+#define DCBK dcba DST,BK
+#endif // __ghs__
+#endif // __GNUC__ or __MWERKS__
+#else
+#define DCBK nop
+#endif // NO_DCBA
+
+ .text
+#ifdef __MWERKS__
+ .align 32
+#else
+ .align 5
+#endif
+
+#ifdef LIBMOTOVEC
+ .globl memset
+memset:
+#else
+ .globl _vec_memset
+_vec_memset:
+#endif
+
+ cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
+ cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count
+ rlwinm. Fsh,FILL,28,28,3 // IU1 Is fill byte zero? and shift
+
+ addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
+ addi DR,DST,16 // IU1 Address of second dst vector
+ add DBC,DST,BC // IU1 Address of last dst byte + 1
+ bgt cr7,v_memset // b if BC>MIN_VEC
+
+ mtctr BC // for (i=1;i<=BC;i++)
+ beqlr cr1 // return if BC = 0
+Byte_set:
+ stbu FILL,1(DM1) // LSU * ++(DST-1) = FILL
+ bdnz Byte_set
+
+ blr
+
+v_memset:
+// Byte count < MIN_VEC bytes will have been set by scalar code above,
+// so this will not deal with small block sets < MIN_VEC.
+
+// For systems using VRSAVE, define VRSAV=1 when compiling. For systems
+// that don't, make sure VRSAVE is undefined.
+#ifdef VRSAVE
+ mfspr RSV,VRSV // IU2 Get current VRSAVE contents
+#endif
+ rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
+ addi DBK,DBC,-1 // IU1 Address of last dst byte
+
+#ifdef VRSAVE
+ oris Rt,RSV,0xe000 // IU1 Or in registers used by this routine
+#endif
+ subf D,DST,DR // IU1 How many bytes in first destination?
+ li BK,0 // IU1 Initialize byte kount index
+
+#ifdef VRSAVE
+ mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
+#endif
+ vxor v0,v0,v0 // VIU Clear v0
+ subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
+ cmpi cr1,0,D,16 // IU1 Is D0 left justified?
+ beq+ enter_bzero // b if FILL==0
+
+ lvsl v0,0,Fsh // LSU Move upper nibble to byte 0 of VR
+ vspltisb v1,4 // VPU Splat 0x4 to every byte
+
+ lvsl v2,0,FILL // LSU Move lower nibble to byte 0 of VR
+
+ vslb v0,v0,v1 // VIU Move upper nibble to VR[0:3]
+
+ vor v0,v0,v2 // VIU Form FILL byte in VR[0:7]
+
+ vspltb v0,v0,0 // VPU Splat the fill byte to all bytes
+enter_bzero:
+ mtcrf 0x01,D // IU2 Put bytes in 1st dst in cr7
+ rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
+ beq cr1,Left_just // b if D0 is left justified
+
+ bns cr7,No_B_fwd // b if only even number of bytes to store
+
+ stvebx v0,DST,BK // LSU store first byte at DST+0
+ addi BK,BK,1 // IU1 increment index
+No_B_fwd:
+ bne cr7,No_H_fwd // b if only words to store
+
+ stvehx v0,DST,BK // LSU store halfword at DST+0/1
+ addi BK,BK,2 // IU1 increment index
+No_H_fwd:
+ bng cr7,No_W1_fwd // b if exactly zero or two words to store
+
+ stvewx v0,DST,BK // LSU store word 1 of one or three
+ addi BK,BK,4 // IU1 increment index
+
+No_W1_fwd:
+ bnl cr7,No_W2_fwd // b if there was only one word to store
+ stvewx v0,DST,BK // LSU store word 1 of two or 2 of three
+ addi BK,BK,4 // IU1 increment index
+
+ stvewx v0,DST,BK // LSU store word 2 of two or 3 of three
+ b No_W2_fwd
+
+Left_just:
+ stvx v0,0,DST // LSU Store 16 bytes at D0
+No_W2_fwd:
+ rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
+ cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
+
+ li BK,16 // IU1 Re-initialize byte kount index
+ cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
+ ble cr6,Last_QW // b if no Quad words to do
+
+ mtctr QW // IU2 for (i=0;i<=QW;i++)
+ cmpi cr6,0,QW,4 // IU1 Check QW>4
+
+QW_loop:
+ stvx v0,DST,BK // LSU Store 16 fill bytes
+ addi BK,BK,16 // IU1 Increment byte kount index
+ bdnzf 25,QW_loop // b if 4 or less quad words to do
+
+ add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
+ addi QW,QW,-1 // IU1 One more QW stored by now
+ bgt cr6,GT_4QW_fwd // b if >4 quad words left
+
+Last_QW: // Next vector is the last; we're done.
+ mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
+
+ beq cr1,Rt_just_fwd // b if last destination is right justified
+
+ rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
+ li BL,0 // IU1 Initialize index pointer
+ bnl cr7,Only_1W_fwd // b if there was only one or zero words to store
+
+ stvewx v0,DBK,BL // LSU store word 1 of two or three
+ addi BL,BL,4 // IU1 increment index
+
+ stvewx v0,DBK,BL // LSU store word 2 of two or three
+ addi BL,BL,4 // IU1 increment index
+Only_1W_fwd:
+ bng cr7,Only_2W_fwd // b if there were only two or zero words to store
+
+ stvewx v0,DBK,BL // LSU store word 3 of three if necessary
+ addi BL,BL,4 // IU1 increment index
+Only_2W_fwd:
+ bne cr7,Only_B_fwd // b if there are no half words to store
+
+ stvehx v0,DBK,BL // LSU store one halfword if necessary
+ addi BL,BL,2 // IU1 increment index
+Only_B_fwd:
+ bns cr7,All_done_fwd // b if there are no bytes to store
+
+ stvebx v0,DBK,BL // LSU store one byte if necessary
+ b All_done_fwd
+
+Rt_just_fwd:
+
+ stvx v0,DST,BK // LSU Store 16 bytes at D14
+All_done_fwd:
+#ifdef VRSAVE
+ mtspr VRSV,RSV // IU1 Restore VRSAVE
+#endif
+ blr // Return destination address from entry
+
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
+
+ addi QW,QW,-1 // IU1 Keeping track of QWs stored
+ mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
+ addi DNX,DNX,16 // IU1 Update cr6 for next loop
+
+ stvx v0,DST,BK // LSU Store 16 bytes at D2
+ addi BK,BK,16 // IU1 Increment byte count by 16
+ bdnzf 27,GT_4QW_fwd // b if next store is to lower (even) half of CL
+
+ mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
+
+ bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
+
+// We need the ctr register to reflect an even byte count before entering
+// the next block - faster to decrement than to reload.
+ bdnz B32_fwd // decrement counter for last QW store odd
+
+B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
+ DCBK // LSU then Kill instead of RWITM
+
+ stvx v0,DST,BK // LSU Store 16 bytes at D11
+ addi BK,BK,16 // IU1 Increment byte count
+ bdz Nxt_loc_fwd // always decrement and branch to next instr
+
+Nxt_loc_fwd:
+ stvx v0,DST,BK // LSU Store 16 bytes at D12
+ addi BK,BK,16 // IU1 Increment byte count
+ bdnz B32_fwd // b if there are at least two more QWs to do
+
+ bso cr6,One_even_QW // b if there is one even and one odd QW to store
+ b Last_QW // b if last store is to even address
+
+// Come here with two more loads and two stores to do
+One_even_QW:
+ stvx v0,DST,BK // LSU Store 16 bytes at D13
+ addi BK,BK,16 // IU1 Increment byte count
+
+ b Last_QW
+
+// End of memset in AltiVec
+
+#define BCz r4 // in bzero r4 enters with byte count
+
+#ifdef __MWERKS__
+ .align 32
+#else
+ .align 5
+#endif
+
+#ifdef LIBMOTOVEC
+ .globl bzero
+bzero:
+#else
+ .globl vec_bzero
+vec_bzero:
+#endif
+
+ mr BC,BCz // IU1 arg[2] is BC here, not FILL
+ li FILL,0 // IU1 for bzero FILL=0
+#ifdef LIBMOTOVEC
+ b memset
+#else
+ b _vec_memset
+#endif
+
+// cacheable_memzero will employ dcbz to clear 32 bytes at a time
+// of cacheable memory. Like bzero, second entering argument will be BC.
+// Using this for non-cacheable memory will generate an alignment exception.
+
+ .text
+#ifdef __MWERKS__
+ .align 32
+#else
+ .align 5
+#endif
+
+#ifdef LIBMOTOVEC
+ .globl cacheable_memzero
+cacheable_memzero:
+#else
+ .globl vec_cacheable_memzero
+vec_cacheable_memzero:
+#endif
+
+ mr BC,BCz // IU1 arg[2] is BC here, not FILL
+ li FILL,0 // IU1 for bzero FILL=0
+ cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
+
+ cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count
+
+ addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
+ addi DR,DST,16 // IU1 Address of second dst vector
+ add DBC,DST,BC // IU1 Address of last dst byte + 1
+ bgt cr7,c_v_memset // b if BC>MIN_VEC
+
+ mtctr BC // for (i=1;i<=BC;i++)
+ beqlr cr1 // return if BC = 0
+c_Byte_set:
+ stbu FILL,1(DM1) // LSU * ++(DST-1) = FILL
+ bdnz c_Byte_set
+
+ blr
+
+c_v_memset:
+// Byte count < MIN_VEC bytes will have been set by scalar code above,
+// so this will not deal with small block sets < MIN_VEC.
+
+// For systems using VRSAVE, define VRSAV=1 when compiling. For systems
+// that don't, make sure VRSAVE is undefined.
+#ifdef VRSAVE
+ mfspr RSV,VRSV // IU2 Get current VRSAVE contents
+#endif
+ rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
+ addi DBK,DBC,-1 // IU1 Address of last dst byte
+
+#ifdef VRSAVE
+ oris Rt,RSV,0x8000 // IU1 Or in registers used by this routine
+#endif
+ subf D,DST,DR // IU1 How many bytes in first destination?
+ li BK,0 // IU1 Initialize byte kount index
+
+#ifdef VRSAVE
+ mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
+#endif
+ vxor v0,v0,v0 // VIU Clear v0
+ subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
+ cmpi cr1,0,D,16 // IU1 Is D0 left justified?
+
+ mtcrf 0x01,D // IU2 Put bytes in 1st dst in cr7
+ rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
+ beq cr1,c_Left_just // b if D0 is left justified
+
+ bns cr7,c_No_B_fwd // b if only even number of bytes to store
+
+ stvebx v0,DST,BK // LSU store first byte at DST+0
+ addi BK,BK,1 // IU1 increment index
+c_No_B_fwd:
+ bne cr7,c_No_H_fwd // b if only words to store
+
+ stvehx v0,DST,BK // LSU store halfword at DST+0/1
+ addi BK,BK,2 // IU1 increment index
+c_No_H_fwd:
+ bng cr7,c_No_W1_fwd // b if exactly zero or two words to store
+
+ stvewx v0,DST,BK // LSU store word 1 of one or three
+ addi BK,BK,4 // IU1 increment index
+
+c_No_W1_fwd:
+ bnl cr7,c_No_W2_fwd // b if there was only one word to store
+ stvewx v0,DST,BK // LSU store word 1 of two or 2 of three
+ addi BK,BK,4 // IU1 increment index
+
+ stvewx v0,DST,BK // LSU store word 2 of two or 3 of three
+ b c_No_W2_fwd
+
+c_Left_just:
+ stvx v0,0,DST // LSU Store 16 bytes at D0
+c_No_W2_fwd:
+ rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
+ cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
+
+ li BK,16 // IU1 Re-initialize byte kount index
+ cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
+ ble cr6,c_Last_QW // b if no Quad words to do
+
+ mtctr QW // IU2 for (i=0;i<=QW;i++)
+ cmpi cr6,0,QW,4 // IU1 Check QW>4
+
+c_QW_loop:
+ stvx v0,DST,BK // LSU Store 16 fill bytes
+ addi BK,BK,16 // IU1 Increment byte kount index
+ bdnzf 25,c_QW_loop // b if 4 or less quad words to do
+
+ add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
+ addi QW,QW,-1 // IU1 One more QW stored by now
+ bgt cr6,c_GT_4QW_fwd // b if >4 quad words left
+
+c_Last_QW: // Next vector is the last; we're done.
+ mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
+
+ beq cr1,c_Rt_just_fwd // b if last destination is right justified
+
+ rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
+ li BL,0 // IU1 Initialize index pointer
+ bnl cr7,c_Only_1W_fwd // b if there was only one or zero words to store
+
+ stvewx v0,DBK,BL // LSU store word 1 of two or three
+ addi BL,BL,4 // IU1 increment index
+
+ stvewx v0,DBK,BL // LSU store word 2 of two or three
+ addi BL,BL,4 // IU1 increment index
+c_Only_1W_fwd:
+ bng cr7,Only_2W_fwd // b if there were only two or zero words to store
+
+ stvewx v0,DBK,BL // LSU store word 3 of three if necessary
+ addi BL,BL,4 // IU1 increment index
+c_Only_2W_fwd:
+ bne cr7,c_Only_B_fwd // b if there are no half words to store
+
+ stvehx v0,DBK,BL // LSU store one halfword if necessary
+ addi BL,BL,2 // IU1 increment index
+c_Only_B_fwd:
+ bns cr7,c_All_done_fwd // b if there are no bytes to store
+
+ stvebx v0,DBK,BL // LSU store one byte if necessary
+ b c_All_done_fwd
+
+c_Rt_just_fwd:
+
+ stvx v0,DST,BK // LSU Store 16 bytes at D14
+c_All_done_fwd:
+#ifdef VRSAVE
+ mtspr VRSV,RSV // IU1 Restore VRSAVE
+#endif
+ blr // Return destination address from entry
+
+#ifdef __MWERKS__
+ .align 16
+#else
+ .align 4
+#endif
+c_GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
+
+ addi QW,QW,-1 // IU1 Keeping track of QWs stored
+ mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
+ addi DNX,DNX,16 // IU1 Update cr6 for next loop
+
+ stvx v0,DST,BK // LSU Store 16 bytes at D2
+ addi BK,BK,16 // IU1 Increment byte count by 16
+ bdnzf 27,c_GT_4QW_fwd // b if next store is to lower (even) half of CL
+
+ mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
+
+ bns cr6,c_B32_fwd // b if DST[27] == 0; i.e, final store is even
+
+// We need the ctr register to reflect an even byte count before entering
+// the next block - faster to decrement than to reload.
+ bdnz B32_fwd // decrement counter for last QW store odd
+
+c_B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
+ dcbz DST,BK // LSU zero whole cache line
+ bdz c_Nxt_loc_fwd // always decrement and branch to next instr
+
+c_Nxt_loc_fwd:
+ addi BK,BK,32 // IU1 Increment byte count
+ bdnz B32_fwd // b if there are at least two more QWs to do
+
+ bso cr6,c_One_even_QW // b if there is one even and one odd QW to store
+ b c_Last_QW // b if last store is to even address
+
+// Come here with two more loads and two stores to do
+c_One_even_QW:
+ stvx v0,DST,BK // LSU Store 16 bytes at D13
+ addi BK,BK,16 // IU1 Increment byte count
+
+ b c_Last_QW
+
+// End of cacheable_memzero in AltiVec
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/src/motovec/vec_memset.s
--- a/genericopenlibs/liboil/src/motovec/vec_memset.s Fri Sep 17 19:25:42 2010 +0530
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,553 +0,0 @@
-//------------------------------------------------------------------
-// file: vec_memset.S
-// AltiVec enabled version of memset and bzero and cacheable_memzero
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// Copyright Motorola, Inc. 2002
-// ALL RIGHTS RESERVED
-//
-// You are hereby granted a copyright license to use, modify, and
-// distribute the SOFTWARE so long as this entire notice is retained
-// without alteration in any modified and/or redistributed versions,
-// and that such modified versions are clearly identified as such.
-// No licenses are granted by implication, estoppel or otherwise under
-// any patents or trademarks of Motorola, Inc.
-//
-// The SOFTWARE is provided on an "AS IS" basis and without warranty.
-// To the maximum extent permitted by applicable law, MOTOROLA DISCLAIMS
-// ALL WARRANTIES WHETHER EXPRESS OR IMPLIED, INCLUDING IMPLIED
-// WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-// PURPOSE AND ANY WARRANTY AGAINST INFRINGEMENT WITH
-// REGARD TO THE SOFTWARE (INCLUDING ANY MODIFIED VERSIONS
-// THEREOF) AND ANY ACCOMPANYING WRITTEN MATERIALS.
-//
-// To the maximum extent permitted by applicable law, IN NO EVENT SHALL
-// MOTOROLA BE LIABLE FOR ANY DAMAGES WHATSOEVER
-// (INCLUDING WITHOUT LIMITATION, DAMAGES FOR LOSS OF
-// BUSINESS PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS
-// INFORMATION, OR OTHER PECUNIARY LOSS) ARISING OF THE USE OR
-// INABILITY TO USE THE SOFTWARE. Motorola assumes no responsibility
-// for the maintenance and support of the SOFTWARE.
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// extern void *memset( void *ptr, int val, size_t len );
-// Copies val into each of len characters beginning at ptr.
-// - Harbison&Steele 4th ed
-// (despite val being an int, this memset assumes it is never
-// more than a byte. That seems to be correct from all the
-// memset functions I've seen but I don't know if ANSI allows
-// anthing longer. Chuck Corley 12/21/02)
-// Returns:
-// void * ptr
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-// extern void * bzero( char *ptr, int len);
-// Copies 0 into each of len characters at ptr.
-// - Harbison&Steele 4th ed
-// Returns:
-// void * ptr
-//------------------------------------------------------------------
-
-// Revision History:
-// Rev 0.0 Original Chuck Corley 02/09/03
-// Could benefit from changes added to memcpy
-// Rev 0.1 Revised per memcpy Rev 0.30 Chuck Corley 05/01/03
-//
-// This is beta quality code; users are encouraged to make it faster.
-// ASSUMPTIONS:
-// Code is highly likely to be in the cache; data is not (streaming data)
-// Zero fill could be quite likely.
-// Moving fill byte from GPR to VR as below faster than stw->lvebx via stack
-
-#define VRSV 256 // VRSAVE spr
-// Don't use vectors for BC <= MIN_VEC. Works only if MIN_VEC >= 16 bytes.
-#define MIN_VEC 16
-
-// Register useage
-#define Rt r0 // r0 when used as a temporary register
-
-#define DST r3 // entering: dest pointer; exiting: same dest pointer
-
-#define FILL r4 // entering: fill char then fill word
-
-#define BC r5 // entering: Byte_Count then remaining Byte_Count
-
-#define DBC r6// dst + byte count
-
-#define BK r7 // BC - 1 +/- (n*16)
-
-#define Fsh r8 // fill byte shifted right one nibble
-
-#define DM1 r9// dst -1 for byte-by-byte backwards initially
-#define D r9 // (dst+16)[0:27] - dst[28:31]
-#define DNX r9 // (dst+n*16)[28:31]
-#define BL r9 // second byte_kount index pointer
-
-#define DR r10 // (dst+16)[0:27]
-#define QW r10 // number of cache lines
-
-#define DBK r11 // (dst+byte_count-1) then (dst+byte_count-1)[28:31]
-
-#define RSV r12 // storage for VRSAVE register if used
-
-// Condition register use (not including temporary cr0)
-// cr0[2] = (FILL==0)?
-// cr1[0,2] = (BC == 0)? 1 : 0; (nothing to move)
-// then cr1[2] = (DST[28:31] == 0)? 1 : 0; (D0 left justified)
-// then cr1[2] = ((DBK = DST+BC-1)[28:31] = 0xF)? 1 : 0; (DN right justified)
-// cr6[2] = (QW == 0)? 1 : 0;
-// then cr6[1] = (QW > 4)? 1 : 0; (>4 vectors to move?)
-// then cr6[3] = (third store[27] == 1)? 1: 0; (cache line alignment)
-// then cr6[3] = (last store[27] == 1)? 1: 0; (last store odd?)
-// cr7[2] = (BC>MIN_VEC)?1:0; (BC big enough to warrant vectors)
-// then cr7[0:3] = (DST+16)[0:27]-DST (How many bytes (iff <16) in first vector?)
-// then cr7[0:3] = (DST+BC)[0:27] (How many bytes (iff <16) in last vector?)
-
-// Conditionalize the use of dcba. It will help if the data is
-// not in cache and hurt if it is. Generally, except for small
-// benchmarks repeated many times, we assume data is not in cache
-// (data streaming) and using dcba is a performance boost.
-// We use dcba which will noop to non-cacheable memory rather than
-// dcbz which will cause an aligment exception.
-#ifndef NO_DCBA
-#if defined(__GNUC__) || defined(__MWERKS__) || defined(_DIAB_TOOL)
- // gcc and codewarrior and diab don't assemble dcba
-#define DCBK .long 0x7c033dec
-// dcba r3,r7 or dcba DST,BK
-#else
-#ifdef __ghs__
-.macro DCBK
-.long 0x7c033dec
-.endm
-#else
-#define DCBK dcba DST,BK
-#endif // __ghs__
-#endif // __GNUC__ or __MWERKS__
-#else
-#define DCBK nop
-#endif // NO_DCBA
-
- .text
-#ifdef __MWERKS__
- .align 32
-#else
- .align 5
-#endif
-
-#ifdef LIBMOTOVEC
- .globl memset
-memset:
-#else
- .globl _vec_memset
-_vec_memset:
-#endif
-
- cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
- cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count
- rlwinm. Fsh,FILL,28,28,3 // IU1 Is fill byte zero? and shift
-
- addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
- addi DR,DST,16 // IU1 Address of second dst vector
- add DBC,DST,BC // IU1 Address of last dst byte + 1
- bgt cr7,v_memset // b if BC>MIN_VEC
-
- mtctr BC // for (i=1;i<=BC;i++)
- beqlr cr1 // return if BC = 0
-Byte_set:
- stbu FILL,1(DM1) // LSU * ++(DST-1) = FILL
- bdnz Byte_set
-
- blr
-
-v_memset:
-// Byte count < MIN_VEC bytes will have been set by scalar code above,
-// so this will not deal with small block sets < MIN_VEC.
-
-// For systems using VRSAVE, define VRSAV=1 when compiling. For systems
-// that don't, make sure VRSAVE is undefined.
-#ifdef VRSAVE
- mfspr RSV,VRSV // IU2 Get current VRSAVE contents
-#endif
- rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
- addi DBK,DBC,-1 // IU1 Address of last dst byte
-
-#ifdef VRSAVE
- oris Rt,RSV,0xe000 // IU1 Or in registers used by this routine
-#endif
- subf D,DST,DR // IU1 How many bytes in first destination?
- li BK,0 // IU1 Initialize byte kount index
-
-#ifdef VRSAVE
- mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
-#endif
- vxor v0,v0,v0 // VIU Clear v0
- subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
- cmpi cr1,0,D,16 // IU1 Is D0 left justified?
- beq+ enter_bzero // b if FILL==0
-
- lvsl v0,0,Fsh // LSU Move upper nibble to byte 0 of VR
- vspltisb v1,4 // VPU Splat 0x4 to every byte
-
- lvsl v2,0,FILL // LSU Move lower nibble to byte 0 of VR
-
- vslb v0,v0,v1 // VIU Move upper nibble to VR[0:3]
-
- vor v0,v0,v2 // VIU Form FILL byte in VR[0:7]
-
- vspltb v0,v0,0 // VPU Splat the fill byte to all bytes
-enter_bzero:
- mtcrf 0x01,D // IU2 Put bytes in 1st dst in cr7
- rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
- beq cr1,Left_just // b if D0 is left justified
-
- bns cr7,No_B_fwd // b if only even number of bytes to store
-
- stvebx v0,DST,BK // LSU store first byte at DST+0
- addi BK,BK,1 // IU1 increment index
-No_B_fwd:
- bne cr7,No_H_fwd // b if only words to store
-
- stvehx v0,DST,BK // LSU store halfword at DST+0/1
- addi BK,BK,2 // IU1 increment index
-No_H_fwd:
- bng cr7,No_W1_fwd // b if exactly zero or two words to store
-
- stvewx v0,DST,BK // LSU store word 1 of one or three
- addi BK,BK,4 // IU1 increment index
-
-No_W1_fwd:
- bnl cr7,No_W2_fwd // b if there was only one word to store
- stvewx v0,DST,BK // LSU store word 1 of two or 2 of three
- addi BK,BK,4 // IU1 increment index
-
- stvewx v0,DST,BK // LSU store word 2 of two or 3 of three
- b No_W2_fwd
-
-Left_just:
- stvx v0,0,DST // LSU Store 16 bytes at D0
-No_W2_fwd:
- rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
- cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
-
- li BK,16 // IU1 Re-initialize byte kount index
- cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
- ble cr6,Last_QW // b if no Quad words to do
-
- mtctr QW // IU2 for (i=0;i<=QW;i++)
- cmpi cr6,0,QW,4 // IU1 Check QW>4
-
-QW_loop:
- stvx v0,DST,BK // LSU Store 16 fill bytes
- addi BK,BK,16 // IU1 Increment byte kount index
- bdnzf 25,QW_loop // b if 4 or less quad words to do
-
- add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
- addi QW,QW,-1 // IU1 One more QW stored by now
- bgt cr6,GT_4QW_fwd // b if >4 quad words left
-
-Last_QW: // Next vector is the last; we're done.
- mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
-
- beq cr1,Rt_just_fwd // b if last destination is right justified
-
- rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
- li BL,0 // IU1 Initialize index pointer
- bnl cr7,Only_1W_fwd // b if there was only one or zero words to store
-
- stvewx v0,DBK,BL // LSU store word 1 of two or three
- addi BL,BL,4 // IU1 increment index
-
- stvewx v0,DBK,BL // LSU store word 2 of two or three
- addi BL,BL,4 // IU1 increment index
-Only_1W_fwd:
- bng cr7,Only_2W_fwd // b if there were only two or zero words to store
-
- stvewx v0,DBK,BL // LSU store word 3 of three if necessary
- addi BL,BL,4 // IU1 increment index
-Only_2W_fwd:
- bne cr7,Only_B_fwd // b if there are no half words to store
-
- stvehx v0,DBK,BL // LSU store one halfword if necessary
- addi BL,BL,2 // IU1 increment index
-Only_B_fwd:
- bns cr7,All_done_fwd // b if there are no bytes to store
-
- stvebx v0,DBK,BL // LSU store one byte if necessary
- b All_done_fwd
-
-Rt_just_fwd:
-
- stvx v0,DST,BK // LSU Store 16 bytes at D14
-All_done_fwd:
-#ifdef VRSAVE
- mtspr VRSV,RSV // IU1 Restore VRSAVE
-#endif
- blr // Return destination address from entry
-
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
-
- addi QW,QW,-1 // IU1 Keeping track of QWs stored
- mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
- addi DNX,DNX,16 // IU1 Update cr6 for next loop
-
- stvx v0,DST,BK // LSU Store 16 bytes at D2
- addi BK,BK,16 // IU1 Increment byte count by 16
- bdnzf 27,GT_4QW_fwd // b if next store is to lower (even) half of CL
-
- mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
-
- bns cr6,B32_fwd // b if DST[27] == 0; i.e, final store is even
-
-// We need the ctr register to reflect an even byte count before entering
-// the next block - faster to decrement than to reload.
- bdnz B32_fwd // decrement counter for last QW store odd
-
-B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
- DCBK // LSU then Kill instead of RWITM
-
- stvx v0,DST,BK // LSU Store 16 bytes at D11
- addi BK,BK,16 // IU1 Increment byte count
- bdz Nxt_loc_fwd // always decrement and branch to next instr
-
-Nxt_loc_fwd:
- stvx v0,DST,BK // LSU Store 16 bytes at D12
- addi BK,BK,16 // IU1 Increment byte count
- bdnz B32_fwd // b if there are at least two more QWs to do
-
- bso cr6,One_even_QW // b if there is one even and one odd QW to store
- b Last_QW // b if last store is to even address
-
-// Come here with two more loads and two stores to do
-One_even_QW:
- stvx v0,DST,BK // LSU Store 16 bytes at D13
- addi BK,BK,16 // IU1 Increment byte count
-
- b Last_QW
-
-// End of memset in AltiVec
-
-#define BCz r4 // in bzero r4 enters with byte count
-
-#ifdef __MWERKS__
- .align 32
-#else
- .align 5
-#endif
-
-#ifdef LIBMOTOVEC
- .globl bzero
-bzero:
-#else
- .globl vec_bzero
-vec_bzero:
-#endif
-
- mr BC,BCz // IU1 arg[2] is BC here, not FILL
- li FILL,0 // IU1 for bzero FILL=0
-#ifdef LIBMOTOVEC
- b memset
-#else
- b _vec_memset
-#endif
-
-// cacheable_memzero will employ dcbz to clear 32 bytes at a time
-// of cacheable memory. Like bzero, second entering argument will be BC.
-// Using this for non-cacheable memory will generate an alignment exception.
-
- .text
-#ifdef __MWERKS__
- .align 32
-#else
- .align 5
-#endif
-
-#ifdef LIBMOTOVEC
- .globl cacheable_memzero
-cacheable_memzero:
-#else
- .globl vec_cacheable_memzero
-vec_cacheable_memzero:
-#endif
-
- mr BC,BCz // IU1 arg[2] is BC here, not FILL
- li FILL,0 // IU1 for bzero FILL=0
- cmpi cr7,0,BC,MIN_VEC // IU1 Check for minimum byte count
-
- cmpi cr1,0,BC,0 // IU1 Eliminate zero byte count
-
- addi DM1,DST,-1 // IU1 Pre-bias and duplicate destination
- addi DR,DST,16 // IU1 Address of second dst vector
- add DBC,DST,BC // IU1 Address of last dst byte + 1
- bgt cr7,c_v_memset // b if BC>MIN_VEC
-
- mtctr BC // for (i=1;i<=BC;i++)
- beqlr cr1 // return if BC = 0
-c_Byte_set:
- stbu FILL,1(DM1) // LSU * ++(DST-1) = FILL
- bdnz c_Byte_set
-
- blr
-
-c_v_memset:
-// Byte count < MIN_VEC bytes will have been set by scalar code above,
-// so this will not deal with small block sets < MIN_VEC.
-
-// For systems using VRSAVE, define VRSAV=1 when compiling. For systems
-// that don't, make sure VRSAVE is undefined.
-#ifdef VRSAVE
- mfspr RSV,VRSV // IU2 Get current VRSAVE contents
-#endif
- rlwinm DR,DR,0,0,27 // IU1 (DST+16)[0:27]
- addi DBK,DBC,-1 // IU1 Address of last dst byte
-
-#ifdef VRSAVE
- oris Rt,RSV,0x8000 // IU1 Or in registers used by this routine
-#endif
- subf D,DST,DR // IU1 How many bytes in first destination?
- li BK,0 // IU1 Initialize byte kount index
-
-#ifdef VRSAVE
- mtspr VRSV,Rt // IU2 Save in VRSAVE before first vec op
-#endif
- vxor v0,v0,v0 // VIU Clear v0
- subf QW,DR,DBK // IU1 Bytes of full vectors to move (-16)
- cmpi cr1,0,D,16 // IU1 Is D0 left justified?
-
- mtcrf 0x01,D // IU2 Put bytes in 1st dst in cr7
- rlwinm QW,QW,28,4,31 // IU1 Quad words remaining
- beq cr1,c_Left_just // b if D0 is left justified
-
- bns cr7,c_No_B_fwd // b if only even number of bytes to store
-
- stvebx v0,DST,BK // LSU store first byte at DST+0
- addi BK,BK,1 // IU1 increment index
-c_No_B_fwd:
- bne cr7,c_No_H_fwd // b if only words to store
-
- stvehx v0,DST,BK // LSU store halfword at DST+0/1
- addi BK,BK,2 // IU1 increment index
-c_No_H_fwd:
- bng cr7,c_No_W1_fwd // b if exactly zero or two words to store
-
- stvewx v0,DST,BK // LSU store word 1 of one or three
- addi BK,BK,4 // IU1 increment index
-
-c_No_W1_fwd:
- bnl cr7,c_No_W2_fwd // b if there was only one word to store
- stvewx v0,DST,BK // LSU store word 1 of two or 2 of three
- addi BK,BK,4 // IU1 increment index
-
- stvewx v0,DST,BK // LSU store word 2 of two or 3 of three
- b c_No_W2_fwd
-
-c_Left_just:
- stvx v0,0,DST // LSU Store 16 bytes at D0
-c_No_W2_fwd:
- rlwinm Rt,DBK,0,28,31 // IU1 (DBK = DST+BC-1)[28:31]
- cmpi cr6,0,QW,0 // IU1 Any full vectors to move?
-
- li BK,16 // IU1 Re-initialize byte kount index
- cmpi cr1,0,Rt,0xF // IU1 Is DN right justified?
- ble cr6,c_Last_QW // b if no Quad words to do
-
- mtctr QW // IU2 for (i=0;i<=QW;i++)
- cmpi cr6,0,QW,4 // IU1 Check QW>4
-
-c_QW_loop:
- stvx v0,DST,BK // LSU Store 16 fill bytes
- addi BK,BK,16 // IU1 Increment byte kount index
- bdnzf 25,c_QW_loop // b if 4 or less quad words to do
-
- add DNX,DST,BK // IU1 address of next store (DST+32 if QW>4)
- addi QW,QW,-1 // IU1 One more QW stored by now
- bgt cr6,c_GT_4QW_fwd // b if >4 quad words left
-
-c_Last_QW: // Next vector is the last; we're done.
- mtcrf 0x01,DBC // IU2 Put final vector byte count in cr7
-
- beq cr1,c_Rt_just_fwd // b if last destination is right justified
-
- rlwinm DBK,DBK,0,0,27 // IU1 Round to QW addr of last byte
- li BL,0 // IU1 Initialize index pointer
- bnl cr7,c_Only_1W_fwd // b if there was only one or zero words to store
-
- stvewx v0,DBK,BL // LSU store word 1 of two or three
- addi BL,BL,4 // IU1 increment index
-
- stvewx v0,DBK,BL // LSU store word 2 of two or three
- addi BL,BL,4 // IU1 increment index
-c_Only_1W_fwd:
- bng cr7,Only_2W_fwd // b if there were only two or zero words to store
-
- stvewx v0,DBK,BL // LSU store word 3 of three if necessary
- addi BL,BL,4 // IU1 increment index
-c_Only_2W_fwd:
- bne cr7,c_Only_B_fwd // b if there are no half words to store
-
- stvehx v0,DBK,BL // LSU store one halfword if necessary
- addi BL,BL,2 // IU1 increment index
-c_Only_B_fwd:
- bns cr7,c_All_done_fwd // b if there are no bytes to store
-
- stvebx v0,DBK,BL // LSU store one byte if necessary
- b c_All_done_fwd
-
-c_Rt_just_fwd:
-
- stvx v0,DST,BK // LSU Store 16 bytes at D14
-c_All_done_fwd:
-#ifdef VRSAVE
- mtspr VRSV,RSV // IU1 Restore VRSAVE
-#endif
- blr // Return destination address from entry
-
-#ifdef __MWERKS__
- .align 16
-#else
- .align 4
-#endif
-c_GT_4QW_fwd: // Do once if nxt st is to odd half of cache line, else twice
-
- addi QW,QW,-1 // IU1 Keeping track of QWs stored
- mtcrf 0x02,DNX // IU2 cr6[3]=((DST+32)[27]==1)?1:0;
- addi DNX,DNX,16 // IU1 Update cr6 for next loop
-
- stvx v0,DST,BK // LSU Store 16 bytes at D2
- addi BK,BK,16 // IU1 Increment byte count by 16
- bdnzf 27,c_GT_4QW_fwd // b if next store is to lower (even) half of CL
-
- mtcrf 0x02,DBK // IU2 cr6[3]=((last store)[27]==1)?1:0; (odd?)
-
- bns cr6,c_B32_fwd // b if DST[27] == 0; i.e, final store is even
-
-// We need the ctr register to reflect an even byte count before entering
-// the next block - faster to decrement than to reload.
- bdnz B32_fwd // decrement counter for last QW store odd
-
-c_B32_fwd: // Should be at least 2 stores remaining and next 2 are cache aligned
- dcbz DST,BK // LSU zero whole cache line
- bdz c_Nxt_loc_fwd // always decrement and branch to next instr
-
-c_Nxt_loc_fwd:
- addi BK,BK,32 // IU1 Increment byte count
- bdnz B32_fwd // b if there are at least two more QWs to do
-
- bso cr6,c_One_even_QW // b if there is one even and one odd QW to store
- b c_Last_QW // b if last store is to even address
-
-// Come here with two more loads and two stores to do
-c_One_even_QW:
- stvx v0,DST,BK // LSU Store 16 bytes at D13
- addi BK,BK,16 // IU1 Increment byte count
-
- b c_Last_QW
-
-// End of cacheable_memzero in AltiVec
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/clamp1/src/clamp1.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/clamp1/src/clamp1.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,195 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+
+#include
+#include
+#include
+#include
+#include
+
+#define SIZE 5
+
+#define LOG_FILE "c:\\logs\\testsuite_clamp1_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+int i;
+void test_clamp_s8()
+ {
+ int8_t dest[SIZE]={0,0,0,0,0};
+ const int8_t src[SIZE]={2,2,2,2,2},s2_1[SIZE]={14,14,14,14,14},s3_1[SIZE]={1,1,1,1,1};
+ int8_t linux_result[SIZE]={1,1,1,1,1};
+ oil_clamp_s8 (dest,src,SIZE,s2_1,s3_1);
+ for(i=0;i
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_composite_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_composite");
+ close_log_file();
+}
+
+void test_oil_composite_add_argb()
+ {
+ uint32_t input[SIZE];
+ uint32_t output[SIZE];
+ int i = 0;
+
+ for(i = 0; i< SIZE; i++)
+ {
+ input[i] = i*10;
+ output[i] = i;
+ }
+
+ oil_composite_add_argb(output, input, SIZE);
+
+ for(i = 0; i
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_convert_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_convert");
+ close_log_file();
+}
+
+#define SIGN_BIT_8 0x80
+#define SIGN_BIT_16 0x8000
+#define SIGN_BIT_32 0x80000000
+
+#define MAX_SIGNED_INT_32 0x7FFFFFFF
+#define MAX_SIGNED_INT_16 0x7FFF
+#define MAX_SIGNED_INT_16 0x7FFF
+#define MAX_SIGNED_INT_8 0x7F
+
+#define MAX_UNSIGNED_INT16 0xFFFF
+#define MAX_UNSIGNED_INT8 0xFF
+
+float f32src[] = {0.0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, 19.9};
+double f64src[] = {0.0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, 19.9};
+
+void test_oil_convert_s16_f32()
+ {
+ int16_t output[SIZE];
+ int i = 0;
+
+ oil_convert_s16_f32(output, f32src, SIZE);
+
+ for(i = 0; i
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_dct_log.txt"
+#include "std_log_result.h"
+#include "utils.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_dct");
+ close_log_file();
+}
+
+void test_oil_mdct12_f64()
+ {
+ //double * d_6, const double * s_12
+ double output[6];
+ double input[12];
+ double linux_output[] = {-55.78726058370923368557,-9.77999142525906961509,8.30695505006328360764,5.45142094924720943538,-5.13339728852725407648,-4.58890662311381625216};
+ int i = 0;
+
+ for(i=0; i<12; i++)
+ {
+ input[i] = i+1;
+
+ if(i<6)
+ output[i] = 0;
+ }
+
+ oil_mdct12_f64(output, input);
+
+ for(i=0; i<6; i++)
+ {
+ if(comparefloats(output[i], linux_output[i]))
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %15.14f, actual value - %15.14f", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_imdct12_f64()
+ {
+ //double * d_12, const double * s_6
+ double output[12];
+ double input[6];
+ double linux_output[] = {-4.33833397075162174872,3.40568926865829446626,-3.31124125233533384005,3.31124125233533384005,-3.40568926865828158768,4.33833397075162441325,-4.80351335916817223648,10.06982028664590167466,-10.35088397845068541869,-10.35088397845079377646,10.06982028664594963629,-4.80351335916817401284};
+ int i = 0;
+
+ for(i=0; i<12; i++)
+ {
+ output[i] = 0;
+
+ if(i<6)
+ input[i] = i + 1;
+ }
+
+ oil_imdct12_f64(output, input);
+
+ for(i=0; i<12; i++)
+ {
+ if(comparefloats(output[i], linux_output[i]))
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %15.14f, actual value - %15.14f", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mdct36_f64()
+ {
+ //double * d_18, const double * s_36
+ double output[18];
+ double input[36];
+ double linux_output[] = {-485.54509125873983066413,-79.64662612510757355722,67.80760448776190685294,39.77358393387979162981,-36.41398520030525531865,-26.85943249683056777144,25.37958877703877291765,20.73179262231989383736,-19.93414220762220523397,-17.30353399124829749667,16.83079383688368935168,15.24349952210559955290,-14.95531193252001500582,-14.00077432972704016834,13.83319274912650698184,13.31880337261293334450,-13.24130282007020475987,-13.07848679902590305346};
+ int i = 0;
+
+ for(i=0; i<36; i++)
+ {
+ input[i] = i+1;
+
+ if(i<18)
+ output[i] = 0;
+ }
+
+ oil_mdct36_f64(output, input);
+
+ for(i=0; i<18; i++)
+ {
+ if(comparefloats(output[i], linux_output[i]))
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %15.14f, actual value - %15.14f", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_imdct36_f64()
+ {
+ //double * d_36, const double * s_18
+ double output[36];
+ double input[18];
+ double linux_output[] = {-12.85687531711769970855,11.41757120437667261115,-11.15646549643737905910,10.28156353478235018883,-10.12421323499659031597,9.61624441673711061185,-9.53135483275377914936,9.29662075491665795823,-9.26973797227096696361,9.26973797227097051632,-9.29662075491650519155,9.53135483275377559664,-9.61624441673730778746,10.12421323499673242452,-10.28156353478229512177,11.15646549643748208780,-11.41757120437673655999,12.85687531711769793219,-13.28789667691522780046,15.72998203713914833202,-16.48536211104631377111,21.07260369137263467110,-22.59425383526346919894,33.39775527158744949929,-37.52696988457606863676,85.41533571580391992484,-80.79110748109037842823,-80.79110748109157214003,85.41533571580409045509,-37.52696988457621074531,33.39775527158775503267,-22.59425383526349762064,21.07260369137274835794,-16.48536211104587678733,15.72998203713892451105,-13.28789667691528109117};
+ int i = 0;
+
+ for(i=0; i<36; i++)
+ {
+ output[i] = 0;
+
+ if(i<18)
+ input[i] = i+1;
+ }
+
+ oil_imdct36_f64(output, input);
+
+ for(i=0; i<36; i++)
+ {
+ if(comparefloats(output[i], linux_output[i]))
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %15.14f, actual value - %15.14f", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_dct36_f32()
+ {
+ //float * d_36, int dstr, const float * s_36, int sstr
+ float output[36];
+ float input[36];
+ float linux_output[] = {2.000000,3.000000,4.000000,5.000000,6.000000,7.000000,8.000000,9.000000,10.000000,11.000000,12.000000,13.000000,14.000000,15.000000,16.000000,17.000000,18.000000,19.000000,20.000000,21.000000,22.000000,23.000000,24.000000,25.000000,26.000000,27.000000,28.000000,29.000000,30.000000,31.000000,32.000000,33.000000,34.000000,35.000000,36.000000,37.000000};
+ int i = 0;
+
+ for(i=0; i<36; i++)
+ {
+ output[i] = i+2;
+ input[i] = i+1;
+ }
+
+ oil_dct36_f32(output, 1, input, 2);
+
+ for(i=0; i<36; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %f, actual value - %f", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_fdct8x8s_s16()
+ {
+ //int16_t * d_8x8, int ds, const int16_t * s_8x8, int ss
+ int16_t output[64];
+ int16_t input[64];
+ int16_t linux_output[] = {13824,-4608,-1024,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ int i = 0;
+
+ for(i=0; i<64; i++)
+ {
+ output[i] = 0;
+ input[i] = i+1;
+ }
+
+ oil_fdct8x8s_s16(output, 1, input, 2);
+
+ for(i=0; i<64; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_fdct8x8theora()
+ {
+ //const int16_t * s_8x8, int16_t * d_8x8
+ int16_t output[64];
+ int16_t input[64];
+ int16_t linux_output[] = {1036,-62,0,-5,0,-5,0,-5,-582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-61,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,-20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-6,0,0,0,0,0,0,0};
+ int i = 0;
+
+ for(i=0; i<64; i++)
+ {
+ output[i] = 0;
+ input[i] = i+1;
+ }
+
+ oil_fdct8x8theora(input, output);
+
+ for(i=0; i<64; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_idct8x8lim10_s16()
+ {
+ //int16_t * d_8x8, int dstr, const int16_t * s_8x8, int sstr
+ int16_t output[64];
+ int16_t input[64];
+ int16_t linux_output[] = {1292,-771,768,-511,-1,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+ int i = 0;
+
+ for(i=0; i<64; i++)
+ {
+ output[i] = 0;
+ input[i] = i+1;
+ }
+
+ oil_idct8x8lim10_s16(output, 1, input, 2);
+
+ for(i=0; i<64; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_idct8theora_s16()
+ {
+ //int16_t * d_8, int dstr, const int16_t * s_8, int sstr
+ int16_t output[8];
+ int16_t input[8];
+ int16_t linux_output[] = {16,-18,6,-5,5,-2,2,0};
+ int i = 0;
+
+ for(i=0; i<8; i++)
+ {
+ output[i] = 0;
+ input[i] = i+1;
+ }
+
+ oil_idct8theora_s16(output, 1, input, 2);
+
+ for(i=0; i<8; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_idct8x8theora_s16()
+ {
+ //int16_t * d_8x8, int dstr, const int16_t * s_8x8, int sstr
+ int16_t output[64];
+ int16_t input[64];
+ int16_t linux_output[] = {157,-123,50,-36,26,-14,10,1,-110,51,-30,12,-16,2,-10,-2,52,-31,10,-10,10,0,6,0,-34,19,-11,6,-7,1,-3,-2,26,-15,7,-4,5,-1,3,0,-14,5,-2,2,0,-2,0,-2,12,-9,2,0,6,0,4,0,-1,-1,2,-2,4,2,-2,1};
+ int i = 0;
+
+ for(i=0; i<64; i++)
+ {
+ output[i] = 0;
+ input[i] = i+1;
+ }
+
+ oil_idct8x8theora_s16(output, 1, input, 2);
+
+ for(i=0; i<64; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_imdct32_f32()
+ {
+ //float * d_32, const float * s_32
+ float output[32];
+ float input[32];
+ float expected_output[] = {528.00000000000000000000,-207.42237854003906250000,-0.00000000000002593932,-22.97223091125488281250,-0.00000000000002312733,-8.21512222290039062500,0.00000000000000710542,-4.14796209335327148438,-0.00000000000003045654,-2.47257304191589355469,0.00000000000000630225,-1.62263202667236328125,0.00000000000008801467,-1.13173198699951171875,-0.00000000000003877801,-0.82146918773651123047,0.00000000000035616302,-0.61161065101623535156,0.00000000000014964419,-0.46168053150177001953,0.00000000000006150462,-0.34939777851104736328,-0.00000000000018143386,-0.26159864664077758789,0.00000000000003763656,-0.19001007080078125000,-0.00000000000012429814,-0.12911282479763031006,-0.00000000000002208823,-0.07497953623533248901,-0.00000000000003485602,-0.02459304779767990112};
+ int i = 0;
+
+ for(i=0; i<32; i++)
+ {
+ input[i] = i+1;
+ output[i] = 0;
+ }
+
+ oil_imdct32_f32(output, input);
+
+ for(i=0; i<32; i++)
+ {
+ if(comparefloats(output[i], expected_output[i]))
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %15.14f, actual value - %15.14f", i,expected_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+int main (int argc, char *argv[])
+{
+ oil_init ();
+
+ std_log(LOG_FILENAME_LINE,"START oil_mdct12_f64 TEST");
+ test_oil_mdct12_f64(); //fails because of float precision diff
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_imdct12_f64 TEST");
+ test_oil_imdct12_f64(); //fails because of float precision diff
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mdct36_f64 TEST");
+ test_oil_mdct36_f64(); //fails because of float precision diff
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_imdct36_f64 TEST");
+ test_oil_imdct36_f64(); //fails because of float precision diff
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_dct36_f32 TEST");
+ test_oil_dct36_f32();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_fdct8x8s_s16 TEST");
+ test_oil_fdct8x8s_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_fdct8x8theora TEST");
+ test_oil_fdct8x8theora();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_idct8x8lim10_s16 TEST");
+ test_oil_idct8x8lim10_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_idct8theora_s16 TEST");
+ test_oil_idct8theora_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_idct8x8theora_s16 TEST");
+ test_oil_idct8x8theora_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_imdct32_f32 TEST");
+ test_oil_imdct32_f32(); //getting different output than linux
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ if(assert_failed)
+ std_log(LOG_FILENAME_LINE,"Test Failed");
+ else
+ std_log(LOG_FILENAME_LINE,"Test Successful");
+
+ create_xml(0);
+ return 0;
+}
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/debug/src/debug.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/debug/src/debug.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,69 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_debug_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_debug");
+ close_log_file();
+}
+
+void test()
+ {
+ int level = 2;
+ int ret;
+
+ oil_debug_set_level(level);
+ ret = oil_debug_get_level();
+
+ if(ret != level)
+ {
+ std_log(LOG_FILENAME_LINE,"oil_debug_get/set method failed. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+
+int main (int argc, char *argv[])
+{
+ oil_init ();
+
+ test();
+
+ if(assert_failed)
+ std_log(LOG_FILENAME_LINE,"Test Failed");
+ else
+ std_log(LOG_FILENAME_LINE,"Test Successful");
+
+ create_xml(0);
+ return 0;
+}
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/function/src/function.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/function/src/function.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,152 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_function_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_function");
+ close_log_file();
+}
+
+void abs_f32_f32_test(float * dest, int dstr, const float * src, int sstr, int n)
+ {
+ int i = 0;
+ std_log(LOG_FILENAME_LINE,"abs_f32_f32_test is called");
+ assert_failed = 0;
+
+ for(i=0; ifunc = (void*)abs_f32_f32_test;
+ impl->name = "abs_f32_f32_test";
+
+ oil_class_register_impl_by_name("abs_f32_f32", impl);
+
+ assert_failed = 1; //will be set to 0, if abs_f32_f32_test is called
+ oil_abs_f32_f32(output, 1, input, 2, SIZE);
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"memory allocation failed. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+
+void test_oil_class_register_impl()
+ {
+ float output[SIZE];
+ float input[SIZE];
+
+ OilFunctionClass *klass;
+ OilFunctionImpl *impl;
+
+ if(impl != NULL)
+ {
+ impl = (OilFunctionImpl*)calloc(sizeof(OilFunctionImpl), 0);
+ impl->func = (void *)abs_f32_f32_test;
+ impl->name = "abs_f32_f32_test";
+
+ klass = (OilFunctionClass *)oil_class_get ("abs_f32_f32");
+
+ if(klass != NULL)
+ {
+ oil_class_register_impl(klass, impl);
+
+ assert_failed = 1; //will be set to 0, if abs_f32_f32_test is called
+ oil_abs_f32_f32(output, 1, input, 2, SIZE);
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"oil_class_get returned NULL. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"memory allocation failed. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+
+void test_oil_class_register_impl_full()
+ {
+ float output[SIZE];
+ float input[SIZE];
+ OilFunctionClass *klass;
+
+ klass = (OilFunctionClass *)oil_class_get ("abs_f32_f32");
+
+ if(klass != NULL)
+ {
+ oil_class_register_impl_full(klass, (void*)abs_f32_f32_test, "abs_f32_f32_test", OIL_IMPL_FLAG_OPT);
+
+ assert_failed = 1; //will be set to 0, if abs_f32_f32_test is called
+ oil_abs_f32_f32(output, 1, input, 2, SIZE);
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"oil_class_get returned NULL. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+
+int main (int argc, char *argv[])
+{
+ oil_init();
+ oil_init_no_optimize();
+ oil_optimize("abs_f32_f32");
+
+
+ test_oil_class_register_impl_by_name();
+ test_oil_class_register_impl();
+ test_oil_class_register_impl_full();
+
+ if(assert_failed)
+ std_log(LOG_FILENAME_LINE,"Test Failed");
+ else
+ std_log(LOG_FILENAME_LINE,"Test Successful");
+ create_xml(0);
+ return 0;
+}
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/liboiltest/src/liboiltest.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/liboiltest/src/liboiltest.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,127 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_liboiltest_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_liboiltest");
+ close_log_file();
+}
+
+void abs_f32_f32_test(float * dest, int dstr, const float * src, int sstr, int n)
+ {
+ int i = 0;
+ std_log(LOG_FILENAME_LINE,"abs_f32_f32_test is called");
+ assert_failed = 0;
+
+ for(i=0; ifunc = (void*)abs_f32_f32_test;
+ impl->name = "abs_f32_f32_test";
+ impl->klass = klass;
+
+ oil_test_set_impl(test, impl);
+
+ if(test->impl != impl)
+ {
+ std_log(LOG_FILENAME_LINE,"oil_test_set_impl failed. errno = %d", errno);
+ assert_failed = 1;
+ }
+
+ p = &test->params[1];
+ footer = p->test_footer;
+ oil_test_set_test_footer(test, p, OIL_TEST_FOOTER+footer_increment);
+
+ if(p->test_footer != footer+footer_increment)
+ {
+ std_log(LOG_FILENAME_LINE,"oil_test_set_test_footer failed. errno = %d", errno);
+ assert_failed = 1;
+ }
+
+ data = (int16_t *)oil_test_get_source_data (test, OIL_ARG_SRC1);
+ n = oil_test_get_arg_pre_n (test, OIL_ARG_SRC1);
+
+ oil_test_cleanup(test);
+ oil_test_free(test);
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"oil_test_new returned NULL. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+ else
+ {
+ std_log(LOG_FILENAME_LINE,"oil_class_get returned NULL. errno = %d", errno);
+ assert_failed = 1;
+ }
+ }
+
+int main (int argc, char *argv[])
+{
+ oil_init ();
+
+ test();
+
+ if(assert_failed)
+ std_log(LOG_FILENAME_LINE,"Test Failed");
+ else
+ std_log(LOG_FILENAME_LINE,"Test Successful");
+
+ create_xml(0);
+ return 0;
+}
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/mas/src/mas.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/mas/src/mas.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,668 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_mas_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_mas");
+ close_log_file();
+}
+
+void test_oil_mas10_u8()
+ {
+ uint8_t input1[2*SIZE];
+ int16_t input2[SIZE/2];
+ int16_t input3[SIZE/10];
+ uint8_t output[SIZE];
+ uint8_t linux_output[] = {17,20,23,26,29,31,34,37,40,43,45,48,51,54,57,60,62,65,68,71};
+ int i,j;
+
+ for(i = 0; i < SIZE; i++)
+ {
+ input1[i] = i;
+ if(i < SIZE/2)
+ input2[i] = i*2;
+ if(i < SIZE/10)
+ input3[i] = i*5;
+ }
+
+ for(j = SIZE; j < 2*SIZE; j++)
+ input1[j] = j;
+
+ oil_mas10_u8(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas10_u8_l15()
+ {
+ uint8_t input1[2*SIZE];
+ int16_t input2[SIZE/2];
+ int16_t input3[SIZE/10];
+ uint8_t output[SIZE];
+ uint8_t linux_output[] = {17,20,23,26,29,31,34,37,40,43,45,48,51,54,57,60,62,65,68,71};
+ int i,j;
+
+ for(i = 0; i < SIZE; i++)
+ {
+ input1[i] = i;
+ if(i < SIZE/2)
+ input2[i] = i*2;
+ if(i < SIZE/10)
+ input3[i] = i*5;
+ }
+
+ for(j = SIZE; j < 2*SIZE; j++)
+ input1[j] = j;
+
+ oil_mas10_u8_l15(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas10_u8_sym_l15()
+ {
+ uint8_t input1[2*SIZE];
+ int16_t input2[SIZE/2];
+ int16_t input3[SIZE/10];
+ uint8_t output[SIZE];
+ uint8_t linux_output[] = {17,20,23,26,29,31,34,37,40,43,45,48,51,54,57,60,62,65,68,71};
+ int i,j;
+
+ for(i = 0; i < SIZE; i++)
+ {
+ input1[i] = i;
+ if(i < SIZE/2)
+ input2[i] = i*2;
+ if(i < SIZE/10)
+ input3[i] = i*5;
+ }
+
+ for(j = SIZE; j < 2*SIZE; j++)
+ input1[j] = j;
+
+ oil_mas10_u8_sym_l15(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas12_addc_rshift_decim2_u8()
+ {
+ uint8_t input[2*SIZE + 12];
+ int16_t taps[12];
+ int16_t offsetshift[2];
+ uint8_t output[SIZE];
+ uint8_t linux_output[] = {31,39,48,56,64,72,81,89,97,105,114,122,130,138,147,155,163,171,180,188};
+ int i,j;
+
+ for(i = 0; i < SIZE; i++)
+ {
+ input[i] = i;
+ if(i < 12)
+ taps[i] = i*2;
+ if(i < 2)
+ offsetshift[i] = i*5;
+ }
+
+ for(j = SIZE; j < 52; j++)
+ input[j] = j;
+
+ oil_mas12_addc_rshift_decim2_u8(output, input, taps, offsetshift, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas2_across_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[SIZE];
+ int16_t input3[SIZE];
+ int16_t input4[2];
+ int16_t input5[2];
+ int16_t output[SIZE];
+ uint8_t linux_output[] = {3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22};
+ int i;
+
+ for(i = 0; i < SIZE; i++)
+ {
+ input1[i] = i+3;
+ input2[i] = i*2;
+ input3[i] = i*5;
+
+ if(i < 2)
+ {
+ input4[i] = i+10;
+ input5[i] = i+20;
+ }
+ }
+
+ oil_mas2_across_add_s16(output, input1, input2, input3, input4, input5, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas2_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[SIZE+1];
+ int16_t input3[2];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22};
+ int i;
+
+ for(i = 0; i <= SIZE; i++)
+ {
+ input2[i] = i*2;
+
+ if(i < SIZE)
+ {
+ input1[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ input3[i] = i*5;
+ input4[i] = i+10;
+ }
+ }
+
+ oil_mas2_add_s16(output, input1, input2, input3, input4, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas4_across_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[100];
+ int16_t input3[4];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {19,23,26,30,33,37,40,44,47,51,54,58,61,65,68,72,75,79,82,86};
+ int i;
+
+ for(i = 0; i < 100; i++)
+ {
+ input2[i] = i;
+
+ if(i < SIZE)
+ {
+ input1[i] = i+3;
+ }
+
+ if(i < 4)
+ {
+ input3[i] = i*5;
+ }
+
+ if(i < 2)
+ {
+ input4[i] = i+10;
+ }
+ }
+
+ oil_mas4_across_add_s16(output, input1, input2, 5, input3, input4, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas4_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[SIZE+3];
+ int16_t input3[4];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22};
+ int i;
+
+ for(i = 0; i < SIZE+3; i++)
+ {
+ input2[i] = i;
+
+ if(i < SIZE)
+ {
+ input1[i] = i+3;
+ }
+
+ if(i < 4)
+ {
+ input3[i] = i*5;
+ }
+
+ if(i < 2)
+ {
+ input4[i] = i+10;
+ }
+ }
+
+ oil_mas4_add_s16(output, input1, input2, input3, input4, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_across_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[SIZE*8];
+ int16_t input3[8];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {139,150,161,172,183,194,205,216,227,238,249,260,271,282,294,305,316,327,338,349};
+ int i;
+
+ for(i = 0; i < SIZE*8; i++)
+ {
+ input2[i] = i;
+
+ if(i < SIZE)
+ {
+ input1[i] = i+3;
+ }
+
+ if(i < 8)
+ {
+ input3[i] = i*5;
+ }
+
+ if(i < 2)
+ {
+ input4[i] = i+10;
+ }
+ }
+
+ oil_mas8_across_add_s16(output, input1, input2, 5, input3, input4, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_across_u8()
+ {
+ uint8_t input1[SIZE*8];
+ int16_t input2[8];
+ int16_t input3[2];
+ uint8_t output[SIZE];
+ int16_t linux_output[] = {35,36,38,39,41,43,44,46,48,49,51,52,54,56,57,59,61,62,64,65};
+ int i;
+
+ for(i = 0; i < SIZE*8; i++)
+ {
+ input1[i] = i;
+
+ if(i < 8)
+ {
+ input2[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ input3[i] = i*5;
+ }
+ }
+
+ oil_mas8_across_u8(output, input1, 5, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_add_s16()
+ {
+ int16_t input1[SIZE];
+ int16_t input2[SIZE+7];
+ int16_t input3[8];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {3,4,5,7,8,9,10,11,12,13,15,16,17,18,19,20,21,23,24,25};
+ int i;
+
+ for(i = 0; i < SIZE+7; i++)
+ {
+ input2[i] = i;
+
+ if(i < SIZE)
+ {
+ input1[i] = i+3;
+ }
+
+ if(i < 8)
+ {
+ input3[i] = i*5;
+ }
+
+ if(i < 2)
+ {
+ input4[i] = i*10;
+ }
+ }
+
+ oil_mas8_add_s16(output, input1, input2, input3, input4, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_addc_rshift_decim2_u8()
+ {
+ uint8_t input1[2*(SIZE+9)];
+ int16_t taps[8];
+ int16_t offsetshift[2];
+ uint8_t output[SIZE];
+ int16_t linux_output[] = {7,10,13,16,20,23,26,29,33,36,39,42,46,49,52,55,59,62,65,68};
+ int i;
+
+ for(i = 0; i < 2*(SIZE+9); i++)
+ {
+ input1[i] = i;
+
+ if(i < 8)
+ {
+ taps[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ offsetshift[i] = i*5;
+ }
+ }
+
+ oil_mas8_addc_rshift_decim2_u8(output, input1, taps, offsetshift, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+
+ }
+
+void test_oil_mas8_u8()
+ {
+ uint8_t input1[SIZE+7];
+ int16_t input2[8];
+ int16_t input3[2];
+ uint8_t output[SIZE];
+ int16_t linux_output[] = {7,8,10,11,13,15,16,18,20,21,23,24,26,28,29,31,33,34,36,37};
+ int i;
+
+ for(i = 0; i < SIZE+7; i++)
+ {
+ input1[i] = i;
+
+ if(i < 8)
+ {
+ input2[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ input3[i] = i*5;
+ }
+ }
+
+ oil_mas8_u8(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_u8_l15()
+ {
+ uint8_t input1[SIZE+7];
+ int16_t input2[8];
+ int16_t input3[2];
+ uint8_t output[SIZE];
+ int16_t linux_output[] = {7,8,10,11,13,15,16,18,20,21,23,24,26,28,29,31,33,34,36,37};
+ int i;
+
+ for(i = 0; i < SIZE+7; i++)
+ {
+ input1[i] = i;
+
+ if(i < 8)
+ {
+ input2[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ input3[i] = i*5;
+ }
+ }
+
+ oil_mas8_u8_l15(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != linux_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,linux_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+void test_oil_mas8_u8_sym_l15()
+ {
+ uint8_t input1[SIZE+7];
+ int16_t input2[8];
+ int16_t input3[2];
+ uint8_t output[SIZE];
+ int16_t expected_output[] = {7,8,10,11,13,15,16,18,20,21,23,24,26,28,29,31,33,34,36,37};
+ int i;
+
+ for(i = 0; i < SIZE+7; i++)
+ {
+ input1[i] = i;
+
+ if(i < 8)
+ {
+ input2[i] = i+3;
+ }
+
+ if(i < 2)
+ {
+ input3[i] = i*5;
+ }
+ }
+
+ oil_mas8_u8_sym_l15(output, input1, input2, input3, SIZE);
+
+ for(i = 0; i < SIZE; i++)
+ {
+ if(output[i] != expected_output[i])
+ {
+ std_log(LOG_FILENAME_LINE, "output[%d]: expected value - %d, actual value - %d", i,expected_output[i],output[i]);
+ assert_failed = 1;
+ }
+ }
+ }
+
+int main (int argc, char *argv[])
+{
+ oil_init ();
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas10_u8 TEST");
+ test_oil_mas10_u8();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas10_u8_l15 TEST");
+ test_oil_mas10_u8_l15();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas10_u8_sym_l15 TEST");
+ test_oil_mas10_u8_sym_l15();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas12_addc_rshift_decim2_u8 TEST");
+ test_oil_mas12_addc_rshift_decim2_u8();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas2_across_add_s16 TEST");
+ test_oil_mas2_across_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas2_add_s16 TEST");
+ test_oil_mas2_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas4_across_add_s16 TEST");
+ test_oil_mas4_across_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas4_add_s16 TEST");
+ test_oil_mas4_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_across_add_s16 TEST");
+ test_oil_mas8_across_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_across_u8 TEST");
+ test_oil_mas8_across_u8();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_add_s16 TEST");
+ test_oil_mas8_add_s16();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_addc_rshift_decim2_u8 TEST");
+ test_oil_mas8_addc_rshift_decim2_u8();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_u8 TEST");
+ test_oil_mas8_u8();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_u8_l15 TEST");
+ test_oil_mas8_u8_l15();
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ std_log(LOG_FILENAME_LINE,"START oil_mas8_u8_sym_l15 TEST");
+ test_oil_mas8_u8_sym_l15(); //Getting different result than linux
+ std_log(LOG_FILENAME_LINE,"END TEST\n");
+
+ if(assert_failed)
+ std_log(LOG_FILENAME_LINE,"Test Failed");
+ else
+ std_log(LOG_FILENAME_LINE,"Test Successful");
+
+ create_xml(0);
+ return 0;
+}
+
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/liboil/tsrc/testsuite/random/src/random.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/liboil/tsrc/testsuite/random/src/random.c Wed Oct 13 19:39:18 2010 +0530
@@ -0,0 +1,104 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+#include
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_random_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_random");
+ close_log_file();
+}
+
+void test_oil_random_s64()
+ {
+ int i = 0;
+ int pos = SIZE;
+
+ oil_type_s64 output1[SIZE];
+ oil_type_s64 output2[SIZE];
+
+ oil_random_s64(output1, SIZE);
+ oil_random_s64(output2, SIZE);
+
+ for(i=0; i
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_swab_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_swab");
+ close_log_file();
+}
+
+void test_oil_swab_u16()
+ {
+ //uint16_t * d_n, const uint16_t * s_n, int n
+ uint16_t output[SIZE];
+ uint16_t input[SIZE];
+ uint16_t linux_output[] = {768,1024,1280,1536,1792,2048,2304,2560,2816,3072,3328,3584,3840,4096,4352,4608,4864,5120,5376,5632};
+ int i = 0;
+
+ for(i=0; i
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_trans8x8_log.txt"
+#include "std_log_result.h"
+#include "utils.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 8*8
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_trans8x8");
+ close_log_file();
+}
+
+void test_oil_trans8x8_f64()
+ {
+ //double * d_8x8, int ds, const double * s_8x8, int ss
+ double output[SIZE];
+ double input[SIZE];
+ double linux_output[SIZE] = {77.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,88.000000000000000,0.000000000000000,0.000000000000000,-2.000000000007314,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000,0.000000000000000};
+ int i = 0;
+
+ for(i=0; i
+#include
+#include
+#include
+
+#include
+
+#define LOG_FILE "c:\\logs\\testsuite_wavelet_log.txt"
+#include "std_log_result.h"
+#define LOG_FILENAME_LINE __FILE__, __LINE__
+
+#define SIZE 20
+
+void create_xml(int result)
+{
+ if(result)
+ assert_failed = 1;
+
+ testResultXml("testsuite_wavelet");
+ close_log_file();
+}
+
+void test_oil_add2_rshift_add_s16()
+ {
+ //int16_t * d, const int16_t * s1, const int16_t * s2, const int16_t * s3, const int16_t * s4_2, int n
+ int16_t input1[SIZE];
+ int16_t input2[SIZE];
+ int16_t input3[SIZE];
+ int16_t input4[2];
+ int16_t output[SIZE];
+ int16_t linux_output[] = {0,1,2,3,5,6,7,9,10,11,13,14,15,17,18,19,21,22,23,24};
+ int i = 0;
+
+ for(i=0; i
#include
+
struct msqid_ds;
struct shmid_ds;
@@ -52,8 +53,14 @@
{
public:
RIpcSession():iIsConnected(EFalse)
- {iLock.CreateLocal();}
-
+ {
+ iLock.CreateLocal();
+ }
+ inline void Close()
+ {
+ iLock.Close();
+ RSessionBase::Close();
+ }
//msgqueue functions
int msgctl(int msqid, int cmd, struct msqid_ds *buf, int &aerrno);
int msgget(key_t key, int msgflg, int& aerrno);
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -189,7 +189,6 @@
//Create Server Locks
err |= iSSLock.CreateLocal();
err |= iCSLock.CreateLocal();
- err |= iIpcS.iLock.CreateLocal();
//Create TLDList Lock
err |= iTLDListLock.CreateLocal();
//Create the lock for Session Path
@@ -2191,7 +2190,7 @@
{
timer.After(*reqarray[numReqs+arraycount], timeout);
// Wait for any request to complete
- CLocalSystemInterface::WaitForNRequest(*reqarray, numReqs+arraycount+1);
+ CLocalSystemInterface::WaitForNRequest(reqarray, numReqs+arraycount+1);
if( (*reqarray[numReqs+arraycount]).Int() == KRequestPending)
{
// The timer hasn't fired yet.
@@ -2206,7 +2205,7 @@
}
else
{
- CLocalSystemInterface::WaitForNRequest(*reqarray, numReqs+arraycount);
+ CLocalSystemInterface::WaitForNRequest(reqarray, numReqs+arraycount);
// Completion Status of one request has been gathered
onedown = ETrue;
}
@@ -3652,6 +3651,47 @@
// Used in lieu of User::WaitForNRequest because of need to support pre-Argus builds
// ---------------------------------------------------------------------------------
//
+void CLocalSystemInterface::WaitForNRequest(TRequestStatus **aStatusArray, TInt aNum)
+ {
+ if (aNum)
+ {
+ // used to keep count of requests we have not been asked to wait for
+ TInt nOther = -1;
+ TBool done = EFalse;
+
+ do
+ {
+ ++nOther;
+ User::WaitForAnyRequest();
+ for (TInt i = 0; i < aNum; ++i)
+ {
+ if ((*aStatusArray[i]).Int() != KRequestPending)
+ {
+ done = ETrue;
+ break;
+ }
+ }
+ } while (!done);
+
+ if (nOther)
+ {
+ // Adjust the thread's signal semaphore to account for the requests
+ // we were not asked to wait for.
+ RThread thrd;
+ for (TInt i = 0; i < nOther; ++i)
+ {
+ thrd.RequestSignal();
+ }
+ }
+ }
+ }
+
+// ---------------------------------------------------------------------------------
+// CLocalSystemInterface::WaitForNRequest
+// Wait for any one of the input asynchronous requests to complete
+// Used in lieu of User::WaitForNRequest because of need to support pre-Argus builds
+// ---------------------------------------------------------------------------------
+//
void CLocalSystemInterface::WaitForNRequest(TRequestStatus aStatusArray[], TInt aNum)
{
if (aNum)
diff -r a1e347446159 -r 28ccaba883f4 genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp
--- a/genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp Fri Sep 17 19:25:42 2010 +0530
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/ufilesocket.cpp Wed Oct 13 19:39:18 2010 +0530
@@ -22,7 +22,7 @@
#include