From 53bdfcf03418c4709127140d64f12ede970c174b Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Mon, 30 Apr 2012 20:25:53 +0200 Subject: push error handlers out of line in the vm * libguile/vm.c: (vm_error): (vm_error_bad_instruction): (vm_error_unbound): (vm_error_unbound_fluid): (vm_error_not_a_variable): (vm_error_not_a_thunk): (vm_error_apply_to_non_list): (vm_error_kwargs_length_not_even): (vm_error_kwargs_invalid_keyword): (vm_error_kwargs_unrecognized_keyword): (vm_error_too_many_args): (vm_error_wrong_num_args): (vm_error_wrong_type_apply): (vm_error_stack_overflow): (vm_error_stack_underflow): (vm_error_improper_list): (vm_error_not_a_pair): (vm_error_not_a_bytevector): (vm_error_not_a_struct): (vm_error_no_values): (vm_error_not_enough_values): (vm_error_continuation_not_rewindable): (vm_error_bad_wide_string_length): (vm_error_invalid_address): (vm_error_object): (vm_error_free_variable): New internal helpers, implementing VM error handling. * libguile/vm-engine.h (VM_ASSERT): New helper macro. (ASSERT, CHECK_OBJECT, CHECK_FREE_VARIABLE): (PRE_CHECK_UNDERFLOW, PUSH_LIST): Use the new helper. * libguile/vm-i-loader.c: * libguile/vm-i-scheme.c: * libguile/vm-i-system.c: Use VM_ASSERT and the out-of-line error handlers. * libguile/vm-engine.c (vm_engine): Remove inline error handlers, and remove a couple of local vars. Use VM_ASSERT. Have halt handle the return itself. --- libguile/vm-i-scheme.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'libguile/vm-i-scheme.c') diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c index 80328cde8..5191b8eac 100644 --- a/libguile/vm-i-scheme.c +++ b/libguile/vm-i-scheme.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -124,11 +124,7 @@ VM_DEFINE_FUNCTION (140, cons, "cons", 2) } #define VM_VALIDATE_CONS(x, proc) \ - if (SCM_UNLIKELY (!scm_is_pair (x))) \ - { func_name = proc; \ - finish_args = x; \ - goto vm_error_not_a_pair; \ - } + VM_ASSERT (scm_is_pair (x), vm_error_not_a_pair (proc, x)) VM_DEFINE_FUNCTION (141, car, "car", 1) { @@ -503,12 +499,7 @@ VM_DEFINE_INSTRUCTION (165, make_array, "make-array", 3, -1, 1) * Structs */ #define VM_VALIDATE_STRUCT(obj, proc) \ - if (SCM_UNLIKELY (!SCM_STRUCTP (obj))) \ - { \ - func_name = proc; \ - finish_args = (obj); \ - goto vm_error_not_a_struct; \ - } + VM_ASSERT (SCM_STRUCTP (obj), vm_error_not_a_pair (proc, obj)) VM_DEFINE_FUNCTION (166, struct_p, "struct?", 1) { @@ -654,16 +645,7 @@ VM_DEFINE_INSTRUCTION (173, slot_set, "slot-set", 0, 3, 0) * Bytevectors */ #define VM_VALIDATE_BYTEVECTOR(x, proc) \ - do \ - { \ - if (SCM_UNLIKELY (!SCM_BYTEVECTOR_P (x))) \ - { \ - func_name = proc; \ - finish_args = x; \ - goto vm_error_not_a_bytevector; \ - } \ - } \ - while (0) + VM_ASSERT (SCM_BYTEVECTOR_P (x), vm_error_not_a_bytevector (proc, x)) #define BV_REF_WITH_ENDIANNESS(stem, fn_stem) \ { \ -- cgit v1.2.3