m68k: fix numerous test suite failures (original) (raw)

This is the mail archive of the gcc-patches@gcc.gnu.orgmailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

From: zippel at linux-m68k dot org
To: gcc-patches at gcc dot gnu dot org
Date: Tue, 27 Feb 2007 18:51:09 +0100
Subject: [patch 1/3] libffi/m68k: fix numerous test suite failures
References: <20070227175108.947774000@linux-m68k.org>

libffi/ 2007-xx-xx Roman Zippel zippel@linux-m68k.org

* src/m68k/ffi.c (ffi_prep_args,ffi_prep_cif_machdep): Fix
numerous test suite failures.
* src/m68k/sysv.S (ffi_call_SYSV): Likewise.

libffi/src/m68k/ffi.c | 130 +++++++++++++++++++++++++++---------------------- libffi/src/m68k/sysv.S | 35 ++++++++----- 2 files changed, 96 insertions(+), 69 deletions(-)

Index: gcc/libffi/src/m68k/ffi.c

--- gcc.orig/libffi/src/m68k/ffi.c +++ gcc/libffi/src/m68k/ffi.c @@ -8,11 +8,16 @@ #include <ffi_common.h> #include <stdlib.h> + +void ffi_call_SYSV (extended_cif , + unsigned, unsigned, + void , void (fn) ()); +void ffi_prep_args (void stack, extended_cif ecif); /* ffi_prep_args is called by the assembly routine once stack space has been allocated for the function's arguments. / -static void +void * ffi_prep_args (void stack, extended_cif ecif) { unsigned int i; @@ -24,7 +33,7 @@ ffi_prep_args (void stack, extended_cif argp = stack; if (ecif->cif->rtype->type == FFI_TYPE_STRUCT - && ecif->cif->rtype->size > 8) + && !ecif->cif->flags) struct_value_ptr = ecif->rvalue; else struct_value_ptr = NULL; @@ -37,44 +46,47 @@ ffi_prep_args (void stack, extended_cif { size_t z; - /* Align if necessary. / - if (((p_arg)->alignment - 1) & (unsigned) argp) - argp = (char ) ALIGN (argp, (p_arg)->alignment);

```
 z = (*p_arg)->size;
```
```
 if (z < sizeof (int))
```

```
 z = (*p_arg)->size;
```
```
 if (z < sizeof (int))
```
{
```
 switch ((*p_arg)->type)
    {
```

```
     switch ((*p_arg)->type)
```
```
  {
```
```
  case FFI_TYPE_SINT8:
```

    *(signed int *) argp = (signed int) *(SINT8 *) *p_argv;

```
    break;
```
```
  case FFI_TYPE_UINT8:
```

    *(unsigned int *) argp = (unsigned int) *(UINT8 *) *p_argv;

```
    break;
```
```
  case FFI_TYPE_SINT16:
```

    *(signed int *) argp = (signed int) *(SINT16 *) *p_argv;

```
    break;
```
```
  case FFI_TYPE_UINT16:
```

    *(unsigned int *) argp = (unsigned int) *(UINT16 *) *p_argv;

```
    break;
```
```
  case FFI_TYPE_STRUCT:
```

    memcpy (argp + sizeof (int) - z, *p_argv, z);

```
    break;
```
```
  default:
```
```
    FFI_ASSERT (0);
```
```
  }
```
```
     z = sizeof (int);
```

```
   case FFI_TYPE_SINT8:
```

     *(signed int *) argp = (signed int) *(SINT8 *) *p_argv;

```
     break;
```
```
   case FFI_TYPE_UINT8:
```

     *(unsigned int *) argp = (unsigned int) *(UINT8 *) *p_argv;

```
     break;
```
```
   case FFI_TYPE_SINT16:
```

     *(signed int *) argp = (signed int) *(SINT16 *) *p_argv;

```
     break;
```
```
   case FFI_TYPE_UINT16:
```

     *(unsigned int *) argp = (unsigned int) *(UINT16 *) *p_argv;

```
     break;
```
```
   case FFI_TYPE_STRUCT:
```

     memcpy (argp + sizeof (int) - z, *p_argv, z);

```
     break;
```
```
   default:
```
```
     FFI_ASSERT (0);
    }
```

```
 else
```
```
   memcpy (argp, *p_argv, z);
```
```
 p_argv++;
```
```
 argp += z;
```

```
 z = sizeof (int);
```
}
```
 else
```
{
```
 memcpy (argp, *p_argv, z);
```
```
 /* Align if necessary.  */
```
```
 if ((sizeof(int) - 1) & z)
```
```
   z = ALIGN(z, sizeof(int));
```
}
```
 p_argv++;
```
```
 argp += z;
```
}

return struct_value_ptr;

