X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/405a79ca7ff12ec81e4963c51be4729ebd6cc922..739941679c2c7dc36c29c30aff7d4c1b436ba773:/libguile/_scm.h?ds=sidebyside

diff --git a/libguile/_scm.h b/libguile/_scm.h
index f18b3a875..5b4f3b7a9 100644
--- a/libguile/_scm.h
+++ b/libguile/_scm.h
@@ -3,7 +3,7 @@
 #ifndef SCM__SCM_H
 #define SCM__SCM_H
 
-/* Copyright (C) 1995,1996,2000,2001, 2002, 2006, 2008, 2009, 2010 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
@@ -87,12 +87,24 @@
 #include "libguile/inline.h"
 #include "libguile/strings.h"
 
+/* 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 <ssdef.h>
-#  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  */
@@ -100,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 */
@@ -118,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
@@ -163,6 +190,11 @@
 #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
@@ -178,8 +210,8 @@
 #define SCM_OBJCODE_WORD_SIZE  SCM_CPP_STRINGIFY (SIZEOF_VOID_P)
 
 /* Major and minor versions must be single characters. */
-#define SCM_OBJCODE_MAJOR_VERSION 0
-#define SCM_OBJCODE_MINOR_VERSION Q
+#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        \
@@ -187,41 +219,14 @@
 #define SCM_OBJCODE_VERSION_STRING                                      \
   SCM_OBJCODE_MAJOR_VERSION_STRING "." SCM_OBJCODE_MINOR_VERSION_STRING
 #define SCM_OBJCODE_MACHINE_VERSION_STRING                              \
-  SCM_OBJCODE_VERSION_STRING "-" SCM_OBJCODE_ENDIANNESS "-" SCM_OBJCODE_WORD_SIZE
+  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 "---"
-
-
-/* Cells have to be 8-byte aligned.  Use `scm_t_aligned_cell' when not
-   allocating on the heap to have this guarantee.  This is similar to the
-   `SCM_ALIGNED' macro but provides an option likely to work with compilers
-   other than GCC.  */
-
-#ifdef __GNUC__
-
-struct scm_aligned_cell
-{
-  scm_t_cell cell __attribute__ ((__aligned__ (8)));
-};
-
-typedef struct scm_aligned_cell scm_t_aligned_cell;
-
-#else /* !__GNUC__ */
-
-union scm_aligned_cell
-{
-  double alignment;
-  scm_t_cell cell;
-};
-
-typedef union scm_aligned_cell scm_t_aligned_cell;
-
-#endif /* !__GNUC__ */
+  "GOOF----" SCM_OBJCODE_MACHINE_VERSION_STRING
+#define SCM_OBJCODE_ENDIANNESS_OFFSET 8
+#define SCM_OBJCODE_WORD_SIZE_OFFSET 11
 
-/* Make sure we get the right alignment.  */
-verify (alignof (scm_t_aligned_cell) >= 8);
 
 #endif  /* SCM__SCM_H */