diff options
Diffstat (limited to 'libguile/objcodes.c')
-rw-r--r-- | libguile/objcodes.c | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 87ffaa5d1..29314681c 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 @@ -30,7 +30,6 @@ #include <alignof.h> #include "_scm.h" -#include "vm-bootstrap.h" #include "programs.h" #include "objcodes.h" @@ -43,8 +42,6 @@ verify (((sizeof (SCM_OBJCODE_COOKIE) - 1) & 7) == 0); * Objcode type */ -scm_t_bits scm_tc16_objcode; - static SCM make_objcode_by_mmap (int fd) #define FUNC_NAME "make_objcode_by_mmap" @@ -91,9 +88,10 @@ make_objcode_by_mmap (int fd) + data->metalen))); } - SCM_NEWSMOB3 (sret, scm_tc16_objcode, addr + strlen (SCM_OBJCODE_COOKIE), - SCM_PACK (SCM_BOOL_F), fd); - SCM_SET_SMOB_FLAGS (sret, SCM_F_OBJCODE_IS_MMAP); + sret = scm_double_cell (scm_tc7_objcode | (SCM_F_OBJCODE_IS_MMAP<<8), + (scm_t_bits)(addr + strlen (SCM_OBJCODE_COOKIE)), + SCM_UNPACK (SCM_BOOL_F), + (scm_t_bits)fd); /* FIXME: we leak ourselves and the file descriptor. but then again so does dlopen(). */ @@ -107,7 +105,6 @@ scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr) { const struct scm_objcode *data, *parent_data; const scm_t_uint8 *parent_base; - SCM ret; SCM_VALIDATE_OBJCODE (1, parent); parent_data = SCM_OBJCODE_DATA (parent); @@ -131,9 +128,8 @@ scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr) assert (SCM_C_OBJCODE_BASE (data) + data->len + data->metalen <= parent_base + parent_data->len + parent_data->metalen); - SCM_NEWSMOB2 (ret, scm_tc16_objcode, data, parent); - SCM_SET_SMOB_FLAGS (ret, SCM_F_OBJCODE_IS_SLICE); - return ret; + return scm_double_cell (scm_tc7_objcode | (SCM_F_OBJCODE_IS_SLICE<<8), + (scm_t_bits)data, SCM_UNPACK (parent), 0); } #undef FUNC_NAME @@ -172,32 +168,27 @@ 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); - + /* foolishly, we assume that as long as bytecode is around, that c_bytecode will be of the same length; perhaps a bad assumption? */ - - return objcode; + return scm_double_cell (scm_tc7_objcode | (SCM_F_OBJCODE_IS_BYTEVECTOR<<8), + (scm_t_bits)data, SCM_UNPACK (bytecode), 0); } #undef FUNC_NAME @@ -225,17 +216,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 @@ -255,12 +246,20 @@ SCM_DEFINE (scm_write_objcode, "write-objcode", 2, 0, 0, } #undef FUNC_NAME +void +scm_i_objcode_print (SCM objcode, SCM port, scm_print_state *pstate) +{ + scm_puts ("#<objcode ", port); + scm_uintprint ((scm_t_bits)SCM_OBJCODE_BASE (objcode), 16, port); + scm_puts (">", port); +} + void scm_bootstrap_objcodes (void) { - scm_tc16_objcode = scm_make_smob_type ("objcode", 0); - scm_c_register_extension ("libguile", "scm_init_objcodes", + scm_c_register_extension ("libguile-" SCM_EFFECTIVE_VERSION, + "scm_init_objcodes", (scm_t_extension_init_func)scm_init_objcodes, NULL); } @@ -275,8 +274,6 @@ scm_bootstrap_objcodes (void) void scm_init_objcodes (void) { - scm_bootstrap_vm (); - #ifndef SCM_MAGIC_SNARFER #include "libguile/objcodes.x" #endif |