Title: [122357] trunk/Source/_javascript_Core
Revision
122357
Author
[email protected]
Date
2012-07-11 12:48:29 -0700 (Wed, 11 Jul 2012)

Log Message

Add MIPS convertibleLoadPtr and other functions
https://bugs.webkit.org/show_bug.cgi?id=90714

Patch by Chao-ying Fu <[email protected]> on 2012-07-11
Reviewed by Oliver Hunt.

* assembler/MIPSAssembler.h:
(JSC::MIPSAssembler::labelIgnoringWatchpoints):
(MIPSAssembler):
(JSC::MIPSAssembler::replaceWithLoad):
(JSC::MIPSAssembler::replaceWithAddressComputation):
* assembler/MacroAssemblerMIPS.h:
(JSC::MacroAssemblerMIPS::convertibleLoadPtr):
(MacroAssemblerMIPS):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (122356 => 122357)


--- trunk/Source/_javascript_Core/ChangeLog	2012-07-11 19:41:03 UTC (rev 122356)
+++ trunk/Source/_javascript_Core/ChangeLog	2012-07-11 19:48:29 UTC (rev 122357)
@@ -1,3 +1,19 @@
+2012-07-11  Chao-ying Fu  <[email protected]>
+
+        Add MIPS convertibleLoadPtr and other functions
+        https://bugs.webkit.org/show_bug.cgi?id=90714
+
+        Reviewed by Oliver Hunt.
+
+        * assembler/MIPSAssembler.h:
+        (JSC::MIPSAssembler::labelIgnoringWatchpoints):
+        (MIPSAssembler):
+        (JSC::MIPSAssembler::replaceWithLoad):
+        (JSC::MIPSAssembler::replaceWithAddressComputation):
+        * assembler/MacroAssemblerMIPS.h:
+        (JSC::MacroAssemblerMIPS::convertibleLoadPtr):
+        (MacroAssemblerMIPS):
+
 2012-07-11  Anders Carlsson  <[email protected]>
 
         Add -Wtautological-compare and -Wsign-compare warning flags

Modified: trunk/Source/_javascript_Core/assembler/MIPSAssembler.h (122356 => 122357)


--- trunk/Source/_javascript_Core/assembler/MIPSAssembler.h	2012-07-11 19:41:03 UTC (rev 122356)
+++ trunk/Source/_javascript_Core/assembler/MIPSAssembler.h	2012-07-11 19:48:29 UTC (rev 122357)
@@ -616,6 +616,11 @@
 
     // General helpers
 
+    AssemblerLabel labelIgnoringWatchpoints()
+    {
+        return m_buffer.label();
+    }
+
     AssemblerLabel label()
     {
         return m_buffer.label();
@@ -809,6 +814,28 @@
 #endif
     }
 
+    static void replaceWithLoad(void* instructionStart)
+    {
+        MIPSWord* insn = reinterpret_cast<MIPSWord*>(instructionStart);
+        ASSERT((*insn & 0xffe00000) == 0x3c000000); // lui
+        insn++;
+        ASSERT((*insn & 0xfc0007ff) == 0x00000021); // addu
+        insn++;
+        *insn = 0x8c000000 | ((*insn) & 0x3ffffff); // lw
+        cacheFlush(insn, 4);
+    }
+
+    static void replaceWithAddressComputation(void* instructionStart)
+    {
+        MIPSWord* insn = reinterpret_cast<MIPSWord*>(instructionStart);
+        ASSERT((*insn & 0xffe00000) == 0x3c000000); // lui
+        insn++;
+        ASSERT((*insn & 0xfc0007ff) == 0x00000021); // addu
+        insn++;
+        *insn = 0x24000000 | ((*insn) & 0x3ffffff); // addiu
+        cacheFlush(insn, 4);
+    }
+
 private:
     /* Update each jump in the buffer of newBase.  */
     void relocateJumps(void* oldBase, void* newBase)

Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h (122356 => 122357)


--- trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2012-07-11 19:41:03 UTC (rev 122356)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerMIPS.h	2012-07-11 19:48:29 UTC (rev 122357)
@@ -496,6 +496,20 @@
         ASSERT_NOT_REACHED();
     }
 
+    ConvertibleLoadLabel convertibleLoadPtr(Address address, RegisterID dest)
+    {
+        ConvertibleLoadLabel result(this);
+        /*
+            lui     addrTemp, (offset + 0x8000) >> 16
+            addu    addrTemp, addrTemp, base
+            lw      dest, (offset & 0xffff)(addrTemp)
+        */
+        m_assembler.lui(addrTempRegister, (address.offset + 0x8000) >> 16);
+        m_assembler.addu(addrTempRegister, addrTempRegister, address.base);
+        m_assembler.lw(dest, addrTempRegister, address.offset);
+        return result;
+    }
+
     // Memory access operations:
     //
     // Loads are of the form load(address, destination) and stores of the form
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to