X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/c6054feaf03f8bde236f5e45a946f38827074923..739941679c2c7dc36c29c30aff7d4c1b436ba773:/libguile/_scm.h diff --git a/libguile/_scm.h b/libguile/_scm.h index 15faa1734..5b4f3b7a9 100644 --- a/libguile/_scm.h +++ b/libguile/_scm.h @@ -3,21 +3,22 @@ #ifndef SCM__SCM_H #define SCM__SCM_H -/* Copyright (C) 1995,1996,2000,2001, 2002, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,2000,2001, 2002, 2006, 2008, 2009, 2010, 2011 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 2.1 of the License, or (at your option) any later version. + * 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 + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA */ @@ -38,7 +39,31 @@ # include #endif +/* The size of `scm_t_bits'. */ +#define SIZEOF_SCM_T_BITS SIZEOF_VOID_P + +/* Undefine HAVE_STRUCT_TIMESPEC, because the libguile C code doesn't + need it anymore, and because on MinGW: + + - the definition of struct timespec is provided (if at all) by + pthread.h + + - pthread.h will _not_ define struct timespec if + HAVE_STRUCT_TIMESPEC is 1, because then it thinks that it doesn't + need to. + + The libguile C code doesn't need HAVE_STRUCT_TIMESPEC anymore, + because the value of HAVE_STRUCT_TIMESPEC has already been + incorporated in how scm_t_timespec is defined (in scmconfig.h), and + the rest of the libguile C code now just uses scm_t_timespec. + */ +#ifdef HAVE_STRUCT_TIMESPEC +#undef HAVE_STRUCT_TIMESPEC +#endif + #include +#include +#include #include "libguile/__scm.h" /* Include headers for those files central to the implementation. The @@ -55,31 +80,31 @@ #include "libguile/boolean.h" /* Everyone wonders about the truth. */ #include "libguile/threads.h" /* You are not alone. */ #include "libguile/snarf.h" /* Everyone snarfs. */ +#include "libguile/foreign.h" /* Snarfing needs the foreign data structures. */ +#include "libguile/programs.h" /* ... and program.h. */ #include "libguile/variable.h" #include "libguile/modules.h" #include "libguile/inline.h" #include "libguile/strings.h" -/* SCM_SYSCALL retries system calls that have been interrupted (EINTR). - However this can be avoided if the operating system can restart - system calls automatically. We assume this is the case if - sigaction is available and SA_RESTART is defined; they will be used - when installing signal handlers. - */ - -#ifdef HAVE_RESTARTABLE_SYSCALLS -#if ! SCM_USE_PTHREAD_THREADS /* However, don't assume SA_RESTART - works with pthreads... */ -#define SCM_SYSCALL(line) line -#endif -#endif - +/* ASYNC_TICK after finding EINTR in order to handle pending signals, if + any. See comment in scm_syserror. */ #ifndef SCM_SYSCALL #ifdef vms # ifndef __GNUC__ # include -# define SCM_SYSCALL(line) do{errno = 0;line;} \ - while(EVMSERR==errno && (vaxc$errno>>3)==(SS$_CONTROLC>>3)) +# define SCM_SYSCALL(line) \ + do \ + { \ + errno = 0; \ + line; \ + if (EVMSERR==errno && (vaxc$errno>>3)==(SS$_CONTROLC>>3)) \ + { \ + SCM_ASYNC_TICK; \ + continue; \ + } \ + } \ + while(0) # endif /* ndef __GNUC__ */ #endif /* def vms */ #endif /* ndef SCM_SYSCALL */ @@ -87,7 +112,18 @@ #ifndef SCM_SYSCALL # ifdef EINTR # if (EINTR > 0) -# define SCM_SYSCALL(line) do{errno = 0;line;}while(EINTR==errno) +# define SCM_SYSCALL(line) \ + do \ + { \ + errno = 0; \ + line; \ + if (errno == EINTR) \ + { \ + SCM_ASYNC_TICK; \ + continue; \ + } \ + } \ + while(0) # endif /* (EINTR > 0) */ # endif /* def EINTR */ #endif /* ndef SCM_SYSCALL */ @@ -105,9 +141,13 @@ #define max(A, B) ((A) >= (B) ? (A) : (B)) #endif +/* Return the first integer greater than or equal to LEN such that + LEN % ALIGN == 0. Return LEN if ALIGN is zero. */ +#define ROUND_UP(len, align) \ + ((align) ? (((len) - 1UL) | ((align) - 1UL)) + 1UL : (len)) -#if GUILE_USE_64_CALLS && HAVE_STAT64 +#if defined GUILE_USE_64_CALLS && GUILE_USE_64_CALLS && defined(HAVE_STAT64) #define CHOOSE_LARGEFILE(foo,foo64) foo64 #else #define CHOOSE_LARGEFILE(foo,foo64) foo @@ -150,6 +190,43 @@ #define scm_to_off64_t scm_to_int64 #define scm_from_off64_t scm_from_int64 +#if (defined __GNUC__) +# define SCM_NOINLINE __attribute__ ((__noinline__)) +#else +# define SCM_NOINLINE /* noinline */ +#endif + +/* The endianness marker in objcode. */ +#ifdef WORDS_BIGENDIAN +# define SCM_OBJCODE_ENDIANNESS "BE" +#else +# define SCM_OBJCODE_ENDIANNESS "LE" +#endif + +#define _SCM_CPP_STRINGIFY(x) # x +#define SCM_CPP_STRINGIFY(x) _SCM_CPP_STRINGIFY (x) + +/* The word size marker in objcode. */ +#define SCM_OBJCODE_WORD_SIZE SCM_CPP_STRINGIFY (SIZEOF_VOID_P) + +/* Major and minor versions must be single characters. */ +#define SCM_OBJCODE_MAJOR_VERSION 2 +#define SCM_OBJCODE_MINOR_VERSION 0 +#define SCM_OBJCODE_MAJOR_VERSION_STRING \ + SCM_CPP_STRINGIFY(SCM_OBJCODE_MAJOR_VERSION) +#define SCM_OBJCODE_MINOR_VERSION_STRING \ + SCM_CPP_STRINGIFY(SCM_OBJCODE_MINOR_VERSION) +#define SCM_OBJCODE_VERSION_STRING \ + SCM_OBJCODE_MAJOR_VERSION_STRING "." SCM_OBJCODE_MINOR_VERSION_STRING +#define SCM_OBJCODE_MACHINE_VERSION_STRING \ + SCM_OBJCODE_ENDIANNESS "-" SCM_OBJCODE_WORD_SIZE "-" SCM_OBJCODE_VERSION_STRING + +/* The objcode magic header. */ +#define SCM_OBJCODE_COOKIE \ + "GOOF----" SCM_OBJCODE_MACHINE_VERSION_STRING +#define SCM_OBJCODE_ENDIANNESS_OFFSET 8 +#define SCM_OBJCODE_WORD_SIZE_OFFSET 11 + #endif /* SCM__SCM_H */