Changeset 167094 in webkit

Timestamp:

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

Author:

msaboff@apple.com

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:

Location:

trunk/Source

Files:

• JavaScriptCore/CMakeLists.txt (modified) (2 diffs)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• JavaScriptCore/assembler/MacroAssemblerCodeRef.h (modified) (2 diffs)
• JavaScriptCore/bytecode/BytecodeList.json (modified) (3 diffs)
• JavaScriptCore/bytecode/CodeBlock.cpp (modified) (2 diffs)
• JavaScriptCore/bytecode/GetByIdStatus.cpp (modified) (1 diff)
• JavaScriptCore/bytecode/Opcode.h (modified) (1 diff)
• JavaScriptCore/bytecode/PutByIdStatus.cpp (modified) (2 diffs)
• JavaScriptCore/generate-bytecode-files (modified) (1 diff)
• JavaScriptCore/jit/JIT.cpp (modified) (1 diff)
• JavaScriptCore/jit/JITStubs.h (modified) (1 diff)
• JavaScriptCore/llint/LLIntCLoop.cpp (modified) (1 diff)
• JavaScriptCore/llint/LLIntData.cpp (modified) (1 diff)
• JavaScriptCore/llint/LLIntData.h (modified) (3 diffs)
• JavaScriptCore/llint/LLIntOpcode.h (modified) (1 diff)
• JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (5 diffs)
• JavaScriptCore/llint/LLIntThunks.cpp (modified) (1 diff)
• JavaScriptCore/llint/LLIntThunks.h (modified) (1 diff)
• JavaScriptCore/llint/LowLevelInterpreter.asm (modified) (5 diffs)
• JavaScriptCore/llint/LowLevelInterpreter.cpp (modified) (2 diffs)
• JavaScriptCore/llint/LowLevelInterpreter.h (modified) (1 diff)
• JavaScriptCore/offlineasm/arm.rb (modified) (2 diffs)
• JavaScriptCore/offlineasm/arm64.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/asm.rb (modified) (3 diffs)
• JavaScriptCore/offlineasm/ast.rb (modified) (19 diffs)
• JavaScriptCore/offlineasm/backends.rb (modified) (3 diffs)
• JavaScriptCore/offlineasm/cloop.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/generate_offset_extractor.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/instructions.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/parser.rb (modified) (8 diffs)
• JavaScriptCore/offlineasm/registers.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/self_hash.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/settings.rb (modified) (2 diffs)
• JavaScriptCore/offlineasm/transform.rb (modified) (1 diff)
• JavaScriptCore/offlineasm/x86.rb (modified) (4 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebKit.vcxproj/WebKit.sln (modified) (2 diffs)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -605 +605 @@
         OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb
-        DEPENDS ${LLINT_ASM} ${OFFLINE_ASM}
-        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
+        DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
+        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/generate_offset_extractor.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
         VERBATIM)
 
@@ -634 +634 @@
         MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb
         DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
-        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
+        COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
         COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
         VERBATIM)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-10  Michael Saboff  <msaboff@apple.com>
+
+        LLInt interpreter code should be generated as part of one function
+        https://bugs.webkit.org/show_bug.cgi?id=131205
+
+        Reviewed by Mark Lam.
+
+        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.
+
 2014-04-10  Matthew Mirman  <mmirman@apple.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.sh

@@ -35 +35 @@
 fi
 
-/usr/bin/env ruby "${SRCROOT}/offlineasm/asm.rb" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntOffsetsExtractor/LLIntOffsetsExtractor${3}.exe" "${OUTPUTFILENAME}" || exit 1
+/usr/bin/env ruby "${SRCROOT}/offlineasm/asm.rb" "-I." "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntOffsetsExtractor/LLIntOffsetsExtractor${3}.exe" "${OUTPUTFILENAME}" || exit 1

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/build-LLIntDesiredOffsets.sh

@@ -23 +23 @@
 mkdir -p "${BUILT_PRODUCTS_DIR}"
 
-/usr/bin/env ruby "${SRCROOT}/offlineasm/generate_offset_extractor.rb" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntDesiredOffsets.h"
+/usr/bin/env ruby "${SRCROOT}/offlineasm/generate_offset_extractor.rb" "-I${BUILT_PRODUCTS_DIR}" "${SRCROOT}/llint/LowLevelInterpreter.asm" "${BUILT_PRODUCTS_DIR}/LLIntDesiredOffsets.h"

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -14 +14 @@
                                 0F4680AA14BA7FD900BFE272 /* Generate Derived Sources */,
                         );
+                        dependencies = (
+                                65442D5018EBB744007AF92F /* PBXTargetDependency */,
+                        );
                         name = "LLInt Offsets";
                         productName = "Derived Sources";
@@ -37 +40 @@
                         );
                         dependencies = (
+                                65244BD318ECB5000010B708 /* PBXTargetDependency */,
                                 65788A9E18B409EB00C189FF /* PBXTargetDependency */,
                         );
@@ -50 +54 @@
                         );
                         dependencies = (
-                                65788AA918B40A3300C189FF /* PBXTargetDependency */,
                         );
                         name = "Derived Sources";
@@ -1832 +1835 @@
                         remoteInfo = "Test Tools";
                 };
