aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty/masm/masm-defs.pri
Commit message (Collapse)AuthorAgeFilesLines
* Fix symbol clash with QtScript when linking staticallyVladyslav Brovko2017-09-071-0/+1
| | | | | | Task-number: QTBUG-63050 Change-Id: I18c8cfae3cc4d8a6d2c82515541693b7b5194f76 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build with GCC 7Marc Mutz2017-03-221-0/+7
| | | | | | | | | | | | GCC 7 warns about preprocessor macros expanding to defined(), which the masm config macros use pervasively. Fix by suppressing the warning (-Wexpansion-to-defined). Task-number: QTBUG-59647 Change-Id: I9220741cf594824472bffc2305b994b311e55832 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* V4: Correctly enable the arm64/aarch64 disassemblerErik Verbruggen2016-08-101-1/+2
| | | | | Change-Id: Icdc82f831ee630de301e19313893d0f70654948c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove Windows CE.Friedemann Kleint2016-03-101-2/+0
| | | | | | | | Remove #ifdef sections for Q_OS_WINCE and wince .pro file clauses. Task-number: QTBUG-51673 Change-Id: I33ab74f0c2ce9086c3610c5fa727f281197b6b55 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* V4: Tweak "enable JIT" ifdefs.Erik Verbruggen2016-01-201-0/+4
| | | | | | | | | | | - indentation, to make it readable - on arm64: only enable for Linux (but only after future testing!) - add CONFIG+=force-compile-jit handling so the JIT can be compiled/used even on platforms that don't officially support it (like iOS, where it works if you run from Xcode). This is done for debugging purposes. Change-Id: I8611ba409e10305f480463a16d88bc854b1c218a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* V4: add Aarch64/ARM64 support.Erik Verbruggen2016-01-191-1/+1
| | | | | | | | | | This uses the JavaScriptCore assembler rev. 195098. It is tested on iOS (for which it is disabled, as it only allows marking pages as executable when running from Xcode). Testing on Linux will be done when hardware arrives. Change-Id: I650e15fec03c27d4b326a2d70863a89b85cfc5c3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* V4 JIT: Switch all platforms to W^X for the ExecutableAllocator.Erik Verbruggen2016-01-151-2/+1
| | | | | | | | This also fixes makeWritable, which needs to work in order to add more c0d3 to used pages. Also finish the WinRT parts. Change-Id: Idaa4187b1ec256e65c881285a608f3a51fdbeebd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* V4: add mips32 disassembler.Julien Brianceau2015-06-191-0/+1
| | | | | | | | | Add a rudimentary disassembler for mips32 instruction set. Although few instructions might be missing, the whole set from MacroAssemblerMIPS should be covered. Change-Id: I9b1b9b40537b99098ca65036f671651d04fe1ab6 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* V4 JIT: enable disassembler on windows.Erik Verbruggen2014-03-031-1/+1
| | | | | Change-Id: I55a2a96a1a774c79cc2146c6b47d441fede1d102 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* V4 ARM JIT: make CONFIG+=disassembler work on ARM.Erik Verbruggen2014-02-171-1/+1
| | | | | Change-Id: I164813c8939849e63103c447a7f64699003d00da Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Avoid symbol clashes when linking QtDeclarative and QtScript staticallySimon Hausmann2013-11-221-0/+5
| | | | | | | | | Re-define the three symbols we actually implement (as stubs). Task-number: QTBUG-35041 Change-Id: Ie9511207440fa23645e52643881f5993177a4368 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Disable WTF assertions in release buildsSimon Hausmann2013-10-171-0/+2
| | | | | | | Define NDEBUG to disable them. Change-Id: Ie1f08863b9b483216be2c0768b505f2e9e7ccef8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix build on ARM in ARM mode (instead of thumb2)Simon Hausmann2013-10-171-17/+0
| | | | | | | | | | We don't support the traditional ARM assembler (yet), only JIT on thumb2. In order for us to reliably check that, we have to wait until the pre-processor runs, which this patch achieves by moving all JIT enable/disable decisions into qv4global_p.h Change-Id: I7eff5b4fbf1cd26297a08dee16984ad867358113 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add support for showing disassembled ARM JIT codeSimon Hausmann2013-10-101-2/+6
| | | | | | | | | | Ported the ARM disassembler from upstream trunk. QtQml needs to be configured with qmake CONFIG+=disassembler and QV4_SHOW_ASM=1 enables the dump at run-time. Change-Id: Ia13a98835829fde0d3c5a795cb8f6ef9de951807 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* V4: invert conditions when the true block follows the test.Erik Verbruggen2013-10-031-0/+1
| | | | | Change-Id: I5044acd4263b71734e4eb5d7e74b1a4a8414741e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Android: Fix compilation when doing ARM buildsSimon Hausmann2013-09-181-3/+10
| | | | | | | | | | | Clean up the code to determine when to _disable_ the JIT and add Android to that list when targeting ARMv5 (dubbed armeabi as opposed to armeabi-v7a) Task-number: QTBUG-33507 Change-Id: Id78e08e888df8f8075d5655e15bb754cede70638 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* wince: Build fix, disable the assembler when JIT is disabled.Sérgio Martins2013-08-291-2/+3
| | | | | Change-Id: Ibd22f27401c3751bc64749c6f1eea3aba57d66eb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix compilation with MSVC 2008 (and prospective Windows CE build fix)Simon Hausmann2013-08-221-1/+2
| | | | | | | | | | | | | | | | | * Only 2010 and newer ship stdint.h, so for 2008 we have to provide a little stdint.h compat header, for some of the third-party code we import. Our own Qt code this patch changes to use quint* types instead. * Include math.h and float.h for some math functions. * disable the JIT on Windows CE for now. * Change use of intptr_t to qintptr in Qt code. intptr_t is in inttypes.h, except that with VS 2008 it is indirectly available through stdio.h. Let's avoid the mess and just use the qt type, that's always available. Change-Id: I19055edd89e0a6b147d9edbb3b711798ed3c05a5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Disable the udis86 disassembler by defaultLars Knoll2013-08-081-1/+1
| | | | | | | | | It's only required for debugging the JIT, and thus shouldn't be included in a regular build. Enable it with CONFIG+=disassembler Change-Id: I71264da0be00e8618f120ac9d3d06e6cb4b6dfae Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Disable the JIT on Windows 64-bit again until the exception support is ↵Simon Hausmann2013-07-301-1/+1
| | | | | | | | | implemented Use the interpreter in the meantime, so that we get sensible test results in the CI system Change-Id: Ib8089836b705433cd15e037d4d2dd662648c941f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix JIT selection on Android with ARM buildsSimon Hausmann2013-07-051-0/+6
| | | | | | | | | | Debug builds on Android are done as ARM builds instead of thumb because of problems with debugging thumb builds with older toolchains. However for the JIT we're not interested in such a choice and prefer to have a consistent choice of JIT - thumb2 generated code in release _and_ debug builds. Change-Id: I36b1ec76311b409e36e3fb38c46c6c193adb1be8 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* JIT: support WIN64Erik Verbruggen2013-07-031-1/+1
| | | | | Change-Id: Id657831231ddec66f7d41f32aaac22a71c4c1673 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Disable the JIT on Windows/AMD64 as well as on iOSSimon Hausmann2013-06-261-3/+3
| | | | | Change-Id: I7402981caa2f73fd0712975e657488a4065f403f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add flag to the engine to enable/disable RegExp JITting.Erik Verbruggen2013-05-081-0/+1
| | | | | Change-Id: I4b632e6f8ab7cf20576f94764ed506de8be63efb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Speed up regular expression matchingSimon Hausmann2013-04-161-1/+1
| | | | | | | | Use the Yarr JIT back-end if possible. Speeds up the RegExp v8 benchmark by a factor of 3. Change-Id: I7c6c8086d1d07dcd13400e3cc8bbae408ea67198 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make it possible to omit the udis86 assembler from compilationSimon Hausmann2013-02-091-1/+3
| | | | | | | | Disable it on Windows and enable it generally only on x86 and amd64 architectures. Change-Id: If8f366a3095608b9afcd30dee6dc636d442d4107 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Work around broken min/max macro definitions on WindowsSimon Hausmann2013-02-091-0/+2
| | | | | | | | | Windows defines min and max to macros, which breaks code that for example uses std::max. Defining NOMINMAX globally prevents WinDefs.h from defining those macros. Change-Id: Ib79a48f9139febd1429a11753ffef4430953a3b4 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Avoid duplicated feature defines between tools/v4/v4.pro and src/v4/v4.proSimon Hausmann2013-02-011-0/+24
Centralize the macros in v4.pri that's included by both. Change-Id: I1ae2ed3b7b97a4e905d2e4ae563c99c964253bb1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>