diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:04:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 15:32:19 +0200 |
| commit | 07782f48f4318a7261f1b0ddcd686b19ec812e36 (patch) | |
| tree | 3fa2aa3a1170ad7ebaf5b1641cdce19a941ca480 /src/qml/jsruntime/qv4value_p.h | |
| parent | 50fcdfd705c2ad9560641986bf4152b017ee8bb6 (diff) | |
| parent | f15a90e5d10465e66698209a5d88f1e63ae336fa (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/qml/qml/qqmlbinding.cpp
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4functionobject.cpp
Change-Id: Ic752e9dfd69b282093651c9234c110a49762f06d
Diffstat (limited to 'src/qml/jsruntime/qv4value_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4value_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4value_p.h b/src/qml/jsruntime/qv4value_p.h index ae1e8fbd32..7deb2098ac 100644 --- a/src/qml/jsruntime/qv4value_p.h +++ b/src/qml/jsruntime/qv4value_p.h @@ -54,8 +54,8 @@ struct Q_QML_PRIVATE_EXPORT Value /* We use two different ways of encoding JS values. One for 32bit and one for 64bit systems. - In both cases, we 8 bytes for a value and different variant of NaN boxing. A Double NaN (actually -qNaN) - is indicated by a number that has the top 13 bits set. THe other values are usually set to 0 by the + In both cases, we use 8 bytes for a value and a different variant of NaN boxing. A Double NaN (actually -qNaN) + is indicated by a number that has the top 13 bits set. The other values are usually set to 0 by the processor, and are thus free for us to store other data. We keep pointers in there for managed objects, and encode the other types using the free space given to use by the unused bits for NaN values. This also works for pointers on 64 bit systems, as they all currently only have 48 bits of addressable memory. @@ -63,7 +63,7 @@ struct Q_QML_PRIVATE_EXPORT Value On 32bit, we store doubles as doubles. All other values, have the high 32bits set to a value that will make the number a NaN. The Masks below are used for encoding the other types. - On 64 bit, we xor Doubles with (0xffff8000 << 32). Thas has the effect that no doubles will get encoded + On 64 bit, we xor Doubles with (0xffff8000 << 32). That has the effect that no doubles will get encoded with the 13 highest bits all 0. We are now using special values for bits 14-17 to encode our values. These can be used, as the highest valid pointer on a 64 bit system is 2^48-1. |