mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
53bdfcf034
* 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.
134 lines
3.3 KiB
C
134 lines
3.3 KiB
C
/* Copyright (C) 2001,2008,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
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
/* FIXME! Need to check that the fetch is within the current program */
|
|
|
|
/* This file is included in vm_engine.c */
|
|
|
|
VM_DEFINE_LOADER (101, load_number, "load-number")
|
|
{
|
|
size_t len;
|
|
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_string_to_number (scm_from_locale_stringn ((char *)ip, len),
|
|
SCM_UNDEFINED /* radix = 10 */));
|
|
/* Was: scm_istring2number (ip, len, 10)); */
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (102, load_string, "load-string")
|
|
{
|
|
size_t len;
|
|
char *buf;
|
|
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_i_make_string (len, &buf, 1));
|
|
memcpy (buf, (char *) ip, len);
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (103, load_symbol, "load-symbol")
|
|
{
|
|
size_t len;
|
|
FETCH_LENGTH (len);
|
|
SYNC_REGISTER ();
|
|
/* FIXME: should be scm_from_latin1_symboln */
|
|
PUSH (scm_from_latin1_symboln ((const char*)ip, len));
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (104, load_program, "load-program")
|
|
{
|
|
scm_t_uint32 len;
|
|
SCM objs, objcode;
|
|
|
|
POP (objs);
|
|
SYNC_REGISTER ();
|
|
|
|
if (scm_is_vector (objs) && scm_is_false (scm_c_vector_ref (objs, 0)))
|
|
scm_c_vector_set_x (objs, 0, scm_current_module ());
|
|
|
|
objcode = scm_c_make_objcode_slice (SCM_PROGRAM_OBJCODE (fp[-1]), ip);
|
|
len = sizeof (struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode);
|
|
|
|
PUSH (scm_make_program (objcode, objs, SCM_BOOL_F));
|
|
|
|
ip += len;
|
|
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_INSTRUCTION (105, link_now, "link-now", 0, 1, 1)
|
|
{
|
|
SCM what;
|
|
POP (what);
|
|
SYNC_REGISTER ();
|
|
PUSH (resolve_variable (what, scm_current_module ()));
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (106, load_array, "load-array")
|
|
{
|
|
SCM type, shape;
|
|
size_t len;
|
|
FETCH_LENGTH (len);
|
|
POP2 (shape, type);
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_from_contiguous_typed_array (type, shape, ip, len));
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
VM_DEFINE_LOADER (107, load_wide_string, "load-wide-string")
|
|
{
|
|
size_t len;
|
|
scm_t_wchar *wbuf;
|
|
|
|
FETCH_LENGTH (len);
|
|
VM_ASSERT ((len % 4) == 0,
|
|
vm_error_bad_wide_string_length (len));
|
|
|
|
SYNC_REGISTER ();
|
|
PUSH (scm_i_make_wide_string (len / 4, &wbuf, 1));
|
|
memcpy ((char *) wbuf, (char *) ip, len);
|
|
ip += len;
|
|
NEXT;
|
|
}
|
|
|
|
/*
|
|
(defun renumber-ops ()
|
|
"start from top of buffer and renumber 'VM_DEFINE_FOO (\n' sequences"
|
|
(interactive "")
|
|
(save-excursion
|
|
(let ((counter 100)) (goto-char (point-min))
|
|
(while (re-search-forward "^VM_DEFINE_[^ ]+ (\\([^,]+\\)," (point-max) t)
|
|
(replace-match
|
|
(number-to-string (setq counter (1+ counter)))
|
|
t t nil 1)))))
|
|
*/
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|