Debugger supports breakpoints (set/clear/list) Clean up usage of final and override on various classes Distinguish tool events for vm loading module and thread loading module

arr committed 10 years ago

Commit e2f8e251 parent d8c9a3314 files · +382 −177Browse files

Showing the changes to src/vm/execution_table.cpp (1 of 14 files). Show all

Unified · Split

         dec_ref_count_and_free(at_val<vm_alloc_t>(r.dest));
         pt_ref(r.dest) = nullptr;
-        auto imported_module = std::shared_ptr<const vm_module_t>{};
+        auto imported_module = std::shared_ptr<vm_module_t>{};
         // Handle self loading module optimization.
         if (std::strcmp(str->str(), "$self") == 0)
         {
-            imported_module = r.module_ref->module;
+            // Remove 'const' from the module type in the shared_ptr<>
+            imported_module = std::const_pointer_cast<vm_module_t>(r.module_ref->module);
         }
         else
         {
         auto entry_module_ref = new vm_module_ref_t{ imported_module, function_imports };
         pt_ref(r.dest) = entry_module_ref->get_allocation();
+        // Check if the tool dispatcher has been supplied
+        auto tool_dispatch = r.tool_dispatch.load();
+        if (tool_dispatch != nullptr)
+            tool_dispatch->on_module_thread_load(r, imported_module);
     }
 }