mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-30 00:40:20 +02:00
a268973767
* 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.
74 lines
2.7 KiB
C
74 lines
2.7 KiB
C
/* 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
|
|
* 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
|
|
*/
|
|
|
|
#ifndef _SCM_OBJCODES_H_
|
|
#define _SCM_OBJCODES_H_
|
|
|
|
#include <libguile.h>
|
|
|
|
/* Objcode data should be directly mappable to this C structure. */
|
|
struct scm_objcode
|
|
{
|
|
scm_t_uint32 len; /* the maximum index of base[] */
|
|
scm_t_uint32 metalen; /* well, i lie. this many bytes at the end of
|
|
base[] for metadata */
|
|
/* In C99, we'd have:
|
|
scm_t_uint8 base[]; */
|
|
};
|
|
|
|
/* Return a pointer to the base of objcode OBJ. */
|
|
#define SCM_C_OBJCODE_BASE(obj) \
|
|
((scm_t_uint8 *)(obj) + sizeof (struct scm_objcode))
|
|
|
|
#define SCM_F_OBJCODE_IS_MMAP (1<<0)
|
|
#define SCM_F_OBJCODE_IS_BYTEVECTOR (1<<1)
|
|
#define SCM_F_OBJCODE_IS_SLICE (1<<2)
|
|
|
|
SCM_API scm_t_bits scm_tc16_objcode;
|
|
|
|
#define SCM_OBJCODE_P(x) (SCM_SMOB_PREDICATE (scm_tc16_objcode, x))
|
|
#define SCM_OBJCODE_DATA(x) ((struct scm_objcode *) SCM_SMOB_DATA (x))
|
|
#define SCM_VALIDATE_OBJCODE(p,x) SCM_MAKE_VALIDATE (p, x, OBJCODE_P)
|
|
|
|
#define SCM_OBJCODE_LEN(x) (SCM_OBJCODE_DATA (x)->len)
|
|
#define SCM_OBJCODE_META_LEN(x) (SCM_OBJCODE_DATA (x)->metalen)
|
|
#define SCM_OBJCODE_TOTAL_LEN(x) (SCM_OBJCODE_LEN (x) + SCM_OBJCODE_META_LEN (x))
|
|
#define SCM_OBJCODE_BASE(x) (SCM_C_OBJCODE_BASE (SCM_OBJCODE_DATA (x)))
|
|
|
|
#define SCM_OBJCODE_IS_MMAP(x) (SCM_SMOB_FLAGS (x) & SCM_F_OBJCODE_IS_MMAP)
|
|
#define SCM_OBJCODE_IS_BYTEVECTOR(x) (SCM_SMOB_FLAGS (x) & SCM_F_OBJCODE_IS_BYTEVECTOR)
|
|
#define SCM_OBJCODE_IS_SLICE(x) (SCM_SMOB_FLAGS (x) & SCM_F_OBJCODE_IS_SLICE)
|
|
|
|
SCM scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr);
|
|
SCM_API SCM scm_load_objcode (SCM file);
|
|
SCM_API SCM scm_objcode_p (SCM obj);
|
|
SCM_API SCM scm_objcode_meta (SCM objcode);
|
|
SCM_API SCM scm_bytecode_to_objcode (SCM bytecode);
|
|
SCM_API SCM scm_objcode_to_bytecode (SCM objcode);
|
|
SCM_API SCM scm_write_objcode (SCM objcode, SCM port);
|
|
|
|
SCM_INTERNAL void scm_bootstrap_objcodes (void);
|
|
SCM_INTERNAL void scm_init_objcodes (void);
|
|
|
|
#endif /* _SCM_OBJCODES_H_ */
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|