@@ -86,7 +98,8 @@ ffi_prep_args (void stack, extended_cif #define CIF_FLAGS_DOUBLE 8 #define CIF_FLAGS_LDOUBLE 16 #define CIF_FLAGS_POINTER 32 -#define CIF_FLAGS_STRUCT 64 +#define CIF_FLAGS_STRUCT1 64 +#define CIF_FLAGS_STRUCT2 128 / Perform machine dependent cif processing / ffi_status @@ -100,12 +113,24 @@ ffi_prep_cif_machdep (ffi_cif cif) break; case FFI_TYPE_STRUCT: - if (cif->rtype->size > 4 && cif->rtype->size <= 8) - cif->flags = CIF_FLAGS_DINT; - else if (cif->rtype->size <= 4) - cif->flags = CIF_FLAGS_STRUCT; - else - cif->flags = 0; + switch (cif->rtype->size) + { + case 1: + cif->flags = CIF_FLAGS_STRUCT1; + break; + case 2: + cif->flags = CIF_FLAGS_STRUCT2; + break; + case 4: + cif->flags = CIF_FLAGS_INT; + break; + case 8: + cif->flags = CIF_FLAGS_DINT; + break; + default: + cif->flags = 0; + break; + } break; case FFI_TYPE_FLOAT: @@ -137,11 +162,6 @@ ffi_prep_cif_machdep (ffi_cif cif) return FFI_OK; } -extern void ffi_call_SYSV (void () (void , extended_cif ), - extended_cif , - unsigned, unsigned, unsigned, - void , void (fn) ());

void ffi_call (ffi_cif cif, void (fn) (), void *rvalue, void **avalue) { @@ -149,7 +169,7 @@ ffi_call (ffi_cif cif, void (fn) (), v ecif.cif = cif; ecif.avalue = avalue;

/* If the return value is a struct and we don't have a return value address then we need to make one. */

@@ -159,13 +179,11 @@ ffi_call (ffi_cif cif, void (fn) (), v ecif.rvalue = alloca (cif->rtype->size); else ecif.rvalue = rvalue;

switch (cif->abi)

switch (cif->abi) { case FFI_SYSV:

 ffi_call_SYSV (ffi_prep_args, &ecif, cif->bytes,

       cif->flags, cif->rtype->size * 8,

 ffi_call_SYSV (&ecif, cif->bytes, cif->flags,
        ecif.rvalue, fn);
 break;

Index: gcc/libffi/src/m68k/sysv.S

--- gcc.orig/libffi/src/m68k/sysv.S +++ gcc/libffi/src/m68k/sysv.S @@ -12,36 +12,40 @@

 .globl	ffi_call_SYSV
 .type	ffi_call_SYSV,@function

.align 4

ffi_call_SYSV: link %fp,#0 move.l %d2,-(%sp) | Make room for all of the new args.

sub.l 16(%fp),%sp

sub.l 12(%fp),%sp
```
| Call ffi_prep_args
```

move.l 12(%fp),-(%sp)

move.l 8(%fp),-(%sp) pea 4(%sp)

move.l 8(%fp),%a0
jsr (%a0) +#if !defined PIC

jsr ffi_prep_args +#else
bsr.l ffi_prep_args@PLTPC +#endif addq.l #8,%sp | Pass pointer to struct value, if any move.l %a0,%a1 | Call the function

move.l 32(%fp),%a0

move.l 24(%fp),%a0 jsr (%a0) | Remove the space we pushed for the args

add.l 16(%fp),%sp

add.l 12(%fp),%sp

| Load the pointer to storage for the return value

move.l 28(%fp),%a1

move.l 20(%fp),%a1
```
| Load the return type code
```

move.l 20(%fp),%d2

move.l 16(%fp),%d2

| If the return value pointer is NULL, assume no return value.
tst.l	%a1

@@ -79,19 +83,24 @@ retlongdouble:

retpointer: btst #5,%d2 - jbeq retstruct + jbeq retstruct1 move.l %a0,(%a1) jbra epilogue

-retstruct: +retstruct1: btst #6,%d2 + jbeq retstruct2 + move.b %d0,(%a1) + jbra epilogue + +retstruct2: + btst #7,%d2 jbeq noretval - move.l 24(%fp),%d2 - bfins %d0,(%a1){#0,%d2} + move.w %d0,(%a1)

noretval: epilogue: move.l (%sp)+,%d2 - unlk %a6 + unlk %fp rts .size ffi_call_SYSV,.-ffi_call_SYSV

References:
- [patch 0/3] libffi/m68k patches (take 2)
  * From: zippel

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]

[patch 1/3] libffi/m68k: fix numerous test suite failures (original) (raw)

Index: gcc/libffi/src/m68k/ffi.c

void ffi_call (ffi_cif *cif, void (*fn) (), void *rvalue, void **avalue) { @@ -149,7 +169,7 @@ ffi_call (ffi_cif *cif, void (*fn) (), v ecif.cif = cif; ecif.avalue = avalue;

@@ -159,13 +179,11 @@ ffi_call (ffi_cif *cif, void (*fn) (), v ecif.rvalue = alloca (cif->rtype->size); else ecif.rvalue = rvalue;

Index: gcc/libffi/src/m68k/sysv.S

void ffi_call (ffi_cif cif, void (fn) (), void *rvalue, void **avalue) { @@ -149,7 +169,7 @@ ffi_call (ffi_cif cif, void (fn) (), v ecif.cif = cif; ecif.avalue = avalue;

@@ -159,13 +179,11 @@ ffi_call (ffi_cif cif, void (fn) (), v ecif.rvalue = alloca (cif->rtype->size); else ecif.rvalue = rvalue;