Upgrade to 2003-06-08 libbitset, then:

[bison.git] / lib / alloca.c

diff --git a/lib/alloca.c b/lib/alloca.c
index 8f98b73dbb90788101e7e83c2909ab60de28d719..fd95a34d63a7d8f7ddd4c3845a9dda6a3060d6be 100644 (file)
--- a/lib/alloca.c
+++ b/lib/alloca.c
@@ -22,18 +22,26 @@
    your main control loop, etc. to force garbage collection.  */
 
 #ifdef HAVE_CONFIG_H
    your main control loop, etc. to force garbage collection.  */
 
 #ifdef HAVE_CONFIG_H

-#include <config.h>
+# include <config.h>

 #endif
 
 #endif
 

-#ifdef HAVE_STRING_H
-#include <string.h>
+#if HAVE_STRING_H
+# include <string.h>

 #endif
 #endif

-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+#if HAVE_STDLIB_H
+# include <stdlib.h>

 #endif
 
 #ifdef emacs
 #endif
 
 #ifdef emacs

-#include "blockinput.h"
+# include "lisp.h"
+# include "blockinput.h"
+# define xalloc_die() memory_full ()
+# ifdef EMACS_FREE
+#  undef free
+#  define free EMACS_FREE
+# endif
+#else
+# include <xalloc.h>

 #endif
 
 /* If compiling with GCC 2, this file's not needed.  */
 #endif
 
 /* If compiling with GCC 2, this file's not needed.  */


@@ -41,56 +49,46 @@
 
 /* If someone has defined alloca as a macro,
    there must be some other way alloca is supposed to work.  */
 
 /* If someone has defined alloca as a macro,
    there must be some other way alloca is supposed to work.  */

-#ifndef alloca
+# ifndef alloca

 
 

-#ifdef emacs
-#ifdef static
+#  ifdef emacs
+#   ifdef static

 /* actually, only want this if static is defined as ""
    -- this is for usg, in which emacs must undefine static
    in order to make unexec workable
    */
 /* actually, only want this if static is defined as ""
    -- this is for usg, in which emacs must undefine static
    in order to make unexec workable
    */

-#ifndef STACK_DIRECTION
+#    ifndef STACK_DIRECTION

 you
 lose
 -- must know STACK_DIRECTION at compile-time
 you
 lose
 -- must know STACK_DIRECTION at compile-time

-#endif /* STACK_DIRECTION undefined */
-#endif /* static */
-#endif /* emacs */
+/* Using #error here is not wise since this file should work for
+   old and obscure compilers.  */
+#    endif /* STACK_DIRECTION undefined */
+#   endif /* static */
+#  endif /* emacs */

 
 /* If your stack is a linked list of frames, you have to
    provide an "address metric" ADDRESS_FUNCTION macro.  */
 
 
 /* If your stack is a linked list of frames, you have to
    provide an "address metric" ADDRESS_FUNCTION macro.  */
 

-#if defined (CRAY) && defined (CRAY_STACKSEG_END)
+#  if defined (CRAY) && defined (CRAY_STACKSEG_END)

 long i00afunc ();
 long i00afunc ();

-#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
-#else
-#define ADDRESS_FUNCTION(arg) &(arg)
-#endif
-
-#if __STDC__
-typedef void *pointer;
-#else
-typedef char *pointer;
-#endif
-
-#ifndef NULL
-#define        NULL    0
-#endif
-
-/* Different portions of Emacs need to call different versions of
-   malloc.  The Emacs executable needs alloca to call xmalloc, because
-   ordinary malloc isn't protected from input signals.  On the other
-   hand, the utilities in lib-src need alloca to call malloc; some of
-   them are very simple, and don't have an xmalloc routine.
-
-   Non-Emacs programs expect this to call use xmalloc.
-
-   Callers below should use malloc.  */
-
-#ifndef emacs
-#define malloc xmalloc
-#endif
-extern pointer malloc ();
+#   define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg))
+#  else
+#   define ADDRESS_FUNCTION(arg) &(arg)
+#  endif
+
+#  ifndef POINTER_TYPE
+#   ifdef __STDC__
+#    define POINTER_TYPE void
+#   else
+#    define POINTER_TYPE char
+#   endif
+#  endif
+typedef POINTER_TYPE *pointer;
+
+#  ifndef NULL
+#   define NULL 0
+#  endif

 
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically
 
 /* Define STACK_DIRECTION if you know the direction of stack
    growth for your system; otherwise it will be automatically


@@ -100,18 +98,18 @@ extern pointer malloc ();
    STACK_DIRECTION < 0 => grows toward lower addresses
    STACK_DIRECTION = 0 => direction of growth unknown  */
 
    STACK_DIRECTION < 0 => grows toward lower addresses
    STACK_DIRECTION = 0 => direction of growth unknown  */
 

