From 7904ddcac2413fe9ee61ddd4e335b4cf994aa9f0 Mon Sep 17 00:00:00 2001 From: slava Date: Fri, 17 Nov 2006 07:01:05 +0000 Subject: [PATCH] Fix Objective-C exception handling --- library/tools/errors.factor | 1 + vm/os-macosx.m | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/tools/errors.factor b/library/tools/errors.factor index 5ad9837cfa..7d815a7fe9 100644 --- a/library/tools/errors.factor +++ b/library/tools/errors.factor @@ -80,6 +80,7 @@ DEFER: objc-error. ( alien -- ) retainstack-overflow. callstack-underflow. callstack-overflow. + objc-error. } nth ; M: kernel-error error. dup kernel-error execute ; diff --git a/vm/os-macosx.m b/vm/os-macosx.m index 1c4ae64908..e9959c9e64 100644 --- a/vm/os-macosx.m +++ b/vm/os-macosx.m @@ -18,6 +18,7 @@ void run() for(;;) { NS_DURING + stack_chain->native_stack_pointer = native_stack_pointer(); SETJMP(stack_chain->toplevel); handle_error(); @@ -38,7 +39,7 @@ NS_ENDHANDLER void run_toplevel(void) { - interpreter(); + run(); } void early_init(void)