From c6abc5d9d4bbb48f91c12f34fcf67ff4380d185c Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 14 Nov 2002 22:51:39 +0000 Subject: [PATCH] Make small functions inline git-svn-id: svn://svn.cc65.org/cc65/trunk@1519 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/cc65/datatype.c | 44 -------------------------------------------- src/cc65/datatype.h | 45 ++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 49 deletions(-) diff --git a/src/cc65/datatype.c b/src/cc65/datatype.c index 2080cc95f..3996e04a5 100644 --- a/src/cc65/datatype.c +++ b/src/cc65/datatype.c @@ -422,14 +422,6 @@ void CopyEncode (const type* Source, type* Target) -type UnqualifiedType (type T) -/* Return the unqalified type */ -{ - return (T & ~T_MASK_QUAL); -} - - - unsigned SizeOf (const type* T) /* Compute size of object represented by type array. */ { @@ -681,42 +673,6 @@ int IsVariadicFunc (const type* T) -type GetType (const type* T) -/* Get the raw type */ -{ - PRECONDITION (T[0] != T_END); - return (T[0] & T_MASK_TYPE); -} - - - -type GetClass (const type* T) -/* Get the class of a type string */ -{ - PRECONDITION (T[0] != T_END); - return (T[0] & T_MASK_CLASS); -} - - - -type GetSignedness (const type* T) -/* Get the sign of a type */ -{ - PRECONDITION (T[0] != T_END); - return (T[0] & T_MASK_SIGN); -} - - - -type GetSizeModifier (const type* T) -/* Get the size modifier of a type */ -{ - PRECONDITION (T[0] != T_END); - return (T[0] & T_MASK_SIZE); -} - - - type GetQualifier (const type* T) /* Get the qualifier from the given type string */ { diff --git a/src/cc65/datatype.h b/src/cc65/datatype.h index bf03bab41..75892f0f1 100644 --- a/src/cc65/datatype.h +++ b/src/cc65/datatype.h @@ -234,8 +234,15 @@ int HasEncode (const type* Type); void CopyEncode (const type* Source, type* Target); /* Copy encoded data from Source to Target */ -type UnqualifiedType (type T); +#if defined(HAVE_INLINE) +INLINE type UnqualifiedType (type T) /* Return the unqalified type */ +{ + return (T & ~T_MASK_QUAL); +} +#else +# define UnqualifiedType(T) ((T) & ~T_MASK_QUAL) +#endif unsigned SizeOf (const type* Type); /* Compute size of object represented by type array. */ @@ -414,17 +421,45 @@ int IsVariadicFunc (const type* T) attribute ((const)); * variable parameter list */ -type GetType (const type* T) attribute ((const)); +#if defined(HAVE_INLINE) +INLINE type GetType (const type* T) /* Get the raw type */ +{ + return (T[0] & T_MASK_TYPE); +} +#else +# define GetType(T) ((T)[0] & T_MASK_TYPE) +#endif -type GetClass (const type* T) attribute ((const)); +#if defined(HAVE_INLINE) +INLINE type GetClass (const type* T) /* Get the class of a type string */ +{ + return (T[0] & T_MASK_CLASS); +} +#else +# define GetClass(T) ((T)[0] & T_MASK_CLASS) +#endif -type GetSignedness (const type* T) attribute ((const)); +#if defined(HAVE_INLINE) +INLINE type GetSignedness (const type* T) /* Get the sign of a type */ +{ + return (T[0] & T_MASK_SIGN); +} +#else +# define GetSignedness(T) ((T)[0] & T_MASK_SIGN) +#endif -type GetSizeModifier (const type* T) attribute ((const)); +#if defined(HAVE_INLINE) +INLINE type GetSizeModifier (const type* T) /* Get the size modifier of a type */ +{ + return (T[0] & T_MASK_SIZE); +} +#else +# define GetSizeModifier(T) ((T)[0] & T_MASK_SIZE) +#endif type GetQualifier (const type* T) attribute ((const)); /* Get the qualifier from the given type string */