Changeset 112192 in webkit for trunk/Source/JavaScriptCore/assembler/SH4Assembler.h

Timestamp:

Mar 26, 2012, 7:03:47 PM (13 years ago)

Author:

[email protected]

Message:

Unaligned userspace access for SH4 platforms
​https://bugs.webkit.org/show_bug.cgi?id=79104

Patch by Thouraya ANDOLSI <​[email protected]> on 2012-03-26
Reviewed by Gavin Barraclough.

• assembler/AbstractMacroAssembler.h:

(Jump):
(JSC::AbstractMacroAssembler::Jump::Jump):
(JSC::AbstractMacroAssembler::Jump::link):

• assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::load16Unaligned):
(JSC::MacroAssemblerSH4::load32WithUnalignedHalfWords):
(JSC::MacroAssemblerSH4::branchDouble):
(JSC::MacroAssemblerSH4::branchTrue):
(JSC::MacroAssemblerSH4::branchFalse):

• assembler/SH4Assembler.h:

(JSC::SH4Assembler::extraInstrForBranch):
(SH4Assembler):
(JSC::SH4Assembler::bra):
(JSC::SH4Assembler::linkJump):

• jit/JIT.h:

(JIT):

• yarr/YarrJIT.cpp:

(JSC::Yarr::YarrGenerator::generatePatternCharacterOnce):

File:

• trunk/Source/JavaScriptCore/assembler/SH4Assembler.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/assembler/SH4Assembler.h

@@ -327 +327 @@
     };
 
+    enum JumpType { JumpFar,
+                    JumpNear
+    };
+
     SH4Assembler()
     {
@@ -1189 +1193 @@
     }
 
+    void extraInstrForBranch(RegisterID dst)
+    {
+        loadConstantUnReusable(0x0, dst);
+        nop();
+        nop();
+    }
+
     AssemblerLabel jmp(RegisterID dst)
     {
@@ -1213 +1224 @@
         AssemblerLabel label = m_buffer.label();
         branch(BT_OPCODE, 0);
+        return label;
+    }
+
+    AssemblerLabel bra()
+    {
+        AssemblerLabel label = m_buffer.label();
+        branch(BRA_OPCODE, 0);
         return label;
     }
@@ -1425 +1443 @@
     // Linking & patching
 
-    void linkJump(AssemblerLabel from, AssemblerLabel to)
+    void linkJump(AssemblerLabel from, AssemblerLabel to, JumpType type = JumpFar)
     {
         ASSERT(to.isSet());
@@ -1433 +1451 @@
         uint16_t instruction = *instructionPtr;
         int offsetBits;
+
+        if (type == JumpNear) {
+            ASSERT((instruction ==  BT_OPCODE) || (instruction == BF_OPCODE) || (instruction == BRA_OPCODE));
+            int offset = (codeSize() - from.m_offset) - 4;
+            *instructionPtr++ = instruction | (offset >> 1);
+            printInstr(*instructionPtr, from.m_offset + 2);
+            return;
+        }
 
         if (((instruction & 0xff00) == BT_OPCODE) || ((instruction & 0xff00) == BF_OPCODE)) {