Changeset 240138 in webkit

Timestamp:

Jan 17, 2019 6:11:44 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Audit bytecode fields and ensure that LLInt instructions for accessing them are appropriate.
​https://bugs.webkit.org/show_bug.cgi?id=193557
<rdar://problem/47369125>

Reviewed by Yusuke Suzuki.

1. Rename some bytecode fields so that it's easier to discern whether the LLInt is accessing them the right way:
   • distinguish between targetVirtualRegister and targetLabel.
   • name all StructureID fields as structureID (oldStructureID, newStructureID) instead of structure (oldStructure, newStructure).

2. Use bitwise_cast in struct Fits when sizeof(T) == size. This prevents potential undefined behavior issues arising from doing assignments with reinterpret_cast'ed pointers.

3. Make Special::Pointer an unsigned type (previously int). Make ResolveType an unsigned type (previously int).

4. In LowLevelInterpreter*.asm:

• rename the op macro argument to opcodeName or opcodeStruct respectively. This makes it clearer which argument type the macro is working with.

• rename the name macro argument to opcodeName.

• fix operator types to match the field type being accessed. The following may have resulted in bugs before:

1. The following should be read with getu() instead of get() because they are unsigned ints:

OpSwitchImm::m_tableIndex
OpSwitchChar::m_tableIndex
OpGetFromArguments::m_index
OpPutToArguments::m_index
OpGetRestLength::m_numParametersToSkip

OpJneqPtr::m_specialPointer should also be read with getu() though this
wasn't a bug because it was previously an int by default, and is only
changed to an unsigned int in this patch.

2.The following should be read with loadi (not loadp) because they are of

unsigned type (not a pointer):

OpResolveScope::Metadata::m_resolveType
CodeBlock::m_numParameters (see prepareForTailCall)

3. OpPutToScope::Metadata::m_operand should be read with loadp (not loadis) because it is a uintptr_t.

4. The following should be read with loadi (not loadis) because they are unsigned ints:

OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits
OpPutById::Metadata::m_oldStructureID
OpPutToScope::Metadata::m_getPutInfo + GetPutInfo::m_operand

These may not have manifested in bugs because the operations that follow
the load are 32-bit instructions which ignore the high word.

5. Give class GetPutInfo a default constructor so that we can use bitwise_cast on it. Also befriend LLIntOffsetsExtractor so that we can take the offset of m_operand in it.

• bytecode/ArithProfile.h:
• bytecode/BytecodeList.rb:
• bytecode/BytecodeUseDef.h:

(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::propagateTransitions):
(JSC::CodeBlock::finalizeLLIntInlineCaches):

• bytecode/Fits.h:
• bytecode/GetByIdMetadata.h:
• bytecode/GetByIdStatus.cpp:

(JSC::GetByIdStatus::computeFromLLInt):

• bytecode/LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp:

(JSC::LLIntPrototypeLoadAdaptiveStructureWatchpoint::clearLLIntGetByIdCache):

• bytecode/PreciseJumpTargetsInlines.h:

(JSC::jumpTargetForInstruction):
(JSC::updateStoredJumpTargetsForInstruction):

• bytecode/PutByIdStatus.cpp:

(JSC::PutByIdStatus::computeFromLLInt):

• bytecode/SpecialPointer.h:
• bytecompiler/BytecodeGenerator.cpp:

(JSC::Label::setLocation):

• dfg/DFGByteCodeParser.cpp:

(JSC::DFG::ByteCodeParser::parseBlock):

• jit/JITArithmetic.cpp:

(JSC::JIT::emit_compareAndJump):
(JSC::JIT::emit_compareUnsignedAndJump):
(JSC::JIT::emit_compareAndJumpSlow):

• jit/JITArithmetic32_64.cpp:

(JSC::JIT::emit_compareAndJump):
(JSC::JIT::emit_compareUnsignedAndJump):
(JSC::JIT::emit_compareAndJumpSlow):
(JSC::JIT::emitBinaryDoubleOp):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_jmp):
(JSC::JIT::emit_op_jfalse):
(JSC::JIT::emit_op_jeq_null):
(JSC::JIT::emit_op_jneq_null):
(JSC::JIT::emit_op_jneq_ptr):
(JSC::JIT::emit_op_jeq):
(JSC::JIT::emit_op_jtrue):
(JSC::JIT::emit_op_jneq):
(JSC::JIT::compileOpStrictEqJump):
(JSC::JIT::emitSlow_op_jstricteq):
(JSC::JIT::emitSlow_op_jnstricteq):
(JSC::JIT::emit_op_check_tdz):
(JSC::JIT::emitSlow_op_jeq):
(JSC::JIT::emitSlow_op_jneq):
(JSC::JIT::emit_op_profile_type):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_jmp):
(JSC::JIT::emit_op_jfalse):
(JSC::JIT::emit_op_jtrue):
(JSC::JIT::emit_op_jeq_null):
(JSC::JIT::emit_op_jneq_null):
(JSC::JIT::emit_op_jneq_ptr):
(JSC::JIT::emit_op_jeq):
(JSC::JIT::emitSlow_op_jeq):
(JSC::JIT::emit_op_jneq):
(JSC::JIT::emitSlow_op_jneq):
(JSC::JIT::compileOpStrictEqJump):
(JSC::JIT::emitSlow_op_jstricteq):
(JSC::JIT::emitSlow_op_jnstricteq):
(JSC::JIT::emit_op_check_tdz):
(JSC::JIT::emit_op_profile_type):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::setupGetByIdPrototypeCache):

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/CommonSlowPaths.cpp:
• runtime/GetPutInfo.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecode/ArithProfile.h (modified) (2 diffs)
• bytecode/BytecodeList.rb (modified) (12 diffs)
• bytecode/BytecodeUseDef.h (modified) (2 diffs)
• bytecode/CodeBlock.cpp (modified) (5 diffs)
• bytecode/Fits.h (modified) (2 diffs)
• bytecode/GetByIdMetadata.h (modified) (2 diffs)
• bytecode/GetByIdStatus.cpp (modified) (1 diff)
• bytecode/LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp (modified) (1 diff)
• bytecode/PreciseJumpTargetsInlines.h (modified) (2 diffs)
• bytecode/PutByIdStatus.cpp (modified) (2 diffs)
• bytecode/SpecialPointer.h (modified) (2 diffs)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• dfg/DFGByteCodeParser.cpp (modified) (22 diffs)
• jit/JITArithmetic.cpp (modified) (3 diffs)
• jit/JITArithmetic32_64.cpp (modified) (4 diffs)
• jit/JITOpcodes.cpp (modified) (15 diffs)
• jit/JITOpcodes32_64.cpp (modified) (15 diffs)
• llint/LLIntSlowPaths.cpp (modified) (14 diffs)
• llint/LowLevelInterpreter.asm (modified) (20 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (68 diffs)
• llint/LowLevelInterpreter64.asm (modified) (57 diffs)
• runtime/CommonSlowPaths.cpp (modified) (1 diff)
• runtime/GetPutInfo.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-01-17  Mark Lam  <mark.lam@apple.com>
+
+        Audit bytecode fields and ensure that LLInt instructions for accessing them are appropriate.
+        https://bugs.webkit.org/show_bug.cgi?id=193557
+        <rdar://problem/47369125>
+
+        Reviewed by Yusuke Suzuki.
+
+        1. Rename some bytecode fields so that it's easier to discern whether the LLInt
+           is accessing them the right way:
+           - distinguish between targetVirtualRegister and targetLabel.
+           - name all StructureID fields as structureID (oldStructureID, newStructureID)
+             instead of structure (oldStructure, newStructure).
+
+        2. Use bitwise_cast in struct Fits when sizeof(T) == size.
+           This prevents potential undefined behavior issues arising from doing
+           assignments with reinterpret_cast'ed pointers.
+
+        3. Make Special::Pointer an unsigned type (previously int).
+           Make ResolveType an unsigned type (previously int).
+
+        4. In LowLevelInterpreter*.asm:
+
+           - rename the op macro argument to opcodeName or opcodeStruct respectively.
+             This makes it clearer which argument type the macro is working with.
+
+           - rename the name macro argument to opcodeName.
+
+           - fix operator types to match the field type being accessed.  The following
+             may have resulted in bugs before:
+
+             1. The following should be read with getu() instead of get() because they
+                are unsigned ints:
+                    OpSwitchImm::m_tableIndex
+                    OpSwitchChar::m_tableIndex
+                    OpGetFromArguments::m_index
+                    OpPutToArguments::m_index
+                    OpGetRestLength::m_numParametersToSkip
+
+                OpJneqPtr::m_specialPointer should also be read with getu() though this
+                wasn't a bug because it was previously an int by default, and is only
+                changed to an unsigned int in this patch.
+
+             2.The following should be read with loadi (not loadp) because they are of
+               unsigned type (not a pointer):
+                    OpResolveScope::Metadata::m_resolveType
+                    CodeBlock::m_numParameters (see prepareForTailCall)
+
+             3. OpPutToScope::Metadata::m_operand should be read with loadp (not loadis)
+                because it is a uintptr_t.
+
+             4. The following should be read with loadi (not loadis) because they are
+                unsigned ints:
+                    OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits
+                    OpPutById::Metadata::m_oldStructureID
+                    OpPutToScope::Metadata::m_getPutInfo + GetPutInfo::m_operand
+
+                These may not have manifested in bugs because the operations that follow
+                the load are 32-bit instructions which ignore the high word.
+
+        5. Give class GetPutInfo a default constructor so that we can use bitwise_cast
+           on it.  Also befriend LLIntOffsetsExtractor so that we can take the offset of
+           m_operand in it.
+
+        * bytecode/ArithProfile.h:
+        * bytecode/BytecodeList.rb:
+        * bytecode/BytecodeUseDef.h:
+        (JSC::computeUsesForBytecodeOffset):
+        (JSC::computeDefsForBytecodeOffset):
+        * bytecode/CodeBlock.cpp:
+        (JSC::CodeBlock::propagateTransitions):
+        (JSC::CodeBlock::finalizeLLIntInlineCaches):
+        * bytecode/Fits.h:
+        * bytecode/GetByIdMetadata.h:
+        * bytecode/GetByIdStatus.cpp:
+        (JSC::GetByIdStatus::computeFromLLInt):
+        * bytecode/LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp:
+        (JSC::LLIntPrototypeLoadAdaptiveStructureWatchpoint::clearLLIntGetByIdCache):
+        * bytecode/PreciseJumpTargetsInlines.h:
+        (JSC::jumpTargetForInstruction):
+        (JSC::updateStoredJumpTargetsForInstruction):
+        * bytecode/PutByIdStatus.cpp:
+        (JSC::PutByIdStatus::computeFromLLInt):
+        * bytecode/SpecialPointer.h:
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::Label::setLocation):
+        * dfg/DFGByteCodeParser.cpp:
+        (JSC::DFG::ByteCodeParser::parseBlock):
+        * jit/JITArithmetic.cpp:
+        (JSC::JIT::emit_compareAndJump):
+        (JSC::JIT::emit_compareUnsignedAndJump):
+        (JSC::JIT::emit_compareAndJumpSlow):
+        * jit/JITArithmetic32_64.cpp:
+        (JSC::JIT::emit_compareAndJump):
+        (JSC::JIT::emit_compareUnsignedAndJump):
+        (JSC::JIT::emit_compareAndJumpSlow):
+        (JSC::JIT::emitBinaryDoubleOp):
+        * jit/JITOpcodes.cpp:
+        (JSC::JIT::emit_op_jmp):
+        (JSC::JIT::emit_op_jfalse):
+        (JSC::JIT::emit_op_jeq_null):
+        (JSC::JIT::emit_op_jneq_null):
+        (JSC::JIT::emit_op_jneq_ptr):
+        (JSC::JIT::emit_op_jeq):
+        (JSC::JIT::emit_op_jtrue):
+        (JSC::JIT::emit_op_jneq):
+        (JSC::JIT::compileOpStrictEqJump):
+        (JSC::JIT::emitSlow_op_jstricteq):
+        (JSC::JIT::emitSlow_op_jnstricteq):
+        (JSC::JIT::emit_op_check_tdz):
+        (JSC::JIT::emitSlow_op_jeq):
+        (JSC::JIT::emitSlow_op_jneq):
+        (JSC::JIT::emit_op_profile_type):
+        * jit/JITOpcodes32_64.cpp:
+        (JSC::JIT::emit_op_jmp):
+        (JSC::JIT::emit_op_jfalse):
+        (JSC::JIT::emit_op_jtrue):
+        (JSC::JIT::emit_op_jeq_null):
+        (JSC::JIT::emit_op_jneq_null):
+        (JSC::JIT::emit_op_jneq_ptr):
+        (JSC::JIT::emit_op_jeq):
+        (JSC::JIT::emitSlow_op_jeq):
+        (JSC::JIT::emit_op_jneq):
+        (JSC::JIT::emitSlow_op_jneq):
+        (JSC::JIT::compileOpStrictEqJump):
+        (JSC::JIT::emitSlow_op_jstricteq):
+        (JSC::JIT::emitSlow_op_jnstricteq):
+        (JSC::JIT::emit_op_check_tdz):
+        (JSC::JIT::emit_op_profile_type):
+        * llint/LLIntSlowPaths.cpp:
+        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+        (JSC::LLInt::setupGetByIdPrototypeCache):
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        * runtime/CommonSlowPaths.cpp:
+        * runtime/GetPutInfo.h:
+
 2019-01-17  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/JavaScriptCore/bytecode/ArithProfile.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2016 Apple Inc. All rights reserved.
