[PATCH] m32r libffi port

[PATCH] m32r libffi port

[Kazuhiro Inaoka]

[-- Attachment #1: Type: text/plain, Size: 433 bytes --]

Hi Nick,

This patch adds support libffi for M32R.
Please commit it and regenerate configure, Makefile.in.

2004-10-13  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>

	* Makefile.am: Add m32r support.
	* configure.ac: Ditto.
	* src/types.c: Add m32r port to FFI_INTERNAL_TYPEDEF
	(uint64, sint64, double, longdouble)
	* src/m32r/ffi.c: New file.
	* src/m32r/sysv.S: Ditto.
	* src/m32r/ffitarget.h: Ditto.

Regards,

Kazuhiro Inaoka


[-- Attachment #2: libffi.patch --]
[-- Type: text/plain, Size: 14476 bytes --]

diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/Makefile.am libffi.new/Makefile.am
--- libffi/Makefile.am	2004-08-31 00:42:59.000000000 +0900
+++ libffi.new/Makefile.am	2004-10-13 18:58:52.000000000 +0900
@@ -23,7 +23,8 @@
 	src/sparc/ffi.c \
 	src/x86/ffi.c src/x86/sysv.S src/x86/win32.S \
 	src/x86/ffi64.c src/x86/unix64.S src/x86/ffitarget.h \
-	src/pa/ffi.c src/pa/linux.S src/frv/eabi.S src/frv/ffitarget.h
+	src/pa/ffi.c src/pa/linux.S src/frv/eabi.S src/frv/ffitarget.h \
+	src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h
 
 ## ################################################################
 
@@ -134,6 +135,9 @@
 if PA
 nodist_libffi_la_SOURCES += src/pa/linux.S src/pa/ffi.c
 endif
+if M32R
+nodist_libffi_la_SOURCES += src/m32r/sysv.S src/m32r/ffi.c
+endif
 
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/configure.ac libffi.new/configure.ac
--- libffi/configure.ac	2004-08-31 00:43:00.000000000 +0900
+++ libffi.new/configure.ac	2004-10-13 18:58:53.000000000 +0900
@@ -73,6 +73,7 @@
 sh-*-linux* | sh[[34]]*-*-linux*) TARGET=SH; TARGETDIR=sh;;
 sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
 hppa-*-linux* | parisc-*-linux*) TARGET=PA; TARGETDIR=pa;;
+m32r*-*-linux* ) TARGET=M32R; TARGETDIR=m32r;;
 esac
 
 AC_SUBST(AM_RUNTESTFLAGS)
@@ -99,6 +100,7 @@
 AM_CONDITIONAL(SH, test x$TARGET = xSH)
 AM_CONDITIONAL(SH64, test x$TARGET = xSH64)
 AM_CONDITIONAL(PA, test x$TARGET = xPA)
+AM_CONDITIONAL(M32R, test x$TARGET = xM32R)
 
 case x$TARGET in
   xMIPS*) TARGET=MIPS ;;
diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/src/m32r/ffi.c libffi.new/src/m32r/ffi.c
--- libffi/src/m32r/ffi.c	1970-01-01 09:00:00.000000000 +0900
+++ libffi.new/src/m32r/ffi.c	2004-10-13 18:58:53.000000000 +0900
@@ -0,0 +1,246 @@
+/* -----------------------------------------------------------------------
+   ffi.c - Copyright (c) 2004  Renesas Technology
+   
+   M32R Foreign Function Interface 
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+#include <ffi.h>
+#include <ffi_common.h>
+
+#include <stdlib.h>
+
+/* ffi_prep_args is called by the assembly routine once stack space
+   has been allocated for the function's arguments */
+
+/*@-exportheader@*/
+void ffi_prep_args(char *stack, extended_cif *ecif)
+/*@=exportheader@*/
+{
+  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;
+
+  if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT && ecif->cif->rtype->size > 8 ) {
+    *(void **) argp = ecif->rvalue;
+    argp += 4;
+  }
+
+  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++)
+    {
+      size_t z;
+
+      /* Align if necessary */
+      if (((*p_arg)->alignment - 1) & (unsigned) argp) {
+	argp = (char *) ALIGN(argp, (*p_arg)->alignment);
+      }
+
+      if (avn != 0) 
+	{
+	  avn--;
+	  z = (*p_arg)->size;
+	  if (z < sizeof(int))
+	    {
+	      z = sizeof(int);
+	      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:
+	  	  z = (*p_arg)->size;
+	  	  if ( (*p_arg)->alignment != 1 )
+	          	memcpy(argp, *p_argv, z);
+		  else
+	          	memcpy(argp + 4 - z, *p_argv, z);
+	  	  z = sizeof(int);
+		  break;
+
+		default:
+		  FFI_ASSERT(0);
+		}
+	    }
+	  else if (z == sizeof(int))
+	    {
+	       *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv);
+	    }
+	  else
+	    {
+	      if ( (*p_arg)->type == FFI_TYPE_STRUCT )
+	        {
+		  if ( z > 8 )
+		    {
+		      *(unsigned int *) argp = (unsigned int)(void *)(* p_argv);
+		      z = sizeof(void *);
+		    }
+		  else
+		    {
+	              memcpy(argp, *p_argv, z);
+		      z = 8;
+		    }
+	        }
+	      else
+	        { /* double or long long 64bit */
+	          memcpy(argp, *p_argv, z);
+	        }
+	    }
+	  p_argv++;
+	  argp += z;
+	}
+    }
+  
+  return;
+}
+
+/* Perform machine dependent cif processing */
+ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
+{
+  /* Set the return type flag */
+  switch (cif->rtype->type)
+    {
+    case FFI_TYPE_VOID:
+      cif->flags = (unsigned) cif->rtype->type;
+      break;
+
+    case FFI_TYPE_STRUCT:
+      if (cif->rtype->size <= 4)
+	{
+          cif->flags = FFI_TYPE_INT;
+	}
+      else if (cif->rtype->size <= 8)
+	{
+          cif->flags = FFI_TYPE_DOUBLE;
+	}
+      else
+	{
+          cif->flags = (unsigned) cif->rtype->type;
+	}
+      break;
+
+    case FFI_TYPE_SINT64:
+    case FFI_TYPE_UINT64:
+    case FFI_TYPE_DOUBLE:
+      cif->flags = FFI_TYPE_DOUBLE;
+      break;
+
+    case FFI_TYPE_FLOAT:
+    default:
+      cif->flags = FFI_TYPE_INT;
+      break;
+    }
+
+  return FFI_OK;
+}
+
+/*@-declundef@*/
+/*@-exportheader@*/
+extern void ffi_call_SYSV(void (*)(char *, extended_cif *), 
+			  /*@out@*/ extended_cif *, 
+			  unsigned, unsigned, 
+			  /*@out@*/ unsigned *, 
+			  void (*fn)());
+/*@=declundef@*/
+/*@=exportheader@*/
+
+void ffi_call(/*@dependent@*/ ffi_cif *cif, 
+	      void (*fn)(), 
+	      /*@out@*/ void *rvalue, 
+	      /*@dependent@*/ void **avalue)
+{
+  extended_cif ecif;
+
+  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		        */
+
+  if ((rvalue == NULL) && 
+      (cif->rtype->type == FFI_TYPE_STRUCT))
+    {
+      /*@-sysunrecog@*/
+      ecif.rvalue = alloca(cif->rtype->size);
+      /*@=sysunrecog@*/
+    }
+  else
+    ecif.rvalue = rvalue;
+    
+  
+  switch (cif->abi) 
+    {
+    case FFI_SYSV:
+      /*@-usedef@*/
+      ffi_call_SYSV(ffi_prep_args, &ecif, cif->bytes, 
+		    cif->flags, ecif.rvalue, fn);
+      if ( cif->rtype->type == FFI_TYPE_STRUCT )
+	{
+	  int size = cif->rtype->size;
+	  int align = cif->rtype->alignment;
+	  if (size < 4)
+	    {
+	      if ( align == 1 )
+	        *(unsigned long *)(ecif.rvalue) <<= (4 - size)*8;
+	    }
+	  else if ( 4 < size && size < 8 )
+	    {
+	       if ( align == 1 )
+	         {
+	            memcpy(ecif.rvalue, ecif.rvalue + 8-size, size);
+	         }
+	       else if (align == 2)
+	         {
+		    if (size & 1) size += 1;
+		    if (size != 8)
+	              memcpy(ecif.rvalue, ecif.rvalue + 8-size, size);
+	         }
+	    }
+	}
+      /*@=usedef@*/
+      break;
+    default:
+      FFI_ASSERT(0);
+      break;
+    }
+}
diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/src/m32r/ffitarget.h libffi.new/src/m32r/ffitarget.h
--- libffi/src/m32r/ffitarget.h	1970-01-01 09:00:00.000000000 +0900
+++ libffi.new/src/m32r/ffitarget.h	2004-10-13 18:58:53.000000000 +0900
@@ -0,0 +1,48 @@
+/* -----------------------------------------------------------------*-C-*-
+   ffitarget.h - Copyright (c) 2004  Renesas Technology.
+   Target configuration macros for M32R.
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+
+   ----------------------------------------------------------------------- */
+
+#ifndef LIBFFI_TARGET_H
+#define LIBFFI_TARGET_H
+
+/* ---- Generic type definitions ----------------------------------------- */
+
+#ifndef LIBFFI_ASM
+typedef unsigned long          ffi_arg;
+typedef signed long            ffi_sarg;
+
+typedef enum ffi_abi {
+  FFI_FIRST_ABI = 0,
+  FFI_SYSV,
+  FFI_DEFAULT_ABI = FFI_SYSV,
+  FFI_LAST_ABI = FFI_DEFAULT_ABI + 1
+} ffi_abi;
+#endif
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 24
+#define FFI_NATIVE_RAW_API 0
+
+#endif
+
diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/src/m32r/sysv.S libffi.new/src/m32r/sysv.S
--- libffi/src/m32r/sysv.S	1970-01-01 09:00:00.000000000 +0900
+++ libffi.new/src/m32r/sysv.S	2004-10-13 18:58:53.000000000 +0900
@@ -0,0 +1,122 @@
+/* -----------------------------------------------------------------------
+   sysv.S - Copyright (c) 2004 Renesas Technology
+   
+   M32R Foreign Function Interface 
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+#define LIBFFI_ASM	
+#include <fficonfig.h>
+#include <ffi.h>
+#ifdef HAVE_MACHINE_ASM_H
+#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
+	
+.text
+
+	/* R0:   ffi_prep_args */
+	/* R1:   &ecif */
+	/* R2:   cif->bytes */
+	/* R3:   fig->flags */
+	/* sp+0: ecif.rvalue */
+	/* sp+4: fn */
+
+	/* This assumes we are using gas. */
+ENTRY(ffi_call_SYSV)
+	/* Save registers */
+	push	fp
+	push	lr
+	push	r3
+	push	r2
+	push	r1
+	push	r0
+	mv	fp, sp
+
+	/* Make room for all of the new args. */
+	sub	sp, r2
+
+	/* Place all of the ffi_prep_args in position */
+	mv	lr, r0	
+	mv	r0, sp
+	/* R1 already set */
+
+	/* And call */
+	jl	lr
+
+	/* move first 4 parameters in registers */
+	ld	r0, @(0,sp)
+	ld	r1, @(4,sp)
+	ld	r2, @(8,sp)
+        ld	r3, @(12,sp)
+
+	/* and adjust stack */
+	ld	lr, @(8,fp)
+        cmpi	lr, #16
+	bc	adjust_stack
+	ldi	lr, #16
+adjust_stack:
+        add	sp, lr
+
+	/* call function */
+	ld	lr, @(28,fp)
+	jl	lr	
+
+	/* Remove the space we pushed for the args */
+	mv	sp, fp	
+
+	/* Load R2 with the pointer to storage for the return value */
+	ld	r2, @(24,sp)
+
+	/* Load R3 with the return type code */
+	ld	r3, @(12,sp)
+
+	/* If the return value pointer is NULL, assume no return value. */
+	beqz	r2, epilogue
+
+/* return INT */
+	ldi	r4, #FFI_TYPE_INT
+	bne	r3, r4, return_double
+	st	r0, @r2	
+	bra	epilogue
+
+return_double:
+/* return DOUBLE or LONGDOUBLE */
+	ldi	r4, #FFI_TYPE_DOUBLE
+	bne	r3, r4, epilogue
+	st	r0, @r2	
+	st	r1, @(4,r2)
+
+epilogue:
+	pop	r0
+	pop	r1
+	pop	r2
+	pop	r3
+	pop	lr
+	pop	fp
+        jmp lr
+
+.ffi_call_SYSV_end:
+        .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
+
diff -x CVS -x autom4te.cache -x configure -x Makefile.in -uNr libffi/src/types.c libffi.new/src/types.c
--- libffi/src/types.c	2004-09-03 06:14:45.000000000 +0900
+++ libffi.new/src/types.c	2004-10-13 18:58:52.000000000 +0900
@@ -53,7 +53,7 @@
 
 #endif
 
