Changeset 167094 in webkit for trunk/Source/JavaScriptCore/offlineasm/asm.rb

Timestamp:

Apr 10, 2014, 3:33:59 PM (11 years ago)

Author:

[email protected]

Message:

LLInt interpreter code should be generated as part of one function
​https://bugs.webkit.org/show_bug.cgi?id=131205

Reviewed by Mark Lam.

Source/JavaScriptCore:

Changed the generation of llint opcodes so that they are all part of the same
global function, llint_entry. That function is used to fill in an entry point
table that includes each of the opcodes and helpers.

• CMakeLists.txt:
• JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh:
• JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh:
• JavaScriptCore.xcodeproj/project.pbxproj:

Added appropriate use of new -I option to offline assembler and offset
generator scripts.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter.cpp:
• llint/LowLevelInterpreter.h:
• offlineasm/arm.rb:
• offlineasm/arm64.rb:
• offlineasm/asm.rb:
• offlineasm/ast.rb:
• offlineasm/backends.rb:
• offlineasm/cloop.rb:
• offlineasm/generate_offset_extractor.rb:
• offlineasm/instructions.rb:
• offlineasm/parser.rb:
• offlineasm/registers.rb:
• offlineasm/self_hash.rb:
• offlineasm/settings.rb:
• offlineasm/transform.rb:
• offlineasm/x86.rb:

Added a new "global" keyword to the offline assembler that denotes a label that
should be exported. Added opcode and operand support to get the absolute
address of a local label using position independent calculations. Updated the
offline assembler to handle included files, both when generating the checksum
as well as including files from other than the local directory via a newly
added -I option. The offline assembler now automatically determines external
functions by keeping track of referenced functions that are defined within the
assembly source. This is used both for choosing the correct macro for external
references as well as generating the needed EXTERN directives for masm.
Updated the generation of the masm only .sym file to be written once at the end
of the offline assembler.

• assembler/MacroAssemblerCodeRef.h:

(JSC::MacroAssemblerCodePtr::createLLIntCodePtr):
(JSC::MacroAssemblerCodeRef::createLLIntCodeRef):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::dumpBytecode):
(JSC::CodeBlock::CodeBlock):

• bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeFromLLInt):

• bytecode/Opcode.h:

(JSC::padOpcodeName):

• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFromLLInt):

• jit/JIT.cpp:

(JSC::JIT::privateCompileMainPass):

• jit/JITStubs.h:
• llint/LLIntCLoop.cpp:

(JSC::LLInt::initialize):

• llint/LLIntData.h:

(JSC::LLInt::getCodeFunctionPtr):
(JSC::LLInt::getOpcode): Deleted.
(JSC::LLInt::getCodePtr): Deleted.

• llint/LLIntOpcode.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• llint/LLIntThunks.cpp:

(JSC::LLInt::functionForCallEntryThunkGenerator):
(JSC::LLInt::functionForConstructEntryThunkGenerator):
(JSC::LLInt::functionForCallArityCheckThunkGenerator):
(JSC::LLInt::functionForConstructArityCheckThunkGenerator):
(JSC::LLInt::evalEntryThunkGenerator):
(JSC::LLInt::programEntryThunkGenerator):

• llint/LLIntThunks.h:

Changed references to llint helpers to go through the entry point table populated
by llint_entry. Added helpers to OpcodeID enum for all builds.

• bytecode/BytecodeList.json:
• generate-bytecode-files:
• llint/LLIntCLoop.cpp:

(JSC::LLInt::CLoop::initialize):
Reordered sections to match the order that the functions are added to the entry point
table. Added new "asmPrefix" property for symbols that have one name but are generated
with a prefix, e.g. op_enter -> llint_op_enter. Eliminated the "emitDefineID" property
as we are using enums for all bytecode references. Changed the C Loop only
llint_c_loop_init to llint_entry.

Source/WebKit:

Updated VS dependencies for JavaScriptCore changes.

• WebKit.vcxproj/WebKit.sln:

File:

• trunk/Source/JavaScriptCore/offlineasm/asm.rb (modified) (3 diffs)

trunk/Source/JavaScriptCore/offlineasm/asm.rb

@@ -173 +173 @@
     end
 
-    def putsLabel(labelName)
+    def putsLabel(labelName, isGlobal)
         raise unless @state == :asm
         @numGlobalLabels += 1
-        putsProcEndIfNeeded if $emitWinAsm
+        putsProcEndIfNeeded if $emitWinAsm and isGlobal
         putsNewlineSpacerIfAppropriate(:global)
         @internalComment = $enableLabelCountComments ? "Global Label #{@numGlobalLabels}" : nil
-        if /\Allint_op_/.match(labelName)
+        if isGlobal
+            if !$emitWinAsm
+                @outp.puts(formatDump("OFFLINE_ASM_GLOBAL_LABEL(#{labelName})", lastComment))
+            else
+                putsProc(labelName, lastComment)
+            end            
+        elsif /\Allint_op_/.match(labelName)
             if !$emitWinAsm
                 @outp.puts(formatDump("OFFLINE_ASM_OPCODE_LABEL(op_#{$~.post_match})", lastComment))
             else
                 label = "llint_" + "op_#{$~.post_match}"
-                putsProc(label, lastComment)
-            end
+                @outp.puts(formatDump("  _#{label}:", lastComment))
+            end            
         else
             if !$emitWinAsm
                 @outp.puts(formatDump("OFFLINE_ASM_GLUE_LABEL(#{labelName})", lastComment))
             else
-                putsProc(labelName, lastComment)
+                @outp.puts(formatDump("  _#{labelName}:", lastComment))
             end
         end
@@ -207 +213 @@
         end
     end
-    
+
+    def self.externLabelReference(labelName)
+        if !$emitWinAsm
+            "\" LOCAL_REFERENCE(#{labelName}) \""
+        else
+            "#{labelName}"
+        end
+    end
+
     def self.labelReference(labelName)
         if !$emitWinAsm
-            "\" LOCAL_REFERENCE(#{labelName}) \""
-        else
-            "#{labelName}"
+            "\" LOCAL_LABEL_STRING(#{labelName}) \""
+        else
+            "_#{labelName}"
         end
     end
@@ -262 +276 @@
     end
 end
+
+IncludeFile.processIncludeOptions()
 
 asmFile = ARGV.shift