Changeset 159422 in webkit

Timestamp:

Nov 18, 2013 8:01:17 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Remove architecture specific code in LowLevelInterpreter.
​https://bugs.webkit.org/show_bug.cgi?id=124501

Patch by Julien Brianceau <​jbriance@cisco.com> on 2013-11-18
Reviewed by Michael Saboff.

• llint/LowLevelInterpreter.asm: Use generic path instead of sh4 specific code.
• llint/LowLevelInterpreter32_64.asm: Merge sh4/mips path with arm path. The

"move t0, a0" is not needed for arm because t0 == a0 with this architecture.

• offlineasm/sh4.rb: Handle move opcode with pr register.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (2 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (2 diffs)
• offlineasm/sh4.rb (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-11-18  Julien Brianceau  <jbriance@cisco.com>
+
+        Remove architecture specific code in LowLevelInterpreter.
+        https://bugs.webkit.org/show_bug.cgi?id=124501
+
+        Reviewed by Michael Saboff.
+
+        * llint/LowLevelInterpreter.asm: Use generic path instead of sh4 specific code.
+        * llint/LowLevelInterpreter32_64.asm: Merge sh4/mips path with arm path. The
+        "move t0, a0" is not needed for arm because t0 == a0 with this architecture.
+        * offlineasm/sh4.rb: Handle move opcode with pr register.
+
 2013-11-18  Julien Brianceau  <jbriance@cisco.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -208 +208 @@
 
 macro preserveReturnAddressAfterCall(destinationRegister)
-    if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS
+    if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS or SH4
         # In C_LOOP case, we're only preserving the bytecode vPC.
         move lr, destinationRegister
-    elsif SH4
-        stspr destinationRegister
     elsif X86 or X86_64
         pop destinationRegister
@@ -221 +219 @@
 
 macro restoreReturnAddressBeforeReturn(sourceRegister)
-    if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS
+    if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS or SH4
         # In C_LOOP case, we're only restoring the bytecode vPC.
         move sourceRegister, lr
-    elsif SH4
-        ldspr sourceRegister
     elsif X86 or X86_64
         push sourceRegister

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -1911 +1911 @@
         andp MarkedBlockMask, t3
         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
-    elsif ARM or ARMv7 or ARMv7_TRADITIONAL
+    elsif ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
         loadp ScopeChain[cfr], t3
         andp MarkedBlockMask, t3
@@ -1923 +1923 @@
         loadp JSFunction::m_executable[t1], t1
         move t2, cfr
-        call executableOffsetToFunction[t1]
-        restoreReturnAddressBeforeReturn(t3)
-        loadp ScopeChain[cfr], t3
-        andp MarkedBlockMask, t3
-        loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
-    elsif MIPS or SH4
-        loadp ScopeChain[cfr], t3
-        andp MarkedBlockMask, t3
-        loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
-        storep cfr, VM::topCallFrame[t3]
-        move t0, t2
-        preserveReturnAddressAfterCall(t3)
-        storep t3, ReturnPC[cfr]
-        move cfr, t0
-        loadi Callee + PayloadOffset[cfr], t1
-        loadp JSFunction::m_executable[t1], t1
-        move t2, cfr
-        move t0, a0
+        if MIPS or SH4
+            move t0, a0
+        end
         call executableOffsetToFunction[t1]
         restoreReturnAddressBeforeReturn(t3)

trunk/Source/JavaScriptCore/offlineasm/sh4.rb

@@ -490 +490 @@
         if node.is_a? Instruction
             case node.opcode
+            when "move"
+                if node.operands[0].is_a? RegisterID and node.operands[0].sh4Operand == "pr"
+                    newList << Instruction.new(codeOrigin, "stspr", [node.operands[1]])
+                elsif node.operands[1].is_a? RegisterID and node.operands[1].sh4Operand == "pr"
+                    newList << Instruction.new(codeOrigin, "ldspr", [node.operands[0]])
+                else
+                    newList << node
+                end
             when "loadi", "loadis", "loadp"
                 if node.operands[1].is_a? RegisterID and node.operands[1].sh4Operand == "pr"