Changeset 252699 in webkit for trunk/Source/JavaScriptCore/assembler

Timestamp:

Nov 20, 2019, 12:06:52 PM (6 years ago)

Author:

[email protected]

Message:

Fix load<16> on ARM64
​https://bugs.webkit.org/show_bug.cgi?id=204326

Reviewed by Mark Lam.

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):

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h

@@ -1255 +1255 @@
     void load16(const void* address, RegisterID dest)
     {
-        load<16>(address, dest);
+        moveToCachedReg(TrustedImmPtr(address), cachedMemoryTempRegister());
+        m_assembler.ldrh(dest, memoryTempRegister, 0);
     }
 
@@ -1568 +1569 @@
     void store16(RegisterID src, const void* address)
     {
-        store<16>(src, address);
+        moveToCachedReg(TrustedImmPtr(address), cachedMemoryTempRegister());
+        m_assembler.strh(src, memoryTempRegister, 0);
     }