gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

iFixups for method signature generation from types

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
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> 2009-02-20 Richard Frith-Macdonald <rfm@gnu.org>
* configure.ac: Add checks for backtrace() function * configure.ac: Add checks for backtrace() function

15
Source/mframe/i386/freebsd
View file

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

14
Source/mframe/i386/generic
View file

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

20
Source/mframe/i386/linux
View file

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

20
Source/mframe/i386/linux-gnu
View file

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

15
Source/mframe/i386/openbsd
View file

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

20
Source/mframe/i386/sysv4.2MP
View file

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

20
Source/mframe/i386/sysv4.2uw2.1.3
View file

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