-#if defined X86 || defined ARM || defined M68K
+#if defined X86 || defined ARM || defined M68K || defined M32R
 
 FFI_INTEGRAL_TYPEDEF(uint64, 8, 4, FFI_TYPE_UINT64);
 FFI_INTEGRAL_TYPEDEF(sint64, 8, 4, FFI_TYPE_SINT64);
@@ -80,7 +80,7 @@
 #endif
 FFI_INTEGRAL_TYPEDEF(longdouble, 12, 4, FFI_TYPE_LONGDOUBLE);
 
-#elif defined ARM || defined SH || defined POWERPC_AIX
+#elif defined ARM || defined SH || defined POWERPC_AIX || defined M32R
 
 FFI_INTEGRAL_TYPEDEF(double, 8, 4, FFI_TYPE_DOUBLE);
 FFI_INTEGRAL_TYPEDEF(longdouble, 8, 4, FFI_TYPE_LONGDOUBLE);

Re: [PATCH] m32r libffi port

[Nick Clifton]

Hi Kazuhiro,

> 2004-10-13  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
> 
> 	* Makefile.am: Add m32r support.
> 	* configure.ac: Ditto.
> 	* src/types.c: Add m32r port to FFI_INTERNAL_TYPEDEF
> 	(uint64, sint64, double, longdouble)
> 	* src/m32r/ffi.c: New file.
> 	* src/m32r/sysv.S: Ditto.
> 	* src/m32r/ffitarget.h: Ditto.