-#ifndef STACK_DIRECTION
-#define        STACK_DIRECTION 0       /* Direction unknown.  */
-#endif
+#  ifndef STACK_DIRECTION
+#   define STACK_DIRECTION     0       /* Direction unknown.  */
+#  endif

 
 

-#if STACK_DIRECTION != 0
+#  if STACK_DIRECTION != 0

 
 

-#define        STACK_DIR       STACK_DIRECTION /* Known at compile-time.  */
+#   define STACK_DIR   STACK_DIRECTION /* Known at compile-time.  */

 
 

-#else /* STACK_DIRECTION == 0; need run-time code.  */
+#  else /* STACK_DIRECTION == 0; need run-time code.  */

 
 static int stack_dir;          /* 1 or -1 once known.  */
 
 static int stack_dir;          /* 1 or -1 once known.  */

-#define        STACK_DIR       stack_dir
+#   define STACK_DIR   stack_dir

 
 static void
 find_stack_direction ()
 
 static void
 find_stack_direction ()


@@ -135,7 +133,7 @@ find_stack_direction ()
     }
 }
 
     }
 }
 

-#endif /* STACK_DIRECTION == 0 */
+#  endif /* STACK_DIRECTION == 0 */

 
 /* An "alloca header" is used to:
    (a) chain together all alloca'ed blocks;
 
 /* An "alloca header" is used to:
    (a) chain together all alloca'ed blocks;


@@ -144,9 +142,9 @@ find_stack_direction ()
    It is very important that sizeof(header) agree with malloc
    alignment chunk size.  The following default should work okay.  */
 
    It is very important that sizeof(header) agree with malloc
    alignment chunk size.  The following default should work okay.  */
 

