|
@@ -1,7 +1,7 @@
|
|
|
/* obstack.h - object stack macros
|
|
|
- Copyright (C) 1988,89,90,91,92,93,94,96,97,98,99 Free Software Foundation, Inc.
|
|
|
- This file is part of the GNU C Library. Its master source is NOT part of
|
|
|
- the C library, however. The master source lives in /gd/gnu/lib.
|
|
|
+ Copyright (C) 1988-1994,1996-1999,2003,2004,2005
|
|
|
+ Free Software Foundation, Inc.
|
|
|
+ This file is part of the GNU C Library.
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
@@ -15,8 +15,8 @@
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
License along with the GNU C Library; if not, write to the Free
|
|
|
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
- 02111-1307 USA. */
|
|
|
+ Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
+ Boston, MA 02110-1301, USA. */
|
|
|
|
|
|
/* Summary:
|
|
|
|
|
@@ -110,45 +110,36 @@ Summary:
|
|
|
extern "C" {
|
|
|
#endif
|
|
|
|
|
|
-/* We use subtraction of (char *) 0 instead of casting to int
|
|
|
- because on word-addressable machines a simple cast to int
|
|
|
- may ignore the byte-within-word field of the pointer. */
|
|
|
-
|
|
|
-#ifndef __PTR_TO_INT
|
|
|
-# define __PTR_TO_INT(P) ((P) - (char *) 0)
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifndef __INT_TO_PTR
|
|
|
-# define __INT_TO_PTR(P) ((P) + (char *) 0)
|
|
|
-#endif
|
|
|
-
|
|
|
-/* We need the type of the resulting object. If __PTRDIFF_TYPE__ is
|
|
|
+/* We need the type of a pointer subtraction. If __PTRDIFF_TYPE__ is
|
|
|
defined, as with GNU C, use that; that way we don't pollute the
|
|
|
- namespace with <stddef.h>'s symbols. Otherwise, if <stddef.h> is
|
|
|
- available, include it and use ptrdiff_t. In traditional C, long is
|
|
|
- the best that we can do. */
|
|
|
+ namespace with <stddef.h>'s symbols. Otherwise, include <stddef.h>
|
|
|
+ and use ptrdiff_t. */
|
|
|
|
|
|
#ifdef __PTRDIFF_TYPE__
|
|
|
# define PTR_INT_TYPE __PTRDIFF_TYPE__
|
|
|
#else
|
|
|
-# ifdef HAVE_STDDEF_H
|
|
|
-# include <stddef.h>
|
|
|
-# define PTR_INT_TYPE ptrdiff_t
|
|
|
-# else
|
|
|
-# define PTR_INT_TYPE long
|
|
|
-# endif
|
|
|
+# include <stddef.h>
|
|
|
+# define PTR_INT_TYPE ptrdiff_t
|
|
|
#endif
|
|
|
|
|
|
-#if defined _LIBC || defined HAVE_STRING_H
|
|
|
-# include <string.h>
|
|
|
-# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
|
|
|
-#else
|
|
|
-# ifdef memcpy
|
|
|
-# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
|
|
|
-# else
|
|
|
-# define _obstack_memcpy(To, From, N) bcopy ((From), (To), (N))
|
|
|
-# endif
|
|
|
-#endif
|
|
|
+/* If B is the base of an object addressed by P, return the result of
|
|
|
+ aligning P to the next multiple of A + 1. B and P must be of type
|
|
|
+ char *. A + 1 must be a power of 2. */
|
|
|
+
|
|
|
+#define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))
|
|
|
+
|
|
|
+/* Similiar to _BPTR_ALIGN (B, P, A), except optimize the common case
|
|
|
+ where pointers can be converted to integers, aligned as integers,
|
|
|
+ and converted back again. If PTR_INT_TYPE is narrower than a
|
|
|
+ pointer (e.g., the AS/400), play it safe and compute the alignment
|
|
|
+ relative to B. Otherwise, use the faster strategy of computing the
|
|
|
+ alignment relative to 0. */
|
|
|
+
|
|
|
+#define __PTR_ALIGN(B, P, A) \
|
|
|
+ __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
|
|
|
+ P, A)
|
|
|
+
|
|
|
+#include <string.h>
|
|
|
|
|
|
struct _obstack_chunk /* Lives at front of each chunk. */
|
|
|
{
|
|
@@ -164,20 +155,18 @@ struct obstack /* control current object in current chunk */
|
|
|
char *object_base; /* address of object we are building */
|
|
|
char *next_free; /* where to add next char to current object */
|
|
|
char *chunk_limit; /* address of char after current chunk */
|
|
|
- PTR_INT_TYPE temp; /* Temporary for some macros. */
|
|
|
+ union
|
|
|
+ {
|
|
|
+ PTR_INT_TYPE tempint;
|
|
|
+ void *tempptr;
|
|
|
+ } temp; /* Temporary for some macros. */
|
|
|
int alignment_mask; /* Mask of alignment for each object. */
|
|
|
-#if defined __STDC__ && __STDC__
|
|
|
/* These prototypes vary based on `use_extra_arg', and we use
|
|
|
casts to the prototypeless function type in all assignments,
|
|
|
but having prototypes here quiets -Wstrict-prototypes. */
|
|
|
struct _obstack_chunk *(*chunkfun) (void *, long);
|
|
|
void (*freefun) (void *, struct _obstack_chunk *);
|
|
|
void *extra_arg; /* first arg for chunk alloc/dealloc funcs */
|
|
|
-#else
|
|
|
- struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk. */
|
|
|
- void (*freefun) (); /* User's function to free a chunk. */
|
|
|
- char *extra_arg; /* first arg for chunk alloc/dealloc funcs */
|
|
|
-#endif
|
|
|
unsigned use_extra_arg:1; /* chunk alloc/dealloc funcs take extra arg */
|
|
|
unsigned maybe_empty_object:1;/* There is a possibility that the current
|
|
|
chunk contains a zero-length object. This
|
|
@@ -190,77 +179,22 @@ struct obstack /* control current object in current chunk */
|
|
|
|
|
|
/* Declare the external functions we use; they are in obstack.c. */
|
|
|
|
|
|
-#if defined __STDC__ && __STDC__
|
|
|
extern void _obstack_newchunk (struct obstack *, int);
|
|
|
-extern void _obstack_free (struct obstack *, void *);
|
|
|
extern int _obstack_begin (struct obstack *, int, int,
|
|
|
void *(*) (long), void (*) (void *));
|
|
|
extern int _obstack_begin_1 (struct obstack *, int, int,
|
|
|
void *(*) (void *, long),
|
|
|
void (*) (void *, void *), void *);
|
|
|
extern int _obstack_memory_used (struct obstack *);
|
|
|
-#else
|
|
|
-extern void _obstack_newchunk ();
|
|
|
-extern void _obstack_free ();
|
|
|
-extern int _obstack_begin ();
|
|
|
-extern int _obstack_begin_1 ();
|
|
|
-extern int _obstack_memory_used ();
|
|
|
-#endif
|
|
|
-
|
|
|
-#if defined __STDC__ && __STDC__
|
|
|
-
|
|
|
-/* Do the function-declarations after the structs
|
|
|
- but before defining the macros. */
|
|
|
-
|
|
|
-void obstack_init (struct obstack *obstack);
|
|
|
-
|
|
|
-void * obstack_alloc (struct obstack *obstack, int size);
|
|
|
-
|
|
|
-void * obstack_copy (struct obstack *obstack, const void *address, int size);
|
|
|
-void * obstack_copy0 (struct obstack *obstack, const void *address, int size);
|
|
|
|
|
|
void obstack_free (struct obstack *obstack, void *block);
|
|
|
|
|
|
-void obstack_blank (struct obstack *obstack, int size);
|
|
|
-
|
|
|
-void obstack_grow (struct obstack *obstack, const void *data, int size);
|
|
|
-void obstack_grow0 (struct obstack *obstack, const void *data, int size);
|
|
|
-
|
|
|
-void obstack_1grow (struct obstack *obstack, int data_char);
|
|
|
-void obstack_ptr_grow (struct obstack *obstack, const void *data);
|
|
|
-void obstack_int_grow (struct obstack *obstack, int data);
|
|
|
-
|
|
|
-void * obstack_finish (struct obstack *obstack);
|
|
|
-
|
|
|
-int obstack_object_size (struct obstack *obstack);
|
|
|
-
|
|
|
-int obstack_room (struct obstack *obstack);
|
|
|
-void obstack_make_room (struct obstack *obstack, int size);
|
|
|
-void obstack_1grow_fast (struct obstack *obstack, int data_char);
|
|
|
-void obstack_ptr_grow_fast (struct obstack *obstack, const void *data);
|
|
|
-void obstack_int_grow_fast (struct obstack *obstack, int data);
|
|
|
-void obstack_blank_fast (struct obstack *obstack, int size);
|
|
|
-
|
|
|
-void * obstack_base (struct obstack *obstack);
|
|
|
-void * obstack_next_free (struct obstack *obstack);
|
|
|
-int obstack_alignment_mask (struct obstack *obstack);
|
|
|
-int obstack_chunk_size (struct obstack *obstack);
|
|
|
-int obstack_memory_used (struct obstack *obstack);
|
|
|
-
|
|
|
-#endif /* __STDC__ */
|
|
|
-
|
|
|
-/* Non-ANSI C cannot really support alternative functions for these macros,
|
|
|
- so we do not declare them. */
|
|
|
|
|
|
/* Error handler called when `obstack_chunk_alloc' failed to allocate
|
|
|
more memory. This can be set to a user defined function which
|
|
|
should either abort gracefully or use longjump - but shouldn't
|
|
|
return. The default action is to print a message and abort. */
|
|
|
-#if defined __STDC__ && __STDC__
|
|
|
extern void (*obstack_alloc_failed_handler) (void);
|
|
|
-#else
|
|
|
-extern void (*obstack_alloc_failed_handler) ();
|
|
|
-#endif
|
|
|
|
|
|
/* Exit value used when `print_and_abort' is used. */
|
|
|
extern int obstack_exit_failure;
|
|
@@ -269,7 +203,7 @@ extern int obstack_exit_failure;
|
|
|
Note that this might not be the final address of the object
|
|
|
because a new chunk might be needed to hold the final size. */
|
|
|
|
|
|
-#define obstack_base(h) ((h)->object_base)
|
|
|
+#define obstack_base(h) ((void *) (h)->object_base)
|
|
|
|
|
|
/* Size for allocating ordinary chunks. */
|
|
|
|
|
@@ -283,67 +217,34 @@ extern int obstack_exit_failure;
|
|
|
|
|
|
#define obstack_alignment_mask(h) ((h)->alignment_mask)
|
|
|
|
|
|
-/* To prevent prototype warnings provide complete argument list in
|
|
|
- standard C version. */
|
|
|
-#if defined __STDC__ && __STDC__
|
|
|
-
|
|
|
-# define obstack_init(h) \
|
|
|
+/* To prevent prototype warnings provide complete argument list. */
|
|
|
+#define obstack_init(h) \
|
|
|
_obstack_begin ((h), 0, 0, \
|
|
|
- (void *(*) (long)) obstack_chunk_alloc, \
|
|
|
+ (void *(*) (long)) obstack_chunk_alloc, \
|
|
|
(void (*) (void *)) obstack_chunk_free)
|
|
|
|
|
|
-# define obstack_begin(h, size) \
|
|
|
+#define obstack_begin(h, size) \
|
|
|
_obstack_begin ((h), (size), 0, \
|
|
|
- (void *(*) (long)) obstack_chunk_alloc, \
|
|
|
+ (void *(*) (long)) obstack_chunk_alloc, \
|
|
|
(void (*) (void *)) obstack_chunk_free)
|
|
|
|
|
|
-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
|
|
|
+#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
|
|
|
_obstack_begin ((h), (size), (alignment), \
|
|
|
- (void *(*) (long)) (chunkfun), \
|
|
|
+ (void *(*) (long)) (chunkfun), \
|
|
|
(void (*) (void *)) (freefun))
|
|
|
|
|
|
-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
|
|
|
+#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
|
|
|
_obstack_begin_1 ((h), (size), (alignment), \
|
|
|
(void *(*) (void *, long)) (chunkfun), \
|
|
|
(void (*) (void *, void *)) (freefun), (arg))
|
|
|
|
|
|
-# define obstack_chunkfun(h, newchunkfun) \
|
|
|
+#define obstack_chunkfun(h, newchunkfun) \
|
|
|
((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
|
|
|
|
|
|
-# define obstack_freefun(h, newfreefun) \
|
|
|
+#define obstack_freefun(h, newfreefun) \
|
|
|
((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
|
|
|
|
|
|
-#else
|
|
|
-
|
|
|
-# define obstack_init(h) \
|
|
|
- _obstack_begin ((h), 0, 0, \
|
|
|
- (void *(*) ()) obstack_chunk_alloc, \
|
|
|
- (void (*) ()) obstack_chunk_free)
|
|
|
-
|
|
|
-# define obstack_begin(h, size) \
|
|
|
- _obstack_begin ((h), (size), 0, \
|
|
|
- (void *(*) ()) obstack_chunk_alloc, \
|
|
|
- (void (*) ()) obstack_chunk_free)
|
|
|
-
|
|
|
-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
|
|
|
- _obstack_begin ((h), (size), (alignment), \
|
|
|
- (void *(*) ()) (chunkfun), \
|
|
|
- (void (*) ()) (freefun))
|
|
|
-
|
|
|
-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
|
|
|
- _obstack_begin_1 ((h), (size), (alignment), \
|
|
|
- (void *(*) ()) (chunkfun), \
|
|
|
- (void (*) ()) (freefun), (arg))
|
|
|
-
|
|
|
-# define obstack_chunkfun(h, newchunkfun) \
|
|
|
- ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun))
|
|
|
-
|
|
|
-# define obstack_freefun(h, newfreefun) \
|
|
|
- ((h) -> freefun = (void (*)()) (newfreefun))
|
|
|
-
|
|
|
-#endif
|
|
|
-
|
|
|
-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar)
|
|
|
+#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
|
|
|
|
|
|
#define obstack_blank_fast(h,n) ((h)->next_free += (n))
|
|
|
|
|
@@ -364,12 +265,12 @@ extern int obstack_exit_failure;
|
|
|
|
|
|
# define obstack_object_size(OBSTACK) \
|
|
|
__extension__ \
|
|
|
- ({ struct obstack *__o = (OBSTACK); \
|
|
|
+ ({ struct obstack const *__o = (OBSTACK); \
|
|
|
(unsigned) (__o->next_free - __o->object_base); })
|
|
|
|
|
|
# define obstack_room(OBSTACK) \
|
|
|
__extension__ \
|
|
|
- ({ struct obstack *__o = (OBSTACK); \
|
|
|
+ ({ struct obstack const *__o = (OBSTACK); \
|
|
|
(unsigned) (__o->chunk_limit - __o->next_free); })
|
|
|
|
|
|
# define obstack_make_room(OBSTACK,length) \
|
|
@@ -382,8 +283,11 @@ __extension__ \
|
|
|
|
|
|
# define obstack_empty_p(OBSTACK) \
|
|
|
__extension__ \
|
|
|
- ({ struct obstack *__o = (OBSTACK); \
|
|
|
- (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
|
|
|
+ ({ struct obstack const *__o = (OBSTACK); \
|
|
|
+ (__o->chunk->prev == 0 \
|
|
|
+ && __o->next_free == __PTR_ALIGN ((char *) __o->chunk, \
|
|
|
+ __o->chunk->contents, \
|
|
|
+ __o->alignment_mask)); })
|
|
|
|
|
|
# define obstack_grow(OBSTACK,where,length) \
|
|
|
__extension__ \
|
|
@@ -391,7 +295,7 @@ __extension__ \
|
|
|
int __len = (length); \
|
|
|
if (__o->next_free + __len > __o->chunk_limit) \
|
|
|
_obstack_newchunk (__o, __len); \
|
|
|
- _obstack_memcpy (__o->next_free, (where), __len); \
|
|
|
+ memcpy (__o->next_free, where, __len); \
|
|
|
__o->next_free += __len; \
|
|
|
(void) 0; })
|
|
|
|
|
@@ -401,7 +305,7 @@ __extension__ \
|
|
|
int __len = (length); \
|
|
|
if (__o->next_free + __len + 1 > __o->chunk_limit) \
|
|
|
_obstack_newchunk (__o, __len + 1); \
|
|
|
- _obstack_memcpy (__o->next_free, (where), __len); \
|
|
|
+ memcpy (__o->next_free, where, __len); \
|
|
|
__o->next_free += __len; \
|
|
|
*(__o->next_free)++ = 0; \
|
|
|
(void) 0; })
|
|
@@ -411,7 +315,7 @@ __extension__ \
|
|
|
({ struct obstack *__o = (OBSTACK); \
|
|
|
if (__o->next_free + 1 > __o->chunk_limit) \
|
|
|
_obstack_newchunk (__o, 1); \
|
|
|
- *(__o->next_free)++ = (datum); \
|
|
|
+ obstack_1grow_fast (__o, datum); \
|
|
|
(void) 0; })
|
|
|
|
|
|
/* These assume that the obstack alignment is good enough for pointers
|
|
@@ -423,22 +327,28 @@ __extension__ \
|
|
|
({ struct obstack *__o = (OBSTACK); \
|
|
|
if (__o->next_free + sizeof (void *) > __o->chunk_limit) \
|
|
|
_obstack_newchunk (__o, sizeof (void *)); \
|
|
|
- *((void **)__o->next_free)++ = (datum); \
|
|
|
- (void) 0; })
|
|
|
+ obstack_ptr_grow_fast (__o, datum); }) \
|
|
|
|
|
|
# define obstack_int_grow(OBSTACK,datum) \
|
|
|
__extension__ \
|
|
|
({ struct obstack *__o = (OBSTACK); \
|
|
|
if (__o->next_free + sizeof (int) > __o->chunk_limit) \
|
|
|
_obstack_newchunk (__o, sizeof (int)); \
|
|
|
- *((int *)__o->next_free)++ = (datum); \
|
|
|
- (void) 0; })
|
|
|
+ obstack_int_grow_fast (__o, datum); })
|
|
|
|
|
|
-# define obstack_ptr_grow_fast(h,aptr) \
|
|
|
- (*((void **) (h)->next_free)++ = (aptr))
|
|
|
+# define obstack_ptr_grow_fast(OBSTACK,aptr) \
|
|
|
+__extension__ \
|
|
|
+({ struct obstack *__o1 = (OBSTACK); \
|
|
|
+ *(const void **) __o1->next_free = (aptr); \
|
|
|
+ __o1->next_free += sizeof (const void *); \
|
|
|
+ (void) 0; })
|
|
|
|
|
|
-# define obstack_int_grow_fast(h,aint) \
|
|
|
- (*((int *) (h)->next_free)++ = (aint))
|
|
|
+# define obstack_int_grow_fast(OBSTACK,aint) \
|
|
|
+__extension__ \
|
|
|
+({ struct obstack *__o1 = (OBSTACK); \
|
|
|
+ *(int *) __o1->next_free = (aint); \
|
|
|
+ __o1->next_free += sizeof (int); \
|
|
|
+ (void) 0; })
|
|
|
|
|
|
# define obstack_blank(OBSTACK,length) \
|
|
|
__extension__ \
|
|
@@ -446,7 +356,7 @@ __extension__ \
|
|
|
int __len = (length); \
|
|
|
if (__o->chunk_limit - __o->next_free < __len) \
|
|
|
_obstack_newchunk (__o, __len); \
|
|
|
- __o->next_free += __len; \
|
|
|
+ obstack_blank_fast (__o, __len); \
|
|
|
(void) 0; })
|
|
|
|
|
|
# define obstack_alloc(OBSTACK,length) \
|
|
@@ -469,21 +379,20 @@ __extension__ \
|
|
|
|
|
|
/* The local variable is named __o1 to avoid a name conflict
|
|
|
when obstack_blank is called. */
|
|
|
-# define obstack_finish(OBSTACK) \
|
|
|
+# define obstack_finish(OBSTACK) \
|
|
|
__extension__ \
|
|
|
({ struct obstack *__o1 = (OBSTACK); \
|
|
|
- void *value; \
|
|
|
- value = (void *) __o1->object_base; \
|
|
|
- if (__o1->next_free == value) \
|
|
|
+ void *__value = (void *) __o1->object_base; \
|
|
|
+ if (__o1->next_free == __value) \
|
|
|
__o1->maybe_empty_object = 1; \
|
|
|
__o1->next_free \
|
|
|
- = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
|
|
|
- & ~ (__o1->alignment_mask)); \
|
|
|
+ = __PTR_ALIGN (__o1->object_base, __o1->next_free, \
|
|
|
+ __o1->alignment_mask); \
|
|
|
if (__o1->next_free - (char *)__o1->chunk \
|
|
|
> __o1->chunk_limit - (char *)__o1->chunk) \
|
|
|
__o1->next_free = __o1->chunk_limit; \
|
|
|
__o1->object_base = __o1->next_free; \
|
|
|
- value; })
|
|
|
+ __value; })
|
|
|
|
|
|
# define obstack_free(OBSTACK, OBJ) \
|
|
|
__extension__ \
|
|
@@ -502,7 +411,10 @@ __extension__ \
|
|
|
(unsigned) ((h)->chunk_limit - (h)->next_free)
|
|
|
|
|
|
# define obstack_empty_p(h) \
|
|
|
- ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0)
|
|
|
+ ((h)->chunk->prev == 0 \
|
|
|
+ && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk, \
|
|
|
+ (h)->chunk->contents, \
|
|
|
+ (h)->alignment_mask))
|
|
|
|
|
|
/* Note that the call to _obstack_newchunk is enclosed in (..., 0)
|
|
|
so that we can avoid having void expressions
|
|
@@ -511,51 +423,51 @@ __extension__ \
|
|
|
but some compilers won't accept it. */
|
|
|
|
|
|
# define obstack_make_room(h,length) \
|
|
|
-( (h)->temp = (length), \
|
|
|
- (((h)->next_free + (h)->temp > (h)->chunk_limit) \
|
|
|
- ? (_obstack_newchunk ((h), (h)->temp), 0) : 0))
|
|
|
+( (h)->temp.tempint = (length), \
|
|
|
+ (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit) \
|
|
|
+ ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
|
|
|
|
|
|
# define obstack_grow(h,where,length) \
|
|
|
-( (h)->temp = (length), \
|
|
|
- (((h)->next_free + (h)->temp > (h)->chunk_limit) \
|
|
|
- ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \
|
|
|
- _obstack_memcpy ((h)->next_free, (where), (h)->temp), \
|
|
|
- (h)->next_free += (h)->temp)
|
|
|
+( (h)->temp.tempint = (length), \
|
|
|
+ (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit) \
|
|
|
+ ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0), \
|
|
|
+ memcpy ((h)->next_free, where, (h)->temp.tempint), \
|
|
|
+ (h)->next_free += (h)->temp.tempint)
|
|
|
|
|
|
# define obstack_grow0(h,where,length) \
|
|
|
-( (h)->temp = (length), \
|
|
|
- (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \
|
|
|
- ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \
|
|
|
- _obstack_memcpy ((h)->next_free, (where), (h)->temp), \
|
|
|
- (h)->next_free += (h)->temp, \
|
|
|
+( (h)->temp.tempint = (length), \
|
|
|
+ (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit) \
|
|
|
+ ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0), \
|
|
|
+ memcpy ((h)->next_free, where, (h)->temp.tempint), \
|
|
|
+ (h)->next_free += (h)->temp.tempint, \
|
|
|
*((h)->next_free)++ = 0)
|
|
|
|
|
|
# define obstack_1grow(h,datum) \
|
|
|
( (((h)->next_free + 1 > (h)->chunk_limit) \
|
|
|
? (_obstack_newchunk ((h), 1), 0) : 0), \
|
|
|
- (*((h)->next_free)++ = (datum)))
|
|
|
+ obstack_1grow_fast (h, datum))
|
|
|
|
|
|
# define obstack_ptr_grow(h,datum) \
|
|
|
( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \
|
|
|
? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \
|
|
|
- (*((const char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = (datum)))
|
|
|
+ obstack_ptr_grow_fast (h, datum))
|
|
|
|
|
|
# define obstack_int_grow(h,datum) \
|
|
|
( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \
|
|
|
? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \
|
|
|
- (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = (datum)))
|
|
|
+ obstack_int_grow_fast (h, datum))
|
|
|
|
|
|
# define obstack_ptr_grow_fast(h,aptr) \
|
|
|
- (*((const char **) (h)->next_free)++ = (aptr))
|
|
|
+ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
|
|
|
|
|
|
# define obstack_int_grow_fast(h,aint) \
|
|
|
- (*((int *) (h)->next_free)++ = (aint))
|
|
|
+ (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
|
|
|
|
|
|
# define obstack_blank(h,length) \
|
|
|
-( (h)->temp = (length), \
|
|
|
- (((h)->chunk_limit - (h)->next_free < (h)->temp) \
|
|
|
- ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \
|
|
|
- ((h)->next_free += (h)->temp))
|
|
|
+( (h)->temp.tempint = (length), \
|
|
|
+ (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint) \
|
|
|
+ ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0), \
|
|
|
+ obstack_blank_fast (h, (h)->temp.tempint))
|
|
|
|
|
|
# define obstack_alloc(h,length) \
|
|
|
(obstack_blank ((h), (length)), obstack_finish ((h)))
|
|
@@ -566,35 +478,27 @@ __extension__ \
|
|
|
# define obstack_copy0(h,where,length) \
|
|
|
(obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
|
|
|
|
|
|
-# define obstack_finish(h) \
|
|
|
+# define obstack_finish(h) \
|
|
|
( ((h)->next_free == (h)->object_base \
|
|
|
? (((h)->maybe_empty_object = 1), 0) \
|
|
|
: 0), \
|
|
|
- (h)->temp = __PTR_TO_INT ((h)->object_base), \
|
|
|
+ (h)->temp.tempptr = (h)->object_base, \
|
|
|
(h)->next_free \
|
|
|
- = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask) \
|
|
|
- & ~ ((h)->alignment_mask)), \
|
|
|
+ = __PTR_ALIGN ((h)->object_base, (h)->next_free, \
|
|
|
+ (h)->alignment_mask), \
|
|
|
(((h)->next_free - (char *) (h)->chunk \
|
|
|
> (h)->chunk_limit - (char *) (h)->chunk) \
|
|
|
? ((h)->next_free = (h)->chunk_limit) : 0), \
|
|
|
(h)->object_base = (h)->next_free, \
|
|
|
- __INT_TO_PTR ((h)->temp))
|
|
|
+ (h)->temp.tempptr)
|
|
|
|
|
|
-# if defined __STDC__ && __STDC__
|
|
|
-# define obstack_free(h,obj) \
|
|
|
-( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \
|
|
|
- (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
|
|
|
- ? (int) ((h)->next_free = (h)->object_base \
|
|
|
- = (h)->temp + (char *) (h)->chunk) \
|
|
|
- : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0)))
|
|
|
-# else
|
|
|
-# define obstack_free(h,obj) \
|
|
|
-( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \
|
|
|
- (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
|
|
|
+# define obstack_free(h,obj) \
|
|
|
+( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \
|
|
|
+ ((((h)->temp.tempint > 0 \
|
|
|
+ && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \
|
|
|
? (int) ((h)->next_free = (h)->object_base \
|
|
|
- = (h)->temp + (char *) (h)->chunk) \
|
|
|
- : (_obstack_free ((h), (h)->temp + (char *) (h)->chunk), 0)))
|
|
|
-# endif
|
|
|
+ = (h)->temp.tempint + (char *) (h)->chunk) \
|
|
|
+ : (((obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0)))
|
|
|
|
|
|
#endif /* not __GNUC__ or not __STDC__ */
|
|
|
|