[Dotgnu-pnet-commits] CVS: pnet/libffi/src/arm ffi.c,1.1,1.2 sysv.S,1.1,1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/libffi/src/arm
In directory subversions:/tmp/cvs-serv21586/libffi/src/arm

Modified Files:
        ffi.c sysv.S 
Log Message:


Update the libffi library from the gcc CVS tree.


Index: ffi.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/src/arm/ffi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ffi.c       10 May 2002 23:04:40 -0000      1.1
--- ffi.c       6 Feb 2003 01:15:38 -0000       1.2
***************
*** 37,47 ****
  {
    register unsigned int i;
-   register int tmp;
-   register unsigned int avn;
    register void **p_argv;
    register char *argp;
    register ffi_type **p_arg;
  
-   tmp = 0;
    argp = stack;
  
--- 37,44 ----
***************
*** 51,59 ****
    }
  
-   avn = ecif->cif->nargs;
    p_argv = ecif->avalue;
  
    for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
!        (i != 0) && (avn != 0);
         i--, p_arg++)
      {
--- 48,55 ----
    }
  
    p_argv = ecif->avalue;
  
    for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
!        (i != 0);
         i--, p_arg++)
      {
***************
*** 65,71 ****
        }
  
-       if (avn != 0) 
-       {
-         avn--;
          z = (*p_arg)->size;
          if (z < sizeof(int))
--- 61,64 ----
***************
*** 108,112 ****
          p_argv++;
          argp += z;
-       }
      }
    
--- 101,104 ----

Index: sysv.S
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/src/arm/sysv.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** sysv.S      10 May 2002 23:04:40 -0000      1.1
--- sysv.S      6 Feb 2003 01:15:38 -0000       1.2
***************
*** 29,34 ****
  #include <machine/asm.h>
  #else
! /* XXX these lose for some platforms, I'm sure. */
  #define CNAME(x) x
  #define ENTRY(x) .globl CNAME(x); .type CNAME(x),%function; CNAME(x):
  #endif
--- 29,41 ----
  #include <machine/asm.h>
  #else
! #ifdef __USER_LABEL_PREFIX__
! #define CONCAT1(a, b) CONCAT2(a, b)
! #define CONCAT2(a, b) a ## b
! 
! /* Use the right prefix for global labels.  */
! #define CNAME(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
! #else
  #define CNAME(x) x
+ #endif
  #define ENTRY(x) .globl CNAME(x); .type CNAME(x),%function; CNAME(x):
  #endif
***************
*** 97,106 ****
--- 104,121 ----
  # return FLOAT
        cmp     a4, #FFI_TYPE_FLOAT
+ #ifdef __SOFTFP__
+       streq   a1, [a3]
+ #else
        stfeqs  f0, [a3]
+ #endif
        beq     epilogue
  
  # return DOUBLE or LONGDOUBLE
        cmp     a4, #FFI_TYPE_DOUBLE
+ #ifdef __SOFTFP__
+       stmeqia a3, {a1, a2}
+ #else
        stfeqd  f0, [a3]
+ #endif
  
  epilogue: