diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:29:33 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-13 18:29:33 +0200 |
| commit | 39a94d7c2c5d720ee6c8743b7315c7040afdaae1 (patch) | |
| tree | 3163a177a6b26598b39ad1bd94aadb452746ab14 /Source/JavaScriptCore/assembler/ARMAssembler.h | |
| parent | ee8436b6ee3bb3742316b51d3b6bf4330f6c81b1 (diff) | |
| parent | 6eecd106312582cacbfce3085e5a7b0b82778c92 (diff) | |
| download | qtwebkit-39a94d7c2c5d720ee6c8743b7315c7040afdaae1.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Change-Id: Iaa6209d0d611d18b8c916bcd165c8bf5b7441b7b
Diffstat (limited to 'Source/JavaScriptCore/assembler/ARMAssembler.h')
| -rw-r--r-- | Source/JavaScriptCore/assembler/ARMAssembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/JavaScriptCore/assembler/ARMAssembler.h b/Source/JavaScriptCore/assembler/ARMAssembler.h index 18b10179c..31d316d0d 100644 --- a/Source/JavaScriptCore/assembler/ARMAssembler.h +++ b/Source/JavaScriptCore/assembler/ARMAssembler.h @@ -163,8 +163,8 @@ namespace JSC { VMOV_VFP32 = 0x0e000a10, VMOV_ARM32 = 0x0e100a10, VCVT_F64_S32 = 0x0eb80bc0, - VCVT_S32_F64 = 0x0ebd0b40, - VCVT_U32_F64 = 0x0ebc0b40, + VCVT_S32_F64 = 0x0ebd0bc0, + VCVT_U32_F64 = 0x0ebc0bc0, VCVT_F32_F64 = 0x0eb70bc0, VCVT_F64_F32 = 0x0eb70ac0, VMRS_APSR = 0x0ef1fa10, |