Approved and applied.

Note - I made one small change.  In the comment at the start of the 
three new files I changed "Cygnus Solutions" to "Renesas Technology".

Cheers
   Nick

Re: [PATCH] m32r libffi port

[Kazuhiro Inaoka]

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

Hi Nick,

Excuse me, I sent a miss patch at libffi/src/m32r/libffitaget.h.
Please commit this patch.

libffi/ChangeLog

2004-10-25  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>

	* src/m32r/libffitarget.h (FFI_CLOSURES): Set 0.

Regards,

Kazuhiro Inaoka

[-- Attachment #2: gcc-4.0-libffitarget.h.patch --]
[-- Type: text/plain, Size: 466 bytes --]

Index: src/m32r/ffitarget.h
===================================================================
RCS file: /cvs/gcc/gcc/libffi/src/m32r/ffitarget.h,v
retrieving revision 1.1
diff -u -r1.1 ffitarget.h
--- src/m32r/ffitarget.h	13 Oct 2004 17:20:24 -0000	1.1
+++ src/m32r/ffitarget.h	25 Oct 2004 07:40:55 -0000
@@ -41,7 +41,7 @@
   } ffi_abi;
 #endif
 
-#define FFI_CLOSURES 		1
+#define FFI_CLOSURES 		0
 #define FFI_TRAMPOLINE_SIZE	24
 #define FFI_NATIVE_RAW_API 	0
 

Re: [PATCH] m32r libffi port

[Nick Clifton]

Hi Kazuhiro,

> Excuse me, I sent a miss patch at libffi/src/m32r/libffitaget.h.
> Please commit this patch.
> 
> libffi/ChangeLog
> 
> 2004-10-25  Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
> 
>     * src/m32r/libffitarget.h (FFI_CLOSURES): Set 0.

Committed.

Cheers
   Nick