summaryrefslogtreecommitdiff
path: root/libguile/vm-i-system.c
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-07-27 14:54:53 +0200
committerLudovic Courtès <ludo@gnu.org>2010-07-28 12:24:25 +0200
commit5b46a8c2c8f41581dd5576c8dcc06e8bde8cd849 (patch)
tree27af561d2cf6cd08dee3ff78c19d281ecce626e4 /libguile/vm-i-system.c
parent9defb64118774c8f1a1f6af05d6f1705e7a40619 (diff)
downloadguile-5b46a8c2c8f41581dd5576c8dcc06e8bde8cd849.tar.gz
Use "pointer" instead of "foreign" when dealing with wrapped pointers.
* libguile/foreign.h (scm_t_foreign_finalizer): Rename to... (scm_t_pointer_finalizer): ... this. (SCM_FOREIGN_P): Rename to... (SCM_POINTER_P): this. (SCM_VALIDATE_FOREIGN): Rename to... (SCM_VALIDATE_POINTER): ... this. (SCM_FOREIGN_HAS_FINALIZER): Rename to... (SCM_POINTER_HAS_FINALIZER): ... this. (scm_take_foreign_pointer): Rename to... (scm_from_pointer): ... this. (scm_foreign_address): Rename to... (scm_pointer_address): ... this. (scm_foreign_to_bytevector): Rename to... (scm_pointer_to_bytevector): ... this. (scm_foreign_set_finalizer_x): Rename to... (scm_set_pointer_finalizer_x): ... this. (scm_bytevector_to_foreign): Rename to... (scm_bytevector_to_pointer): ... this. (scm_i_foreign_print): Rename to... (scm_i_pointer_print): ... this. * libguile/foreign.c: Update accordingly. * libguile/tags.h (scm_tc7_foreign): Rename to... (scm_tc7_pointer): ... this. * libguile/foreign.c, libguile/deprecated.c, libguile/dynl.c, libguile/evalext.c, libguile/gc.c, libguile/goops.c, libguile/gsubr.c, libguile/gsubr.h, libguile/print.c, libguile/snarf.h, libguile/vm-i-system.c, module/system/foreign.scm, test-suite/standalone/test-ffi, test-suite/tests/foreign.test: Update accordingly.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r--libguile/vm-i-system.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 8944c8415..9ba287d5a 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -840,12 +840,13 @@ VM_DEFINE_INSTRUCTION (55, tail_call, "tail-call", 1, -1, 1)
VM_DEFINE_INSTRUCTION (56, subr_call, "subr-call", 1, -1, -1)
{
- SCM foreign, ret;
+ SCM pointer, ret;
SCM (*subr)();
+
nargs = FETCH ();
- POP (foreign);
+ POP (pointer);
- subr = SCM_FOREIGN_POINTER (foreign);
+ subr = SCM_POINTER_VALUE (pointer);
VM_HANDLE_INTERRUPTS;
SYNC_REGISTER ();