Changeset 105035 in webkit for trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h

Timestamp:

Jan 15, 2012, 8:03:47 PM (13 years ago)

Author:

[email protected]

Message:

The C calling convention logic in DFG::SpeculativeJIT should be available even
when not generating code for the DFG speculative path
​https://bugs.webkit.org/show_bug.cgi?id=76355

Reviewed by Dan Bernstein.

Moved all of the logic for placing C call arguments into the right place (stack
or registers) into a new class, DFG::CCallHelpers. This class inherits from
AssemblyHelpers, another DFG grab-bag of helper functions. I could have moved
this code into AssemblyHelpers, but decided against it, because I wanted to
limit the number of methods each class in the JIT has. Hence now we have a
slightly odd organization of JIT classes in DFG: MacroAssembler (basic instruction
emission) <= AssemblyHelpers (some additional JS smarts) <= CCallHelpers
(understands calls to C functions) <= JITCompiler (can compile a graph to machine
code). Each of these except for JITCompiler can be reused for stub compilation.

• GNUmakefile.list.am:
• JavaScriptCore.xcodeproj/project.pbxproj:
• dfg/DFGCCallHelpers.h: Added.

(JSC::DFG::CCallHelpers::CCallHelpers):
(JSC::DFG::CCallHelpers::resetCallArguments):
(JSC::DFG::CCallHelpers::addCallArgument):
(JSC::DFG::CCallHelpers::setupArguments):
(JSC::DFG::CCallHelpers::setupArgumentsExecState):
(JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
(JSC::DFG::CCallHelpers::setupTwoStubArgs):
(JSC::DFG::CCallHelpers::setupStubArguments):

• dfg/DFGJITCompiler.h:

(JSC::DFG::JITCompiler::JITCompiler):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculativeJIT::callOperation):

File:

• trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/dfg/DFGJITCompiler.h

@@ -32 +32 @@
 #include <assembler/MacroAssembler.h>
 #include <bytecode/CodeBlock.h>
-#include <dfg/DFGAssemblyHelpers.h>
+#include <dfg/DFGCCallHelpers.h>
 #include <dfg/DFGFPRInfo.h>
 #include <dfg/DFGGPRInfo.h>
@@ -148 +148 @@
 // compilation, and also records information used in linking (e.g. a list of all
 // call to be linked).
-class JITCompiler : public AssemblyHelpers {
+class JITCompiler : public CCallHelpers {
 public:
     JITCompiler(JSGlobalData* globalData, Graph& dfg, CodeBlock* codeBlock)
-        : AssemblyHelpers(globalData, codeBlock)
+        : CCallHelpers(globalData, codeBlock)
         , m_graph(dfg)
     {