[wasm] Move asm.js offset table to compiled module

src/wasm/wasm-objects.h

 // Copyright 2016 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_OBJECTS_H_
 #define V8_WASM_OBJECTS_H_
 
 #include "src/objects-inl.h"
 #include "src/wasm/managed.h"
 
@@ skipping 185 matching lines @@
   Handle<TYPE> NAME() const {                            \
     return handle(TYPE::cast(weak_##NAME()->value()));   \
   }
 
 #define CORE_WCM_PROPERTY_TABLE(MACRO)                \
   MACRO(OBJECT, FixedArray, code_table)               \
   MACRO(OBJECT, Foreign, module_wrapper)              \
   /* For debugging: */                                \
   MACRO(OBJECT, SeqOneByteString, module_bytes)       \
   MACRO(OBJECT, Script, script)                       \
-  MACRO(OBJECT, ByteArray, asm_js_offset_tables)      \
+  MACRO(OBJECT, ByteArray, asm_js_offset_table)       \
   /* End of debugging stuff */                        \
   MACRO(OBJECT, FixedArray, function_tables)          \
   MACRO(OBJECT, FixedArray, empty_function_tables)    \
   MACRO(OBJECT, JSArrayBuffer, memory)                \
   MACRO(SMALL_NUMBER, uint32_t, min_mem_pages)        \
   MACRO(SMALL_NUMBER, uint32_t, max_mem_pages)        \
   MACRO(WEAK_LINK, WasmCompiledModule, next_instance) \
   MACRO(WEAK_LINK, WasmCompiledModule, prev_instance) \
   MACRO(WEAK_LINK, JSObject, owning_instance)         \
   MACRO(WEAK_LINK, JSObject, wasm_module)
@@ skipping 67 matching lines @@
   // Returns the function containing the given byte offset.
   // Returns -1 if the byte offset is not contained in any function of this
   // module.
   int GetContainingFunction(uint32_t byte_offset) const;
 
   // Translate from byte offset in the module to function number and byte offset
   // within that function, encoded as line and column in the position info.
   // Returns true if the position is valid inside this module, false otherwise.
   bool GetPositionInfo(uint32_t position, Script::PositionInfo* info);
 
+  // Get the asm.js source position from a byte offset.
+  // Must only be called if the associated wasm object was created from asm.js.
+  static int GetAsmJsSourcePosition(Handle<WasmCompiledModule> debug_info,
+                                    uint32_t func_index, uint32_t byte_offset);
+
  private:
   void InitId();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WasmCompiledModule);
 };
 
+// TODO(clemensh): Extend this object for breakpoint support, or remove it.
 class WasmDebugInfo : public FixedArray {
  public:
   enum class Fields { kFieldCount };
 
   static Handle<WasmDebugInfo> New(Handle<WasmInstanceObject> instance);
 
   static bool IsDebugInfo(Object* object);
   static WasmDebugInfo* cast(Object* object);
 
   WasmInstanceObject* wasm_instance();
-
-  bool SetBreakPoint(int byte_offset);
-
-  // Get the Script for the specified function.
-  static Script* GetFunctionScript(Handle<WasmDebugInfo> debug_info,
-                                   int func_index);
-
-  // Disassemble the specified function from this module.
-  static Handle<String> DisassembleFunction(Handle<WasmDebugInfo> debug_info,
-                                            int func_index);
-
-  // Get the offset table for the specified function, mapping from byte offsets
-  // to position in the disassembly.
-  // Returns an array with three entries per instruction: byte offset, line and
-  // column.
-  static Handle<FixedArray> GetFunctionOffsetTable(
-      Handle<WasmDebugInfo> debug_info, int func_index);
-
-  // Get the asm.js source position from a byte offset.
-  // Must only be called if the associated wasm object was created from asm.js.
-  static int GetAsmJsSourcePosition(Handle<WasmDebugInfo> debug_info,
-                                    int func_index, int byte_offset);
 };
 
 class WasmInstanceWrapper : public FixedArray {
  public:
   static Handle<WasmInstanceWrapper> New(Isolate* isolate,
                                          Handle<WasmInstanceObject> instance);
   static WasmInstanceWrapper* cast(Object* fixed_array) {
     SLOW_DCHECK(IsWasmInstanceWrapper(fixed_array));
     return reinterpret_cast<WasmInstanceWrapper*>(fixed_array);
   }
@@ skipping 44 matching lines @@
   };
 };
 
 #undef DECLARE_ACCESSORS
 #undef DECLARE_OPTIONAL_ACCESSORS
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_WASM_OBJECTS_H_