+                65244BD218ECB5000010B708 /* PBXContainerItemProxy */ = {
+                        isa = PBXContainerItemProxy;
+                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                        proxyType = 1;
+                        remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
+                        remoteInfo = "Derived Sources";
+                };
+                65442D4F18EBB744007AF92F /* PBXContainerItemProxy */ = {
+                        isa = PBXContainerItemProxy;
+                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+                        proxyType = 1;
+                        remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
+                        remoteInfo = "Derived Sources";
+                };
                 65788A9F18B409EB00C189FF /* PBXContainerItemProxy */ = {
                         isa = PBXContainerItemProxy;
@@ -1838 +1855 @@
                         remoteGlobalIDString = 0FF922C314F46B130041A24E;
                         remoteInfo = JSCLLIntOffsetsExtractor;
-                };
-                65788AA818B40A3300C189FF /* PBXContainerItemProxy */ = {
-                        isa = PBXContainerItemProxy;
-                        containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-                        proxyType = 1;
-                        remoteGlobalIDString = 0F4680A914BA7FD900BFE272;
-                        remoteInfo = "LLInt Offsets";
                 };
                 65788AAA18B40A3B00C189FF /* PBXContainerItemProxy */ = {
@@ -6528 +6538 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/\"\n\n/usr/bin/env ruby \"${SRCROOT}/offlineasm/generate_offset_extractor.rb\" \"${SRCROOT}/llint/LowLevelInterpreter.asm\" \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/LLIntDesiredOffsets.h\"\n";
+                        shellScript = "set -e\n\nmkdir -p \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/\"\n\n/usr/bin/env ruby \"${SRCROOT}/offlineasm/generate_offset_extractor.rb\" \"-I${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\" \"${SRCROOT}/llint/LowLevelInterpreter.asm\" \"${BUILT_PRODUCTS_DIR}/LLIntOffsets/LLIntDesiredOffsets.h\"\n";
                 };
                 0FCEFAD91806191800472CE4 /* Copy LLVM Library Into Framework */ = {
@@ -6716 +6726 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "if [[ \"${ACTION}\" == \"installhdrs\" ]]; then\n    exit 0\nfi\n\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\n\n/usr/bin/env ruby JavaScriptCore/offlineasm/asm.rb JavaScriptCore/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1";
+                        shellScript = "if [[ \"${ACTION}\" == \"installhdrs\" ]]; then\n    exit 0\nfi\n\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore\"\n\n/usr/bin/env ruby JavaScriptCore/offlineasm/asm.rb -I${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore JavaScriptCore/llint/LowLevelInterpreter.asm ${BUILT_PRODUCTS_DIR}/JSCLLIntOffsetsExtractor LLIntAssembly.h || exit 1";
                 };
                 65FB3F6509D11E9100F49DEB /* Generate Derived Sources */ = {
@@ -7429 +7439 @@
                         targetProxy = 5D6B2A56152B9E2E005231DE /* PBXContainerItemProxy */;
                 };
+                65244BD318ECB5000010B708 /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
+                        targetProxy = 65244BD218ECB5000010B708 /* PBXContainerItemProxy */;
+                };
+                65442D5018EBB744007AF92F /* PBXTargetDependency */ = {
+                        isa = PBXTargetDependency;
+                        target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
+                        targetProxy = 65442D4F18EBB744007AF92F /* PBXContainerItemProxy */;
+                };
                 65788A9E18B409EB00C189FF /* PBXTargetDependency */ = {
                         isa = PBXTargetDependency;
                         target = 0FF922C314F46B130041A24E /* JSCLLIntOffsetsExtractor */;
                         targetProxy = 65788A9F18B409EB00C189FF /* PBXContainerItemProxy */;
-                };
-                65788AA918B40A3300C189FF /* PBXTargetDependency */ = {
-                        isa = PBXTargetDependency;
-                        target = 0F4680A914BA7FD900BFE272 /* LLInt Offsets */;
-                        targetProxy = 65788AA818B40A3300C189FF /* PBXContainerItemProxy */;
                 };
                 65788AAB18B40A3B00C189FF /* PBXTargetDependency */ = {

trunk/Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h

@@ -295 +295 @@
 
 #if ENABLE(LLINT)
-    static MacroAssemblerCodePtr createLLIntCodePtr(LLIntCode codeId)
+    static MacroAssemblerCodePtr createLLIntCodePtr(OpcodeID codeId)
     {
         return createFromExecutableAddress(LLInt::getCodePtr(codeId));
@@ -413 +413 @@
 #if ENABLE(LLINT)
     // Helper for creating self-managed code refs from LLInt.
-    static MacroAssemblerCodeRef createLLIntCodeRef(LLIntCode codeId)
+    static MacroAssemblerCodeRef createLLIntCodeRef(OpcodeID codeId)
     {
         return createSelfManagedCodeRef(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(codeId)));

trunk/Source/JavaScriptCore/bytecode/BytecodeList.json

@@ -1 +1 @@
 [
     {
-        "section" : "Bytecodes", "emitInHFile" : true, "emitInASMFile" : true, "macroNameComponent" : "BYTECODE",
+        "section" : "Bytecodes", "emitInHFile" : true, "emitInASMFile" : true, 
+        "macroNameComponent" : "BYTECODE", "asmPrefix" : "llint_", 
         "bytecodes" : [
             { "name" : "op_enter", "length" : 1 },
@@ -126 +127 @@
     },
     {
+        "section" : "CLoopHelpers", "emitInHFile" : true, "emitInASMFile" : false, "defaultLength" : 1,
+        "macroNameComponent" : "CLOOP_BYTECODE_HELPER",
+        "bytecodes" : [
+            { "name" : "llint_entry" },
+            { "name" : "getHostCallReturnValue" },
+            { "name" : "llint_return_to_host" },
+            { "name" : "llint_call_to_javascript" },
+            { "name" : "llint_call_to_native_function" },
+            { "name" : "llint_cloop_did_return_from_js_1" },
+            { "name" : "llint_cloop_did_return_from_js_2" },
+            { "name" : "llint_cloop_did_return_from_js_3" },
+            { "name" : "llint_cloop_did_return_from_js_4" },
+            { "name" : "llint_cloop_did_return_from_js_5" },
+            { "name" : "llint_cloop_did_return_from_js_6" },
+            { "name" : "llint_cloop_did_return_from_js_7" },
+            { "name" : "llint_cloop_did_return_from_js_8" }
+        ]
+    },
+    {
         "section" : "NativeHelpers", "emitInHFile" : true, "emitInASMFile" : true, "defaultLength" : 1,
-        "macroNameComponent" : "BYTECODE_HELPER", "emitDefineID" : true,
+        "macroNameComponent" : "BYTECODE_HELPER",
         "bytecodes" : [
             { "name" : "llint_program_prologue" },
@@ -139 +159 @@
             { "name" : "llint_throw_during_call_trampoline" },
             { "name" : "llint_native_call_trampoline" },
-            { "name" : "llint_native_construct_trampoline" }
-        ]
-    },
-    {
-        "section" : "CLoopHelpers", "emitInHFile" : true, "emitInASMFile" : false, "defaultLength" : 1,
-        "macroNameComponent" : "CLOOP_BYTECODE_HELPER",
-        "bytecodes" : [
-            { "name" : "llint_c_loop_init" },
-            { "name" : "getHostCallReturnValue" },
-            { "name" : "llint_return_to_host" },
-            { "name" : "llint_call_to_javascript" },
-            { "name" : "llint_call_to_native_function" },
-            { "name" : "handleUncaughtException" },
-            { "name" : "llint_cloop_did_return_from_js_1" },
-            { "name" : "llint_cloop_did_return_from_js_2" },
-            { "name" : "llint_cloop_did_return_from_js_3" },
-            { "name" : "llint_cloop_did_return_from_js_4" },
-            { "name" : "llint_cloop_did_return_from_js_5" },
-            { "name" : "llint_cloop_did_return_from_js_6" },
-            { "name" : "llint_cloop_did_return_from_js_7" },
-            { "name" : "llint_cloop_did_return_from_js_8" }
+            { "name" : "llint_native_construct_trampoline" },
+            { "name" : "handleUncaughtException" }
         ]
     }

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1369 +1369 @@
             break;
         }
-#if ENABLE(LLINT_C_LOOP)
         default:
             RELEASE_ASSERT_NOT_REACHED();
-#endif
     }
 
@@ -1588 +1586 @@
                 m_rareData->m_exceptionHandlers[i].scopeDepth = nonLocalScopeDepth + handler.scopeDepth;
 #if ENABLE(JIT) && ENABLE(LLINT)
-                m_rareData->m_exceptionHandlers[i].nativeCode = CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(llint_op_catch)));
+                m_rareData->m_exceptionHandlers[i].nativeCode = CodeLocationLabel(MacroAssemblerCodePtr::createFromExecutableAddress(LLInt::getCodePtr(op_catch)));
 #endif
             }

trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp

@@ -65 +65 @@
     Instruction* instruction = profiledBlock->instructions().begin() + bytecodeIndex;
     
-    if (instruction[0].u.opcode == LLInt::getOpcode(llint_op_get_array_length))
+    if (instruction[0].u.opcode == LLInt::getOpcode(op_get_array_length))
         return GetByIdStatus(NoInformation, false);
 

trunk/Source/JavaScriptCore/bytecode/Opcode.h

@@ -61 +61 @@
 const int maxOpcodeLength = 9;
 #if ENABLE(LLINT_C_LOOP)
-const int numOpcodeIDs = NUMBER_OF_BYTECODE_IDS + NUMBER_OF_BYTECODE_HELPER_IDS + NUMBER_OF_CLOOP_BYTECODE_HELPER_IDS;
+const int numOpcodeIDs = NUMBER_OF_BYTECODE_IDS + NUMBER_OF_CLOOP_BYTECODE_HELPER_IDS + NUMBER_OF_BYTECODE_HELPER_IDS;
 #else
-const int numOpcodeIDs = NUMBER_OF_BYTECODE_IDS;
+const int numOpcodeIDs = NUMBER_OF_BYTECODE_IDS + NUMBER_OF_BYTECODE_HELPER_IDS;
 #endif
 

trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp

@@ -71 +71 @@
         return PutByIdStatus(NoInformation);
     
-    if (instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id)
-        || instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id_out_of_line)) {
+    if (instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id)
+        || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_out_of_line)) {
         PropertyOffset offset = structure->getConcurrently(*profiledBlock->vm(), uid);
         if (!isValidOffset(offset))
@@ -82 +82 @@
     ASSERT(structure->transitionWatchpointSetHasBeenInvalidated());
     
-    ASSERT(instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id_transition_direct)
-           || instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id_transition_normal)
-           || instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id_transition_direct_out_of_line)
-           || instruction[0].u.opcode == LLInt::getOpcode(llint_op_put_by_id_transition_normal_out_of_line));
+    ASSERT(instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_direct)
+        || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal)
+        || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_direct_out_of_line)
+        || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal_out_of_line));
     
     Structure* newStructure = instruction[6].u.structure.get();

trunk/Source/JavaScriptCore/generate-bytecode-files

@@ -213 +213 @@
             bytecodeHFile.write("#define NUMBER_OF_{0}_IDS {1}\n\n".format(section["macroNameComponent"], bytecodeNum))
 
-            if "emitDefineID" in section:
-                bytecodeNum = 0
-                for bytecode in section["bytecodes"]:
-                    bytecodeHFile.write("#define %s_ID %s\n" % (bytecode["name"].upper(), bytecodeNum))
-                    bytecodeNum = bytecodeNum + 1
-
-                bytecodeHFile.write("\n\n")
-
         if initASMFileName and section['emitInASMFile']:
+            prefix = ""
+            if "asmPrefix" in section:
+                prefix = section["asmPrefix"]
             for bytecode in section["bytecodes"]:
-                initBytecodesFile.write("setEntryAddress({0}, _{1})\n".format(initASMBytecodeNum, bytecode["name"]))
+                initBytecodesFile.write("setEntryAddress({0}, _{1}{2})\n".format(initASMBytecodeNum, prefix, bytecode["name"]))
                 initASMBytecodeNum = initASMBytecodeNum + 1
 

trunk/Source/JavaScriptCore/jit/JIT.cpp

@@ -293 +293 @@
         DEFINE_OP(op_get_from_scope)
         DEFINE_OP(op_put_to_scope)