+ * Copyright (C) 2016-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -307 +307 @@
 
     uint32_t m_bits { 0 }; // We take care to update m_bits only in a single operation. We don't ever store an inconsistent bit representation to it.
+
+    friend class JSC::LLIntOffsetsExtractor;
 };
 

trunk/Source/JavaScriptCore/bytecode/BytecodeList.rb

@@ -1 @@
-# Copyright (C) 2018 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2019 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -143 +143 @@
 op :check_tdz,
     args: {
-        target: VirtualRegister,
+        targetVirtualRegister: VirtualRegister,
     }
 
@@ -450 +450 @@
     metadata: {
         profile: ValueProfile, # not used in llint
-        structure: StructureID,
+        structureID: StructureID,
         offset: unsigned,
     }
@@ -472 +472 @@
     },
     metadata: {
-        oldStructure: StructureID,
+        oldStructureID: StructureID,
         offset: unsigned,
-        newStructure: StructureID,
+        newStructureID: StructureID,
         structureChain: WriteBarrierBase[StructureChain],
     }
@@ -599 +599 @@
 op :jmp,
     args: {
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -605 +605 @@
     args: {
         condition: VirtualRegister,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -611 +611 @@
     args: {
         condition: VirtualRegister,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -617 +617 @@
     args: {
         value: VirtualRegister,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -623 +623 @@
     args: {
         value: VirtualRegister,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -630 +630 @@
         value: VirtualRegister,
         specialPointer: Special::Pointer,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     },
     metadata: {
@@ -656 +656 @@
         lhs: VirtualRegister,
         rhs: VirtualRegister,
-        target: BoundLabel,
+        targetLabel: BoundLabel,
     }
 
@@ -966 +966 @@
 op :profile_type,
     args: {
-        target: VirtualRegister,
+        targetVirtualRegister: VirtualRegister,
         symbolTableOrScopeDepth: int,
         flag: ProfileTypeBytecodeFlag,

trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h

@@ -95 +95 @@
     USES(OpGetScope, dst)
     USES(OpToThis, srcDst)
-    USES(OpCheckTdz, target)
+    USES(OpCheckTdz, targetVirtualRegister)
     USES(OpIdentityWithProfile, srcDst)
-    USES(OpProfileType, target);
+    USES(OpProfileType, targetVirtualRegister);
     USES(OpThrow, value)
     USES(OpThrowStaticError, message)
@@ -449 +449 @@
     DEFS(OpNewObject, dst)
     DEFS(OpToThis, srcDst)
-    DEFS(OpCheckTdz, target)
+    DEFS(OpCheckTdz, targetVirtualRegister)
     DEFS(OpGetScope, dst)
     DEFS(OpCreateDirectArguments, dst)

trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

@@ -1096 +1096 @@
             if (instruction->is<OpPutById>()) {
                 auto& metadata = instruction->as<OpPutById>().metadata(this);
-                StructureID oldStructureID = metadata.m_oldStructure;
-                StructureID newStructureID = metadata.m_newStructure;
+                StructureID oldStructureID = metadata.m_oldStructureID;
+                StructureID newStructureID = metadata.m_newStructureID;
                 if (!oldStructureID || !newStructureID)
                     continue;
@@ -1227 +1227 @@
             if (metadata.m_mode != GetByIdMode::Default)
                 break;
-            StructureID oldStructureID = metadata.m_modeMetadata.defaultMode.structure;
+            StructureID oldStructureID = metadata.m_modeMetadata.defaultMode.structureID;
             if (!oldStructureID || Heap::isMarked(vm.heap.structureIDTable().get(oldStructureID)))
                 break;
@@ -1237 +1237 @@
         case op_get_by_id_direct: {
             auto& metadata = curInstruction->as<OpGetByIdDirect>().metadata(this);
-            StructureID oldStructureID = metadata.m_structure;
+            StructureID oldStructureID = metadata.m_structureID;
             if (!oldStructureID || Heap::isMarked(vm.heap.structureIDTable().get(oldStructureID)))
                 break;
             if (Options::verboseOSR())
                 dataLogF("Clearing LLInt property access.\n");
-            metadata.m_structure = 0;
+            metadata.m_structureID = 0;
             metadata.m_offset = 0;
             break;
@@ -1248 +1248 @@
         case op_put_by_id: {
             auto& metadata = curInstruction->as<OpPutById>().metadata(this);
-            StructureID oldStructureID = metadata.m_oldStructure;
-            StructureID newStructureID = metadata.m_newStructure;
+            StructureID oldStructureID = metadata.m_oldStructureID;
+            StructureID newStructureID = metadata.m_newStructureID;
             StructureChain* chain = metadata.m_structureChain.get();
             if ((!oldStructureID || Heap::isMarked(vm.heap.structureIDTable().get(oldStructureID)))
@@ -1257 +1257 @@
             if (Options::verboseOSR())
                 dataLogF("Clearing LLInt put transition.\n");
-            metadata.m_oldStructure = 0;
+            metadata.m_oldStructureID = 0;
             metadata.m_offset = 0;
-            metadata.m_newStructure = 0;
+            metadata.m_newStructureID = 0;
             metadata.m_structureChain.clear();
             break;

trunk/Source/JavaScriptCore/bytecode/Fits.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53 +53 @@
     static bool check(T) { return true; }
 
-    static typename TypeBySize<size>::type convert(T t) { return *reinterpret_cast<typename TypeBySize<size>::type*>(&t); }
+    static typename TypeBySize<size>::type convert(T t) { return bitwise_cast<typename TypeBySize<size>::type>(t); }
 
     template<class T1 = T, OpcodeSize size1 = size, typename = std::enable_if_t<!std::is_same<T1, typename TypeBySize<size1>::type>::value, std::true_type>>
-    static T1 convert(typename TypeBySize<size1>::type t) { return *reinterpret_cast<T1*>(&t); }
+    static T1 convert(typename TypeBySize<size1>::type t) { return bitwise_cast<T1>(t); }
 };
 

trunk/Source/JavaScriptCore/bytecode/GetByIdMetadata.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2018-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40 +40 @@
 
     struct Default {
-        StructureID structure;
+        StructureID structureID;
         PropertyOffset cachedOffset;
     } defaultMode;
 
     struct Unset {
-        StructureID structure;
+        StructureID structureID;
     } unsetMode;
 
     struct ProtoLoad {
-        StructureID structure;
+        StructureID structureID;
         PropertyOffset cachedOffset;
         JSObject* cachedSlot;

trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp

@@ -67 +67 @@
         if (metadata.m_mode != GetByIdMode::Default)
             return GetByIdStatus(NoInformation, false);
-        structureID = metadata.m_modeMetadata.defaultMode.structure;
+        structureID = metadata.m_modeMetadata.defaultMode.structureID;
         break;
     }
     case op_get_by_id_direct:
-        structureID = instruction->as<OpGetByIdDirect>().metadata(profiledBlock).m_structure;
+        structureID = instruction->as<OpGetByIdDirect>().metadata(profiledBlock).m_structureID;
         break;
     case op_try_get_by_id: {

trunk/Source/JavaScriptCore/bytecode/LLIntPrototypeLoadAdaptiveStructureWatchpoint.cpp

@@ -62 +62 @@
     metadata.m_mode = GetByIdMode::Default;
     metadata.m_modeMetadata.defaultMode.cachedOffset = 0;
-    metadata.m_modeMetadata.defaultMode.structure = 0;
+    metadata.m_modeMetadata.defaultMode.structureID = 0;
 }
 

trunk/Source/JavaScriptCore/bytecode/PreciseJumpTargetsInlines.h

@@ -109 +109 @@
 {
     auto bytecode = instruction->as<Op>();
-    return jumpTargetForInstruction(codeBlock, instruction, bytecode.m_target);
+    return jumpTargetForInstruction(codeBlock, instruction, bytecode.m_targetLabel);
 }
 
@@ -140 +140 @@
         int32_t target = jumpTargetForInstruction<__op>(codeBlockOrHashMap, instruction); \
         int32_t newTarget = function(target); \
-        instruction->cast<__op>()->setTarget(BoundLabel(newTarget), [&]() { \
+        instruction->cast<__op>()->setTargetLabel(BoundLabel(newTarget), [&]() { \
             codeBlock->addOutOfLineJumpTarget(finalOffset + instruction.offset(), newTarget); \
             return BoundLabel(); \

trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp

@@ -56 +56 @@
     auto& metadata = bytecode.metadata(profiledBlock);
 
-    StructureID structureID = metadata.m_oldStructure;
+    StructureID structureID = metadata.m_oldStructureID;
     if (!structureID)
         return PutByIdStatus(NoInformation);
@@ -62 +62 @@
     Structure* structure = vm.heap.structureIDTable().get(structureID);
 
-    StructureID newStructureID = metadata.m_newStructure;
+    StructureID newStructureID = metadata.m_newStructureID;
     if (!newStructureID) {
         PropertyOffset offset = structure->getConcurrently(uid);

trunk/Source/JavaScriptCore/bytecode/SpecialPointer.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2012-2019 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32 +32 @@
 
 namespace Special {
-enum Pointer {
+enum Pointer : unsigned {
     CallFunction,
     ApplyFunction,

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -103 +103 @@
 #define CASE(__op) \
     case __op::opcodeID:  \
-        instruction->cast<__op>()->setTarget(BoundLabel(target), [&]() { \
+        instruction->cast<__op>()->setTargetLabel(BoundLabel(target), [&]() { \
             generator.m_codeBlock->addOutOfLineJumpTarget(instruction.offset(), target); \
             return BoundLabel(); \

trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp

@@ -5091 +5091 @@
         case op_check_tdz: {
             auto bytecode = currentInstruction->as<OpCheckTdz>();
-            addToGraph(CheckNotEmpty, get(bytecode.m_target));
+            addToGraph(CheckNotEmpty, get(bytecode.m_targetVirtualRegister));
             NEXT_OPCODE(op_check_tdz);
         }
@@ -5599 +5599 @@
             auto bytecode = currentInstruction->as<OpProfileType>();
             auto& metadata = bytecode.metadata(codeBlock);
-            Node* valueToProfile = get(bytecode.m_target);
+            Node* valueToProfile = get(bytecode.m_targetVirtualRegister);
             addToGraph(ProfileType, OpInfo(metadata.m_typeLocation), valueToProfile);
             NEXT_OPCODE(op_profile_type);
@@ -5616 +5616 @@
             ASSERT(!m_currentBlock->terminal());
             auto bytecode = currentInstruction->as<OpJmp>();
-            int relativeOffset = jumpTarget(bytecode.m_target);
+            int relativeOffset = jumpTarget(bytecode.m_targetLabel);
             addToGraph(Jump, OpInfo(m_currentIndex + relativeOffset));
             if (relativeOffset <= 0)
@@ -5625 +5625 @@
         case op_jtrue: {
             auto bytecode = currentInstruction->as<OpJtrue>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* condition = get(bytecode.m_condition);
             addToGraph(Branch, OpInfo(branchData(m_currentIndex + relativeOffset, m_currentIndex + currentInstruction->size())), condition);
@@ -5633 +5633 @@
         case op_jfalse: {
             auto bytecode = currentInstruction->as<OpJfalse>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* condition = get(bytecode.m_condition);
             addToGraph(Branch, OpInfo(branchData(m_currentIndex + currentInstruction->size(), m_currentIndex + relativeOffset)), condition);
@@ -5641 +5641 @@
         case op_jeq_null: {
             auto bytecode = currentInstruction->as<OpJeqNull>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* value = get(bytecode.m_value);
             Node* nullConstant = addToGraph(JSConstant, OpInfo(m_constantNull));
@@ -5651 +5651 @@
         case op_jneq_null: {
             auto bytecode = currentInstruction->as<OpJneqNull>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* value = get(bytecode.m_value);
             Node* nullConstant = addToGraph(JSConstant, OpInfo(m_constantNull));
@@ -5661 +5661 @@
         case op_jless: {
             auto bytecode = currentInstruction->as<OpJless>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5671 +5671 @@
         case op_jlesseq: {
             auto bytecode = currentInstruction->as<OpJlesseq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5681 +5681 @@
         case op_jgreater: {
             auto bytecode = currentInstruction->as<OpJgreater>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5691 +5691 @@
         case op_jgreatereq: {
             auto bytecode = currentInstruction->as<OpJgreatereq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5701 +5701 @@
         case op_jeq: {
             auto bytecode = currentInstruction->as<OpJeq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5711 +5711 @@
         case op_jstricteq: {
             auto bytecode = currentInstruction->as<OpJstricteq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5721 +5721 @@
         case op_jnless: {
             auto bytecode = currentInstruction->as<OpJnless>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5731 +5731 @@
         case op_jnlesseq: {
             auto bytecode = currentInstruction->as<OpJnlesseq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5741 +5741 @@
         case op_jngreater: {
             auto bytecode = currentInstruction->as<OpJngreater>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5751 +5751 @@
         case op_jngreatereq: {
             auto bytecode = currentInstruction->as<OpJngreatereq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5761 +5761 @@
         case op_jneq: {
             auto bytecode = currentInstruction->as<OpJneq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5771 +5771 @@
         case op_jnstricteq: {
             auto bytecode = currentInstruction->as<OpJnstricteq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5781 +5781 @@
         case op_jbelow: {
             auto bytecode = currentInstruction->as<OpJbelow>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -5791 +5791 @@
         case op_jbeloweq: {
             auto bytecode = currentInstruction->as<OpJbeloweq>();
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* op1 = get(bytecode.m_lhs);
             Node* op2 = get(bytecode.m_rhs);
@@ -6108 +6108 @@
                 actualPointerFor(m_inlineStackTop->m_codeBlock, specialPointer));
             FrozenValue* frozenPointer = m_graph.freeze(actualPointer);
-            unsigned relativeOffset = jumpTarget(bytecode.m_target);
+            unsigned relativeOffset = jumpTarget(bytecode.m_targetLabel);
             Node* child = get(bytecode.m_value);
             if (bytecode.metadata(codeBlock).m_hasJumped) {

trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp

@@ -179 +179 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
     if (isOperandConstantChar(op1)) {
         emitGetVirtualRegister(op2, regT0);
@@ -226 +226 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
     if (isOperandConstantInt(op2)) {
         emitGetVirtualRegister(op1, regT0);
@@ -270 +270 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
 
     // We generate inline code for the following cases in the slow path:

trunk/Source/JavaScriptCore/jit/JITArithmetic32_64.cpp

@@ -51 +51 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
 
     // Character less.
@@ -105 +105 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
 
     if (isOperandConstantInt(op1)) {
@@ -146 +146 @@
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();
-    unsigned target = jumpTarget(instruction, bytecode.m_target);
+    unsigned target = jumpTarget(instruction, bytecode.m_targetLabel);
 
     linkAllSlowCases(iter);
@@ -200 +200 @@
     auto bytecode = instruction->as<Op>();
     int opcodeID = Op::opcodeID;
-    int target = jumpTarget(instruction, bytecode.m_target);
+    int target = jumpTarget(instruction, bytecode.m_targetLabel);
     int op1 = bytecode.m_lhs.offset();
     int op2 = bytecode.m_rhs.offset();

trunk/Source/JavaScriptCore/jit/JITOpcodes.cpp

@@ -87 +87 @@
 {
     auto bytecode = currentInstruction->as<OpJmp>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     addJump(jump(), target);
 }
@@ -384 +384 @@
 {
     auto bytecode = currentInstruction->as<OpJfalse>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     GPRReg value = regT0;
@@ -399 +399 @@
     auto bytecode = currentInstruction->as<OpJeqNull>();
     int src = bytecode.m_value.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitGetVirtualRegister(src, regT0);
@@ -423 +423 @@
     auto bytecode = currentInstruction->as<OpJneqNull>();
     int src = bytecode.m_value.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitGetVirtualRegister(src, regT0);
@@ -449 +449 @@
     int src = bytecode.m_value.offset();
     Special::Pointer ptr = bytecode.m_specialPointer;
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     
     emitGetVirtualRegister(src, regT0);
@@ -471 +471 @@
 {
     auto bytecode = currentInstruction->as<OpJeq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     emitGetVirtualRegisters(bytecode.m_lhs.offset(), regT0, bytecode.m_rhs.offset(), regT1);
     emitJumpSlowCaseIfNotInt(regT0, regT1, regT2);
@@ -480 +480 @@
 {
     auto bytecode = currentInstruction->as<OpJtrue>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     GPRReg value = regT0;
@@ -504 +504 @@
 {
     auto bytecode = currentInstruction->as<OpJneq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     emitGetVirtualRegisters(bytecode.m_lhs.offset(), regT0, bytecode.m_rhs.offset(), regT1);
     emitJumpSlowCaseIfNotInt(regT0, regT1, regT2);
@@ -567 +567 @@
 {
     auto bytecode = currentInstruction->as<Op>();
-    int target = jumpTarget(currentInstruction, bytecode.m_target);
+    int target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     int src1 = bytecode.m_lhs.offset();
     int src2 = bytecode.m_rhs.offset();
@@ -608 +608 @@
 
     auto bytecode = currentInstruction->as<OpJstricteq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareStrictEq, regT0, regT1);
     emitJumpSlowToHot(branchTest32(NonZero, returnValueGPR), target);
@@ -618 +618 @@
 
     auto bytecode = currentInstruction->as<OpJnstricteq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareStrictEq, regT0, regT1);
     emitJumpSlowToHot(branchTest32(Zero, returnValueGPR), target);
@@ -933 +933 @@
 {
     auto bytecode = currentInstruction->as<OpCheckTdz>();
-    emitGetVirtualRegister(bytecode.m_target.offset(), regT0);
+    emitGetVirtualRegister(bytecode.m_targetVirtualRegister.offset(), regT0);
     addSlowCase(branchIfEmpty(regT0));
 }
@@ -966 +966 @@
 
     auto bytecode = currentInstruction->as<OpJeq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareEq, regT0, regT1);
     emitJumpSlowToHot(branchTest32(NonZero, returnValueGPR), target);
@@ -976 +976 @@
 
     auto bytecode = currentInstruction->as<OpJneq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareEq, regT0, regT1);
     emitJumpSlowToHot(branchTest32(Zero, returnValueGPR), target);
@@ -1400 +1400 @@
     auto& metadata = bytecode.metadata(m_codeBlock);
     TypeLocation* cachedTypeLocation = metadata.m_typeLocation;
-    int valueToProfile = bytecode.m_target.offset();
+    int valueToProfile = bytecode.m_targetVirtualRegister.offset();
 
     emitGetVirtualRegister(valueToProfile, regT0);

trunk/Source/JavaScriptCore/jit/JITOpcodes32_64.cpp

@@ -75 +75 @@
 {
     auto bytecode = currentInstruction->as<OpJmp>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     addJump(jump(), target);
 }
@@ -373 +373 @@
     auto bytecode = currentInstruction->as<OpJfalse>();
     int cond = bytecode.m_condition.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitLoad(cond, regT1, regT0);
@@ -388 +388 @@
     auto bytecode = currentInstruction->as<OpJtrue>();
     int cond = bytecode.m_condition.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitLoad(cond, regT1, regT0);
@@ -402 +402 @@
     auto bytecode = currentInstruction->as<OpJeqNull>();
     int src = bytecode.m_value.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitLoad(src, regT1, regT0);
@@ -428 +428 @@
     auto bytecode = currentInstruction->as<OpJneqNull>();
     int src = bytecode.m_value.offset();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitLoad(src, regT1, regT0);
@@ -456 +456 @@
     int src = bytecode.m_value.offset();
     Special::Pointer ptr = bytecode.m_specialPointer;
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
 
     emitLoad(src, regT1, regT0);
@@ -515 +515 @@
 {
     auto bytecode = currentInstruction->as<OpJeq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     int src1 = bytecode.m_lhs.offset();
     int src2 = bytecode.m_rhs.offset();
@@ -555 +555 @@
 {
     auto bytecode = currentInstruction->as<OpJeq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     compileOpEqJumpSlow(iter, CompileOpEqType::Eq, target);
 }
@@ -607 +607 @@
 {
     auto bytecode = currentInstruction->as<OpJneq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     int src1 = bytecode.m_lhs.offset();
     int src2 = bytecode.m_rhs.offset();
@@ -622 +622 @@
 {
     auto bytecode = currentInstruction->as<OpJneq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     compileOpEqJumpSlow(iter, CompileOpEqType::NEq, target);
 }
@@ -670 +670 @@
 {
     auto bytecode = currentInstruction->as<Op>();
-    int target = jumpTarget(currentInstruction, bytecode.m_target);
+    int target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     int src1 = bytecode.m_lhs.offset();
     int src2 = bytecode.m_rhs.offset();
@@ -709 +709 @@
 
     auto bytecode = currentInstruction->as<OpJstricteq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareStrictEq, JSValueRegs(regT1, regT0), JSValueRegs(regT3, regT2));
     emitJumpSlowToHot(branchTest32(NonZero, returnValueGPR), target);
@@ -719 +719 @@
 
     auto bytecode = currentInstruction->as<OpJnstricteq>();
-    unsigned target = jumpTarget(currentInstruction, bytecode.m_target);
+    unsigned target = jumpTarget(currentInstruction, bytecode.m_targetLabel);
     callOperation(operationCompareStrictEq, JSValueRegs(regT1, regT0), JSValueRegs(regT3, regT2));
     emitJumpSlowToHot(branchTest32(Zero, returnValueGPR), target);
@@ -1059 +1059 @@
 {
     auto bytecode = currentInstruction->as<OpCheckTdz>();
-    emitLoadTag(bytecode.m_target.offset(), regT0);
+    emitLoadTag(bytecode.m_targetVirtualRegister.offset(), regT0);
     addSlowCase(branchIfEmpty(regT0));
 }
@@ -1272 +1272 @@
     auto& metadata = bytecode.metadata(m_codeBlock);
     TypeLocation* cachedTypeLocation = metadata.m_typeLocation;
-    int valueToProfile = bytecode.m_target.offset();
+    int valueToProfile = bytecode.m_targetVirtualRegister.offset();
 
     // Load payload in T0. Load tag in T3.

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -123 +123 @@
     } while (false)
 
-#define JUMP_OFFSET(target) \
-    ((target) ? (target) : exec->codeBlock()->outOfLineJumpOffset(pc))
+#define JUMP_OFFSET(targetOffset) \
+    ((targetOffset) ? (targetOffset) : exec->codeBlock()->outOfLineJumpOffset(pc))
 
 #define JUMP_TO(target) do { \
@@ -134 +134 @@
         LLINT_CHECK_EXCEPTION();                                  \
         if (__b_condition)                                        \
-            JUMP_TO(JUMP_OFFSET(bytecode.m_target)); \
+            JUMP_TO(JUMP_OFFSET(bytecode.m_targetLabel));         \
         else                                                      \
             JUMP_TO(pc->size()); \
@@ -657 +657 @@
         auto& metadata = bytecode.metadata(exec);
         {
-            StructureID oldStructureID = metadata.m_structure;
+            StructureID oldStructureID = metadata.m_structureID;
             if (oldStructureID) {
                 Structure* a = vm.heap.structureIDTable().get(oldStructureID);
@@ -673 +673 @@
         if (slot.isValue()) {
             // Start out by clearing out the old cache.
-            metadata.m_structure = 0;
+            metadata.m_structureID = 0;
             metadata.m_offset = 0;
 
@@ -682 +682 @@
                 ConcurrentJSLocker locker(codeBlock->m_lock);
 
-                metadata.m_structure = structure->id();
+                metadata.m_structureID = structure->id();
                 metadata.m_offset = slot.cachedOffset();
             }
@@ -737 +737 @@
     if (slot.isUnset()) {
         metadata.m_mode = GetByIdMode::Unset;
-        metadata.m_modeMetadata.unsetMode.structure = structure->id();
+        metadata.m_modeMetadata.unsetMode.structureID = structure->id();
         return;
     }
@@ -743 +743 @@
 
     metadata.m_mode = GetByIdMode::ProtoLoad;
-    metadata.m_modeMetadata.protoLoadMode.structure = structure->id();
+    metadata.m_modeMetadata.protoLoadMode.structureID = structure->id();
     metadata.m_modeMetadata.protoLoadMode.cachedOffset = offset;
     metadata.m_modeMetadata.protoLoadMode.cachedSlot = slot.slotBase();
@@ -774 +774 @@
             switch (mode) {
             case GetByIdMode::Default:
-                oldStructureID = metadata.m_modeMetadata.defaultMode.structure;
+                oldStructureID = metadata.m_modeMetadata.defaultMode.structureID;
                 break;
             case GetByIdMode::Unset:
-                oldStructureID = metadata.m_modeMetadata.unsetMode.structure;
+                oldStructureID = metadata.m_modeMetadata.unsetMode.structureID;
                 break;
             case GetByIdMode::ProtoLoad:
-                oldStructureID = metadata.m_modeMetadata.protoLoadMode.structure;
+                oldStructureID = metadata.m_modeMetadata.protoLoadMode.structureID;
                 break;
             default:
@@ -801 +801 @@
             // Start out by clearing out the old cache.
             metadata.m_mode = GetByIdMode::Default;
-            metadata.m_modeMetadata.defaultMode.structure = 0;
+            metadata.m_modeMetadata.defaultMode.structureID = 0;
             metadata.m_modeMetadata.defaultMode.cachedOffset = 0;
 
@@ -813 +813 @@
                 ConcurrentJSLocker locker(codeBlock->m_lock);
 
-                metadata.m_modeMetadata.defaultMode.structure = structure->id();
+                metadata.m_modeMetadata.defaultMode.structureID = structure->id();
                 metadata.m_modeMetadata.defaultMode.cachedOffset = slot.cachedOffset();
             }
@@ -858 +858 @@
 
         {
-            StructureID oldStructureID = metadata.m_oldStructure;
+            StructureID oldStructureID = metadata.m_oldStructureID;
             if (oldStructureID) {
                 Structure* a = vm.heap.structureIDTable().get(oldStructureID);
@@ -873 +873 @@
 
         // Start out by clearing out the old cache.
-        metadata.m_oldStructure = 0;
+        metadata.m_oldStructureID = 0;
         metadata.m_offset = 0;
-        metadata.m_newStructure = 0;
+        metadata.m_newStructureID = 0;
         metadata.m_structureChain.clear();
         
@@ -897 +897 @@
                     if (result != InvalidPrototypeChain && !sawPolyProto) {
                         ASSERT(structure->previousID()->isObject());
-                        metadata.m_oldStructure = structure->previousID()->id();
+                        metadata.m_oldStructureID = structure->previousID()->id();
                         metadata.m_offset = slot.cachedOffset();
-                        metadata.m_newStructure = structure->id();
+                        metadata.m_newStructureID = structure->id();
                         if (!(bytecode.m_flags & PutByIdIsDirect)) {
                             StructureChain* chain = structure->prototypeChain(exec, asObject(baseCell));
@@ -909 +909 @@
             } else {
                 structure->didCachePropertyReplacement(vm, slot.cachedOffset());
-                metadata.m_oldStructure = structure->id();
+                metadata.m_oldStructureID = structure->id();
                 metadata.m_offset = slot.cachedOffset();
             }

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -286 +286 @@
 end
 
-macro dispatch(advance)
-    addp advance, PC
+macro dispatch(advanceReg)
+    addp advanceReg, PC
     nextInstruction()
 end
 
-macro dispatchIndirect(offset)
-    dispatch(offset)
-end
-
-macro dispatchOp(size, op)
+macro dispatchIndirect(offsetReg)
+    dispatch(offsetReg)
+end
+
+macro dispatchOp(size, opcodeName)
     macro dispatchNarrow()
-        dispatch(constexpr %op%_length)
+        dispatch(constexpr %opcodeName%_length)
     end
 
     macro dispatchWide()
-        dispatch(constexpr %op%_length * 4 + 1)
+        dispatch(constexpr %opcodeName%_length * 4 + 1)
     end
 
@@ -307 +307 @@
 end
 
-macro getu(size, op, fieldName, dst)
+macro getu(size, opcodeStruct, fieldName, dst)
     size(getuOperandNarrow, getuOperandWide, macro (getu)
-        getu(op, fieldName, dst)
+        getu(opcodeStruct, fieldName, dst)
     end)
 end
 
-macro get(size, op, fieldName, dst)
+macro get(size, opcodeStruct, fieldName, dst)
     size(getOperandNarrow, getOperandWide, macro (get)
-        get(op, fieldName, dst)
+        get(opcodeStruct, fieldName, dst)
     end)
 end
@@ -335 +335 @@
 end
 
-macro jumpImpl(target)
-    btiz target, .outOfLineJumpTarget
-    dispatchIndirect(target)
+macro jumpImpl(targetOffsetReg)
+    btiz targetOffsetReg, .outOfLineJumpTarget
+    dispatchIndirect(targetOffsetReg)
 .outOfLineJumpTarget:
     callSlowPath(_llint_slow_path_out_of_line_jump_target)
@@ -359 +359 @@
 end
 
-macro llintOp(name, op, fn)
-    commonOp(llint_%name%, traceExecution, macro(size)
+macro llintOp(opcodeName, opcodeStruct, fn)
+    commonOp(llint_%opcodeName%, traceExecution, macro(size)
         macro getImpl(fieldName, dst)
-            get(size, op, fieldName, dst)
+            get(size, opcodeStruct, fieldName, dst)
         end
 
         macro dispatchImpl()
-            dispatchOp(size, name)
+            dispatchOp(size, opcodeName)
         end
 
@@ -373 +373 @@
 end
 
-macro llintOpWithReturn(name, op, fn)
-    llintOp(name, op, macro(size, get, dispatch)
+macro llintOpWithReturn(opcodeName, opcodeStruct, fn)
+    llintOp(opcodeName, opcodeStruct, macro(size, get, dispatch)
         makeReturn(get, dispatch, macro (return)
             fn(size, get, dispatch, return)
@@ -381 +381 @@
 end
 
-macro llintOpWithMetadata(name, op, fn)
-    llintOpWithReturn(name, op, macro (size, get, dispatch, return)
+macro llintOpWithMetadata(opcodeName, opcodeStruct, fn)
+    llintOpWithReturn(opcodeName, opcodeStruct, macro (size, get, dispatch, return)
         macro meta(dst, scratch)
-            metadata(size, op, dst, scratch)
+            metadata(size, opcodeStruct, dst, scratch)
         end
         fn(size, get, dispatch, meta, return)
@@ -390 +390 @@
 end
 
-macro llintOpWithJump(name, op, impl)
-    llintOpWithMetadata(name, op, macro(size, get, dispatch, metadata, return)
+macro llintOpWithJump(opcodeName, opcodeStruct, impl)
+    llintOpWithMetadata(opcodeName, opcodeStruct, macro(size, get, dispatch, metadata, return)
         macro jump(fieldName)
             get(fieldName, t0)
@@ -401 +401 @@
 end
 
-macro llintOpWithProfile(name, op, fn)
-    llintOpWithMetadata(name, op, macro(size, get, dispatch, metadata, return)
-        makeReturnProfiled(op, get, metadata, dispatch, macro (returnProfiled)
+macro llintOpWithProfile(opcodeName, opcodeStruct, fn)
+    llintOpWithMetadata(opcodeName, opcodeStruct, macro(size, get, dispatch, metadata, return)
+        makeReturnProfiled(opcodeStruct, get, metadata, dispatch, macro (returnProfiled)
             fn(size, get, dispatch, returnProfiled)
         end)
@@ -896 +896 @@
 end
 
-macro callTargetFunction(size, op, dispatch, callee, callPtrTag)
+macro callTargetFunction(size, opcodeStruct, dispatch, callee, callPtrTag)
     if C_LOOP
         cloopCallJSFunction callee
@@ -903 +903 @@
     end
     restoreStackPointerAfterCall()
-    dispatchAfterCall(size, op, dispatch)
+    dispatchAfterCall(size, opcodeStruct, dispatch)
 end
 
@@ -916 +916 @@
     loadi PayloadOffset + ArgumentCount[cfr], temp2
     loadp CodeBlock[cfr], temp1
-    loadp CodeBlock::m_numParameters[temp1], temp1
+    loadi CodeBlock::m_numParameters[temp1], temp1
     bilteq temp1, temp2, .noArityFixup
     move temp1, temp2
@@ -971 +971 @@
 end
 
-macro slowPathForCall(size, op, dispatch, slowPath, prepareCall)
+macro slowPathForCall(size, opcodeStruct, dispatch, slowPath, prepareCall)
     callCallSlowPath(
         slowPath,
@@ -980 +980 @@
             prepareCall(callee, t2, t3, t4, SlowPathPtrTag)
         .dontUpdateSP:
-            callTargetFunction(size, op, dispatch, callee, SlowPathPtrTag)
+            callTargetFunction(size, opcodeStruct, dispatch, callee, SlowPathPtrTag)
         end)
 end
@@ -1193 +1193 @@
     btpz t3, .argumentProfileDone # When we can't JIT, we don't allocate any argument value profiles.
     mulp sizeof ValueProfile, t0, t2 # Aaaaahhhh! Need strength reduction!
-    lshiftp 3, t0
-    addp t2, t3
+    lshiftp 3, t0 # offset of last JSValue arguments on the stack.
+    addp t2, t3 # pointer to end of ValueProfile array in CodeBlock::m_argumentValueProfiles.
 .argumentProfileLoop:
     if JSVALUE64
@@ -1434 +1434 @@
 
 # Value-representation-agnostic code.
-macro slowPathOp(op)
-    llintOp(op_%op%, unused, macro (unused, unused, dispatch)
-        callSlowPath(_slow_path_%op%)
+macro slowPathOp(opcodeName)
+    llintOp(op_%opcodeName%, unused, macro (unused, unused, dispatch)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -1482 +1482 @@
 slowPathOp(unreachable)
 
-macro llintSlowPathOp(op)
-    llintOp(op_%op%, unused, macro (unused, unused, dispatch)
-        callSlowPath(_llint_slow_path_%op%)
+macro llintSlowPathOp(opcodeName)
+    llintOp(op_%opcodeName%, unused, macro (unused, unused, dispatch)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -1539 +1539 @@
 
 llintOpWithJump(op_jmp, OpJmp, macro (size, get, jump, dispatch)
-    jump(m_target)
+    jump(m_targetLabel)
 end)
 
@@ -1675 +1675 @@
 
 
-macro callOp(name, op, prepareCall, fn)
-    commonCallOp(op_%name%, _llint_slow_path_%name%, op, prepareCall, fn)
+macro callOp(opcodeName, opcodeStruct, prepareCall, fn)
+    commonCallOp(op_%opcodeName%, _llint_slow_path_%opcodeName%, opcodeStruct, prepareCall, fn)
 end
 
@@ -1691 +1691 @@
 
 
-macro doCallVarargs(size, op, dispatch, frameSlowPath, slowPath, prepareCall)
+macro doCallVarargs(size, opcodeStruct, dispatch, frameSlowPath, slowPath, prepareCall)
     callSlowPath(frameSlowPath)
     branchIfException(_llint_throw_from_slow_path_trampoline)
@@ -1706 +1706 @@
         end
     end
-    slowPathForCall(size, op, dispatch, slowPath, prepareCall)
+    slowPathForCall(size, opcodeStruct, dispatch, slowPath, prepareCall)
 end
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -36 +36 @@
 end
 
-macro getuOperandNarrow(op, fieldName, dst)
-    loadb constexpr %op%_%fieldName%_index[PC], dst
-end
-
-macro getOperandNarrow(op, fieldName, dst)
-    loadbsp constexpr %op%_%fieldName%_index[PC], dst
-end
-
-macro getuOperandWide(op, fieldName, dst)
-    loadi constexpr %op%_%fieldName%_index * 4 + 1[PC], dst
-end
-
-macro getOperandWide(op, fieldName, dst)
-    loadis constexpr %op%_%fieldName%_index * 4 + 1[PC], dst
+macro getuOperandNarrow(opcodeStruct, fieldName, dst)
+    loadb constexpr %opcodeStruct%_%fieldName%_index[PC], dst
+end
+
+macro getOperandNarrow(opcodeStruct, fieldName, dst)
+    loadbsp constexpr %opcodeStruct%_%fieldName%_index[PC], dst
+end
+
+macro getuOperandWide(opcodeStruct, fieldName, dst)
+    loadi constexpr %opcodeStruct%_%fieldName%_index * 4 + 1[PC], dst
+end
+
+macro getOperandWide(opcodeStruct, fieldName, dst)
+    loadis constexpr %opcodeStruct%_%fieldName%_index * 4 + 1[PC], dst
 end
 
@@ -63 +63 @@
 end
 
-macro makeReturnProfiled(op, get, metadata, dispatch, fn)
+macro makeReturnProfiled(opcodeStruct, get, metadata, dispatch, fn)
     fn(macro (tag, payload)
         move tag, t1
@@ -69 +69 @@
 
         metadata(t5, t2)
-        valueProfile(op, t5, t1, t0)
+        valueProfile(opcodeStruct, t5, t1, t0)
         get(m_dst, t2)
         storei t1, TagOffset[cfr, t2, 8]
@@ -78 +78 @@
 
 
-macro dispatchAfterCall(size, op, dispatch)
+macro dispatchAfterCall(size, opcodeStruct, dispatch)
     loadi ArgumentCount + TagOffset[cfr], PC
-    get(size, op, m_dst, t3)
+    get(size, opcodeStruct, m_dst, t3)
     storei r1, TagOffset[cfr, t3, 8]
     storei r0, PayloadOffset[cfr, t3, 8]
-    metadata(size, op, t2, t3)
-    valueProfile(op, t2, r1, r0)
+    metadata(size, opcodeStruct, t2, t3)
+    valueProfile(opcodeStruct, t2, r1, r0)
     dispatch()
 end
@@ -599 +599 @@
 end
 
-macro valueProfile(op, metadata, tag, payload)
-    storei tag, %op%::Metadata::m_profile.m_buckets + TagOffset[metadata]
-    storei payload, %op%::Metadata::m_profile.m_buckets + PayloadOffset[metadata]
+macro valueProfile(opcodeStruct, metadata, tag, payload)
+    storei tag, %opcodeStruct%::Metadata::m_profile.m_buckets + TagOffset[metadata]
+    storei payload, %opcodeStruct%::Metadata::m_profile.m_buckets + PayloadOffset[metadata]
 end
 
@@ -683 +683 @@
     andp MarkedBlockMask, t3
     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t3], t3
-    btiz VM::m_exception[t3], .noException
+    btpz VM::m_exception[t3], .noException
     jmp label
 .noException:
@@ -735 +735 @@
 llintOpWithReturn(op_get_scope, OpGetScope, macro (size, get, dispatch, return)
     loadi Callee + PayloadOffset[cfr], t0
-    loadi JSCallee::m_scope[t0], t0
+    loadp JSCallee::m_scope[t0], t0
     return (CellTag, t0)
 end)
@@ -747 +747 @@
     metadata(t2, t3)
     loadp OpToThis::Metadata::m_cachedStructure[t2], t2
-    bpneq JSCell::m_structureID[t0], t2, .opToThisSlow
+    bineq JSCell::m_structureID[t0], t2, .opToThisSlow
     dispatch()
 
@@ -757 +757 @@
 
 llintOp(op_check_tdz, OpCheckTdz, macro (size, get, dispatch)
-    get(m_target, t0)
+    get(m_targetVirtualRegister, t0)
     loadConstantOrVariableTag(size, t0, t1)
     bineq t1, EmptyValueTag, .opNotTDZ
@@ -787 +787 @@
 
 
-macro equalityComparisonOp(name, op, integerComparison)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro equalityComparisonOp(opcodeName, opcodeStruct, integerComparison)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -800 +800 @@
 
     .opEqSlow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -806 +806 @@
 
 
-macro equalityJumpOp(name, op, integerComparison)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro equalityJumpOp(opcodeName, opcodeStruct, integerComparison)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -819 +819 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -828 +828 @@
 
 
-macro equalNullComparisonOp(name, op, fn)
-    llintOpWithReturn(name, op, macro (size, get, dispatch, return)
+macro equalNullComparisonOp(opcodeName, opcodeStruct, fn)
+    llintOpWithReturn(opcodeName, opcodeStruct, macro (size, get, dispatch, return)
         get(m_operand, t0)
         assertNotConstant(size, t0)
@@ -839 +839 @@
         jmp .opEqNullNotImmediate
     .opEqNullMasqueradesAsUndefined:
-        loadp JSCell::m_structureID[t0], t1
+        loadi JSCell::m_structureID[t0], t1
         loadp CodeBlock[cfr], t0
         loadp CodeBlock::m_globalObject[t0], t0
@@ -870 +870 @@
 
 
-macro strictEqOp(name, op, equalityOperation)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro strictEqOp(opcodeName, opcodeStruct, equalityOperation)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -886 +886 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -892 +892 @@
 
 
-macro strictEqualityJumpOp(name, op, equalityOperation)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro strictEqualityJumpOp(opcodeName, opcodeStruct, equalityOperation)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -908 +908 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -933 +933 @@
 
 
-macro preOp(name, op, operation)
-    llintOp(op_%name%, op, macro (size, get, dispatch)
+macro preOp(opcodeName, opcodeStruct, operation)
+    llintOp(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch)
         get(m_srcDst, t0)
         bineq TagOffset[cfr, t0, 8], Int32Tag, .slow
@@ -943 +943 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -993 +993 @@
 
     macro arithProfile(type)
-        ori type, OpNegate::Metadata::m_arithProfile[t5]
+        ori type, OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits[t5]
     end
 
@@ -1016 +1016 @@
 
 
-macro binaryOpCustomStore(name, op, integerOperationAndStore, doubleOperation)
-    llintOpWithMetadata(op_%name%, op, macro (size, get, dispatch, metadata, return)
+macro binaryOpCustomStore(opcodeName, opcodeStruct, integerOperationAndStore, doubleOperation)
+    llintOpWithMetadata(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, metadata, return)
         macro arithProfile(type)
-            ori type, %op%::Metadata::m_arithProfile[t5]
+            ori type, %opcodeStruct%::Metadata::m_arithProfile + ArithProfile::m_bits[t5]
         end
 
@@ -1064 +1064 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
 end
 
-macro binaryOp(name, op, integerOperation, doubleOperation)
-    binaryOpCustomStore(name, op,
+macro binaryOp(opcodeName, opcodeStruct, integerOperation, doubleOperation)
+    binaryOpCustomStore(opcodeName, opcodeStruct,
         macro (int32Tag, left, right, slow, index)
             integerOperation(left, right, slow)
@@ -1131 +1131 @@
 
 
-macro commonBitOp(opKind, name, op, operation)
-    opKind(op_%name%, op, macro (size, get, dispatch, return)
+macro commonBitOp(opKind, opcodeName, opcodeStruct, operation)
+    opKind(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -1143 +1143 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
 end
 
-macro bitOp(name, op, operation)
-    commonBitOp(llintOpWithReturn, name, op, operation)
-end
-
-macro bitOpProfiled(name, op, operation)
-    commonBitOp(llintOpWithProfile, name, op, operation)
+macro bitOp(opcodeName, opcodeStruct, operation)
+    commonBitOp(llintOpWithReturn, opcodeName, opcodeStruct, operation)
+end
+
+macro bitOpProfiled(opcodeName, opcodeStruct, operation)
+    commonBitOp(llintOpWithProfile, opcodeName, opcodeStruct, operation)
 end
 
@@ -1237 +1237 @@
     return(BooleanTag, 0)
 .opIsUndefinedMasqueradesAsUndefined:
-    loadp JSCell::m_structureID[t3], t1
+    loadi JSCell::m_structureID[t3], t1
     loadp CodeBlock[cfr], t3
     loadp CodeBlock::m_globalObject[t3], t3
@@ -1329 +1329 @@
     metadata(t5, t0)
     get(m_base, t0)
-    loadi OpGetByIdDirect::Metadata::m_structure[t5], t1
+    loadi OpGetByIdDirect::Metadata::m_structureID[t5], t1
     loadConstantOrVariablePayload(size, t0, CellTag, t3, .opGetByIdDirectSlow)
     loadi OpGetByIdDirect::Metadata::m_offset[t5], t2
@@ -1350 +1350 @@
 .opGetByIdProtoLoad:
     bbneq t1, constexpr GetByIdMode::ProtoLoad, .opGetByIdArrayLength
-    loadi OpGetById::Metadata::m_modeMetadata.protoLoadMode.structure[t5], t1
+    loadi OpGetById::Metadata::m_modeMetadata.protoLoadMode.structureID[t5], t1
     loadConstantOrVariablePayload(size, t0, CellTag, t3, .opGetByIdSlow)
     loadis OpGetById::Metadata::m_modeMetadata.protoLoadMode.cachedOffset[t5], t2
@@ -1374 +1374 @@
 .opGetByIdUnset:
     bbneq t1, constexpr GetByIdMode::Unset, .opGetByIdDefault
-    loadi OpGetById::Metadata::m_modeMetadata.unsetMode.structure[t5], t1
+    loadi OpGetById::Metadata::m_modeMetadata.unsetMode.structureID[t5], t1
     loadConstantOrVariablePayload(size, t0, CellTag, t3, .opGetByIdSlow)
     bineq JSCell::m_structureID[t3], t1, .opGetByIdSlow
@@ -1381 +1381 @@
 
 .opGetByIdDefault:
-    loadi OpGetById::Metadata::m_modeMetadata.defaultMode.structure[t5], t1
+    loadi OpGetById::Metadata::m_modeMetadata.defaultMode.structureID[t5], t1
     loadConstantOrVariablePayload(size, t0, CellTag, t3, .opGetByIdSlow)
     loadis OpGetById::Metadata::m_modeMetadata.defaultMode.cachedOffset[t5], t2
@@ -1401 +1401 @@
     loadConstantOrVariablePayload(size, t3, CellTag, t0, .opPutByIdSlow)
     loadi JSCell::m_structureID[t0], t2
-    bineq t2, OpPutById::Metadata::m_oldStructure[t5], .opPutByIdSlow
+    bineq t2, OpPutById::Metadata::m_oldStructureID[t5], .opPutByIdSlow
 
     # At this point, we have:
@@ -1409 +1409 @@
     # We will lose currentStructureID in the shenanigans below.
 
-    loadi OpPutById::Metadata::m_newStructure[t5], t1
+    loadi OpPutById::Metadata::m_newStructureID[t5], t1
 
     btiz t1, .opPutByIdNotTransition
@@ -1418 +1418 @@
     btpz t3, .opPutByIdTransitionDirect
 
-    loadi OpPutById::Metadata::m_oldStructure[t5], t2 # Need old structure again.
+    loadi OpPutById::Metadata::m_oldStructureID[t5], t2 # Need old structure again.
     loadp StructureChain::m_vector[t3], t3
     assert(macro (ok) btpnz t3, ok end)
@@ -1426 +1426 @@
 .opPutByIdTransitionChainLoop:
     loadp [t3], t1
-    bpneq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+    bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
     addp 4, t3
     loadp Structure::m_prototype[t1], t2
@@ -1432 +1432 @@
 
 .opPutByIdTransitionChainDone:
-    loadi OpPutById::Metadata::m_newStructure[t5], t1
+    loadi OpPutById::Metadata::m_newStructureID[t5], t1
 
 .opPutByIdTransitionDirect:
@@ -1508 +1508 @@
 
 
-macro putByValOp(name, op)
-    llintOpWithMetadata(op_%name%, op, macro (size, get, dispatch, metadata, return)
+macro putByValOp(opcodeName, opcodeStruct)
+    llintOpWithMetadata(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, metadata, return)
         macro contiguousPutByVal(storeCallback)
             biaeq t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0], .outOfBounds
@@ -1519 +1519 @@
         .outOfBounds:
             biaeq t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t0], .opPutByValOutOfBounds
-            storeb 1, %op%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
+            storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
             addi 1, t3, t2
             storei t2, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0]
@@ -1530 +1530 @@
         loadConstantOrVariablePayload(size, t0, CellTag, t1, .opPutByValSlow)
         move t1, t2
-        arrayProfile(%op%::Metadata::m_arrayProfile, t2, t5, t0)
+        arrayProfile(%opcodeStruct%::Metadata::m_arrayProfile, t2, t5, t0)
         get(m_property, t0)
         loadConstantOrVariablePayload(size, t0, Int32Tag, t3, .opPutByValSlow)
@@ -1584 +1584 @@
 
     .opPutByValArrayStorageEmpty:
-        storeb 1, %op%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
+        storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
         addi 1, ArrayStorage::m_numValuesInVector[t0]
         bib t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0], .opPutByValArrayStorageStoreResult
@@ -1592 +1592 @@
 
     .opPutByValOutOfBounds:
-        storeb 1, %op%::Metadata::m_arrayProfile.m_outOfBounds[t5]
+        storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_outOfBounds[t5]
     .opPutByValSlow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -1605 +1605 @@
 
 
-macro llintJumpTrueOrFalseOp(name, op, conditionOp)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro llintJumpTrueOrFalseOp(opcodeName, opcodeStruct, conditionOp)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_condition, t1)
         loadConstantOrVariablePayload(size, t1, BooleanTag, t0, .slow)
@@ -1613 +1613 @@
 
     .target:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -1622 +1622 @@
 
 
-macro equalNullJumpOp(name, op, cellHandler, immediateHandler)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro equalNullJumpOp(opcodeName, opcodeStruct, cellHandler, immediateHandler)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_value, t0)
         assertNotConstant(size, t0)
@@ -1629 +1629 @@
         loadi PayloadOffset[cfr, t0, 8], t0
         bineq t1, CellTag, .immediate
-        loadp JSCell::m_structureID[t0], t2
+        loadi JSCell::m_structureID[t0], t2
         cellHandler(t2, JSCell::m_flags[t0], .target)
         dispatch()
 
     .target:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .immediate:
@@ -1666 +1666 @@
 llintOpWithMetadata(op_jneq_ptr, OpJneqPtr, macro (size, get, dispatch, metadata, return)
     get(m_value, t0)
-    get(m_specialPointer, t1)
+    getu(size, OpJneqPtr, m_specialPointer, t1)
     loadp CodeBlock[cfr], t2
     loadp CodeBlock::m_globalObject[t2], t2
@@ -1675 +1675 @@
     metadata(t5, t2)
     storeb 1, OpJneqPtr::Metadata::m_hasJumped[t5]
-    get(m_target, t0)
+    get(m_targetLabel, t0)
     jumpImpl(t0)
 .opJneqPtrFallThrough:
@@ -1682 +1682 @@
 
 
-macro compareUnsignedJumpOp(name, op, integerCompare)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro compareUnsignedJumpOp(opcodeName, opcodeStruct, integerCompare)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -1692 +1692 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
     end)
 end
 
 
-macro compareUnsignedOp(name, op, integerCompareAndSet)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro compareUnsignedOp(opcodeName, opcodeStruct, integerCompareAndSet)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t2)
         get(m_lhs, t0)
@@ -1709 +1709 @@
 
 
-macro compareJumpOp(name, op, integerCompare, doubleCompare)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro compareJumpOp(opcodeName, opcodeStruct, integerCompare, doubleCompare)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -1741 +1741 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -1752 +1752 @@
 llintOpWithJump(op_switch_imm, OpSwitchImm, macro (size, get, jump, dispatch)
     get(m_scrutinee, t2)
-    get(m_tableIndex, t3)
+    getu(size, OpSwitchImm, m_tableIndex, t3)
     loadConstantOrVariable(size, t2, t1, t0)
     loadp CodeBlock[cfr], t2
@@ -1780 +1780 @@
 llintOpWithJump(op_switch_char, OpSwitchChar, macro (size, get, jump, dispatch)
     get(m_scrutinee, t2)
-    get(m_tableIndex, t3)
+    getu(size, OpSwitchChar, m_tableIndex, t3)
     loadConstantOrVariable(size, t2, t1, t0)
     loadp CodeBlock[cfr], t2
@@ -1815 +1815 @@
 
 
-macro arrayProfileForCall(op, getu)
+macro arrayProfileForCall(opcodeStruct, getu)
     getu(m_argv, t3)
     negi t3
     bineq ThisArgumentOffset + TagOffset[cfr, t3, 8], CellTag, .done
     loadi ThisArgumentOffset + PayloadOffset[cfr, t3, 8], t0
-    loadp JSCell::m_structureID[t0], t0
-    storep t0, %op%::Metadata::m_arrayProfile.m_lastSeenStructureID[t5]
+    loadi JSCell::m_structureID[t0], t0
+    storei t0, %opcodeStruct%::Metadata::m_arrayProfile.m_lastSeenStructureID[t5]
 .done:
 end
 
-macro commonCallOp(name, slowPath, op, prepareCall, prologue)
-    llintOpWithMetadata(name, op, macro (size, get, dispatch, metadata, return)
+macro commonCallOp(opcodeName, slowPath, opcodeStruct, prepareCall, prologue)
+    llintOpWithMetadata(opcodeName, opcodeStruct, macro (size, get, dispatch, metadata, return)
         metadata(t5, t0)
 
         prologue(macro (fieldName, dst)
-            getu(size, op, fieldName, dst)
+            getu(size, opcodeStruct, fieldName, dst)
         end, metadata)
 
         get(m_callee, t0)
-        loadp %op%::Metadata::m_callLinkInfo.callee[t5], t2
+        loadp %opcodeStruct%::Metadata::m_callLinkInfo.callee[t5], t2
         loadConstantOrVariablePayload(size, t0, CellTag, t3, .opCallSlow)
         bineq t3, t2, .opCallSlow
-        getu(size, op, m_argv, t3)
+        getu(size, opcodeStruct, m_argv, t3)
         lshifti 3, t3
         negi t3
         addp cfr, t3  # t3 contains the new value of cfr
         storei t2, Callee + PayloadOffset[t3]
-        getu(size, op, m_argc, t2)
+        getu(size, opcodeStruct, m_argc, t2)
         storei PC, ArgumentCount + TagOffset[cfr]
         storei t2, ArgumentCount + PayloadOffset[t3]
         storei CellTag, Callee + TagOffset[t3]
         move t3, sp
-        prepareCall(%op%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2, t3, t4, JSEntryPtrTag)
-        callTargetFunction(size, op, dispatch, %op%::Metadata::m_callLinkInfo.machineCodeTarget[t5], JSEntryPtrTag)
+        prepareCall(%opcodeStruct%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2, t3, t4, JSEntryPtrTag)
+        callTargetFunction(size, opcodeStruct, dispatch, %opcodeStruct%::Metadata::m_callLinkInfo.machineCodeTarget[t5], JSEntryPtrTag)
 
     .opCallSlow:
-        slowPathForCall(size, op, dispatch, slowPath, prepareCall)
+        slowPathForCall(size, opcodeStruct, dispatch, slowPath, prepareCall)
     end)
 end
@@ -1906 +1906 @@
     loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t3], t3
 
-    loadi VM::m_exception[t3], t0
-    storei 0, VM::m_exception[t3]
+    loadp VM::m_exception[t3], t0
+    storep 0, VM::m_exception[t3]
     get(size, OpCatch, m_exception, t2)
     storei t0, PayloadOffset[cfr, t2, 8]
@@ -2014 +2014 @@
     end
     
-    btinz VM::m_exception[t3], .handleException
+    btpnz VM::m_exception[t3], .handleException
 
     functionEpilogue()
@@ -2069 +2069 @@
     end
 
-    btinz VM::m_exception[t3], .handleException
+    btpnz VM::m_exception[t3], .handleException
 
     functionEpilogue()
@@ -2114 +2114 @@
 
     metadata(t5, t0)
-    loadp OpResolveScope::Metadata::m_resolveType[t5], t0
+    loadi OpResolveScope::Metadata::m_resolveType[t5], t0
 
 #rGlobalProperty:
@@ -2162 +2162 @@
 
 
-macro loadWithStructureCheck(op, get, operand, slowPath)
+macro loadWithStructureCheck(opcodeStruct, get, operand, slowPath)
     get(m_scope, t0)
     loadp PayloadOffset[cfr, t0, 8], t0
-    loadp %op%::Metadata::m_structure[t5], t1
-    bpneq JSCell::m_structureID[t0], t1, slowPath
+    loadp %opcodeStruct%::Metadata::m_structure[t5], t1
+    bineq JSCell::m_structureID[t0], t1, slowPath
 end
 
@@ -2196 +2196 @@
 
     metadata(t5, t0)
-    loadi OpGetFromScope::Metadata::m_getPutInfo[t5], t0
+    loadi OpGetFromScope::Metadata::m_getPutInfo + GetPutInfo::m_operand[t5], t0
     andi ResolveTypeMask, t0
 
@@ -2254 +2254 @@
         get(m_value, t1)
         loadConstantOrVariable(size, t1, t2, t3)
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storePropertyAtVariableOffset(t1, t0, t2, t3)
     end
@@ -2271 +2271 @@
         get(m_value, t1)
         loadConstantOrVariable(size, t1, t2, t3)
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storei t2, JSLexicalEnvironment_variables + TagOffset[t0, t1, 8]
         storei t3, JSLexicalEnvironment_variables + PayloadOffset[t0, t1, 8]
@@ -2283 +2283 @@
         notifyWrite(t1, .pDynamic)
     .noVariableWatchpointSet:
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storei t2, JSLexicalEnvironment_variables + TagOffset[t0, t1, 8]
         storei t3, JSLexicalEnvironment_variables + PayloadOffset[t0, t1, 8]
@@ -2290 +2290 @@
 
     metadata(t5, t0)
-    loadi OpPutToScope::Metadata::m_getPutInfo[t5], t0
+    loadi OpPutToScope::Metadata::m_getPutInfo + GetPutInfo::m_operand[t5], t0
     andi ResolveTypeMask, t0
 
@@ -2369 +2369 @@
     get(m_arguments, t0)
     loadi PayloadOffset[cfr, t0, 8], t0
-    get(m_index, t1)
+    getu(size, OpGetFromArguments, m_index, t1)
     loadi DirectArguments_storage + TagOffset[t0, t1, 8], t2
     loadi DirectArguments_storage + PayloadOffset[t0, t1, 8], t3
@@ -2382 +2382 @@
     get(m_value, t1)
     loadConstantOrVariable(size, t1, t2, t3)
-    get(m_index, t1)
+    getu(size, OpPutToArguments, m_index, t1)
     storei t2, DirectArguments_storage + TagOffset[t0, t1, 8]
     storei t3, DirectArguments_storage + PayloadOffset[t0, t1, 8]
@@ -2405 +2405 @@
 
     # t0 is holding the payload, t5 is holding the tag.
-    get(m_target, t2)
+    get(m_targetVirtualRegister, t2)
     loadConstantOrVariable(size, t2, t5, t0)
 
@@ -2457 +2457 @@
     loadi PayloadOffset + ArgumentCount[cfr], t0
     subi 1, t0
-    get(m_numParametersToSkip, t1)
+    getu(size, OpGetRestLength, m_numParametersToSkip, t1)
     bilteq t0, t1, .storeZero
     subi t1, t0

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -37 +37 @@
 end
 
-macro getuOperandNarrow(op, fieldName, dst)
-    loadb constexpr %op%_%fieldName%_index[PB, PC, 1], dst
-end
-
-macro getOperandNarrow(op, fieldName, dst)
-    loadbsp constexpr %op%_%fieldName%_index[PB, PC, 1], dst
-end
-
-macro getuOperandWide(op, fieldName, dst)
-    loadi constexpr %op%_%fieldName%_index * 4 + 1[PB, PC, 1], dst
-end
-
-macro getOperandWide(op, fieldName, dst)
-    loadis constexpr %op%_%fieldName%_index * 4 + 1[PB, PC, 1], dst
+macro getuOperandNarrow(opcodeStruct, fieldName, dst)
+    loadb constexpr %opcodeStruct%_%fieldName%_index[PB, PC, 1], dst
+end
+
+macro getOperandNarrow(opcodeStruct, fieldName, dst)
+    loadbsp constexpr %opcodeStruct%_%fieldName%_index[PB, PC, 1], dst
+end
+
+macro getuOperandWide(opcodeStruct, fieldName, dst)
+    loadi constexpr %opcodeStruct%_%fieldName%_index * 4 + 1[PB, PC, 1], dst
+end
+
+macro getOperandWide(opcodeStruct, fieldName, dst)
+    loadis constexpr %opcodeStruct%_%fieldName%_index * 4 + 1[PB, PC, 1], dst
 end
 
@@ -62 +62 @@
 end
 
-macro makeReturnProfiled(op, get, metadata, dispatch, fn)
+macro makeReturnProfiled(opcodeStruct, get, metadata, dispatch, fn)
     fn(macro (value)
         move value, t3
         metadata(t1, t2)
-        valueProfile(op, t1, t3)
+        valueProfile(opcodeStruct, t1, t3)
         get(m_dst, t1)
         storeq t3, [cfr, t1, 8]
@@ -73 +73 @@
 end
 
-macro valueProfile(op, metadata, value)
-    storeq value, %op%::Metadata::m_profile.m_buckets[metadata]
-end
-
-macro dispatchAfterCall(size, op, dispatch)
+macro valueProfile(opcodeStruct, metadata, value)
+    storeq value, %opcodeStruct%::Metadata::m_profile.m_buckets[metadata]
+end
+
+macro dispatchAfterCall(size, opcodeStruct, dispatch)
     loadi ArgumentCount + TagOffset[cfr], PC
     loadp CodeBlock[cfr], PB
     loadp CodeBlock::m_instructionsRawPointer[PB], PB
     unpoison(_g_CodeBlockPoison, PB, t1)
-    get(size, op, m_dst, t1)
+    get(size, opcodeStruct, m_dst, t1)
     storeq r0, [cfr, t1, 8]
-    metadata(size, op, t2, t1)
-    valueProfile(op, t2, r0)
+    metadata(size, opcodeStruct, t2, t1)
+    valueProfile(opcodeStruct, t2, r0)
     dispatch()
 end
@@ -711 +711 @@
 
 llintOp(op_check_tdz, OpCheckTdz, macro (size, get, dispatch)
-    get(m_target, t0)
+    get(m_targetVirtualRegister, t0)
     loadConstantOrVariable(size, t0, t1)
     bqneq t1, ValueEmpty, .opNotTDZ
@@ -742 +742 @@
 
 
-macro equalityComparisonOp(name, op, integerComparison)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro equalityComparisonOp(opcodeName, opcodeStruct, integerComparison)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t0)
         get(m_lhs, t2)
@@ -753 +753 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -759 +759 @@
 
 
-macro equalNullComparisonOp(name, op, fn)
-    llintOpWithReturn(name, op, macro (size, get, dispatch, return)
+macro equalNullComparisonOp(opcodeName, opcodeStruct, fn)
+    llintOpWithReturn(opcodeName, opcodeStruct, macro (size, get, dispatch, return)
         get(m_operand, t0)
         loadq [cfr, t0, 8], t0
@@ -800 +800 @@
 
 
-macro strictEqOp(name, op, equalityOperation)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro strictEqOp(opcodeName, opcodeStruct, equalityOperation)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t0)
         get(m_lhs, t2)
@@ -820 +820 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -834 +834 @@
 
 
-macro strictEqualityJumpOp(name, op, equalityOperation)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro strictEqualityJumpOp(opcodeName, opcodeStruct, equalityOperation)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -853 +853 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -870 +870 @@
 
 
-macro preOp(name, op, arithmeticOperation)
-    llintOp(op_%name%, op, macro (size, get, dispatch)
+macro preOp(opcodeName, opcodeStruct, arithmeticOperation)
+    llintOp(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch)
         get(m_srcDst, t0)
         loadq [cfr, t0, 8], t1
@@ -880 +880 @@
         dispatch()
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -930 +930 @@
     loadConstantOrVariable(size, t0, t3)
     metadata(t1, t2)
-    loadis OpNegate::Metadata::m_arithProfile[t1], t2
+    loadi OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits[t1], t2
     bqb t3, tagTypeNumber, .opNegateNotInt
     btiz t3, 0x7fffffff, .opNegateSlow
@@ -936 +936 @@
     orq tagTypeNumber, t3
     ori ArithProfileInt, t2
-    storei t2, OpNegate::Metadata::m_arithProfile[t1]
+    storei t2, OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits[t1]
     return(t3)
 .opNegateNotInt:
@@ -942 +942 @@
     xorq 0x8000000000000000, t3
     ori ArithProfileNumber, t2
-    storei t2, OpNegate::Metadata::m_arithProfile[t1]
+    storei t2, OpNegate::Metadata::m_arithProfile + ArithProfile::m_bits[t1]
     return(t3)
 
@@ -951 +951 @@
 
 
-macro binaryOpCustomStore(name, op, integerOperationAndStore, doubleOperation)
-    llintOpWithMetadata(op_%name%, op, macro (size, get, dispatch, metadata, return)
+macro binaryOpCustomStore(opcodeName, opcodeStruct, integerOperationAndStore, doubleOperation)
+    llintOpWithMetadata(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, metadata, return)
         metadata(t5, t0)
 
         macro profile(type)
-            ori type, %op%::Metadata::m_arithProfile[t5]
+            ori type, %opcodeStruct%::Metadata::m_arithProfile + ArithProfile::m_bits[t5]
         end
 
@@ -1008 +1008 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -1053 +1053 @@
 
 
-macro binaryOp(name, op, integerOperation, doubleOperation)
-    binaryOpCustomStore(name, op,
+macro binaryOp(opcodeName, opcodeStruct, integerOperation, doubleOperation)
+    binaryOpCustomStore(opcodeName, opcodeStruct,
         macro (left, right, slow, index)
             integerOperation(left, right, slow)
@@ -1084 +1084 @@
 
 
-macro commonBitOp(opKind, name, op, operation)
-    opKind(op_%name%, op, macro (size, get, dispatch, return)
+macro commonBitOp(opKind, opcodeName, opcodeStruct, operation)
+    opKind(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_rhs, t0)
         get(m_lhs, t2)
@@ -1097 +1097 @@
 
     .slow:
-        callSlowPath(_slow_path_%name%)
+        callSlowPath(_slow_path_%opcodeName%)
         dispatch()
     end)
 end
 
-macro bitOp(name, op, operation)
-    commonBitOp(llintOpWithReturn, name, op, operation)
-end
-
-macro bitOpProfiled(name, op, operation)
-    commonBitOp(llintOpWithProfile, name, op, operation)
+macro bitOp(opcodeName, opcodeStruct, operation)
+    commonBitOp(llintOpWithReturn, opcodeName, opcodeStruct, operation)
+end
+
+macro bitOpProfiled(opcodeName, opcodeStruct, operation)
+    commonBitOp(llintOpWithProfile, opcodeName, opcodeStruct, operation)
 end
 
@@ -1270 +1270 @@
     loadConstantOrVariableCell(size, t0, t3, .opGetByIdDirectSlow)
     loadi JSCell::m_structureID[t3], t1
-    loadi OpGetByIdDirect::Metadata::m_structure[t2], t0
+    loadi OpGetByIdDirect::Metadata::m_structureID[t2], t0
     bineq t0, t1, .opGetByIdDirectSlow
     loadi OpGetByIdDirect::Metadata::m_offset[t2], t1
@@ -1292 +1292 @@
     bbneq t1, constexpr GetByIdMode::Default, .opGetByIdProtoLoad
     loadi JSCell::m_structureID[t3], t1
-    loadi OpGetById::Metadata::m_modeMetadata.defaultMode.structure[t2], t0
+    loadi OpGetById::Metadata::m_modeMetadata.defaultMode.structureID[t2], t0
     bineq t0, t1, .opGetByIdSlow
     loadis OpGetById::Metadata::m_modeMetadata.defaultMode.cachedOffset[t2], t1
@@ -1302 +1302 @@
     bbneq t1, constexpr GetByIdMode::ProtoLoad, .opGetByIdArrayLength
     loadi JSCell::m_structureID[t3], t1
-    loadi OpGetById::Metadata::m_modeMetadata.protoLoadMode.structure[t2], t3
+    loadi OpGetById::Metadata::m_modeMetadata.protoLoadMode.structureID[t2], t3
     bineq t3, t1, .opGetByIdSlow
     loadis OpGetById::Metadata::m_modeMetadata.protoLoadMode.cachedOffset[t2], t1
@@ -1325 +1325 @@
 .opGetByIdUnset:
     loadi JSCell::m_structureID[t3], t1
-    loadi OpGetById::Metadata::m_modeMetadata.unsetMode.structure[t2], t0
+    loadi OpGetById::Metadata::m_modeMetadata.unsetMode.structureID[t2], t0
     bineq t0, t1, .opGetByIdSlow
     valueProfile(OpGetById, t2, ValueUndefined)
@@ -1340 +1340 @@
     loadConstantOrVariableCell(size, t3, t0, .opPutByIdSlow)
     metadata(t5, t2)
-    loadis OpPutById::Metadata::m_oldStructure[t5], t2
+    loadi OpPutById::Metadata::m_oldStructureID[t5], t2
     bineq t2, JSCell::m_structureID[t0], .opPutByIdSlow
 
@@ -1348 +1348 @@
     # t5 -> metadata
 
-    loadi OpPutById::Metadata::m_newStructure[t5], t1
+    loadi OpPutById::Metadata::m_newStructureID[t5], t1
     btiz t1, .opPutByIdNotTransition
 
@@ -1381 +1381 @@
 .opPutByIdTransitionChainDone:
     # Reload the new structure, since we clobbered it above.
-    loadi OpPutById::Metadata::m_newStructure[t5], t1
+    loadi OpPutById::Metadata::m_newStructureID[t5], t1
 
 .opPutByIdTransitionDirect:
@@ -1575 +1575 @@
 
 
-macro putByValOp(name, op)
-    llintOpWithMetadata(op_%name%, op, macro (size, get, dispatch, metadata, return)
+macro putByValOp(opcodeName, opcodeStruct)
+    llintOpWithMetadata(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, metadata, return)
         macro contiguousPutByVal(storeCallback)
             biaeq t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0], .outOfBounds
@@ -1586 +1586 @@
         .outOfBounds:
             biaeq t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.vectorLength[t0], .opPutByValOutOfBounds
-            storeb 1, %op%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
+            storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
             addi 1, t3, t2
             storei t2, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0]
@@ -1596 +1596 @@
         move t1, t2
         metadata(t5, t0)
-        arrayProfile(%op%::Metadata::m_arrayProfile, t2, t5, t0)
+        arrayProfile(%opcodeStruct%::Metadata::m_arrayProfile, t2, t5, t0)
         get(m_property, t0)
         loadConstantOrVariableInt32(size, t0, t3, .opPutByValSlow)
@@ -1651 +1651 @@
 
     .opPutByValArrayStorageEmpty:
-        storeb 1, %op%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
+        storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_mayStoreToHole[t5]
         addi 1, ArrayStorage::m_numValuesInVector[t0]
         bib t3, -sizeof IndexingHeader + IndexingHeader::u.lengths.publicLength[t0], .opPutByValArrayStorageStoreResult
@@ -1659 +1659 @@
 
     .opPutByValOutOfBounds:
-        storeb 1, %op%::Metadata::m_arrayProfile.m_outOfBounds[t5]
+        storeb 1, %opcodeStruct%::Metadata::m_arrayProfile.m_outOfBounds[t5]
     .opPutByValSlow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         dispatch()
     end)
@@ -1671 +1671 @@
 
 
-macro llintJumpTrueOrFalseOp(name, op, conditionOp)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro llintJumpTrueOrFalseOp(opcodeName, opcodeStruct, conditionOp)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_condition, t1)
         loadConstantOrVariable(size, t1, t0)
@@ -1680 +1680 @@
 
     .target:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -1689 +1689 @@
 
 
-macro equalNullJumpOp(name, op, cellHandler, immediateHandler)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro equalNullJumpOp(opcodeName, opcodeStruct, cellHandler, immediateHandler)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_value, t0)
         assertNotConstant(size, t0)
@@ -1700 +1700 @@
 
     .target:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .immediate:
@@ -1732 +1732 @@
 llintOpWithMetadata(op_jneq_ptr, OpJneqPtr, macro (size, get, dispatch, metadata, return)
     get(m_value, t0)
-    get(m_specialPointer, t1)
+    getu(size, OpJneqPtr, m_specialPointer, t1)
     loadp CodeBlock[cfr], t2
     loadp CodeBlock::m_globalObject[t2], t2
@@ -1742 +1742 @@
     metadata(t5, t0)
     storeb 1, OpJneqPtr::Metadata::m_hasJumped[t5]
-    get(m_target, t0)
+    get(m_targetLabel, t0)
     jumpImpl(t0)
 end)
 
 
-macro compareJumpOp(name, op, integerCompare, doubleCompare)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro compareJumpOp(opcodeName, opcodeStruct, integerCompare, doubleCompare)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -1782 +1782 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -1791 +1791 @@
 
 
-macro equalityJumpOp(name, op, integerComparison)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro equalityJumpOp(opcodeName, opcodeStruct, integerComparison)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -1801 +1801 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
 
     .slow:
-        callSlowPath(_llint_slow_path_%name%)
+        callSlowPath(_llint_slow_path_%opcodeName%)
         nextInstruction()
     end)
@@ -1810 +1810 @@
 
 
-macro compareUnsignedJumpOp(name, op, integerCompareMacro)
-    llintOpWithJump(op_%name%, op, macro (size, get, jump, dispatch)
+macro compareUnsignedJumpOp(opcodeName, opcodeStruct, integerCompareMacro)
+    llintOpWithJump(op_%opcodeName%, opcodeStruct, macro (size, get, jump, dispatch)
         get(m_lhs, t2)
         get(m_rhs, t3)
@@ -1820 +1820 @@
 
     .jumpTarget:
-        jump(m_target)
+        jump(m_targetLabel)
     end)
 end
 
 
-macro compareUnsignedOp(name, op, integerCompareAndSet)
-    llintOpWithReturn(op_%name%, op, macro (size, get, dispatch, return)
+macro compareUnsignedOp(opcodeName, opcodeStruct, integerCompareAndSet)
+    llintOpWithReturn(op_%opcodeName%, opcodeStruct, macro (size, get, dispatch, return)
         get(m_lhs, t2)
         get(m_rhs,  t0)
@@ -1840 +1840 @@
 llintOpWithJump(op_switch_imm, OpSwitchImm, macro (size, get, jump, dispatch)
     get(m_scrutinee, t2)
-    get(m_tableIndex, t3)
+    getu(size, OpSwitchImm, m_tableIndex, t3)
     loadConstantOrVariable(size, t2, t1)
     loadp CodeBlock[cfr], t2
@@ -1868 +1868 @@
 llintOpWithJump(op_switch_char, OpSwitchChar, macro (size, get, jump, dispatch)
     get(m_scrutinee, t2)
-    get(m_tableIndex, t3)
+    getu(size, OpSwitchChar, m_tableIndex, t3)
     loadConstantOrVariable(size, t2, t1)
     loadp CodeBlock[cfr], t2
@@ -1904 +1904 @@
 
 # we assume t5 contains the metadata, and we should not scratch that
-macro arrayProfileForCall(op, getu)
+macro arrayProfileForCall(opcodeStruct, getu)
     getu(m_argv, t3)
     negp t3
@@ -1910 +1910 @@
     btqnz t0, tagMask, .done
     loadi JSCell::m_structureID[t0], t3
-    storei t3, %op%::Metadata::m_arrayProfile.m_lastSeenStructureID[t5]
+    storei t3, %opcodeStruct%::Metadata::m_arrayProfile.m_lastSeenStructureID[t5]
 .done:
 end
 
-macro commonCallOp(name, slowPath, op, prepareCall, prologue)
-    llintOpWithMetadata(name, op, macro (size, get, dispatch, metadata, return)
+macro commonCallOp(opcodeName, slowPath, opcodeStruct, prepareCall, prologue)
+    llintOpWithMetadata(opcodeName, opcodeStruct, macro (size, get, dispatch, metadata, return)
         metadata(t5, t0)
 
         prologue(macro (fieldName, dst)
-            getu(size, op, fieldName, dst)
+            getu(size, opcodeStruct, fieldName, dst)
         end, metadata)
 
         get(m_callee, t0)
-        loadp %op%::Metadata::m_callLinkInfo.callee[t5], t2
+        loadp %opcodeStruct%::Metadata::m_callLinkInfo.callee[t5], t2
         loadConstantOrVariable(size, t0, t3)
         bqneq t3, t2, .opCallSlow
-        getu(size, op, m_argv, t3)
+        getu(size, opcodeStruct, m_argv, t3)
         lshifti 3, t3
         negp t3
         addp cfr, t3
         storeq t2, Callee[t3]
-        getu(size, op, m_argc, t2)
+        getu(size, opcodeStruct, m_argc, t2)
         storei PC, ArgumentCount + TagOffset[cfr]
         storei t2, ArgumentCount + PayloadOffset[t3]
@@ -1937 +1937 @@
         if POISON
             loadp _g_JITCodePoison, t2
-            xorp %op%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2
+            xorp %opcodeStruct%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2
             prepareCall(t2, t1, t3, t4, JSEntryPtrTag)
-            callTargetFunction(size, op, dispatch, t2, JSEntryPtrTag)
+            callTargetFunction(size, opcodeStruct, dispatch, t2, JSEntryPtrTag)
         else
-            prepareCall(%op%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2, t3, t4, JSEntryPtrTag)
-            callTargetFunction(size, op, dispatch, %op%::Metadata::m_callLinkInfo.machineCodeTarget[t5], JSEntryPtrTag)
+            prepareCall(%opcodeStruct%::Metadata::m_callLinkInfo.machineCodeTarget[t5], t2, t3, t4, JSEntryPtrTag)
+            callTargetFunction(size, opcodeStruct, dispatch, %opcodeStruct%::Metadata::m_callLinkInfo.machineCodeTarget[t5], JSEntryPtrTag)
         end
 
     .opCallSlow:
-        slowPathForCall(size, op, dispatch, slowPath, prepareCall)
+        slowPathForCall(size, opcodeStruct, dispatch, slowPath, prepareCall)
     end)
 end
@@ -2171 +2171 @@
     end
 
-    loadp OpResolveScope::Metadata::m_resolveType[t5], t0
+    loadi OpResolveScope::Metadata::m_resolveType[t5], t0
 
 #rGlobalProperty:
@@ -2219 +2219 @@
 
 
-macro loadWithStructureCheck(op, get, slowPath)
+macro loadWithStructureCheck(opcodeStruct, get, slowPath)
     get(m_scope, t0)
     loadq [cfr, t0, 8], t0
     loadStructureWithScratch(t0, t2, t1, t3)
-    loadp %op%::Metadata::m_structure[t5], t1
+    loadp %opcodeStruct%::Metadata::m_structure[t5], t1
     bpneq t2, t1, slowPath
 end
@@ -2252 +2252 @@
     end
 
-    loadi OpGetFromScope::Metadata::m_getPutInfo[t5], t0
+    loadi OpGetFromScope::Metadata::m_getPutInfo + GetPutInfo::m_operand[t5], t0
     andi ResolveTypeMask, t0
 
@@ -2310 +2310 @@
         get(m_value, t1)
         loadConstantOrVariable(size, t1, t2)
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storePropertyAtVariableOffset(t1, t0, t2)
     end
@@ -2326 +2326 @@
         get(m_value, t1)
         loadConstantOrVariable(size, t1, t2)
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storeq t2, JSLexicalEnvironment_variables[t0, t1, 8]
     end
@@ -2337 +2337 @@
         notifyWrite(t3, .pDynamic)
     .noVariableWatchpointSet:
-        loadis OpPutToScope::Metadata::m_operand[t5], t1
+        loadp OpPutToScope::Metadata::m_operand[t5], t1
         storeq t2, JSLexicalEnvironment_variables[t0, t1, 8]
     end
 
     macro checkTDZInGlobalPutToScopeIfNecessary()
-        loadis OpPutToScope::Metadata::m_getPutInfo[t5], t0
+        loadi OpPutToScope::Metadata::m_getPutInfo + GetPutInfo::m_operand[t5], t0
         andi InitializationModeMask, t0
         rshifti InitializationModeShift, t0
@@ -2353 +2353 @@
 
     metadata(t5, t0)
-    loadi OpPutToScope::Metadata::m_getPutInfo[t5], t0
+    loadi OpPutToScope::Metadata::m_getPutInfo + GetPutInfo::m_operand[t5], t0
     andi ResolveTypeMask, t0
 
@@ -2467 +2467 @@
 
     # t0 is holding the JSValue argument.
-    get(m_target, t3)
+    get(m_targetVirtualRegister, t3)
     loadConstantOrVariable(size, t3, t0)
 

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp

@@ -126 +126 @@
         CHECK_EXCEPTION();                                  \
         if (bCondition)                                        \
-            pc = bytecode.m_target \
-                ? reinterpret_cast<const Instruction*>(reinterpret_cast<const uint8_t*>(pc) + bytecode.m_target) \
+            pc = bytecode.m_targetLabel \
+                ? reinterpret_cast<const Instruction*>(reinterpret_cast<const uint8_t*>(pc) + bytecode.m_targetLabel) \
                 : exec->codeBlock()->outOfLineJumpTarget(pc);                              \
         else                                                      \

trunk/Source/JavaScriptCore/runtime/GetPutInfo.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2015-2018 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2015-2019 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39 +39 @@
 };
 
-enum ResolveType {
+enum ResolveType : unsigned {
     // Lexical scope guaranteed a certain type of variable access.
     GlobalProperty,
@@ -211 +211 @@
     static_assert((modeBits & initializationBits & typeBits) == 0x0, "There should be no intersection between ResolveMode ResolveType and InitializationMode");
 
+    GetPutInfo() = default;
+
     GetPutInfo(ResolveMode resolveMode, ResolveType resolveType, InitializationMode initializationMode)
         : m_operand((resolveMode << modeShift) | (static_cast<unsigned>(initializationMode) << initializationShift) | resolveType)
@@ -229 +231 @@
 
 private:
-    Operand m_operand;
+    Operand m_operand { 0 };
+
+    friend class JSC::LLIntOffsetsExtractor;
 };