Index: src/scopeinfo.h |
diff --git a/src/scopeinfo.h b/src/scopeinfo.h |
index 93734f5a16c2b4842915cc83b46a0c8a77f25eb3..a884b3b9ed8c03713d12414ca951386016cdebf1 100644 |
--- a/src/scopeinfo.h |
+++ b/src/scopeinfo.h |
@@ -114,9 +114,9 @@ class ContextSlotCache { |
// Bit fields in value_ (type, shift, size). Must be public so the |
// constants can be embedded in generated code. |
- class ModeField: public BitField<VariableMode, 0, 3> {}; |
- class InitField: public BitField<InitializationFlag, 3, 1> {}; |
- class IndexField: public BitField<int, 4, 32-4> {}; |
+ class ModeField: public BitField<VariableMode, 0, 4> {}; |
+ class InitField: public BitField<InitializationFlag, 4, 1> {}; |
+ class IndexField: public BitField<int, 5, 32-5> {}; |
private: |
uint32_t value_; |
@@ -130,6 +130,67 @@ class ContextSlotCache { |
}; |
+ |
+ |
+//--------------------------------------------------------------------------- |
+// Auxiliary class used for the description of module instances. |
+// Used by Runtime_DeclareModules. |
+ |
+class ModuleInfo: public FixedArray { |
+ public: |
+ static ModuleInfo* cast(Object* description) { |
+ return static_cast<ModuleInfo*>(FixedArray::cast(description)); |
+ } |
+ |
+ static Handle<ModuleInfo> Create( |
+ Isolate* isolate, Interface* interface, Scope* scope); |
+ |
+ // Index of module's context in host context. |
+ int host_index() { return Smi::cast(get(HOST_OFFSET))->value(); } |
+ |
+ // Name, mode, and index of the i-th export, respectively. |
+ // For value exports, the index is the slot of the value in the module |
+ // context, for exported modules it is the slot index of the |
+ // referred module's context in the host context. |
+ // TODO(rossberg): This format cannot yet handle exports of modules declared |
+ // in earlier scripts. |
+ String* name(int i) { return String::cast(get(name_offset(i))); } |
+ VariableMode mode(int i) { |
+ return static_cast<VariableMode>(Smi::cast(get(mode_offset(i)))->value()); |
+ } |
+ int index(int i) { return Smi::cast(get(index_offset(i)))->value(); } |
+ |
+ int length() { return (FixedArray::length() - HEADER_SIZE) / ITEM_SIZE; } |
+ |
+ private: |
+ // The internal format is: Index, (Name, VariableMode, Index)* |
+ enum { |
+ HOST_OFFSET, |
+ NAME_OFFSET, |
+ MODE_OFFSET, |
+ INDEX_OFFSET, |
+ HEADER_SIZE = NAME_OFFSET, |
+ ITEM_SIZE = INDEX_OFFSET - NAME_OFFSET + 1 |
+ }; |
+ inline int name_offset(int i) { return NAME_OFFSET + i * ITEM_SIZE; } |
+ inline int mode_offset(int i) { return MODE_OFFSET + i * ITEM_SIZE; } |
+ inline int index_offset(int i) { return INDEX_OFFSET + i * ITEM_SIZE; } |
+ |
+ static Handle<ModuleInfo> Allocate(Isolate* isolate, int length) { |
+ return Handle<ModuleInfo>::cast( |
+ isolate->factory()->NewFixedArray(HEADER_SIZE + ITEM_SIZE * length)); |
+ } |
+ void set_host_index(int index) { set(HOST_OFFSET, Smi::FromInt(index)); } |
+ void set_name(int i, String* name) { set(name_offset(i), name); } |
+ void set_mode(int i, VariableMode mode) { |
+ set(mode_offset(i), Smi::FromInt(mode)); |
+ } |
+ void set_index(int i, int index) { |
+ set(index_offset(i), Smi::FromInt(index)); |
+ } |
+}; |
+ |
+ |
} } // namespace v8::internal |
#endif // V8_SCOPEINFO_H_ |