+        default:
+            RELEASE_ASSERT_NOT_REACHED();
         }
     }

trunk/Source/JavaScriptCore/jit/JITStubs.h

@@ -44 +44 @@
     EncodedJSValue callToJavaScript(void*, VM*, ProtoCallFrame*);
     EncodedJSValue callToNativeFunction(void*, VM*, ProtoCallFrame*);
-    void handleUncaughtException();
 }
 #endif

trunk/Source/JavaScriptCore/llint/LLIntCLoop.cpp

@@ -36 +36 @@
 void CLoop::initialize()
 {
-    execute(llint_c_loop_init, 0, 0, 0, true);
+    execute(llint_entry, 0, 0, 0, true);
 }
 

trunk/Source/JavaScriptCore/llint/LLIntData.cpp

@@ -41 +41 @@
 
 Instruction* Data::s_exceptionInstructions = 0;
-Opcode* Data::s_opcodeMap = 0;
+Opcode Data::s_opcodeMap[numOpcodeIDs] = {0};
+
+#if !ENABLE(LLINT_C_LOOP)
+extern "C" void llint_entry(void*);
+#endif
 
 void initialize()
 {
     Data::s_exceptionInstructions = new Instruction[maxOpcodeLength + 1];
-    Data::s_opcodeMap = new Opcode[numOpcodeIDs];
 
-    #if ENABLE(LLINT_C_LOOP)
+#if ENABLE(LLINT_C_LOOP)
     CLoop::initialize();
 
-    #else // !ENABLE(LLINT_C_LOOP)
+#else // !ENABLE(LLINT_C_LOOP)
+    llint_entry(&Data::s_opcodeMap);
+
     for (int i = 0; i < maxOpcodeLength + 1; ++i)
         Data::s_exceptionInstructions[i].u.pointer =
             LLInt::getCodePtr(llint_throw_from_slow_path_trampoline);
-    #define OPCODE_ENTRY(opcode, length) \
-        Data::s_opcodeMap[opcode] = static_cast<Opcode>(LLInt::getCodePtr(llint_##opcode));
-    FOR_EACH_CORE_OPCODE_ID(OPCODE_ENTRY);
-    #undef OPCODE_ENTRY
-    #endif // !ENABLE(LLINT_C_LOOP)
+#endif // !ENABLE(LLINT_C_LOOP)
 }
 

trunk/Source/JavaScriptCore/llint/LLIntData.h

@@ -51 +51 @@
 private:
     static Instruction* s_exceptionInstructions;
-    static Opcode* s_opcodeMap;
+    static Opcode s_opcodeMap[numOpcodeIDs];
 
     friend void initialize();
@@ -87 +87 @@
 }
 
+#if ENABLE(JIT)
+ALWAYS_INLINE LLIntCode getCodeFunctionPtr(OpcodeID codeId)
+{
+    return reinterpret_cast<LLIntCode>(getCodePtr(codeId));
+}
+#endif
+
 #else // !ENABLE(LLINT)
 
@@ -105 +112 @@
 #endif // !ENABLE(LLINT)
 
-ALWAYS_INLINE void* getOpcode(void llintOpcode())
-{
-    return bitwise_cast<void*>(llintOpcode);
-}
-
-ALWAYS_INLINE void* getCodePtr(void glueHelper())
-{
-    return bitwise_cast<void*>(glueHelper);
-}
-
 ALWAYS_INLINE void* getCodePtr(JSC::EncodedJSValue glueHelper())
 {

trunk/Source/JavaScriptCore/llint/LLIntOpcode.h

@@ -49 +49 @@
 
 
-#if ENABLE(LLINT_C_LOOP)
 #define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) FOR_EACH_LLINT_NATIVE_HELPER(macro)
-#else
-#define FOR_EACH_LLINT_OPCODE_EXTENSION(macro) // Nothing to add.
-#endif
 
 #else // !ENABLE(LLINT)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -589 +589 @@
                 vm, codeBlock->ownerExecutable(), structure);
             if (isInlineOffset(slot.cachedOffset())) {
-                pc[0].u.opcode = LLInt::getOpcode(llint_op_get_by_id);
+                pc[0].u.opcode = LLInt::getOpcode(op_get_by_id);
                 pc[5].u.operand = offsetInInlineStorage(slot.cachedOffset()) * sizeof(JSValue) + JSObject::offsetOfInlineStorage();
             } else {
-                pc[0].u.opcode = LLInt::getOpcode(llint_op_get_by_id_out_of_line);
+                pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_out_of_line);
                 pc[5].u.operand = offsetInButterfly(slot.cachedOffset()) * sizeof(JSValue);
             }
@@ -601 +601 @@
         && isJSArray(baseValue)
         && ident == exec->propertyNames().length) {
-        pc[0].u.opcode = LLInt::getOpcode(llint_op_get_array_length);
+        pc[0].u.opcode = LLInt::getOpcode(op_get_array_length);
         ArrayProfile* arrayProfile = codeBlock->getOrAddArrayProfile(pc - codeBlock->instructions().begin());
         arrayProfile->observeStructure(baseValue.asCell()->structure());
@@ -654 +654 @@
                     // This is needed because some of the methods we call
                     // below may GC.
-                    pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id);
+                    pc[0].u.opcode = LLInt::getOpcode(op_put_by_id);
 
                     if (normalizePrototypeChain(exec, baseCell) != InvalidPrototypeChain) {
@@ -673 +673 @@
                         if (pc[8].u.operand) {
                             if (isInlineOffset(slot.cachedOffset()))
-                                pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id_transition_direct);
+                                pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_direct);
                             else
-                                pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id_transition_direct_out_of_line);
+                                pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_direct_out_of_line);
                         } else {
                             if (isInlineOffset(slot.cachedOffset()))
-                                pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id_transition_normal);
+                                pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_normal);
                             else
-                                pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id_transition_normal_out_of_line);
+                                pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_normal_out_of_line);
                         }
                     }
