Change assert to exception if a dis module contains an invalid magic number. Broken threads now terminate the VM using the default scheduler. Tools can not get a callback for broken threads.

arr committed 10 years ago

Commit 096b0c71 parent 9c1abd69 files · +74 −28Browse files

Showing the changes to src/include (3 of 9 files). Show all

Unified · Split

3 files

@@ -128,6 +128,18 @@ namespace disvm · 127 unmodified lines
128	const char *module_name;	128	const char *module_name;
129	const vm_pc_t program_counter;	129	const vm_pc_t program_counter;
130	};	130	};
		131
		132	class vm_term_request final : public vm_user_exception
		133	{
		134	public:
		135	explicit vm_term_request()
		136	: vm_user_exception("VM termination requested")
		137	{ }
		138
		139	explicit vm_term_request(const char *msg)
		140	: vm_user_exception(msg)
		141	{ }
		142	};
131	}	143	}
132	}	144	}
133		145

             exiting,  // exit instruction
             empty_stack,
-            broken,   // thread crashed
+            broken,   // thread crashed - the scheduler is free to terminate the entire VM if any thread enters this state.
         };
         // Forward declaration
             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;
             uint32_t get_thread_id() const;
             uint32_t get_parent_thread_id() const;
             const vm_registers_t& get_registers() const;
         private:
+            vm_registers_t _registers;
             const uint32_t _thread_id;
             const uint32_t _parent_thread_id;
-            vm_registers_t _registers;
+            char *_error_message;
         };
         //

@@ -49,6 +49,7 @@ namespace disvm · 48 unmodified lines
49		49
50	thread_begin, // value1: const vm_thread_t	50	thread_begin, // value1: const vm_thread_t
51	thread_end, // value1: const vm_thread_t	51	thread_end, // value1: const vm_thread_t
		52	thread_broken, // value1: const vm_thread_t
52		53
53	exception_raised, // value1: vm_registers_t	54	exception_raised, // value1: vm_registers_t
54	// value2: const vm_string_t - exception ID	55	// value2: const vm_string_t - exception ID