@@ -60,7 +60,6 @@ namespace rubinius {
, thread(this, (Thread*)Qnil)
, current_mark(NULL)
, reuse_llvm(true)
- , use_safe_position(false)
{
probe.set(Qnil, &globals.roots);
}
@@ -343,27 +342,6 @@ namespace rubinius {
abort();
}
- void VM::raise_exception_safely(Exception* exc) {
- abort();
- safe_position_data.exc = exc;
- siglongjmp(safe_position, cReasonException);
- // Never reached.
- }
-
- void VM::raise_typeerror_safely(TypeError* err) {
- abort();
- safe_position_data.type_error = err;
- siglongjmp(safe_position, cReasonTypeError);
- // Never reached.
- }
-
- void VM::raise_assertion_safely(Assertion* err) {
- abort();
- safe_position_data.assertion = err;
- siglongjmp(safe_position, cReasonAssertion);
- // Never reached.
- }
-
// Trampoline to call scheduler_loop()
static void* __thread_tramp__(void* arg) {
VM* state = static_cast<VM*>(arg);
vm/vm.cpp
@@ -118,25 +118,6 @@ namespace rubinius {
// The thread used to trigger preemptive thread switching
pthread_t preemption_thread;
- // The safe position on the stack used to handle rare
- // events.
- sigjmp_buf safe_position;
-
- // Indicates if safe_position should be used, or if the error
- // should be thrown as a C++ exception.
- bool use_safe_position;
-
- // Data used with safe_position.
- union {
- Exception* exc;
- TypeError* type_error;
- Assertion* assertion;
- } safe_position_data;
-
- static const int cReasonException = 1;
- static const int cReasonTypeError = 2;
- static const int cReasonAssertion = 3;
-
static int cStackDepthMax;
public: /* Inline methods */
@@ -229,10 +210,6 @@ namespace rubinius {
void initialize_platform_data();
void boot_threads();
- void raise_exception_safely(Exception* exc);
- void raise_typeerror_safely(TypeError* exc);
- void raise_assertion_safely(Assertion* exc);
-
void raise_stack_error(CallFrame* call_frame);
void init_stack_size();
vm/vm.hpp
b704c2a624b9d89993005b1707dbd6f86b74238c
Evan Phoenix
ephoenix@engineyard.com
http://github.com/evanphx/rubinius/commit/9a29da11b427203ae747530184ffa4c8a48d7e14
9a29da11b427203ae747530184ffa4c8a48d7e14
2009-11-06T18:26:56-08:00
2009-11-06T18:26:56-08:00
Remove old cruft
b3985357303d3d6841c2ce93ee13c4a2306580fc
Evan Phoenix
ephoenix@engineyard.com