diff options
Diffstat (limited to 'libguile/objcodes.c')
-rw-r--r-- | libguile/objcodes.c | 334 |
1 files changed, 54 insertions, 280 deletions
diff --git a/libguile/objcodes.c b/libguile/objcodes.c index 73422c40c..c2932334b 100644 --- a/libguile/objcodes.c +++ b/libguile/objcodes.c @@ -41,8 +41,20 @@ #include "programs.h" #include "objcodes.h" -/* This file contains the loader for Guile's ELF format. It is followed - by the old loader. We'll remove the old loader at some point. */ +/* Before, we used __BYTE_ORDER, but that is not defined on all + systems. So punt and use automake, PDP endianness be damned. */ +#define SCM_BYTE_ORDER_BE 4321 +#define SCM_BYTE_ORDER_LE 1234 + +/* Byte order of the build machine. */ +#ifdef WORDS_BIGENDIAN +#define SCM_BYTE_ORDER SCM_BYTE_ORDER_BE +#else +#define SCM_BYTE_ORDER SCM_BYTE_ORDER_LE +#endif + +/* This file contains the loader for Guile's on-disk format: ELF with + some custom tags in the dynamic segment. */ #if SIZEOF_SCM_T_BITS == 4 #define Elf_Half Elf32_Half @@ -589,201 +601,21 @@ SCM_DEFINE (scm_load_thunk_from_memory, "load-thunk-from-memory", 1, 0, 0, #undef FUNC_NAME - -/* SCM_OBJCODE_COOKIE, defined in _scm.h, is a magic value prepended - to objcode on disk but not in memory. - - The length of the header must be a multiple of 8 bytes. */ -verify (((sizeof (SCM_OBJCODE_COOKIE) - 1) & 7) == 0); - -/* Endianness and word size of the compilation target. */ -static SCM target_endianness_var = SCM_BOOL_F; -static SCM target_word_size_var = SCM_BOOL_F; - - /* * Objcode type */ -/* Endianness of the build machine. */ -#ifdef WORDS_BIGENDIAN -# define NATIVE_ENDIANNESS 'B' -#else -# define NATIVE_ENDIANNESS 'L' -#endif - -/* Return the endianness of the compilation target. */ -static char -target_endianness (void) -{ - if (scm_is_true (target_endianness_var)) - return scm_is_eq (scm_call_0 (scm_variable_ref (target_endianness_var)), - scm_endianness_big) ? 'B' : 'L'; - else - return NATIVE_ENDIANNESS; -} - -/* Return the word size in bytes of the compilation target. */ -static size_t -target_word_size (void) -{ - if (scm_is_true (target_word_size_var)) - return scm_to_size_t (scm_call_0 - (scm_variable_ref (target_word_size_var))); - else - return sizeof (void *); -} - -/* Convert X, which is in byte order ENDIANNESS, to its native +/* Convert X, which is in byte order BYTE_ORDER, to its native representation. */ static inline uint32_t -to_native_order (uint32_t x, char endianness) +to_native_order (uint32_t x, int byte_order) { - if (endianness == NATIVE_ENDIANNESS) + if (byte_order == SCM_BYTE_ORDER) return x; else return bswap_32 (x); } -static void -verify_cookie (char *cookie, struct stat *st, int map_fd, void *map_addr) -#define FUNC_NAME "make_objcode_from_file" -{ - /* The cookie ends with a version of the form M.N, where M is the - major version and N is the minor version. For this Guile to be - able to load an objcode, M must be SCM_OBJCODE_MAJOR_VERSION, and N - must be less than or equal to SCM_OBJCODE_MINOR_VERSION. Since N - is the last character, we do a strict comparison on all but the - last, then a <= on the last one. */ - if (memcmp (cookie, SCM_OBJCODE_COOKIE, strlen (SCM_OBJCODE_COOKIE) - 1)) - { - SCM args = scm_list_1 (scm_from_latin1_stringn - (cookie, strlen (SCM_OBJCODE_COOKIE))); - if (map_fd >= 0) - { - (void) close (map_fd); -#ifdef HAVE_SYS_MMAN_H - (void) munmap (map_addr, st->st_size); -#endif - } - scm_misc_error (FUNC_NAME, "bad header on object file: ~s", args); - } - - { - char minor_version = cookie[strlen (SCM_OBJCODE_COOKIE) - 1]; - - if (minor_version > SCM_OBJCODE_MINOR_VERSION_STRING[0]) - { - if (map_fd >= 0) - { - (void) close (map_fd); -#ifdef HAVE_SYS_MMAN_H - (void) munmap (map_addr, st->st_size); -#endif - } - - scm_misc_error (FUNC_NAME, "objcode minor version too new (~a > ~a)", - scm_list_2 (scm_from_latin1_stringn (&minor_version, 1), - scm_from_latin1_string - (SCM_OBJCODE_MINOR_VERSION_STRING))); - } - } -} -#undef FUNC_NAME - -/* The words in an objcode SCM object are as follows: - - scm_tc7_objcode | type | flags - - the struct scm_objcode C object - - the parent of this objcode: either another objcode, a bytevector, - or, in the case of mmap types, #f - - "native code" -- not currently used. - */ - -static SCM -make_objcode_from_file (int fd) -#define FUNC_NAME "make_objcode_from_file" -{ - int ret; - /* The SCM_OBJCODE_COOKIE is a string literal, and thus has an extra - trailing NUL, hence the - 1. */ - char cookie[sizeof (SCM_OBJCODE_COOKIE) - 1]; - struct stat st; - - ret = fstat (fd, &st); - if (ret < 0) - SCM_SYSERROR; - - if (st.st_size <= sizeof (struct scm_objcode) + sizeof cookie) - scm_misc_error (FUNC_NAME, "object file too small (~a bytes)", - scm_list_1 (SCM_I_MAKINUM (st.st_size))); - -#ifdef HAVE_SYS_MMAN_H - { - char *addr; - struct scm_objcode *data; - - addr = mmap (0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - - if (addr == MAP_FAILED) - { - int errno_save = errno; - (void) close (fd); - errno = errno_save; - SCM_SYSERROR; - } - else - { - memcpy (cookie, addr, sizeof cookie); - data = (struct scm_objcode *) (addr + sizeof cookie); - } - - verify_cookie (cookie, &st, fd, addr); - - - if (data->len + data->metalen - != (st.st_size - sizeof (*data) - sizeof cookie)) - { - size_t total_len = sizeof (*data) + data->len + data->metalen; - - (void) close (fd); - (void) munmap (addr, st.st_size); - - scm_misc_error (FUNC_NAME, "bad length header (~a, ~a)", - scm_list_2 (scm_from_size_t (st.st_size), - scm_from_size_t (total_len))); - } - - (void) close (fd); - return scm_permanent_object - (scm_double_cell (SCM_MAKE_OBJCODE_TAG (SCM_OBJCODE_TYPE_MMAP, 0), - (scm_t_bits)(addr + strlen (SCM_OBJCODE_COOKIE)), - SCM_BOOL_F_BITS, 0)); - } -#else - { - SCM bv = scm_c_make_bytevector (st.st_size - sizeof cookie); - - if (full_read (fd, cookie, sizeof cookie) != sizeof cookie - || full_read (fd, SCM_BYTEVECTOR_CONTENTS (bv), - SCM_BYTEVECTOR_LENGTH (bv)) != SCM_BYTEVECTOR_LENGTH (bv)) - { - int errno_save = errno; - (void) close (fd); - errno = errno_save; - SCM_SYSERROR; - } - - (void) close (fd); - - verify_cookie (cookie, &st, -1, NULL); - - return scm_bytecode_to_native_objcode (bv); - } -#endif -} -#undef FUNC_NAME - - SCM scm_c_make_objcode_slice (SCM parent, const scm_t_uint8 *ptr) #define FUNC_NAME "make-objcode-slice" @@ -848,9 +680,10 @@ SCM_DEFINE (scm_objcode_meta, "objcode-meta", 1, 0, 0, } #undef FUNC_NAME -/* Turn BYTECODE into objcode encoded for ENDIANNESS and WORD_SIZE. */ +/* Wrap BYTECODE in objcode, interpreting its lengths according to + BYTE_ORDER. */ static SCM -bytecode_to_objcode (SCM bytecode, char endianness, size_t word_size) +bytecode_to_objcode (SCM bytecode, int byte_order) #define FUNC_NAME "bytecode->objcode" { size_t size, len, metalen; @@ -866,8 +699,8 @@ bytecode_to_objcode (SCM bytecode, char endianness, size_t word_size) SCM_ASSERT_RANGE (0, bytecode, size >= sizeof(struct scm_objcode)); data = (struct scm_objcode*)c_bytecode; - len = to_native_order (data->len, endianness); - metalen = to_native_order (data->metalen, endianness); + len = to_native_order (data->len, byte_order); + metalen = to_native_order (data->metalen, byte_order); if (len + metalen != (size - sizeof (*data))) scm_misc_error (FUNC_NAME, "bad bytevector size (~a != ~a)", @@ -881,100 +714,54 @@ bytecode_to_objcode (SCM bytecode, char endianness, size_t word_size) } #undef FUNC_NAME -SCM_DEFINE (scm_bytecode_to_objcode, "bytecode->objcode", 1, 0, 0, - (SCM bytecode), +SCM_DEFINE (scm_bytecode_to_objcode, "bytecode->objcode", 1, 1, 0, + (SCM bytecode, SCM endianness), "") #define FUNC_NAME s_scm_bytecode_to_objcode { - /* Assume we're called from Scheme, which known that to do with - `target-type'. */ - return bytecode_to_objcode (bytecode, target_endianness (), - target_word_size ()); -} -#undef FUNC_NAME - -/* Like `bytecode->objcode', but ignore the `target-type' fluid. This - is useful for native compilation that happens lazily---e.g., direct - calls to this function from libguile itself. */ -SCM -scm_bytecode_to_native_objcode (SCM bytecode) -{ - return bytecode_to_objcode (bytecode, NATIVE_ENDIANNESS, sizeof (void *)); -} - -SCM_DEFINE (scm_load_objcode, "load-objcode", 1, 0, 0, - (SCM file), - "") -#define FUNC_NAME s_scm_load_objcode -{ - int fd; - char *c_file; - - SCM_VALIDATE_STRING (1, file); - - c_file = scm_to_locale_string (file); - fd = open (c_file, O_RDONLY | O_CLOEXEC); - free (c_file); - if (fd < 0) SCM_SYSERROR; + int byte_order; + + if (SCM_UNBNDP (endianness)) + byte_order = SCM_BYTE_ORDER; + else if (scm_is_eq (endianness, scm_endianness_big)) + byte_order = SCM_BYTE_ORDER_BE; + else if (scm_is_eq (endianness, scm_endianness_little)) + byte_order = SCM_BYTE_ORDER_LE; + else + scm_wrong_type_arg (FUNC_NAME, 2, endianness); - return make_objcode_from_file (fd); + return bytecode_to_objcode (bytecode, byte_order); } #undef FUNC_NAME -SCM_DEFINE (scm_objcode_to_bytecode, "objcode->bytecode", 1, 0, 0, - (SCM objcode), +SCM_DEFINE (scm_objcode_to_bytecode, "objcode->bytecode", 1, 1, 0, + (SCM objcode, SCM endianness), "") #define FUNC_NAME s_scm_objcode_to_bytecode { - scm_t_uint32 len; - - SCM_VALIDATE_OBJCODE (1, objcode); - - len = sizeof (struct scm_objcode) + SCM_OBJCODE_TOTAL_LEN (objcode); - - return scm_c_take_gc_bytevector ((scm_t_int8*)SCM_OBJCODE_DATA (objcode), - len, objcode); -} -#undef FUNC_NAME - -SCM_DEFINE (scm_write_objcode, "write-objcode", 2, 0, 0, - (SCM objcode, SCM port), - "") -#define FUNC_NAME s_scm_write_objcode -{ - char cookie[sizeof (SCM_OBJCODE_COOKIE) - 1]; - char endianness, word_size; - size_t total_size; + scm_t_uint32 len, meta_len, total_len; + int byte_order; SCM_VALIDATE_OBJCODE (1, objcode); - SCM_VALIDATE_OUTPUT_PORT (2, port); - endianness = target_endianness (); - switch (target_word_size ()) - { - case 4: - word_size = '4'; - break; - case 8: - word_size = '8'; - break; - default: - abort (); - } - memcpy (cookie, SCM_OBJCODE_COOKIE, strlen (SCM_OBJCODE_COOKIE)); - cookie[SCM_OBJCODE_ENDIANNESS_OFFSET] = endianness; - cookie[SCM_OBJCODE_WORD_SIZE_OFFSET] = word_size; + if (SCM_UNBNDP (endianness)) + byte_order = SCM_BYTE_ORDER; + else if (scm_is_eq (endianness, scm_endianness_big)) + byte_order = SCM_BYTE_ORDER_BE; + else if (scm_is_eq (endianness, scm_endianness_little)) + byte_order = SCM_BYTE_ORDER_LE; + else + scm_wrong_type_arg (FUNC_NAME, 2, endianness); - total_size = - to_native_order (SCM_OBJCODE_LEN (objcode), target_endianness ()) - + to_native_order (SCM_OBJCODE_META_LEN (objcode), target_endianness ()); + len = SCM_OBJCODE_LEN (objcode); + meta_len = SCM_OBJCODE_META_LEN (objcode); - scm_c_write_unlocked (port, cookie, strlen (SCM_OBJCODE_COOKIE)); - scm_c_write_unlocked (port, SCM_OBJCODE_DATA (objcode), - sizeof (struct scm_objcode) - + total_size); + total_len = sizeof (struct scm_objcode); + total_len += to_native_order (len, byte_order); + total_len += to_native_order (meta_len, byte_order); - return SCM_UNSPECIFIED; + return scm_c_take_gc_bytevector ((scm_t_int8*)SCM_OBJCODE_DATA (objcode), + total_len, objcode); } #undef FUNC_NAME @@ -995,14 +782,6 @@ scm_bootstrap_objcodes (void) (scm_t_extension_init_func)scm_init_objcodes, NULL); } -/* Before, we used __BYTE_ORDER, but that is not defined on all - systems. So punt and use automake, PDP endianness be damned. */ -#ifdef WORDS_BIGENDIAN -#define SCM_BYTE_ORDER 4321 -#else -#define SCM_BYTE_ORDER 1234 -#endif - void scm_init_objcodes (void) { @@ -1012,11 +791,6 @@ scm_init_objcodes (void) scm_c_define ("word-size", scm_from_size_t (sizeof(SCM))); scm_c_define ("byte-order", scm_from_uint16 (SCM_BYTE_ORDER)); - - target_endianness_var = scm_c_public_variable ("system base target", - "target-endianness"); - target_word_size_var = scm_c_public_variable ("system base target", - "target-word-size"); } /* |