diff options
author | Andy Wingo <wingo@pobox.com> | 2009-07-19 15:35:33 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-01-07 22:06:56 +0100 |
commit | a2689737679cf2553c118a1d96de7c9ddfec62b0 (patch) | |
tree | 527a55fa0ed77eae66e282f8b87cf7b836edb9e8 /libguile/objcodes.c | |
parent | 3dc2afe2b85eb5c7ec784b6ed8b19242e45f6e34 (diff) | |
download | guile-a2689737679cf2553c118a1d96de7c9ddfec62b0.tar.gz |
reimplement srfi-4 vectors on top of bytevectors
* libguile/srfi-4.h:
* libguile/srfi-4.c (scm_make_srfi_4_vector): New function, exported by
(srfi srfi-4 gnu).
* libguile/srfi-4.i.c: Removed.
* module/srfi/srfi-4.scm:
* module/srfi/srfi-4/gnu.scm: Reimplement srfi-4 vectors on top of
bytevectors. The implementation is mostly in Scheme now.
* test-suite/tests/unif.test: Update to use (srfi srfi-4 gnu).
* libguile/bytevectors.c (bytevector_ref_c32, bytevector_ref_c64)
(bytevector_set_c32, bytevector_set_c64): Fix some embarrassing bugs.
Still need to do an upper bounds check.
* libguile/deprecated.h: Remove deprecated array functions:
scm_i_arrayp, scm_i_array_ndim, scm_i_array_mem, scm_i_array_v,
scm_i_array_base, scm_i_array_dims, and the deprecated macros:
SCM_ARRAYP, SCM_ARRAY_NDIM, SCM_ARRAY_CONTP, SCM_ARRAY_MEM,
SCM_ARRAY_V, SCM_ARRAY_BASE, SCM_ARRAY_DIMS.
* libguile/deprecated.c (scm_uniform_vector_read_x)
(scm_uniform_vector_write, scm_uniform_array_read_x)
(scm_uniform_array_write): Newly deprecated functions.
* libguile/generalized-arrays.c (scm_array_type): Remove the bytevector
hack.
* libguile/objcodes.c (scm_bytecode_to_objcode, scm_objcode_to_bytecode):
Rework to operate on bytevectors, as scm_make_u8vector now causes a
module lookup, which can't be done e.g. when loading the VM boot
program for psyntax-pp.go on a fresh bootstrap.
* libguile/objcodes.h (SCM_F_OBJCODE_IS_BYTEVECTOR):
(SCM_OBJCODE_IS_BYTEVECTOR): s/U8VECTOR/BYTEVECTOR/.
* module/ice-9/boot-9.scm (the-scm-module): A terrible hack to pull in
(srfi srfi-4), as the bindings are primarily there now. We'll worry
about this later.
Diffstat (limited to 'libguile/objcodes.c')
-rw-r--r-- | libguile/objcodes.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 87ffaa5d1..f73265727 100644 --- a/libguile/objcodes.c +++ b/libguile/objcodes.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2009, 2010 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 @@ -172,27 +172,26 @@ SCM_DEFINE (scm_bytecode_to_objcode, "bytecode->objcode", 1, 0, 0, #define FUNC_NAME s_scm_bytecode_to_objcode { size_t size; - ssize_t increment; - scm_t_array_handle handle; const scm_t_uint8 *c_bytecode; struct scm_objcode *data; SCM objcode; - if (scm_is_false (scm_u8vector_p (bytecode))) + if (!scm_is_bytevector (bytecode)) scm_wrong_type_arg (FUNC_NAME, 1, bytecode); - c_bytecode = scm_u8vector_elements (bytecode, &handle, &size, &increment); + size = SCM_BYTEVECTOR_LENGTH (bytecode); + c_bytecode = (const scm_t_uint8*)SCM_BYTEVECTOR_CONTENTS (bytecode); + + SCM_ASSERT_RANGE (0, bytecode, size >= sizeof(struct scm_objcode)); data = (struct scm_objcode*)c_bytecode; - SCM_NEWSMOB2 (objcode, scm_tc16_objcode, data, bytecode); - scm_array_handle_release (&handle); - SCM_ASSERT_RANGE (0, bytecode, size >= sizeof(struct scm_objcode)); if (data->len + data->metalen != (size - sizeof (*data))) - scm_misc_error (FUNC_NAME, "bad u8vector size (~a != ~a)", + scm_misc_error (FUNC_NAME, "bad bytevector size (~a != ~a)", scm_list_2 (scm_from_size_t (size), scm_from_uint32 (sizeof (*data) + data->len + data->metalen))); - assert (increment == 1); - SCM_SET_SMOB_FLAGS (objcode, SCM_F_OBJCODE_IS_U8VECTOR); + + SCM_NEWSMOB2 (objcode, scm_tc16_objcode, data, bytecode); + SCM_SET_SMOB_FLAGS (objcode, SCM_F_OBJCODE_IS_BYTEVECTOR); /* foolishly, we assume that as long as bytecode is around, that c_bytecode will be of the same length; perhaps a bad assumption? */ @@ -225,17 +224,17 @@ SCM_DEFINE (scm_objcode_to_bytecode, "objcode->bytecode", 1, 0, 0, "") #define FUNC_NAME s_scm_objcode_to_bytecode { - scm_t_uint8 *u8vector; + scm_t_int8 *s8vector; scm_t_uint32 len; SCM_VALIDATE_OBJCODE (1, objcode); len = sizeof(struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode); - u8vector = scm_malloc (len); - memcpy (u8vector, SCM_OBJCODE_DATA (objcode), len); + s8vector = scm_malloc (len); + memcpy (s8vector, SCM_OBJCODE_DATA (objcode), len); - return scm_take_u8vector (u8vector, len); + return scm_c_take_bytevector (s8vector, len); } #undef FUNC_NAME |