[wasm] Strongly typed compiled module

src/wasm/wasm-module.h

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_WASM_MODULE_H_
 #define V8_WASM_MODULE_H_
 
 #include <memory>
 
 #include "src/api.h"
@@ skipping 142 matching lines @@
 
 // Static representation of a wasm indirect call table.
 struct WasmIndirectFunctionTable {
   uint32_t size;                 // initial table size.
   uint32_t max_size;             // maximum table size.
   std::vector<uint16_t> values;  // function table.
 };
 
 enum ModuleOrigin { kWasmOrigin, kAsmJsOrigin };
 
+class WasmCompiledModule;
+
 // Static representation of a module.
 struct WasmModule {
   static const uint32_t kPageSize = 0x10000;    // Page size, 64kb.
   static const uint32_t kMinMemPages = 1;       // Minimum memory size = 64kb
   static const uint32_t kMaxMemPages = 16384;   // Maximum memory size =  1gb
 
   const byte* module_start;   // starting address for the module bytes.
   const byte* module_end;     // end address for the module bytes.
   uint32_t min_mem_pages;     // minimum size of the memory in 64k pages.
   uint32_t max_mem_pages;     // maximum size of the memory in 64k pages.
@@ skipping 58 matching lines @@
     size_t size = module_end - module_start;
     return start <= size && end <= size;
   }
 
   // Creates a new instantiation of the module in the given isolate.
   static MaybeHandle<JSObject> Instantiate(Isolate* isolate,
                                            Handle<JSObject> module_object,
                                            Handle<JSReceiver> ffi,
                                            Handle<JSArrayBuffer> memory);
 
