Attachment 383802 Details for Bug 204326 – Patch

[patch] Patch

patch204326 (text/plain), 1.73 KB, created by Robin Morisset on 2019-11-18 16:13:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Robin Morisset

Created: 2019-11-18 16:13:18 PST

Size: 1.73 KB

patch

obsolete

>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 5e3e53cca22..a96508d6a44 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-11-18  Robin Morisset  <rmorisset@apple.com>
>+
>+        Fix load<16> on ARM64
>+        https://bugs.webkit.org/show_bug.cgi?id=204326
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        On ARM64 I used load<16> in https://bugs.webkit.org/show_bug.cgi?id=202832.
>+        Unfortunately it turns out to call ldr<16>, and ldr<n> asserts that n is either 32 or 64.
>+        This fix simply calls ldrh/strh directly.
>+
>+        * assembler/MacroAssemblerARM64.h:
>+        (JSC::MacroAssemblerARM64::load16):
>+        (JSC::MacroAssemblerARM64::store16):
>+
> 2019-11-13  Robin Morisset  <rmorisset@apple.com>
> 
>         [ESNext][BigInt] Add support for op_inc
>diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
>index 20690e41425..c66ff0fe211 100644
>--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
>+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h
>@@ -1254,7 +1254,8 @@ public:
> 
>     void load16(const void* address, RegisterID dest)
>     {
>-        load<16>(address, dest);
>+        move(TrustedImmPtr(address), dataTempRegister);
>+        m_assembler.ldrh(dest, dataTempRegister, 0);
>     }
> 
>     void load16Unaligned(ImplicitAddress address, RegisterID dest)
>@@ -1567,7 +1568,8 @@ public:
> 
>     void store16(RegisterID src, const void* address)
>     {
>-        store<16>(src, address);
>+        move(TrustedImmPtr(address), dataTempRegister);
>+        m_assembler.strh(src, dataTempRegister, 0);
>     }
> 
>     void store16(TrustedImm32 imm, const void* address)

Actions: View | Formatted Diff | Diff

Attachments on bug 204326: 383802 | 383803 | 383805