iFixups for method signature generation from types

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27934 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-02-21 08:37:48 +00:00
parent 833a2f3b26
commit 0e72adc170
8 changed files with 77 additions and 58 deletions

View file

@ -1,3 +1,14 @@
2009-02-21 Richard Frith-Macdonald <rfm@gnu.org>
* Source/mframe/i386/linux:
* Source/mframe/i386/sysv4.2MP:
* Source/mframe/i386/linux-gnu:
* Source/mframe/i386/sysv4.2uw2.1.3:
* Source/mframe/i386/freebsd:
* Source/mframe/i386/openbsd:
* Source/mframe/i386/generic:
Update/fix macro to build method signature information.
2009-02-20 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Add checks for backtrace() function

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,23 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,8 +24,8 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
@ -36,14 +34,18 @@
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,26 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') \
{ \
(TYPE)++; \
} \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,26 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') \
{ \
(TYPE)++; \
} \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,23 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,26 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') \
{ \
(TYPE)++; \
} \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})

View file

@ -16,9 +16,7 @@
#define MFRAME_ARGS int
#define MFRAME_INIT_ARGS(CUM, RTYPE) \
((CUM) = (*(RTYPE)==_C_STRUCT_B || *(RTYPE)==_C_UNION_B || \
*(RTYPE)==_C_ARY_B) ? sizeof(void*) : 0)
#define MFRAME_INIT_ARGS(CUM, RTYPE) ((CUM) = 0)
#define MFRAME_ARG_ENCODING(CUM, TYPE, STACK, DEST) \
({ \
@ -26,26 +24,28 @@
int align = objc_alignof_type(type); \
int size = objc_sizeof_type(type); \
\
(CUM) = ROUND((CUM), align); \
(TYPE) = objc_skip_typespec(type); \
(CUM) = ROUND((CUM), __alignof__(int)); \
sprintf((DEST), "%.*s%d", (TYPE)-type, type, (CUM)); \
if (*(TYPE) == '+') \
{ \
(TYPE)++; \
} \
if (*(TYPE) == '+') (TYPE)++; \
if (*(TYPE) == '-') (TYPE)++; \
while (isdigit(*(TYPE))) \
{ \
(TYPE)++; \
} \
(DEST)=&(DEST)[strlen(DEST)]; \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)&&size>2) \
if ((*type==_C_STRUCT_B||*type==_C_UNION_B||*type==_C_ARY_B)) \
{ \
(STACK) = (CUM) + ROUND(size, align); \
} \
else \
{ \
if (size < sizeof(int)) \
{ \
size = sizeof(int); \
} \
(STACK) = (CUM) + size; \
} \
(CUM) += ROUND(size, sizeof(void*)); \
(CUM) += size; \
})