Add support for traps in VM Add instruction trap to enable single step scenario in debugger Remote get_state() function from thread

arr committed 9 years ago

Commit cb408a11 parent eb570d98 files · +120 −40Browse files

Showing the changes to src/include (2 of 8 files). Show all

Unified · Split

2 files

src/include/runtime.h +12 −6
src/include/vm_tools.h +5 −0

             const vm_string_t &exception_id);
         // VM thread states
-        enum class vm_thread_state_t : uint16_t
+        enum class vm_thread_state_t : uint8_t
         {
             unknown = 0,
             broken,   // thread crashed - the scheduler is free to terminate the entire VM if any thread enters this state.
         };
+        // VM trap flags
+        enum class vm_trap_flags_t : uint8_t
+        {
+            none = 0,
+            instruction = 1 << 0,
+        };
         // Forward declaration
         class vm_thread_t;
         class vm_tool_dispatch_t;
         {
         public:
             vm_registers_t(
-                const vm_thread_t &thread,
+                vm_thread_t &thread,
                 vm_module_ref_t &entry);
             ~vm_registers_t();
-            const vm_thread_t &thread;
+            vm_thread_t &thread;
             std::atomic<vm_tool_dispatch_t *> tool_dispatch;
             vm_stack_t stack;  // Frame pointer access (FP)
             vm_pc_t pc;  // Current Program counter (Index into module code section)
             vm_module_ref_t *module_ref;  // Module reference
             vm_request_mutex_t request_mutex;
-            vm_thread_state_t current_thread_state;
             uint16_t current_thread_quanta;
+            vm_thread_state_t current_thread_state;
+            vm_trap_flags_t trap_flags;
             pointer_t src;
             pointer_t mid;
             // this vm thread.
             void set_tool_dispatch(vm_tool_dispatch_t *dispatch);
-            vm_thread_state_t get_state() const;
             // This function will only return a non-null
             // value if this thread is in the broken state.
             const char *get_error_message() const;

src/include/vm_tools.h+5−0

         union vm_context_value_t
         {
             cookie_t cookie;
+            vm_trap_flags_t trap;
             std::shared_ptr<vm_module_t> *module; // Note this is a pointer to std::shared_ptr<>
             vm_registers_t *registers;
             const vm_thread_t *thread;
             breakpoint,          // value1: vm_registers_t
                                  // value2: cookie_t - cookie of breakpoint. '0' indicates the breakpoint was inserted by the VM or compiler.
+            trap,                // value1: vm_registers_t - The trap flag is unset prior to the event be fired.
+                                 // value2: vm_trap_flags_t
         };
         using vm_event_callback_t = std::function<void(vm_event_t, vm_event_context_t &)>;
             // Manipulate thread execution
             virtual void suspend_all_threads() = 0;
             virtual void resume_all_threads() = 0;
+            virtual void set_thread_trap_flag(const vm_registers_t &, vm_trap_flags_t flag) = 0;
         };
     }
 }