@@ -688 +688 @@
                     vm, codeBlock->ownerExecutable(), structure);
                 if (isInlineOffset(slot.cachedOffset())) {
-                    pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id);
+                    pc[0].u.opcode = LLInt::getOpcode(op_put_by_id);
                     pc[5].u.operand = offsetInInlineStorage(slot.cachedOffset()) * sizeof(JSValue) + JSObject::offsetOfInlineStorage();
                 } else {
-                    pc[0].u.opcode = LLInt::getOpcode(llint_op_put_by_id_out_of_line);
+                    pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_out_of_line);
                     pc[5].u.operand = offsetInButterfly(slot.cachedOffset()) * sizeof(JSValue);
                 }

trunk/Source/JavaScriptCore/llint/LLIntThunks.cpp

@@ -61 +61 @@
 MacroAssemblerCodeRef functionForCallEntryThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_function_for_call_prologue, "function for call");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_function_for_call_prologue), "function for call");
 }
 
 MacroAssemblerCodeRef functionForConstructEntryThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_function_for_construct_prologue, "function for construct");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_function_for_construct_prologue), "function for construct");
 }
 
 MacroAssemblerCodeRef functionForCallArityCheckThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_function_for_call_arity_check, "function for call with arity check");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_function_for_call_arity_check), "function for call with arity check");
 }
 
 MacroAssemblerCodeRef functionForConstructArityCheckThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_function_for_construct_arity_check, "function for construct with arity check");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_function_for_construct_arity_check), "function for construct with arity check");
 }
 
 MacroAssemblerCodeRef evalEntryThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_eval_prologue, "eval");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_eval_prologue), "eval");
 }
 
 MacroAssemblerCodeRef programEntryThunkGenerator(VM* vm)
 {
-    return generateThunkWithJumpTo(vm, llint_program_prologue, "program");
+    return generateThunkWithJumpTo(vm, LLInt::getCodeFunctionPtr(llint_program_prologue), "program");
 }
 

trunk/Source/JavaScriptCore/llint/LLIntThunks.h

@@ -39 +39 @@
     EncodedJSValue callToJavaScript(void*, VM*, ProtoCallFrame*);
     EncodedJSValue callToNativeFunction(void*, VM*, ProtoCallFrame*);
-#if ENABLE(JIT)
-    void handleUncaughtException();
-#endif
 }
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -629 +629 @@
 end
 
-# Dummy entry point the C Loop uses to initialize.
-if C_LOOP
-_llint_c_loop_init:
-    crash()
-end
-
 # stub to call into JavaScript or Native functions
 # EncodedJSValue callToJavaScript(void* code, ExecState** vmTopCallFrame, ProtoCallFrame* protoFrame)
@@ -642 +636 @@
 _llint_call_to_javascript:
 else
+global _callToJavaScript
 _callToJavaScript:
 end
@@ -650 +645 @@
 _llint_call_to_native_function:
 else
+global _callToNativeFunction
 _callToNativeFunction:
 end
@@ -658 +654 @@
 else
 # void sanitizeStackForVMImpl(VM* vm)
+global _sanitizeStackForVMImpl
 _sanitizeStackForVMImpl:
     if X86_64
@@ -692 +689 @@
 end
 
+
+if C_LOOP
+# Dummy entry point the C Loop uses to initialize.
+_llint_entry:
+    crash()
+else
+macro initPCRelative(pcBase)
+    if X86_64
+        call _relativePCBase
+    _relativePCBase:
+        pop pcBase
+    elsif X86 or X86_WIN
+        call _relativePCBase
+    _relativePCBase:
+        pop pcBase
+        loadp 20[sp], t4
+    elsif ARM64
+    elsif ARMv7
+    _relativePCBase:
+        move pc, pcBase
+        subp 3, pcBase   # Need to back up the PC and set the Thumb2 bit
+    elsif ARM or ARMv7_TRADITIONAL
+    _relativePCBase:
+        move pc, pcBase
+        subp 2, pcBase
+    elsif MIPS
+        crash()  # Need to replace with any initialization steps needed to step up PC relative address calculation
+    elsif SH4
+        crash()  # Need to replace with any initialization steps needed to step up PC relative address calculation
+    end
+end
+
+macro setEntryAddress(index, label)
+    if X86_64
+        leap (label - _relativePCBase)[t1], t0
+        move index, t2
+        storep t0, [t4, t2, 8]
+    elsif X86 or X86_WIN
+        leap (label - _relativePCBase)[t1], t0
+        move index, t2
+        storep t0, [t4, t2, 4]
+    elsif ARM64
+        pcrtoaddr label, t1
+        move index, t2
+        storep t1, [a0, t2, 8]
+    elsif ARM or ARMv7 or ARMv7_TRADITIONAL
+        move (label - _relativePCBase), t2
+        addp t2, t1, t2
+        move index, t3
+        storep t2, [a0, t3, 4]
+    elsif MIPS
+        crash()  # Need to replace with code to turn label into and absolute address and save at index
+    elsif SH4
+        crash()  # Need to replace with code to turn label into and absolute address and save at index
+    end
+end
+
+global _llint_entry
+# Entry point for the llint to initialize.
+_llint_entry:
+    functionPrologue()
+    pushCalleeSaves
+    initPCRelative(t1)
+
+    # Include generated bytecode initialization file.
+    include InitBytecodes
+
+    popCalleeSaves
+    functionEpilogue()
+    ret
+end
 
 _llint_program_prologue:

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

@@ -106 +106 @@
 #define OFFLINE_ASM_OPCODE_LABEL(opcode) DEFINE_OPCODE(opcode) USE_LABEL(opcode); TRACE_OPCODE(opcode);
 
+#define OFFLINE_ASM_GLOBAL_LABEL(label)  OFFLINE_ASM_GLUE_LABEL(label)
+
 #if ENABLE(COMPUTED_GOTO_OPCODES)
 #define OFFLINE_ASM_GLUE_LABEL(label)  label: USE_LABEL(label);