-#ifndef        ALIGN_SIZE
-#define        ALIGN_SIZE      sizeof(double)
-#endif
+#  ifndef      ALIGN_SIZE
+#   define ALIGN_SIZE  sizeof(double)
+#  endif

 
 typedef union hdr
 {
 
 typedef union hdr
 {


@@ -169,15 +167,15 @@ static header *last_alloca_header = NULL; /* -> last alloca header.  */
 
 pointer
 alloca (size)
 
 pointer
 alloca (size)

-     unsigned size;
+     size_t size;

 {
   auto char probe;             /* Probes stack depth: */
   register char *depth = ADDRESS_FUNCTION (probe);
 
 {
   auto char probe;             /* Probes stack depth: */
   register char *depth = ADDRESS_FUNCTION (probe);
 

-#if STACK_DIRECTION == 0
+#  if STACK_DIRECTION == 0

   if (STACK_DIR == 0)          /* Unknown growth direction.  */
     find_stack_direction ();
   if (STACK_DIR == 0)          /* Unknown growth direction.  */
     find_stack_direction ();

-#endif
+#  endif

 
   /* Reclaim garbage, defined as all alloca'd storage that
      was allocated from deeper in the stack than currently.  */
 
   /* Reclaim garbage, defined as all alloca'd storage that
      was allocated from deeper in the stack than currently.  */


@@ -185,9 +183,9 @@ alloca (size)
   {
     register header *hp;       /* Traverses linked list.  */
 
   {
     register header *hp;       /* Traverses linked list.  */
 

-#ifdef emacs
+#  ifdef emacs

     BLOCK_INPUT;
     BLOCK_INPUT;

-#endif
+#  endif

 
     for (hp = last_alloca_header; hp != NULL;)
       if ((STACK_DIR > 0 && hp->h.deep > depth)
 
     for (hp = last_alloca_header; hp != NULL;)
       if ((STACK_DIR > 0 && hp->h.deep > depth)


@@ -204,9 +202,9 @@ alloca (size)
 
     last_alloca_header = hp;   /* -> last valid storage.  */
 
 
     last_alloca_header = hp;   /* -> last valid storage.  */
 

-#ifdef emacs
+#  ifdef emacs

     UNBLOCK_INPUT;
     UNBLOCK_INPUT;

-#endif
+#  endif

   }
 
   if (size == 0)
   }
 
   if (size == 0)


@@ -215,8 +213,14 @@ alloca (size)
   /* Allocate combined header + user data storage.  */
 
   {
   /* Allocate combined header + user data storage.  */
 
   {

-    register pointer new = malloc (sizeof (header) + size);

     /* Address of header.  */
     /* Address of header.  */

+    register pointer new;
+
+    size_t combined_size = sizeof (header) + size;
+    if (combined_size < sizeof (header))
+      xalloc_die ();
+
+    new = xmalloc (combined_size);

 
     if (new == 0)
       abort();
 
     if (new == 0)
       abort();


@@ -232,15 +236,15 @@ alloca (size)
   }
 }
 
   }
 }
 

-#if defined (CRAY) && defined (CRAY_STACKSEG_END)
+#  if defined (CRAY) && defined (CRAY_STACKSEG_END)

 
 

-#ifdef DEBUG_I00AFUNC
-#include <stdio.h>
-#endif
+#   ifdef DEBUG_I00AFUNC
+#    include <stdio.h>
+#   endif

 
 

-#ifndef CRAY_STACK
-#define CRAY_STACK
-#ifndef CRAY2
+#   ifndef CRAY_STACK
+#    define CRAY_STACK
+#    ifndef CRAY2

 /* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
 struct stack_control_header
   {
 /* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */
 struct stack_control_header
   {


@@ -292,7 +296,7 @@ struct stack_segment_linkage
     long sss7;
   };
 
     long sss7;
   };
 

-#else /* CRAY2 */
+#    else /* CRAY2 */

 /* The following structure defines the vector of words
    returned by the STKSTAT library routine.  */
 struct stk_stat
 /* The following structure defines the vector of words
    returned by the STKSTAT library routine.  */
 struct stk_stat


@@ -345,10 +349,10 @@ struct stk_trailer
     long unknown14;
   };
 
     long unknown14;
   };
 

-#endif /* CRAY2 */
-#endif /* not CRAY_STACK */
+#    endif /* CRAY2 */
+#   endif /* not CRAY_STACK */

 
 

-#ifdef CRAY2
+#   ifdef CRAY2

 /* Determine a "stack measure" for an arbitrary ADDRESS.
    I doubt that "lint" will like this much.  */
 
 /* Determine a "stack measure" for an arbitrary ADDRESS.
    I doubt that "lint" will like this much.  */
 


@@ -419,7 +423,7 @@ i00afunc (long *address)
   return (result);
 }
 
   return (result);
 }
 

-#else /* not CRAY2 */
+#   else /* not CRAY2 */

 /* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
    Determine the number of the cell within the stack,
    given the address of the cell.  The purpose of this
 /* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP.
    Determine the number of the cell within the stack,
    given the address of the cell.  The purpose of this


@@ -464,9 +468,9 @@ i00afunc (long address)
 
   while (!(this_segment <= address && address <= stkl))
     {
 
   while (!(this_segment <= address && address <= stkl))
     {

-#ifdef DEBUG_I00AFUNC
+#    ifdef DEBUG_I00AFUNC

       fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl);
       fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl);

-#endif
+#    endif

       if (pseg == 0)
        break;
       stkl = stkl - pseg;
       if (pseg == 0)
        break;
       stkl = stkl - pseg;


@@ -485,9 +489,9 @@ i00afunc (long address)
 
   while (pseg != 0)
     {
 
   while (pseg != 0)
     {

-#ifdef DEBUG_I00AFUNC
+#    ifdef DEBUG_I00AFUNC

       fprintf (stderr, "%011o %011o\n", pseg, size);
       fprintf (stderr, "%011o %011o\n", pseg, size);

-#endif
+#    endif

       stkl = stkl - pseg;
       ssptr = (struct stack_segment_linkage *) stkl;
       size = ssptr->sssize;
       stkl = stkl - pseg;
       ssptr = (struct stack_segment_linkage *) stkl;
       size = ssptr->sssize;


@@ -497,8 +501,8 @@ i00afunc (long address)
   return (result);
 }
 
   return (result);
 }
 

-#endif /* not CRAY2 */
-#endif /* CRAY */
+#   endif /* not CRAY2 */
+#  endif /* CRAY */

 
 

-#endif /* no alloca */
+# endif /* no alloca */

 #endif /* not GCC version 2 */
 #endif /* not GCC version 2 */