JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / bytecode / Instruction.h

diff --git a/bytecode/Instruction.h b/bytecode/Instruction.h
index ca457758c459442bcbd1494aacd9d51553ae27e8..c20a4f7284ec1c58188486022b09bd640c231166 100644 (file)
--- a/bytecode/Instruction.h
+++ b/bytecode/Instruction.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2008, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2008, 2012-2015 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -29,12 +29,16 @@
 #ifndef Instruction_h
 #define Instruction_h
 
 #ifndef Instruction_h
 #define Instruction_h
 

+#include "BasicBlockLocation.h"

 #include "MacroAssembler.h"
 #include "Opcode.h"
 #include "MacroAssembler.h"
 #include "Opcode.h"

+#include "SymbolTable.h"
+#include "TypeLocation.h"

 #include "PropertySlot.h"
 #include "SpecialPointer.h"
 #include "Structure.h"
 #include "StructureChain.h"
 #include "PropertySlot.h"
 #include "SpecialPointer.h"
 #include "Structure.h"
 #include "StructureChain.h"

+#include "ToThisStatus.h"

 #include "VirtualRegister.h"
 #include <wtf/VectorTraits.h>
 
 #include "VirtualRegister.h"
 #include <wtf/VectorTraits.h>
 


@@ -43,7 +47,7 @@ namespace JSC {
 class ArrayAllocationProfile;
 class ArrayProfile;
 class ObjectAllocationProfile;
 class ArrayAllocationProfile;
 class ArrayProfile;
 class ObjectAllocationProfile;

-class VariableWatchpointSet;
+class WatchpointSet;

 struct LLIntCallLinkInfo;
 struct ValueProfile;
 
 struct LLIntCallLinkInfo;
 struct ValueProfile;
 


@@ -94,30 +98,33 @@ struct Instruction {
     Instruction(ArrayProfile* profile) { u.arrayProfile = profile; }
     Instruction(ArrayAllocationProfile* profile) { u.arrayAllocationProfile = profile; }
     Instruction(ObjectAllocationProfile* profile) { u.objectAllocationProfile = profile; }
     Instruction(ArrayProfile* profile) { u.arrayProfile = profile; }
     Instruction(ArrayAllocationProfile* profile) { u.arrayAllocationProfile = profile; }
     Instruction(ObjectAllocationProfile* profile) { u.objectAllocationProfile = profile; }

-    Instruction(WriteBarrier<Unknown>* registerPointer) { u.registerPointer = registerPointer; }
+    Instruction(WriteBarrier<Unknown>* variablePointer) { u.variablePointer = variablePointer; }

     Instruction(Special::Pointer pointer) { u.specialPointer = pointer; }
     Instruction(Special::Pointer pointer) { u.specialPointer = pointer; }

-    Instruction(StringImpl* uid) { u.uid = uid; }
+    Instruction(UniquedStringImpl* uid) { u.uid = uid; }

     Instruction(bool* predicatePointer) { u.predicatePointer = predicatePointer; }
 
     union {
         Opcode opcode;
         int operand;
         WriteBarrierBase<Structure> structure;
     Instruction(bool* predicatePointer) { u.predicatePointer = predicatePointer; }
 
     union {
         Opcode opcode;
         int operand;
         WriteBarrierBase<Structure> structure;

+        WriteBarrierBase<SymbolTable> symbolTable;

         WriteBarrierBase<StructureChain> structureChain;
         WriteBarrierBase<JSCell> jsCell;
         WriteBarrierBase<StructureChain> structureChain;
         WriteBarrierBase<JSCell> jsCell;

-        WriteBarrier<Unknown>* registerPointer;
+        WriteBarrier<Unknown>* variablePointer;

         Special::Pointer specialPointer;
         PropertySlot::GetValueFunc getterFunc;
         LLIntCallLinkInfo* callLinkInfo;
         Special::Pointer specialPointer;
         PropertySlot::GetValueFunc getterFunc;
         LLIntCallLinkInfo* callLinkInfo;

-        StringImpl* uid;
+        UniquedStringImpl* uid;

         ValueProfile* profile;
         ArrayProfile* arrayProfile;
         ArrayAllocationProfile* arrayAllocationProfile;
         ObjectAllocationProfile* objectAllocationProfile;
         ValueProfile* profile;
         ArrayProfile* arrayProfile;
         ArrayAllocationProfile* arrayAllocationProfile;
         ObjectAllocationProfile* objectAllocationProfile;

-        VariableWatchpointSet* watchpointSet;
-        WriteBarrierBase<JSActivation> activation;
+        WatchpointSet* watchpointSet;

         void* pointer;
         bool* predicatePointer;
         void* pointer;
         bool* predicatePointer;

+        ToThisStatus toThisStatus;
+        TypeLocation* location;
+        BasicBlockLocation* basicBlockLocation;

     } u;
         
 private:
     } u;
         
 private: