Add support for inleaving source information into disassembly view in debugger.

arr committed 9 years ago

Commit eb8b0901 parent 2b710fc4 files · +217 −59Browse files

Showing the changes to src/include (1 of 4 files). Show all

Unified · Split

             int32_t end_column;
         };
+        // Enumeration for formatting a function name
         enum class function_name_format_t
         {
             name = 1,
         DEFINE_ENUM_FLAG_OPERATORS(function_name_format_t);
-        class symbol_debug_t
+        // Enumeration for advancing the pc
+        enum class advance_pc_t
+        {
+            current, // Return the current pc
+            next_pc,
+            next_debug_statement, // Advance to the next debug statement (i.e. source language statement)
+        };
+        class symbol_pc_iter_t
         {
         public:
             // Set the current pc
             virtual void set_current_pc(disvm::runtime::vm_pc_t) = 0;
-            // Enumeration for advancing the pc
-            enum class advance_pc_t
-            {
-                current, // Return the current pc
-                next_pc,
-                next_debug_statement, // Advance to the next debug statement (i.e. source language statement)
-            };
             // Advance the current pc.
             // Returns 'true' if the function was successful, otherwise 'false'.
             virtual bool try_advance_pc(advance_pc_t, disvm::runtime::vm_pc_t *pc_after_advance = nullptr) = 0;
             // Return the name of the function containing the current pc.
             // Optionally format the returned string.
             // This function will throw a 'std::runtime_error' if a function doesn't exist at the current pc.
-            virtual std::string current_function_name(function_name_format_t f = function_name_format_t::name) const = 0;
+            virtual std::string current_function_name(function_name_format_t f) const = 0;
             // Return the source location for the current pc
             virtual source_ref_t current_source_location() const = 0;
             virtual const std::string &get_source_by_id(int32_t source_id) const = 0;
         };
+        struct function_data_t
+        {
+            disvm::runtime::vm_pc_t entry_pc;
+            disvm::runtime::vm_pc_t limit_pc;
+            std::string name;
+        };
         class symbol_data_t
         {
         public:
             // Get instruction count in the symbol data
             virtual size_t get_instruction_count() const = 0;
-            // Get interface over symbol data targeted for debugging
+            // Get list of functions in module.
-            virtual std::unique_ptr<symbol_debug_t> get_debug() = 0;
+            // Supply a formatting enum for the function name.
+            virtual std::vector<function_data_t> get_functions(function_name_format_t f) const = 0;
+            // Get pc iterator interface over symbol data
+            virtual std::unique_ptr<symbol_pc_iter_t> get_pc_iter() const = 0;
         };
+        // Read in symbol data from the supplied stream
         std::unique_ptr<symbol_data_t> read(std::istream &);
     }