-  MaybeHandle<FixedArray> CompileFunctions(Isolate* isolate,
-                                           ErrorThrower* thrower) const;
+  MaybeHandle<WasmCompiledModule> CompileFunctions(Isolate* isolate,
+                                                   ErrorThrower* thrower) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WasmModule);
 };
 
 // An instantiated WASM module, including memory, function table, etc.
 struct WasmModuleInstance {
   const WasmModule* module;  // static representation of the module.
   // -- Heap allocated --------------------------------------------------------
   Handle<JSObject> js_object;            // JavaScript module object.
@@ skipping 87 matching lines @@
 
 std::ostream& operator<<(std::ostream& os, const WasmModule& module);
 std::ostream& operator<<(std::ostream& os, const WasmFunction& function);
 std::ostream& operator<<(std::ostream& os, const WasmFunctionName& name);
 
 typedef Result<const WasmModule*> ModuleResult;
 typedef Result<WasmFunction*> FunctionResult;
 typedef std::vector<std::pair<int, int>> FunctionOffsets;
 typedef Result<FunctionOffsets> FunctionOffsetsResult;
 
+class WasmCompiledModule : public FixedArray {
+ public:
+  static WasmCompiledModule* cast(Object* fixed_array) {
+    return reinterpret_cast<WasmCompiledModule*>(fixed_array);
+  }
+  static Handle<WasmCompiledModule> New(Isolate* isolate) {
+    Handle<FixedArray> ret =
+        isolate->factory()->NewFixedArray(kTotalFieldCount, TENURED);
+    ret->set(8, *isolate->factory()->NewHeapNumber(0.0, MUTABLE, TENURED));
+    ret->set(11, *isolate->factory()->NewHeapNumber(0.0, MUTABLE, TENURED));
+    ret->set(12, *isolate->factory()->NewHeapNumber(0.0, MUTABLE, TENURED));
+    return handle(WasmCompiledModule::cast(*ret));
+  }
+
+#define WCM_PROPERTY(ID, TYPE, NAME)                                 \
+  Handle<TYPE> NAME() { return handle(ptr_to_##NAME()); }            \
+  MaybeHandle<TYPE> maybe_##NAME() {                                 \
+    if (has_##NAME()) return NAME();                                 \
+    return MaybeHandle<TYPE>();                                      \
+  }                                                                  \
+  TYPE* ptr_to_##NAME() {                                            \
+    Object* obj = get(ID);                                           \
+    if (!obj->Is##TYPE()) return nullptr;                            \
+    return TYPE::cast(obj);                                          \
+  }                                                                  \
+  void set_##NAME(Handle<TYPE> value) { set_ptr_to_##NAME(*value); } \
+  void set_ptr_to_##NAME(TYPE* value) { set(ID, value); }            \
+  bool has_##NAME() { return get(ID)->Is##TYPE(); }                  \
+  void reset_##NAME(Isolate* isolate) {                              \
+    set(ID, *isolate->factory()->undefined_value());                 \
+  }
+
+#define WCM_SMALL_NUMERIC_PROPERTY(ID, TYPE, NAME)                       \
+  TYPE NAME() { return static_cast<TYPE>(Smi::cast(get(ID))->value()); } \
+  void set_##NAME(TYPE value) {                                          \
+    set(ID, Smi::FromInt(static_cast<int>(value)));                      \
+  }
+
+#define WCM_LARGE_NUMERIC_PROPERTY(ID, TYPE, NAME)                    \
+  TYPE NAME() {                                                       \
+    return static_cast<TYPE>(HeapNumber::cast(get(ID))->value());     \
+  }                                                                   \
+  void set_##NAME(TYPE value) {                                       \
+    HeapNumber::cast(get(ID))->set_value(static_cast<double>(value)); \
+  }
+
+#define WCM_WEAK_LINK(ID, TYPE, NAME)      \
+  WCM_PROPERTY(ID, WeakCell, weak_##NAME); \
+  Handle<TYPE> NAME() { return handle(TYPE::cast(weak_##NAME()->value())); }
+
+  WCM_PROPERTY(0, FixedArray, functions);

[bradnelson, 2016/09/13 23:54:49]

Use x-macros as discussed.

[Mircea Trofin, 2016/09/14 16:06:28]

Done.

+  WCM_PROPERTY(1, FixedArray, import_data);
+  WCM_PROPERTY(2, FixedArray, import_map);
+  WCM_PROPERTY(3, FixedArray, exports);
+  WCM_PROPERTY(4, FixedArray, startup_function);
+  WCM_PROPERTY(5, FixedArray, indirect_function_tables);
+  WCM_PROPERTY(6, String, module_bytes);
+  WCM_PROPERTY(7, ByteArray, function_names);
+  WCM_LARGE_NUMERIC_PROPERTY(8, uint32_t, min_required_memory);
+  WCM_PROPERTY(9, FixedArray, data_segments_info);
+  WCM_PROPERTY(10, ByteArray, data_segments);
+  WCM_LARGE_NUMERIC_PROPERTY(11, uint32_t, globals_size);
+  WCM_LARGE_NUMERIC_PROPERTY(12, uint32_t, mem_size);
+  WCM_PROPERTY(13, JSArrayBuffer, mem_start);
+  WCM_SMALL_NUMERIC_PROPERTY(14, bool, export_memory);
+  WCM_SMALL_NUMERIC_PROPERTY(15, ModuleOrigin, origin);
+  WCM_WEAK_LINK(16, WasmCompiledModule, next_instance);
+  WCM_WEAK_LINK(17, WasmCompiledModule, prev_instance);
+  WCM_WEAK_LINK(18, JSObject, owning_instance);
+  WCM_WEAK_LINK(19, JSObject, module_object);
+
+ private:
+  static const int kTotalFieldCount = 20;
+  DISALLOW_IMPLICIT_CONSTRUCTORS(WasmCompiledModule);
+};
+
 // Extract a function name from the given wasm object.
 // Returns "<WASM UNNAMED>" if the function is unnamed or the name is not a
 // valid UTF-8 string.
 Handle<String> GetWasmFunctionName(Isolate* isolate, Handle<Object> wasm,
                                    uint32_t func_index);
 
 // Extract a function name from the given wasm object.
 // Returns a null handle if the function is unnamed or the name is not a valid
 // UTF-8 string.
 Handle<Object> GetWasmFunctionNameOrNull(Isolate* isolate, Handle<Object> wasm,
@@ skipping 65 matching lines @@
                             int instance_count);
 void ValidateModuleState(Isolate* isolate, Handle<JSObject> module_obj);
 void ValidateOrphanedInstance(Isolate* isolate, Handle<JSObject> instance);
 
 }  // namespace testing
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_MODULE_H_