diff options
author | Andy Wingo <wingo@pobox.com> | 2013-10-18 10:03:26 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-10-18 11:39:35 +0200 |
commit | 27337b6373954e1a975d97d0bf06b5c03d65b64d (patch) | |
tree | 33dba0fa3b9c0c7121e5c106556a6a6116efb37f /test-suite/tests/eval.test | |
parent | 9dff1df97f7021b1d2edd5dd73d1ca426def943b (diff) | |
download | guile-27337b6373954e1a975d97d0bf06b5c03d65b64d.tar.gz |
Subrs are RTL programs
* libguile/gsubr.c: Define RTL stubs instead of stack VM stubs.
(SUBR_STUB_CODE, get_subr_stub_code): Adapt to return a uint32_t*
pointer instead of a SCM value.
(create_subr): Create RTL procedures instead of stack VM procedures.
For RTL procedures, the function pointer, name, and generic address
pointer go inline to the procedure, as free variables.
(scm_i_primitive_arity, scm_i_primitive_call_ip): New helpers.
(scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic)
(scm_c_define_gsubr_with_generic): Adapt to create_gsubr being renamed
to create_subr.
Remove gsubr test code.
* libguile/gsubr.h (SCM_PRIMITIVE_P, SCM_PRIMITIVE_GENERIC_P): Only RTL
programs can be primitives now.
(SCM_SUBRF, SCM_SUBR_NAME, SCM_SUBR_GENERIC): These fields are now in
the RTL free variables, not the object table.
* libguile/programs.c (scm_i_rtl_program_name):
(scm_i_rtl_program_documentation):
(scm_i_rtl_program_properties):
(scm_i_rtl_program_minimum_arity): Implement these appropriately for
primitives, which lack debugging information.
(scm_primitive_p, scm_primitive_call_ip): New helpers.
* libguile/snarf.h: Remove static allocation for subrs. Since there is
nothing to allocate besides the program itself, which needs runtime
relocation, static allocation is not a win.
* system/vm/program.scm: Fix up various arity-related things for
primitives, which don't use ELF arity info.
* test-suite/tests/eval.test ("stack involving a primitive"): Add an
XFAIL until we get just one VM.
Diffstat (limited to 'test-suite/tests/eval.test')
-rw-r--r-- | test-suite/tests/eval.test | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test-suite/tests/eval.test b/test-suite/tests/eval.test index 24afe2da0..a0221b81b 100644 --- a/test-suite/tests/eval.test +++ b/test-suite/tests/eval.test @@ -1,5 +1,5 @@ ;;;; eval.test --- tests guile's evaluator -*- scheme -*- -;;;; Copyright (C) 2000, 2001, 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +;;;; Copyright (C) 2000, 2001, 2006, 2007, 2009, 2010, 2011, 2012, 2013 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 @@ -349,7 +349,9 @@ (define tag (make-prompt-tag "foo")) (with-test-prefix "stacks" - (pass-if "stack involving a primitive" + ;; FIXME: Until we get one VM, a call to an RTL primitive from the + ;; stack VM will result in the primitive being on the stack twice. + (expect-fail "stack involving a primitive" ;; The primitive involving the error must appear exactly once on the ;; stack. (let* ((stack (make-tagged-trimmed-stack tag '(#t))) |