Changeset 213881 in webkit

Timestamp:

Mar 13, 2017 5:34:28 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

JSC: fix compilation errors for MIPS
​https://bugs.webkit.org/show_bug.cgi?id=168402

Patch by SKumarMetro <​s.kumar@metrological.com> on 2017-03-13
Reviewed by Mark Lam.

• assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::fillNops):
Added.

• assembler/MacroAssemblerMIPS.h:

Added MacroAssemblerMIPS::numGPRs and MacroAssemblerMIPS::numFPRs .

• bytecode/InlineAccess.h:

(JSC::InlineAccess::sizeForPropertyAccess):
(JSC::InlineAccess::sizeForPropertyReplace):
(JSC::InlineAccess::sizeForLengthAccess):
Added MIPS cases.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/MIPSAssembler.h (modified) (2 diffs)
• assembler/MacroAssemblerMIPS.h (modified) (2 diffs)
• bytecode/InlineAccess.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-03-13  SKumarMetro  <s.kumar@metrological.com>
+
+        JSC: fix compilation errors for MIPS
+        https://bugs.webkit.org/show_bug.cgi?id=168402
+
+        Reviewed by Mark Lam.
+
+        * assembler/MIPSAssembler.h:
+        (JSC::MIPSAssembler::fillNops):
+        Added.
+        * assembler/MacroAssemblerMIPS.h:
+        Added MacroAssemblerMIPS::numGPRs and MacroAssemblerMIPS::numFPRs .
+        * bytecode/InlineAccess.h:
+        (JSC::InlineAccess::sizeForPropertyAccess):
+        (JSC::InlineAccess::sizeForPropertyReplace):
+        (JSC::InlineAccess::sizeForLengthAccess):
+        Added MIPS cases.
+
 2017-03-13  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h

@@ -33 +33 @@
 #include "AssemblerBuffer.h"
 #include "JITCompilationEffort.h"
+#include <limits.h>
 #include <wtf/Assertions.h>
 #include <wtf/SegmentedVector.h>
@@ -192 +193 @@
         emitInst(0x00000000);
     }
-
+    
+    static void fillNops(void* base, size_t size, bool isCopyingToExecutableMemory)
+    {
+        UNUSED_PARAM(isCopyingToExecutableMemory);
+        RELEASE_ASSERT(!(size % sizeof(int32_t)));
+
+        int32_t* ptr = static_cast<int32_t*>(base);
+        const size_t num32s = size / sizeof(int32_t);
+        const int32_t insn = 0x00000000;
+        for (size_t i = 0; i < num32s; i++)
+            *ptr++ = insn;
+    }
+    
     void sync()
     {

trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h

@@ -29 +29 @@
 #if ENABLE(ASSEMBLER) && CPU(MIPS)
 
+#include "MIPSAssembler.h"
 #include "AbstractMacroAssembler.h"
-#include "MIPSAssembler.h"
 
 namespace JSC {
@@ -37 +37 @@
 public:
     typedef MIPSRegisters::FPRegisterID FPRegisterID;
+    static const unsigned numGPRs = 32;
+    static const unsigned numFPRs = 32;
 
     MacroAssemblerMIPS()

trunk/Source/JavaScriptCore/bytecode/InlineAccess.h

@@ -56 +56 @@
         return 52;
 #endif
+#elif CPU(MIPS)
+        return 72;
 #else
 #error "unsupported platform"
@@ -76 +78 @@
         return 48;
 #endif
+#elif CPU(MIPS)
+        return 72;
 #else
 #error "unsupported platform"
@@ -99 +103 @@
         size_t size = 32;
 #endif
+#elif CPU(MIPS)
+        size_t size = 56;
 #else
 #error "unsupported platform"