@@ -496 +498 @@
 #define OFFLINE_ASM_END     );
 
-#define OFFLINE_ASM_OPCODE_LABEL(__opcode) OFFLINE_ASM_GLOBAL_LABEL(llint_##__opcode)
-#define OFFLINE_ASM_GLUE_LABEL(__opcode)   OFFLINE_ASM_GLOBAL_LABEL(__opcode)
+#define OFFLINE_ASM_OPCODE_LABEL(__opcode) OFFLINE_ASM_LOCAL_LABEL(llint_##__opcode)
+#define OFFLINE_ASM_GLUE_LABEL(__opcode)   OFFLINE_ASM_LOCAL_LABEL(__opcode)
 
 #if CPU(ARM_THUMB2)

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.h

@@ -48 +48 @@
 } // namespace JSC
 
-#else // !ENABLE(LLINT_C_LOOP)
-
-#define LLINT_INSTRUCTION_DECL(opcode, length) extern "C" void llint_##opcode();
-    FOR_EACH_OPCODE_ID(LLINT_INSTRUCTION_DECL);
-#undef LLINT_INSTRUCTION_DECL
-
-#define DECLARE_LLINT_NATIVE_HELPER(name, length) extern "C" void name();
-    FOR_EACH_LLINT_NATIVE_HELPER(DECLARE_LLINT_NATIVE_HELPER)
-#undef DECLARE_LLINT_NATIVE_HELPER
-
-#endif // !ENABLE(LLINT_C_LOOP)
+#endif // ENABLE(LLINT_C_LOOP)
 
 #endif // ENABLE(LLINT)

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -70 +70 @@
 def armMoveImmediate(value, register)
     # Currently we only handle the simple cases, and fall back to mov/movt for the complex ones.
-    if value >= 0 && value < 256
+    if value.is_a? String
+      $asm.puts "mov #{register.armOperand}, (#{value})"
+    elsif value >= 0 && value < 256
         $asm.puts "mov #{register.armOperand}, \##{value}"
     elsif (~value) >= 0 && (~value) < 256
@@ -107 +109 @@
         when "sp"
             "sp"
+        when "pc"
+            "pc"
         else
             raise "Bad register #{name} for ARM at #{codeOriginString}"

trunk/Source/JavaScriptCore/offlineasm/arm64.rb

@@ -821 +821 @@
         when "memfence"
             $asm.puts "dmb sy"
+        when "pcrtoaddr"
+          $asm.puts "adr #{operands[1].arm64Operand(:ptr)}, #{operands[0].value}"
         else
             lowerDefault

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

trunk/Source/JavaScriptCore/offlineasm/ast.rb

@@ -230 +230 @@
     end
     
+    def immediateOperand?
+        true
+    end
+        
     def register?
         false
@@ -256 +260 @@
     end
     
-    def address?
-        false
-    end
-    
-    def label?
-        false
-    end
-    
-    def immediate?
+    def value
+        "#{left.value} + #{right.value}"
+    end
+    
+    def address?
+        false
+    end
+    
+    def label?
+        false
+    end
+    
+    def immediate?
+        true
+    end
+    
+    def immediateOperand?
         true
     end
@@ -294 +306 @@
     end
     
-    def address?
-        false
-    end
-    
-    def label?
-        false
-    end
-    
-    def immediate?
+    def value
+        "#{left.value} - #{right.value}"
+    end
+    
+    def address?
+        false
+    end
+    
+    def label?
+        false
+    end
+    
+    def immediate?
+        true
+    end
+    
+    def immediateOperand?
         true
     end
@@ -344 +364 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -381 +405 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -419 +447 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -457 +489 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -495 +531 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -530 +570 @@
     def immediate?
         true
+    end
+    
+    def immediateOperand?
+        false
     end
     
@@ -608 +652 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         true
@@ -627 +675 @@
     
     def immediate?
+        false
+    end
+    
+    def immediateOperand?
         false
     end
@@ -698 +750 @@
     def immediate?
         false
+    end
+    
+    def immediateOperand?
+        true
     end
     
@@ -760 +816 @@
     end
     
+    def immediateOperand?
+        false
+    end
+    
     def register?
         false
@@ -791 +851 @@
     def immediate?
         false
+    end
+    
+    def immediateOperand?
+        true
     end
     
@@ -865 +929 @@
 
 $labelMapping = {}
+$referencedExternLabels = Array.new
 
 class Label < NoChildren
@@ -872 +937 @@
         super(codeOrigin)
         @name = name
-    end
-    
-    def self.forName(codeOrigin, name)
+        @extern = true
+        @global = false
+    end
+    
+    def self.forName(codeOrigin, name, definedInFile = false)
         if $labelMapping[name]
             raise "Label name collision: #{name}" unless $labelMapping[name].is_a? Label
@@ -880 +947 @@
             $labelMapping[name] = Label.new(codeOrigin, name)
         end
+        if definedInFile
+            $labelMapping[name].clearExtern()
+        end
         $labelMapping[name]
     end
-    
+
+    def self.setAsGlobal(codeOrigin, name)
+        if $labelMapping[name]
+            label = $labelMapping[name]
+            raise "Label: #{name} declared global multiple times" unless not label.global?
+            label.setGlobal()
+        else
+            newLabel = Label.new(codeOrigin, name)
+            newLabel.setGlobal()
+            $labelMapping[name] = newLabel
+        end
+    end
+
+    def self.resetReferenced
+        $referencedExternLabels = Array.new
+    end
+
+    def self.forReferencedExtern()
+        $referencedExternLabels.each {
+            | label |
+            yield "#{label.name}"
+        }
+    end
+
+    def clearExtern
+        @extern = false
+    end
+
+    def extern?
+        @extern
+    end
+
+    def setGlobal
+        @global = true
+    end
+
+    def global?
+        @global
+    end
+
     def dump
         "#{name}:"
