Changeset 156120 in webkit for trunk/Source/JavaScriptCore/ftl/FTLCArgumentGetter.h

Timestamp:

Sep 19, 2013, 3:10:26 PM (12 years ago)

Author:

[email protected]

Message:

Move CCallHelpers and AssemblyHelpers into jit/ and have JSInterfaceJIT use them
​https://bugs.webkit.org/show_bug.cgi?id=121637

Rubber stamped by Michael Saboff.

Also moved GPRInfo/FPRInfo into jit/.

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• bytecode/ValueRecovery.h:

(JSC::ValueRecovery::dumpInContext):

• dfg/DFGAssemblyHelpers.cpp: Removed.
• dfg/DFGAssemblyHelpers.h: Removed.
• dfg/DFGBinarySwitch.h:
• dfg/DFGByteCodeParser.cpp:
• dfg/DFGCCallHelpers.h: Removed.
• dfg/DFGDisassembler.cpp:
• dfg/DFGFPRInfo.h: Removed.
• dfg/DFGGPRInfo.h: Removed.
• dfg/DFGGraph.cpp:
• dfg/DFGGraph.h:
• dfg/DFGJITCompiler.h:
• dfg/DFGOSRExit.cpp:
• dfg/DFGOSRExit.h:
• dfg/DFGOSRExitCompiler.h:
• dfg/DFGOSRExitCompilerCommon.h:
• dfg/DFGRegisterBank.h:
• dfg/DFGRegisterSet.h:
• dfg/DFGRepatch.cpp:
• dfg/DFGSilentRegisterSavePlan.h:
• dfg/DFGThunks.cpp:
• dfg/DFGVariableEvent.cpp:
• ftl/FTLCArgumentGetter.h:

(JSC::FTL::CArgumentGetter::CArgumentGetter):
(JSC::FTL::CArgumentGetter::loadNext8):
(JSC::FTL::CArgumentGetter::loadNext32):
(JSC::FTL::CArgumentGetter::loadNext64):
(JSC::FTL::CArgumentGetter::loadNextPtr):
(JSC::FTL::CArgumentGetter::loadNextDouble):

• ftl/FTLCompile.cpp:
• ftl/FTLExitThunkGenerator.h:
• ftl/FTLLink.cpp:
• ftl/FTLThunks.cpp:
• jit/AssemblyHelpers.cpp: Copied from Source/JavaScriptCore/dfg/DFGAssemblyHelpers.cpp.
• jit/AssemblyHelpers.h: Copied from Source/JavaScriptCore/dfg/DFGAssemblyHelpers.h.

(JSC::AssemblyHelpers::AssemblyHelpers):
(JSC::AssemblyHelpers::debugCall):

• jit/CCallHelpers.h: Copied from Source/JavaScriptCore/dfg/DFGCCallHelpers.h.
• jit/FPRInfo.h: Copied from Source/JavaScriptCore/dfg/DFGFPRInfo.h.

(WTF::printInternal):

• jit/GPRInfo.h: Copied from Source/JavaScriptCore/dfg/DFGGPRInfo.h.

(WTF::printInternal):

• jit/JIT.cpp:

(JSC::JIT::JIT):

• jit/JIT.h:
• jit/JITPropertyAccess.cpp:

(JSC::JIT::stringGetByValStubGenerator):

• jit/JITPropertyAccess32_64.cpp:

(JSC::JIT::stringGetByValStubGenerator):

• jit/JSInterfaceJIT.h:

(JSC::JSInterfaceJIT::JSInterfaceJIT):

• jit/SpecializedThunkJIT.h:

(JSC::SpecializedThunkJIT::SpecializedThunkJIT):
(JSC::SpecializedThunkJIT::finalize):

• jit/ThunkGenerators.cpp:

(JSC::linkForGenerator):
(JSC::virtualForGenerator):
(JSC::stringLengthTrampolineGenerator):
(JSC::nativeForGenerator):
(JSC::arityFixup):
(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::floorThunkGenerator):
(JSC::ceilThunkGenerator):
(JSC::roundThunkGenerator):
(JSC::expThunkGenerator):
(JSC::logThunkGenerator):
(JSC::absThunkGenerator):
(JSC::powThunkGenerator):
(JSC::imulThunkGenerator):

• llint/LLIntThunks.cpp:

(JSC::LLInt::generateThunkWithJumpTo):

• runtime/JSCJSValue.h:

File:

• trunk/Source/JavaScriptCore/ftl/FTLCArgumentGetter.h (modified) (8 diffs)

trunk/Source/JavaScriptCore/ftl/FTLCArgumentGetter.h

@@ -31 +31 @@
 #if ENABLE(FTL_JIT)
 
-#include "DFGAssemblyHelpers.h"
+#include "AssemblyHelpers.h"
 #include "FTLValueFormat.h"
 
@@ -54 +54 @@
     // It will be 1 if you haven't pushed or popped after the call; i.e. the only
     // thing is the return address.
-    CArgumentGetter(DFG::AssemblyHelpers& jit, int peekOffset = 1)
+    CArgumentGetter(AssemblyHelpers& jit, int peekOffset = 1)
         : m_jit(jit)
         , m_peekOffset(peekOffset)
@@ -63 +63 @@
     }
     
-    void loadNext8(DFG::GPRReg destination)
+    void loadNext8(GPRReg destination)
     {
-        ASSERT(!isArgumentRegister<DFG::GPRInfo>(destination));
-        if (m_gprArgumentIndex < DFG::GPRInfo::numberOfArgumentRegisters) {
-            m_jit.move(DFG::GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
+        ASSERT(!isArgumentRegister<GPRInfo>(destination));
+        if (m_gprArgumentIndex < GPRInfo::numberOfArgumentRegisters) {
+            m_jit.move(GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
             return;
         }
@@ -74 +74 @@
     }
     
-    void loadNext32(DFG::GPRReg destination)
+    void loadNext32(GPRReg destination)
     {
-        ASSERT(!isArgumentRegister<DFG::GPRInfo>(destination));
-        if (m_gprArgumentIndex < DFG::GPRInfo::numberOfArgumentRegisters) {
-            m_jit.move(DFG::GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
+        ASSERT(!isArgumentRegister<GPRInfo>(destination));
+        if (m_gprArgumentIndex < GPRInfo::numberOfArgumentRegisters) {
+            m_jit.move(GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
             return;
         }
@@ -85 +85 @@
     }
     
-    void loadNext64(DFG::GPRReg destination)
+    void loadNext64(GPRReg destination)
     {
-        ASSERT(!isArgumentRegister<DFG::GPRInfo>(destination));
-        if (m_gprArgumentIndex < DFG::GPRInfo::numberOfArgumentRegisters) {
-            m_jit.move(DFG::GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
+        ASSERT(!isArgumentRegister<GPRInfo>(destination));
+        if (m_gprArgumentIndex < GPRInfo::numberOfArgumentRegisters) {
+            m_jit.move(GPRInfo::toArgumentRegister(m_gprArgumentIndex++), destination);
             return;
         }
@@ -96 +96 @@
     }
     
-    void loadNextPtr(DFG::GPRReg destination)
+    void loadNextPtr(GPRReg destination)
     {
         loadNext64(destination);
     }
     
-    void loadNextDouble(DFG::FPRReg destination)
+    void loadNextDouble(FPRReg destination)
     {
         ASSERT(
-            !isArgumentRegister<DFG::FPRInfo>(destination)
-            || destination == DFG::FPRInfo::argumentFPR0);
+            !isArgumentRegister<FPRInfo>(destination)
+            || destination == FPRInfo::argumentFPR0);
         
-        if (m_fprArgumentIndex < DFG::FPRInfo::numberOfArgumentRegisters) {
-            m_jit.moveDouble(DFG::FPRInfo::toArgumentRegister(m_fprArgumentIndex++), destination);
+        if (m_fprArgumentIndex < FPRInfo::numberOfArgumentRegisters) {
+            m_jit.moveDouble(FPRInfo::toArgumentRegister(m_fprArgumentIndex++), destination);
             return;
         }
@@ -116 +116 @@
     
     void loadNextAndBox(
-        ValueFormat, DFG::GPRReg destination,
-        DFG::GPRReg scratch1 = InvalidGPRReg, DFG::GPRReg scratch2 = InvalidGPRReg);
+        ValueFormat, GPRReg destination,
+        GPRReg scratch1 = InvalidGPRReg, GPRReg scratch2 = InvalidGPRReg);
 
 private:
@@ -127 +127 @@
     }
             
-    DFG::AssemblyHelpers& m_jit;
+    AssemblyHelpers& m_jit;
     unsigned m_peekOffset;
     unsigned m_gprArgumentIndex;