summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch
Commit message (Collapse)AuthorAgeFilesLines
* Update contact information in license headers.Sergio Ahumada2012-08-0145-90/+90
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Disable QAtomic assembly code for incompatible compilers.Ian Dean2012-07-201-1/+1
| | | | | Change-Id: I1d0798f766ea82ff18bcec10af4d002dab9c18d6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix qatomic inline asm for x32 ABI.Davide Pesavento2012-06-191-3/+3
| | | | | | | | | | Drop the 'q' suffix from x86_64 asm instructions. It's not needed, because the assembler can automatically determine the proper size based on the target, and it is in fact causing compilation failures on x32. Change-Id: Ie6ff3ddf352a63bc490acce97a3019ce2e48dc70 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix atomics on SPARCThiago Macieira2012-05-031-8/+8
| | | | | | | | | | Inspired by https://bugreports.qt-project.org/secure/attachment/26020/qt_atomic_sparc64.patch Task-number: QTBUG-22479 Change-Id: Ie3275df96c639d6a75e05f70fe5745aeb34457f9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry-picked from commit 01ee0985319a0f41be12c3c8ff3813a74b43835e)
* Removing Symbian fast allocator implementationMurray Read2012-03-1610-6407/+2
| | | | | | | | | | | | | | An implementation of the Symbian fast allocator was added to Qt before it was available in all Symbian devices, to allow Qt the benefit of it in all installations. Now it is available in all Symbian devices and there is no need to keep a copy in Qt. So it is being removed to simplify the code. Task-number: ou1cimx1#946699 Change-Id: I937faca61beb4ef66a858766ebfa3deff564c786 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix q_atomic_decrement for 64-bit SolarisSamuli Piippo2012-03-141-0/+2
| | | | | | | | | | | | | | | | q_atomic_decrement and q_atomic_increment did not set return value correctly. They expected the %eax return value register to be empty, when it was not necessarily so. This could occur when when compiler inlined e.g., ~QByteArray -> QBasicAtomicInt::deref -> q_atomic_decrement chain to application code. Data would not to be freed and leak memory. Fixed so that %eax is now zero'd before setting return value. Task-number: QTBUG-24470 Change-Id: I83495e3ddb938713863a7b00714215c331b9562b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix signature of q_atomic_test_and_set_ptr.Girish Ramakrishnan2012-03-041-1/+1
| | | | | | | | | | | The lack of const results in a compile error when compiling 32-bit Qt in a 64-bit machine (-platform linux-g++-32 -xplatform linux-g++-32). Adding const is safe since expected and newval parameters are not modified by qatomic_i386.s. Task-Number: QTBUG-22479 Change-Id: Iee9f73b9bed777177aeae34bfcedb2feac83e67a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix bug in qatomic for INTEGRITY RTOSKalle Viironen2012-02-081-34/+57
| | | | | | | | Fixes errors in INTEGRITY qatomic pointer and int templates and wrongly defined IS_WAIT_FREE's & IS_NATIVE's Change-Id: I1ab0236bb4979c0fda6a075ca82ee618a6da40e1 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1153-53/+53
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Resolve atomic operations issues on INTEGRITY.Rolland Dudemaine2011-11-151-3/+4
| | | | | | | Now passes atomicpointer autotest successfully. Merge-request: 1438 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-061-0/+3
| | | | | Merge-Request: 1291 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* Fix compilation with thumb2.Eike Ziller2011-08-171-0/+2
| | | | | Task-number: QTBUG-16402 Rubber-stamped-by: Thiago Macieira
* Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1353-905/+905
| | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Update copyright year to 2011.Rohan McGovern2011-03-102-2/+2
| | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3)
* Fix license headersHarald Fernengel2011-02-221-23/+28
|
* Atomic operations support for INTEGRITY RTOSRolland Dudemaine2011-02-224-1/+292
| | | | | | | Added atomic operations using INTEGRITY native APIs Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-181-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation error with ARMv5 atomics when T is a const value.
| * Fix compilation error with ARMv5 atomics when T is a const value.Thiago Macieira2011-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Error was: ../../include/QtCore/../../src/corelib/arch/qatomic_armv5.h:301: error: invalid conversion from 'const void*' to 'void*' faba550d704312a29d9485bcaaa506331f102301 introduced the fix to 4.7, but since the file was renamed in 4.8, the merge didn't apply. The conflict resolution in 91efdcae was incomplete. Reviewed-by: Harald Fernengel
* | Using a better flag to control the fast allocatormread2011-02-031-1/+2
|/ | | | | | | | | | | | | | The Qt fast allocator should be used on any Symbian platform where it is not supplied by euser. But it's better if the code is not there when euser provides the fast allocator as euser's implementation will be better maintained. The previous flag SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS was only associated with euser's fast allocator in S60 10.1. __SYMBIAN_KERNEL_HYBRID_HEAP__ is more accurately associated with it in the new MCL. Task-number: QTBUG-15901 Reviewed-by: Miikka Heikkinen
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-1750-50/+50
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/imageanalyzer/imageanalyzer.h examples/webkit/imageanalyzer/mainwindow.h mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/corelib/kernel/qcoreapplication.cpp src/network/access/qnetworkaccessdatabackend.cpp src/plugins/bearer/connman/qconnmanservice_linux.cpp src/plugins/platforms/openvglite/qwindowsurface_vglite.h src/s60installs/bwins/QtCoreu.def src/s60installs/eabi/QtCoreu.def src/s60installs/s60installs.pro tools/assistant/tools/assistant/helpviewer_qwv.h tools/qdoc3/test/qt-html-templates.qdocconf
| * Update copyright year to 2011.Jason McDonald2011-01-1050-50/+50
| | | | | | | | Reviewed-by: Trust Me
* | Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined.Thiago Macieira2010-11-011-1/+1
| | | | | | | | Reviewed-by: Bradley T. Hughes
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-262-5/+5
|\ \ | | | | | | | | | | | | Conflicts: src/opengl/qwindowsurface_gl.cpp
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-5/+5
| |\ \ | | |/
| | * Fixed many spelling errors.Rohan McGovern2010-10-252-5/+5
| | |
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-224-5/+12
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_win.cpp src/gui/kernel/qwidget.cpp src/gui/text/qfontengine_ft.cpp
| * | Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.Olivier Goffart2010-10-071-1/+1
| | | | | | | | | | | | The file had been renamed so git did not merge it properly
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-073-4/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msbuild_objectmodel.h qmake/generators/win32/msvc_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp src/corelib/arch/qatomic_arm.h tests/auto/qglthreads/tst_qglthreads.cpp
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adding a threshold for partial updates. Fixed arm X11 build.
| | | * Fixed arm X11 build.Samuel Rødal2010-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Without we get error: invalid conversion from 'const void*' to 'void*' Reviewed-by: Thiago Macieira
| | * | fix for USER: 163 panic found on 5800XMmread2010-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The NO_NAMED_LOCAL_CHUNKS macro should have been set for S605.0 builds. Also for S60 3.2 and Symbian^2. All are added. Reviewed-by: Shane Kearns
| | * | Fixed crash on startup in Symbian debug buildGareth Stockwell2010-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a typo in a debug-only function in the hybrid heap allocator. The typo causes an assertion to fail during startup of applications, when using a debug build of Qt. Reviewed-by: mread
| | * | fixed hybrid heap Symbian udeb build issuesmread2010-10-013-2/+9
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed name collision with TAllocFail Added definition for EDebugHdrSize and fixed scope issue Added definition for SRAllocatorBurstFail Added a definition for global enum ETHeapBadDebugFailParameter Tested compilation on: Symbian^3 RnD - armv5_urel, armv5_udeb, winscw_urel, winscw_udeb S60 3.1 SDK - armv5_urel, armv5_udeb S60 5.0 SDK - armv5_urel, armv5_udeb Symbian^3 PDK - armv5_urel, armv5_udeb Symbian^4 RnD - armv5_urel, armv5_udeb Basic functional testing on N8 armv5_urel Task-number: QTBUG-14168 Reviewed-by: Shane Kearns
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0510-1/+6452
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/painting/qpdf.cpp
| * | Fixed compile for symbian.Rohan McGovern2010-10-041-1/+1
| | |
| * | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0410-1/+6452
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| | * hybrid heap improvement in the disabling of BTracemread2010-09-302-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using an inline function for noBTrace() which can be optimised to nothing. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * Further hybrid heap review changesmread2010-09-301-2/+1
| | | | | | | | | | | | | | | | | | | | | this time, adding a comment to explain a performance improvement Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * hybrid heap further review changesmread2010-09-303-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | changing the way enums are declared and used. commenting and restricting export macro changes. improved flagging Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * lower case name for allocator support headermread2010-09-301-0/+0
| | | | | | | | | | | | | | | | | | | | | Using lower case name, as recommended by review comment Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * hybrid allocator integration review updatesmread2010-09-304-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Disabling BTrace use in the heap checking macros without disabling any of the rest of the heap checking functionality. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * hybrid allocator tuningmread2010-09-302-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set various pragmas and defines to tune the hybrid allocator. Performance test was the time takes to allocate or deallocate as appropriate 1,000,000 times from a set of 100,000 pointers, selected at random, with sizes generated randomly with min 2, max 5960, avg 46. The function was exp(8 - log(2 + rand(0..1023))) * rand(1 or 4). The following parameters were chosen: * pragma arm, for ~1.2% * pragma Otime, for ~3% * pragma O2, already the compiler default, just to be sure * all possible slab sizes enabled, for ~1% NB Disabling BTrace would also gain ~1.5%, but that seems like a bad thing to do. Not done. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * declaring fast allocation shrink hysteresis valuemread2010-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The allocator code copied from 10.1 would have no default value set for KHeapShrinkHysRatio, since it's no longer a patchable constant. This change gives it a value of 0x800, to be tuned for performance. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * fast allocator compiling for S60 3.2mread2010-09-304-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | The fast allocator on S60 3.2 can't use TChunkCreateInfo. Instead, RChunk::CreateDisconnectedLocal() has to be used Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The fast allocator switch was in qglobal.h, which is unnessarily global. Instead it has been moved to qt_hybridHeap_symbian_p.h, where is has the minimum visibility required. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * getting fast allocator to compile on S60 5.0 SDKmread2010-09-306-14/+110
| | | | | | | | | | | | | | | | | | | | | | | | This change adds flagging and definitions necessary to get the fast allocator compiling on 5.0 Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * removing header use not in public SDKsmread2010-09-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | u32exec.h was not available in the symbian^3 SDK, so it has been removed and other necessary headers are added. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * added header to arch.primread2010-09-301-1/+2
| | | | | | | | | | | | | | | | | | | | | qt_hybridHeap_symbian_p.h was missing from arch.pri, added. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * added renamed headermread2010-09-301-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | qt_hybridHeap_symbian_p.h was renamed from qt_hybridHeap_symbian.h to make it clear that it's private/internal. But it hadn't been added to git. Now it is. Task-number: QT-3967 Reviewed-by: Shane Kearns
| | * new allocator tidy up and winscw freezemread2010-09-305-86/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | renamed headers diabaled new allocator for winscw builds, and froze the heap creation export Task-number: QT-3967 Reviewed-by: Shane Kearns