@@ -950 +1059 @@
     end
     
+    def extern?
+        $labelMapping[name].is_a? Label and $labelMapping[name].extern?
+    end
+
+    def used
+        if !$referencedExternLabels.include?(@label) and extern?
+            $referencedExternLabels.push(@label)
+        end
+    end
+
     def dump
         label.name
     end
     
-    def address?
-        false
-    end
-    
-    def label?
-        true
-    end
-    
-    def immediate?
-        false
+    def value
+        asmLabel()
+    end
+
+    def address?
+        false
+    end
+    
+    def label?
+        true
+    end
+    
+    def immediate?
+        false
+    end
+    
+    def immediateOperand?
+        true
     end
 end
@@ -990 +1117 @@
         label.name
     end
-    
-    def address?
-        false
-    end
-    
-    def label?
-        true
-    end
-    
-    def immediate?
-        false
+
+    def value
+        asmLabel()
+    end
+    
+    def address?
+        false
+    end
+    
+    def label?
+        true
+    end
+    
+    def immediate?
+        false
+    end
+    
+    def immediateOperand?
+        true
     end
 end

trunk/Source/JavaScriptCore/offlineasm/backends.rb

@@ -82 +82 @@
 class Label
     def lower(name)
-        $asm.putsLabel(self.name[1..-1])
+        $asm.putsLabel(self.name[1..-1], @global)
     end
 end
@@ -94 +94 @@
 class LabelReference
     def asmLabel
-        Assembler.labelReference(name[1..-1])
+        if extern?
+            Assembler.externLabelReference(name[1..-1])
+        else
+            Assembler.labelReference(name[1..-1])
+        end
     end
+
     def cLabel
         Assembler.cLabelReference(name[1..-1])
@@ -105 +110 @@
         Assembler.localLabelReference("_offlineasm_"+name[1..-1])
     end
+
     def cLabel
         Assembler.cLocalLabelReference("_offlineasm_"+name[1..-1])

trunk/Source/JavaScriptCore/offlineasm/cloop.rb

@@ -1125 +1125 @@
             $asm.putc "opcode = #{operands[0].clValue(:opcode)};"
             $asm.putc "DISPATCH_OPCODE();"
-            $asm.putsLabel("llint_cloop_did_return_from_js_#{@@didReturnFromJSLabelCounter}")
+            $asm.putsLabel("llint_cloop_did_return_from_js_#{@@didReturnFromJSLabelCounter}", false)
 
         # We can't do generic function calls with an arbitrary set of args, but

trunk/Source/JavaScriptCore/offlineasm/generate_offset_extractor.rb

@@ -34 +34 @@
 require "settings"
 require "transform"
+
+IncludeFile.processIncludeOptions()
 
 inputFlnm = ARGV.shift

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -267 +267 @@
 ARM64_INSTRUCTIONS =
     [
+     "pcrtoaddr",    # Address from PC relative offset - adr instruction
      "popLRAndFP",   # ARM64 requires registers to be pushed and popped in pairs,
      "pushLRAndFP"   # therefore we do LR (link register) and FP (frame pointer) together.

trunk/Source/JavaScriptCore/offlineasm/parser.rb

@@ -39 +39 @@
     def to_s
         "#{fileName}:#{lineNumber}"
+    end
+end
+
+class IncludeFile
+    @@includeDirs = []
+
+    attr_reader :fileName
+
+    def initialize(moduleName, defaultDir)
+        directory = nil
+        @@includeDirs.each {
+            | includePath |
+            fileName = includePath + (moduleName + ".asm")
+            directory = includePath unless not File.file?(fileName)
+        }
+        if not directory
+            directory = defaultDir
+        end
+
+        @fileName = directory + (moduleName + ".asm")
+    end
+
+    def self.processIncludeOptions()
+        while ARGV[0][/-I/]
+            path = ARGV.shift[2..-1]
+            if not path
+                path = ARGV.shift
+            end
+            @@includeDirs << (path + "/")
+        end
     end
 end
@@ -158 +188 @@
 
 def isKeyword(token)
-    token =~ /\A((true)|(false)|(if)|(then)|(else)|(elsif)|(end)|(and)|(or)|(not)|(macro)|(const)|(sizeof)|(error)|(include))\Z/ or
+    token =~ /\A((true)|(false)|(if)|(then)|(else)|(elsif)|(end)|(and)|(or)|(not)|(global)|(macro)|(const)|(sizeof)|(error)|(include))\Z/ or
         token =~ REGISTER_PATTERN or
         isInstruction(token)
@@ -381 +411 @@
             codeOrigin, names = parseColonColon
             Sizeof.forName(codeOrigin, names.join('::'))
+        elsif isLabel @tokens[@idx]
+            result = LabelReference.new(@tokens[@idx].codeOrigin, Label.forName(@tokens[@idx].codeOrigin, @tokens[@idx].string))
+            @idx += 1
+            result
+        elsif isLocalLabel @tokens[@idx]
+            result = LocalLabelReference.new(@tokens[@idx].codeOrigin, LocalLabel.forName(@tokens[@idx].codeOrigin, @tokens[@idx].string))
+            @idx += 1
+            result
         else
             parseError
@@ -574 +612 @@
                 @idx += 1
                 list << Macro.new(codeOrigin, name, variables, body)
+            elsif @tokens[@idx] == "global"
+                codeOrigin = @tokens[@idx].codeOrigin
+                @idx += 1
+                skipNewLine
+                parseError unless isLabel(@tokens[@idx])
+                name = @tokens[@idx].string
+                @idx += 1
+                Label.setAsGlobal(codeOrigin, name)
             elsif isInstruction @tokens[@idx]
                 codeOrigin = @tokens[@idx].codeOrigin
@@ -678 +724 @@
                 # It's a label.
                 if isLabel name
-                    list << Label.forName(codeOrigin, name)
+                    list << Label.forName(codeOrigin, name, true)
                 else
                     list << LocalLabel.forName(codeOrigin, name)
@@ -687 +733 @@
                 parseError unless isIdentifier(@tokens[@idx])
                 moduleName = @tokens[@idx].string
-                fileName = @tokens[@idx].codeOrigin.fileName.dirname + (moduleName + ".asm")
+                fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
                 @idx += 1
                 $stderr.puts "offlineasm: Including file #{fileName}"
@@ -696 +742 @@
         }
         Sequence.new(firstCodeOrigin, list)
+    end
+
+    def parseIncludes(final, comment)
+        firstCodeOrigin = @tokens[@idx].codeOrigin
+        fileList = []
+        fileList << @tokens[@idx].codeOrigin.fileName
+        loop {
+            if (@idx == @tokens.length and not final) or (final and @tokens[@idx] =~ final)
+                break
+            elsif @tokens[@idx] == "include"
+                @idx += 1
+                parseError unless isIdentifier(@tokens[@idx])
+                moduleName = @tokens[@idx].string
+                fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName
+                @idx += 1
+                
+                fileList << fileName
+            else
+                @idx += 1
+            end
+        }
+
+        return fileList
     end
 end
@@ -709 +778 @@
 
 def parseHash(fileName)
-    dirHash(Pathname.new(fileName).dirname, /\.asm$/)
-end
-
+    parser = Parser.new(IO::read(fileName), fileName)
+    fileList = parser.parseIncludes(nil, "")
+    fileListHash(fileList)
+end
+

trunk/Source/JavaScriptCore/offlineasm/registers.rb

@@ -45 +45 @@
      "sp",
      "lr",
-     
+     "pc",
      # 64-bit only registers:
      "csr1",  # tag type number register

trunk/Source/JavaScriptCore/offlineasm/self_hash.rb

@@ -46 +46 @@
 
 #
+# fileListHash(fileList) -> SHA1 hexdigest
+#
+# Returns a hash of all files in the list.
+#
+
+def fileListHash(fileList)
+    contents = ""
+    fileList.each {
+        | fileName |
+        contents += IO::read(fileName)
+    }
+    return Digest::SHA1.hexdigest(contents)
+end
+
+#
 # selfHash -> SHA1 hexdigest
 #

trunk/Source/JavaScriptCore/offlineasm/settings.rb

@@ -173 +173 @@
 
 def emitCodeInConfiguration(concreteSettings, ast, backend)
+    Label.resetReferenced
+
     if !$emitWinAsm
         $output.puts cppSettingsTest(concreteSettings)
@@ -194 +196 @@
         $output.puts "_TEXT ENDS"
         $output.puts "END"
+
+        # Write symbols needed by MASM
+        File.open("#{File.basename($output.path)}.sym", "w") {
+            | outp |
+            Label.forReferencedExtern {
+                | name |
+                outp.puts "EXTERN #{name[1..-1]} : near"
+            }
+        }
     end
 end

trunk/Source/JavaScriptCore/offlineasm/transform.rb

@@ -458 +458 @@
 end
 
+class SubImmediates
+    def validate
+      raise "Invalid operand #{left.dump} to immediate subtraction" unless left.immediateOperand?
+      raise "Invalid operand #{right.dump} to immediate subtraction" unless right.immediateOperand?
+    end
+end
+
 class Error
     def validate

trunk/Source/JavaScriptCore/offlineasm/x86.rb

@@ -464 +464 @@
 
 class LocalLabelReference
+    def x86Operand(kind)
+        asmLabel
+    end
     def x86CallOperand(kind)
         asmLabel
@@ -512 +515 @@
 class Instruction
     @@floatingPointCompareImplicitOperand = isIntelSyntax ? "st(0), " : ""
-    @@exportedSymbols = Array.new
     
     def x86Operands(*kinds)
@@ -847 +849 @@
     end
 
-    def writeSymbolToFile(symbol)
-        raise unless isMSVC
-
-        alreadyExported = @@exportedSymbols.include?(symbol)
-
-        if !alreadyExported
-            @@exportedSymbols.push(symbol)
-
-            # Write symbols needed by MASM
-            File.open("#{File.basename($output.path)}.sym", "a") {
-                | outp |
-                outp.puts "EXTERN #{symbol} : near"
-            }
-        end
-    end
-    
     def lowerX86Common
         $asm.codeOrigin codeOriginString if $enableCodeOriginComments
@@ -1339 +1325 @@
             end
             op = operands[0].x86CallOperand(:ptr)
-            if isMSVC && (operands[0].is_a? LabelReference)
-                writeSymbolToFile(op)
+            if operands[0].is_a? LabelReference
+                operands[0].used
             end
             $asm.puts "call #{op}"

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2014-04-10  Michael Saboff  <msaboff@apple.com>
+
+        LLInt interpreter code should be generated as part of one function
+        https://bugs.webkit.org/show_bug.cgi?id=131205
+
+        Reviewed by Mark Lam.
+
+        Updated VS dependencies for JavaScriptCore changes.
+
+        * WebKit.vcxproj/WebKit.sln:
+
 2014-04-10  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebKit/WebKit.vcxproj/WebKit.sln

@@ -69 +69 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "..\..\JavaScriptCore\JavaScriptCore.vcxproj\LLInt\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcxproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
         ProjectSection(ProjectDependencies) = postProject
+                {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
                 {877150A0-41B3-4730-9D98-1B8298098B14} = {877150A0-41B3-4730-9D98-1B8298098B14}
         EndProjectSection
@@ -79 +80 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntAssembly", "..\..\JavaScriptCore\JavaScriptCore.vcxproj\LLInt\LLIntAssembly\LLIntAssembly.vcxproj", "{9221744B-5715-4F56-9590-42F7AB23DD8B}"
         ProjectSection(ProjectDependencies) = postProject
+                {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
                 {D595E3F6-24F2-4C60-935C-95D50C6B3E96} = {D595E3F6-24F2-4C60-935C-95D50C6B3E96}
         EndProjectSection