cpplib: s/ALIGN/_ALIGN
Neil Booth
neil@daikokuya.demon.co.uk
Sat Feb 3 10:19:00 GMT 2001
Zack Weinberg wrote:-
> _ALIGN is in the reserved namespace, so even more likely to cause
> trouble.
Sigh.
> Suggest POOL_ALIGN instead, or #undef ALIGN in system.h (but that may
> cause other problems).
Good idea.
Neil.
* cpphash.h: Rename _ALIGN to POOL_ALIGN.
* cpplex.c (_cpp_pool_reserve, new_chunk): Update.
Index: cpphash.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpphash.h,v
retrieving revision 1.95
diff -u -p -r1.95 cpphash.h
--- cpphash.h 2001/02/03 17:52:31 1.95
+++ cpphash.h 2001/02/03 18:18:11
@@ -43,14 +43,15 @@ struct htab;
#define CPP_STACK_MAX 200
/* Memory pools. */
-#define _ALIGN(size, align) (((size) + ((align) - 1)) & ~((align) - 1))
+#define POOL_ALIGN(size, align) (((size) + ((align) - 1)) & ~((align) - 1))
#define POOL_FRONT(p) ((p)->cur->front)
#define POOL_LIMIT(p) ((p)->cur->limit)
#define POOL_BASE(p) ((p)->cur->base)
#define POOL_SIZE(p) ((p)->cur->limit - (p)->cur->base)
#define POOL_ROOM(p) ((p)->cur->limit - (p)->cur->front)
#define POOL_USED(p) ((p)->cur->front - (p)->cur->base)
-#define POOL_COMMIT(p, len) do {((p)->cur->front += _ALIGN (len, (p)->align));\
+#define POOL_COMMIT(p, len) do {\
+ ((p)->cur->front += POOL_ALIGN (len, (p)->align));\
if ((p)->cur->front > (p)->cur->limit) abort ();} while (0)
typedef struct cpp_chunk cpp_chunk;
Index: cpplex.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cpplex.c,v
retrieving revision 1.128
diff -u -p -r1.128 cpplex.c
--- cpplex.c 2001/02/03 17:52:31 1.128
+++ cpplex.c 2001/02/03 18:18:11
@@ -1759,7 +1759,7 @@ new_chunk (size)
unsigned char *base;
cpp_chunk *result;
- size = _ALIGN (size, DEFAULT_ALIGNMENT);
+ size = POOL_ALIGN (size, DEFAULT_ALIGNMENT);
base = (unsigned char *) xmalloc (size + sizeof (cpp_chunk));
/* Put the chunk descriptor at the end. Then chunk overruns will
cause obvious chaos. */
@@ -1826,7 +1826,7 @@ _cpp_pool_reserve (pool, len)
cpp_pool *pool;
unsigned int len;
{
- len = _ALIGN (len, pool->align);
+ len = POOL_ALIGN (len, pool->align);
if (len > (unsigned int) POOL_ROOM (pool))
_cpp_next_chunk (pool, len, 0);
More information about the Gcc-patches
mailing list