Commit 7446546a by Andrew Haley

[multiple changes]

2009-06-04  Andrew Haley  <aph@redhat.com>

	* src/powerpc/ppc_closure.S: Insert licence header.
	* src/powerpc/linux64_closure.S: Likewise.
	* src/m68k/sysv.S: Likewise.

	* src/sh64/ffi.c: Change void (*)() to void (*)(void).
	* src/powerpc/ffi.c: Likewise.
	* src/powerpc/ffi_darwin.c: Likewise.
	* src/m32r/ffi.c: Likewise.
	* src/sh64/ffi.c: Likewise.
	* src/x86/ffi64.c: Likewise.
	* src/alpha/ffi.c: Likewise.
	* src/alpha/osf.S: Likewise.
	* src/frv/ffi.c: Likewise.
	* src/s390/ffi.c: Likewise.
	* src/pa/ffi.c: Likewise.
	* src/pa/hpux32.S: Likewise.
	* src/ia64/unix.S: Likewise.
	* src/ia64/ffi.c: Likewise.
	* src/sparc/ffi.c: Likewise.
	* src/mips/ffi.c: Likewise.
	* src/sh/ffi.c: Likewise.

2008-02-15  David Daney  <ddaney@avtrex.com>

        * src/mips/ffi.c (USE__BUILTIN___CLEAR_CACHE):
        Define (conditionally), and use it to include cachectl.h.
        (ffi_prep_closure_loc): Fix cache flushing.
        * src/mips/ffitarget.h (_ABIN32, _ABI64, _ABIO32): Define.

From-SVN: r148172
parent 5f933ef0
2009-06-04 Andrew Haley <aph@redhat.com> 2009-06-04 Andrew Haley <aph@redhat.com>
* src/powerpc/ppc_closure.S: Insert licence header.
* src/powerpc/linux64_closure.S: Likewise.
* src/m68k/sysv.S: Likewise.
* src/sh64/ffi.c: Change void (*)() to void (*)(void).
* src/powerpc/ffi.c: Likewise.
* src/powerpc/ffi_darwin.c: Likewise.
* src/m32r/ffi.c: Likewise.
* src/sh64/ffi.c: Likewise.
* src/x86/ffi64.c: Likewise.
* src/alpha/ffi.c: Likewise.
* src/alpha/osf.S: Likewise.
* src/frv/ffi.c: Likewise.
* src/s390/ffi.c: Likewise.
* src/pa/ffi.c: Likewise.
* src/pa/hpux32.S: Likewise.
* src/ia64/unix.S: Likewise.
* src/ia64/ffi.c: Likewise.
* src/sparc/ffi.c: Likewise.
* src/mips/ffi.c: Likewise.
* src/sh/ffi.c: Likewise.
2008-02-15 David Daney <ddaney@avtrex.com>
* src/mips/ffi.c (USE__BUILTIN___CLEAR_CACHE):
Define (conditionally), and use it to include cachectl.h.
(ffi_prep_closure_loc): Fix cache flushing.
* src/mips/ffitarget.h (_ABIN32, _ABI64, _ABIO32): Define.
2009-06-04 Andrew Haley <aph@redhat.com>
include/ffi.h.in, include/ffi.h.in,
src/arm/ffitarget.h, src/arm/ffitarget.h,
src/arm/ffi.c, src/arm/ffi.c,
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1998, 2001, 2007 Red Hat, Inc. ffi.c - Copyright (c) 1998, 2001, 2007, 2008 Red Hat, Inc.
Alpha Foreign Function Interface Alpha Foreign Function Interface
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
# define FFI_TYPE_LONGDOUBLE 4 # define FFI_TYPE_LONGDOUBLE 4
#endif #endif
extern void ffi_call_osf(void *, unsigned long, unsigned, void *, void (*)()) extern void ffi_call_osf(void *, unsigned long, unsigned, void *, void (*)(void))
FFI_HIDDEN; FFI_HIDDEN;
extern void ffi_closure_osf(void) FFI_HIDDEN; extern void ffi_closure_osf(void) FFI_HIDDEN;
...@@ -76,7 +76,7 @@ ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -76,7 +76,7 @@ ffi_prep_cif_machdep(ffi_cif *cif)
void void
ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
unsigned long *stack, *argp; unsigned long *stack, *argp;
long i, avn; long i, avn;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
osf.S - Copyright (c) 1998, 2001, 2007 Red Hat osf.S - Copyright (c) 1998, 2001, 2007, 2008 Red Hat
Alpha/OSF Foreign Function Interface Alpha/OSF Foreign Function Interface
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.text .text
/* ffi_call_osf (void *args, unsigned long bytes, unsigned flags, /* ffi_call_osf (void *args, unsigned long bytes, unsigned flags,
void *raddr, void (*fnaddr)()); void *raddr, void (*fnaddr)(void));
Bit o trickiness here -- ARGS+BYTES is the base of the stack frame Bit o trickiness here -- ARGS+BYTES is the base of the stack frame
for this function. This has been allocated by ffi_call. We also for this function. This has been allocated by ffi_call. We also
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1998 Red Hat, Inc. ffi.c - Copyright (c) 1998, 2008 Red Hat, Inc.
ARM Foreign Function Interface ARM Foreign Function Interface
...@@ -149,9 +149,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -149,9 +149,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
} }
extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *,
unsigned, unsigned, unsigned *, void (*fn)()); unsigned, unsigned, unsigned *, void (*fn)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.S - Copyright (c) 1998 Red Hat, Inc. sysv.S - Copyright (c) 1998, 2008 Red Hat, Inc.
ARM Foreign Function Interface ARM Foreign Function Interface
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2004 Anthony Green ffi.c - Copyright (C) 2004 Anthony Green
Copyright (C) 2007 Free Software Foundation, Inc. Copyright (C) 2007 Free Software Foundation, Inc.
Copyright (C) 2008 Red Hat, Inc.
FR-V Foreign Function Interface FR-V Foreign Function Interface
...@@ -126,10 +127,10 @@ extern void ffi_call_EABI(void *(*)(char *, extended_cif *), ...@@ -126,10 +127,10 @@ extern void ffi_call_EABI(void *(*)(char *, extended_cif *),
extended_cif *, extended_cif *,
unsigned, unsigned, unsigned, unsigned,
unsigned *, unsigned *,
void (*fn)()); void (*fn)(void));
void ffi_call(ffi_cif *cif, void ffi_call(ffi_cif *cif,
void (*fn)(), void (*fn)(void),
void *rvalue, void *rvalue,
void **avalue) void **avalue)
{ {
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1998, 2007 Red Hat, Inc. ffi.c - Copyright (c) 1998, 2007, 2008 Red Hat, Inc.
Copyright (c) 2000 Hewlett Packard Company Copyright (c) 2000 Hewlett Packard Company
IA64 Foreign Function Interface IA64 Foreign Function Interface
...@@ -270,10 +270,10 @@ ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -270,10 +270,10 @@ ffi_prep_cif_machdep(ffi_cif *cif)
return FFI_OK; return FFI_OK;
} }
extern int ffi_call_unix (struct ia64_args *, PTR64, void (*)(), UINT64); extern int ffi_call_unix (struct ia64_args *, PTR64, void (*)(void), UINT64);
void void
ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
struct ia64_args *stack; struct ia64_args *stack;
long i, avn, gpcount, fpcount; long i, avn, gpcount, fpcount;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
unix.S - Copyright (c) 1998 Red Hat, Inc. unix.S - Copyright (c) 1998, 2008 Red Hat, Inc.
Copyright (c) 2000 Hewlett Packard Company Copyright (c) 2000 Hewlett Packard Company
IA64/unix Foreign Function Interface IA64/unix Foreign Function Interface
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.text .text
/* int ffi_call_unix (struct ia64_args *stack, PTR64 rvalue, /* int ffi_call_unix (struct ia64_args *stack, PTR64 rvalue,
void (*fn)(), int flags); void (*fn)(void), int flags);
*/ */
.align 16 .align 16
...@@ -554,3 +554,7 @@ ffi_closure_unix: ...@@ -554,3 +554,7 @@ ffi_closure_unix:
data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT data8 @pcrel(.Lld_hfa_float) // FFI_IA64_TYPE_HFA_FLOAT
data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE data8 @pcrel(.Lld_hfa_double) // FFI_IA64_TYPE_HFA_DOUBLE
data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE data8 @pcrel(.Lld_hfa_ldouble) // FFI_IA64_TYPE_HFA_LDOUBLE
#if defined __ELF__ && defined __linux__
.section .note.GNU-stack,"",@progbits
#endif
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
java_raw_api.c - Copyright (c) 1999, 2007 Red Hat, Inc. java_raw_api.c - Copyright (c) 1999, 2007, 2008 Red Hat, Inc.
Cloned from raw_api.c Cloned from raw_api.c
...@@ -295,7 +295,7 @@ ffi_java_raw_to_rvalue (ffi_cif *cif, void *rvalue) ...@@ -295,7 +295,7 @@ ffi_java_raw_to_rvalue (ffi_cif *cif, void *rvalue)
* these following couple of functions will handle the translation forth * these following couple of functions will handle the translation forth
* and back automatically. */ * and back automatically. */
void ffi_java_raw_call (ffi_cif *cif, void (*fn)(), void *rvalue, void ffi_java_raw_call (ffi_cif *cif, void (*fn)(void), void *rvalue,
ffi_java_raw *raw) ffi_java_raw *raw)
{ {
void **avalue = (void**) alloca (cif->nargs * sizeof (void*)); void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2004 Renesas Technology ffi.c - Copyright (c) 2004 Renesas Technology
Copyright (c) 2008 Red Hat, Inc.
M32R Foreign Function Interface M32R Foreign Function Interface
...@@ -172,9 +173,9 @@ ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -172,9 +173,9 @@ ffi_prep_cif_machdep(ffi_cif *cif)
} }
extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *,
unsigned, unsigned, unsigned *, void (*fn)()); unsigned, unsigned, unsigned *, void (*fn)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.S sysv.S - Copyright (c) 1998 Andreas Schwab
Copyright (c) 2008 Red Hat, Inc.
m68k Foreign Function Interface m68k 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 THE AUTHORS OR COPYRIGHT
HOLDERS 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 #define LIBFFI_ASM
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1996, 2007 Red Hat, Inc. ffi.c - Copyright (c) 1996, 2007, 2008 Red Hat, Inc.
Copyright (c) 2008 David Daney
MIPS Foreign Function Interface MIPS Foreign Function Interface
...@@ -29,6 +30,16 @@ ...@@ -29,6 +30,16 @@
#include <stdlib.h> #include <stdlib.h>
#ifdef __GNUC__
# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
# define USE__BUILTIN___CLEAR_CACHE 1
# endif
#endif
#ifndef USE__BUILTIN___CLEAR_CACHE
#include <sys/cachectl.h>
#endif
#ifdef FFI_DEBUG #ifdef FFI_DEBUG
# define FFI_MIPS_STOP_HERE() ffi_stop_here() # define FFI_MIPS_STOP_HERE() ffi_stop_here()
#else #else
...@@ -483,14 +494,14 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -483,14 +494,14 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
/* Low level routine for calling O32 functions */ /* Low level routine for calling O32 functions */
extern int ffi_call_O32(void (*)(char *, extended_cif *, int, int), extern int ffi_call_O32(void (*)(char *, extended_cif *, int, int),
extended_cif *, unsigned, extended_cif *, unsigned,
unsigned, unsigned *, void (*)()); unsigned, unsigned *, void (*)(void));
/* Low level routine for calling N32 functions */ /* Low level routine for calling N32 functions */
extern int ffi_call_N32(void (*)(char *, extended_cif *, int, int), extern int ffi_call_N32(void (*)(char *, extended_cif *, int, int),
extended_cif *, unsigned, extended_cif *, unsigned,
unsigned, unsigned *, void (*)()); unsigned, unsigned *, void (*)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
...@@ -616,8 +627,11 @@ ffi_prep_closure_loc (ffi_closure *closure, ...@@ -616,8 +627,11 @@ ffi_prep_closure_loc (ffi_closure *closure,
closure->fun = fun; closure->fun = fun;
closure->user_data = user_data; closure->user_data = user_data;
#ifdef USE__BUILTIN___CLEAR_CACHE
__builtin___clear_cache(clear_location, clear_location + FFI_TRAMPOLINE_SIZE); __builtin___clear_cache(clear_location, clear_location + FFI_TRAMPOLINE_SIZE);
#else
cacheflush (clear_location, FFI_TRAMPOLINE_SIZE, ICACHE);
#endif
return FFI_OK; return FFI_OK;
} }
......
...@@ -27,6 +27,19 @@ ...@@ -27,6 +27,19 @@
#ifndef LIBFFI_TARGET_H #ifndef LIBFFI_TARGET_H
#define LIBFFI_TARGET_H #define LIBFFI_TARGET_H
#ifdef linux
#include <asm/sgidefs.h>
# ifndef _ABIN32
# define _ABIN32 _MIPS_SIM_NABI32
# endif
# ifndef _ABI64
# define _ABI64 _MIPS_SIM_ABI64
# endif
# ifndef _ABIO32
# define _ABIO32 _MIPS_SIM_ABI32
# endif
#endif
#if !defined(_MIPS_SIM) #if !defined(_MIPS_SIM)
-- something is very wrong -- -- something is very wrong --
#else #else
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - (c) 2003-2004 Randolph Chung <tausq@debian.org> ffi.c - (c) 2003-2004 Randolph Chung <tausq@debian.org>
(c) 2008 Red Hat, Inc.
HPPA Foreign Function Interface HPPA Foreign Function Interface
HP-UX PA ABI support (c) 2006 Free Software Foundation, Inc. HP-UX PA ABI support (c) 2006 Free Software Foundation, Inc.
...@@ -368,9 +369,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -368,9 +369,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
extern void ffi_call_pa32(void (*)(UINT32 *, extended_cif *, unsigned), extern void ffi_call_pa32(void (*)(UINT32 *, extended_cif *, unsigned),
extended_cif *, unsigned, unsigned, unsigned *, extended_cif *, unsigned, unsigned, unsigned *,
void (*fn)()); void (*fn)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
hpux32.S - Copyright (c) 2006 Free Software Foundation, Inc. hpux32.S - Copyright (c) 2006 Free Software Foundation, Inc.
(c) 2008 Red Hat, Inc.
based on src/pa/linux.S based on src/pa/linux.S
HP-UX PA Foreign Function Interface HP-UX PA Foreign Function Interface
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
unsigned bytes, unsigned bytes,
unsigned flags, unsigned flags,
unsigned *rvalue, unsigned *rvalue,
void (*fn)()); void (*fn)(void));
*/ */
.export ffi_call_pa32,ENTRY,PRIV_LEV=3 .export ffi_call_pa32,ENTRY,PRIV_LEV=3
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
linux.S - (c) 2003-2004 Randolph Chung <tausq@debian.org> linux.S - (c) 2003-2004 Randolph Chung <tausq@debian.org>
(c) 2008 Red Hat, Inc.
HPPA Foreign Function Interface HPPA Foreign Function Interface
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
unsigned bytes, unsigned bytes,
unsigned flags, unsigned flags,
unsigned *rvalue, unsigned *rvalue,
void (*fn)()); void (*fn)(void));
*/ */
.export ffi_call_pa32,code .export ffi_call_pa32,code
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1998 Geoffrey Keating ffi.c - Copyright (c) 1998 Geoffrey Keating
Copyright (C) 2007, 2008 Free Software Foundation, Inc Copyright (C) 2007, 2008 Free Software Foundation, Inc
Copyright (C) 2008 Red Hat, Inc
PowerPC Foreign Function Interface PowerPC Foreign Function Interface
...@@ -875,13 +876,13 @@ ffi_prep_cif_machdep (ffi_cif *cif) ...@@ -875,13 +876,13 @@ ffi_prep_cif_machdep (ffi_cif *cif)
} }
extern void ffi_call_SYSV(extended_cif *, unsigned, unsigned, unsigned *, extern void ffi_call_SYSV(extended_cif *, unsigned, unsigned, unsigned *,
void (*fn)()); void (*fn)(void));
extern void FFI_HIDDEN ffi_call_LINUX64(extended_cif *, unsigned long, extern void FFI_HIDDEN ffi_call_LINUX64(extended_cif *, unsigned long,
unsigned long, unsigned long *, unsigned long, unsigned long *,
void (*fn)()); void (*fn)(void));
void void
ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
......
...@@ -425,11 +425,11 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -425,11 +425,11 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
} }
extern void ffi_call_AIX(extended_cif *, unsigned, unsigned, unsigned *, extern void ffi_call_AIX(extended_cif *, unsigned, unsigned, unsigned *,
void (*fn)(), void (*fn2)()); void (*fn)(void), void (*fn2)(void));
extern void ffi_call_DARWIN(extended_cif *, unsigned, unsigned, unsigned *, extern void ffi_call_DARWIN(extended_cif *, unsigned, unsigned, unsigned *,
void (*fn)(), void (*fn2)()); void (*fn)(void), void (*fn2)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.h - Copyright (c) 2003 Jakub Jelinek <jakub@redhat.com> sysv.h - Copyright (c) 2003 Jakub Jelinek <jakub@redhat.com>
Copyright (c) 2008 Red Hat, Inc.
PowerPC64 Assembly glue. PowerPC64 Assembly glue.
...@@ -180,3 +181,7 @@ ffi_call_LINUX64: ...@@ -180,3 +181,7 @@ ffi_call_LINUX64:
.align 3 .align 3
.LEFDE1: .LEFDE1:
#endif #endif
#if defined __ELF__ && defined __linux__
.section .note.GNU-stack,"",@progbits
#endif
/* -----------------------------------------------------------------------
sysv.h - Copyright (c) 2003 Jakub Jelinek <jakub@redhat.com>
Copyright (c) 2008 Red Hat, Inc.
PowerPC64 Assembly glue.
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 THE AUTHORS OR COPYRIGHT
HOLDERS 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 #define LIBFFI_ASM
#include <fficonfig.h> #include <fficonfig.h>
#include <ffi.h> #include <ffi.h>
...@@ -204,3 +230,7 @@ ffi_closure_LINUX64: ...@@ -204,3 +230,7 @@ ffi_closure_LINUX64:
.align 3 .align 3
.LEFDE1: .LEFDE1:
#endif #endif
#if defined __ELF__ && defined __linux__
.section .note.GNU-stack,"",@progbits
#endif
/* -----------------------------------------------------------------------
sysv.h - Copyright (c) 2003 Jakub Jelinek <jakub@redhat.com>
Copyright (c) 2008 Red Hat, Inc.
PowerPC Assembly glue.
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 THE AUTHORS OR COPYRIGHT
HOLDERS 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 #define LIBFFI_ASM
#include <fficonfig.h> #include <fficonfig.h>
#include <ffi.h> #include <ffi.h>
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
raw_api.c - Copyright (c) 1999 Red Hat, Inc. raw_api.c - Copyright (c) 1999, 2008 Red Hat, Inc.
Author: Kresten Krab Thorup <krab@gnu.org> Author: Kresten Krab Thorup <krab@gnu.org>
$Id $
Permission is hereby granted, free of charge, to any person obtaining Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the a copy of this software and associated documentation files (the
``Software''), to deal in the Software without restriction, including ``Software''), to deal in the Software without restriction, including
...@@ -190,7 +188,7 @@ ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw) ...@@ -190,7 +188,7 @@ ffi_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw)
* these following couple of functions will handle the translation forth * these following couple of functions will handle the translation forth
* and back automatically. */ * and back automatically. */
void ffi_raw_call (ffi_cif *cif, void (*fn)(), void *rvalue, ffi_raw *raw) void ffi_raw_call (ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *raw)
{ {
void **avalue = (void**) alloca (cif->nargs * sizeof (void*)); void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
ffi_raw_to_ptrarray (cif, raw, avalue); ffi_raw_to_ptrarray (cif, raw, avalue);
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2000, 2007 Software AG ffi.c - Copyright (c) 2000, 2007 Software AG
Copyright (c) 2008 Red Hat, Inc
S390 Foreign Function Interface S390 Foreign Function Interface
...@@ -88,7 +89,7 @@ extern void ffi_call_SYSV(unsigned, ...@@ -88,7 +89,7 @@ extern void ffi_call_SYSV(unsigned,
void (*)(unsigned char *, extended_cif *), void (*)(unsigned char *, extended_cif *),
unsigned, unsigned,
void *, void *,
void (*fn)()); void (*fn)(void));
extern void ffi_closure_SYSV(void); extern void ffi_closure_SYSV(void);
...@@ -498,7 +499,7 @@ ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -498,7 +499,7 @@ ffi_prep_cif_machdep(ffi_cif *cif)
void void
ffi_call(ffi_cif *cif, ffi_call(ffi_cif *cif,
void (*fn)(), void (*fn)(void),
void *rvalue, void *rvalue,
void **avalue) void **avalue)
{ {
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.S - Copyright (c) 2000 Software AG sysv.S - Copyright (c) 2000 Software AG
Copyright (c) 2008 Red Hat, Inc.
S390 Foreign Function Interface S390 Foreign Function Interface
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 ffi.c - Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Kaz Kojima
Kaz Kojima Copyright (c) 2008 Red Hat, Inc.
SuperH Foreign Function Interface SuperH Foreign Function Interface
...@@ -407,9 +407,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -407,9 +407,9 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
} }
extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *,
unsigned, unsigned, unsigned *, void (*fn)()); unsigned, unsigned, unsigned *, void (*fn)(void));
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
UINT64 trvalue; UINT64 trvalue;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2003, 2004, 2006, 2007 Kaz Kojima ffi.c - Copyright (c) 2003, 2004, 2006, 2007 Kaz Kojima
Copyright (c) 2008 Anthony Green
SuperH SHmedia Foreign Function Interface SuperH SHmedia Foreign Function Interface
...@@ -237,11 +238,20 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) ...@@ -237,11 +238,20 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
return FFI_OK; return FFI_OK;
} }
extern void ffi_call_SYSV(void (*)(char *, extended_cif *), extended_cif *, /*@-declundef@*/
unsigned, unsigned, long long, unsigned *, /*@-exportheader@*/
void (*fn)()); extern void ffi_call_SYSV(void (*)(char *, extended_cif *),
/*@out@*/ extended_cif *,
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) unsigned, unsigned, long long,
/*@out@*/ unsigned *,
void (*fn)(void));
/*@=declundef@*/
/*@=exportheader@*/
void ffi_call(/*@dependent@*/ ffi_cif *cif,
void (*fn)(void),
/*@out@*/ void *rvalue,
/*@dependent@*/ void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
UINT64 trvalue; UINT64 trvalue;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 1996, 2003, 2004, 2007 Red Hat, Inc. ffi.c - Copyright (c) 1996, 2003, 2004, 2007, 2008 Red Hat, Inc.
SPARC Foreign Function Interface SPARC Foreign Function Interface
...@@ -369,13 +369,13 @@ int ffi_v9_layout_struct(ffi_type *arg, int off, char *ret, char *intg, char *fl ...@@ -369,13 +369,13 @@ int ffi_v9_layout_struct(ffi_type *arg, int off, char *ret, char *intg, char *fl
#ifdef SPARC64 #ifdef SPARC64
extern int ffi_call_v9(void *, extended_cif *, unsigned, extern int ffi_call_v9(void *, extended_cif *, unsigned,
unsigned, unsigned *, void (*fn)()); unsigned, unsigned *, void (*fn)(void));
#else #else
extern int ffi_call_v8(void *, extended_cif *, unsigned, extern int ffi_call_v8(void *, extended_cif *, unsigned,
unsigned, unsigned *, void (*fn)()); unsigned, unsigned *, void (*fn)(void));
#endif #endif
void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
extended_cif ecif; extended_cif ecif;
void *rval = rvalue; void *rval = rvalue;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
v8.S - Copyright (c) 1996, 1997, 2003, 2004 Red Hat, Inc. v8.S - Copyright (c) 1996, 1997, 2003, 2004, 2008 Red Hat, Inc.
SPARC Foreign Function Interface SPARC Foreign Function Interface
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
v9.S - Copyright (c) 2000, 2003, 2004 Red Hat, Inc. v9.S - Copyright (c) 2000, 2003, 2004, 2008 Red Hat, Inc.
SPARC 64-bit Foreign Function Interface SPARC 64-bit Foreign Function Interface
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
darwin64.S - Copyright (c) 2006 Free Software Foundation, Inc. darwin64.S - Copyright (c) 2006 Free Software Foundation, Inc.
Copyright (c) 2008 Red Hat, Inc.
derived from unix64.S derived from unix64.S
x86-64 Foreign Function Interface for Darwin. x86-64 Foreign Function Interface for Darwin.
...@@ -33,7 +34,7 @@ ...@@ -33,7 +34,7 @@
.text .text
/* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
void *raddr, void (*fnaddr)()); void *raddr, void (*fnaddr)(void));
Bit o trickiness here -- ARGS+BYTES is the base of the stack frame Bit o trickiness here -- ARGS+BYTES is the base of the stack frame
for this function. This has been allocated by ffi_call. We also for this function. This has been allocated by ffi_call. We also
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
ffi.c - Copyright (c) 2002, 2007 Bo Thorsen <bo@suse.de> ffi.c - Copyright (c) 2002, 2007 Bo Thorsen <bo@suse.de>
Copyright (c) 2008 Red Hat, Inc.
x86-64 Foreign Function Interface x86-64 Foreign Function Interface
...@@ -43,7 +44,7 @@ struct register_args ...@@ -43,7 +44,7 @@ struct register_args
}; };
extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, extern void ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
void *raddr, void (*fnaddr)(), unsigned ssecount); void *raddr, void (*fnaddr)(void), unsigned ssecount);
/* All reference to register classes here is identical to the code in /* All reference to register classes here is identical to the code in
gcc/config/i386/i386.c. Do *not* change one without the other. */ gcc/config/i386/i386.c. Do *not* change one without the other. */
...@@ -340,7 +341,7 @@ ffi_prep_cif_machdep (ffi_cif *cif) ...@@ -340,7 +341,7 @@ ffi_prep_cif_machdep (ffi_cif *cif)
} }
void void
ffi_call (ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{ {
enum x86_64_reg_class classes[MAX_CLASSES]; enum x86_64_reg_class classes[MAX_CLASSES];
char *stack, *argp; char *stack, *argp;
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
sysv.S - Copyright (c) 1996, 1998, 2001, 2002, 2003, 2005, 2008 sysv.S - Copyright (c) 1996, 1998, 2001-2003, 2005, 2008 Red Hat, Inc.
Red Hat, Inc.
X86 Foreign Function Interface X86 Foreign Function Interface
......
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
unix64.S - Copyright (c) 2002, 2008 Bo Thorsen <bo@suse.de> unix64.S - Copyright (c) 2002 Bo Thorsen <bo@suse.de>
Copyright (c) 2008 Red Hat, Inc
x86-64 Foreign Function Interface x86-64 Foreign Function Interface
...@@ -32,7 +33,7 @@ ...@@ -32,7 +33,7 @@
.text .text
/* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags, /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
void *raddr, void (*fnaddr)()); void *raddr, void (*fnaddr)(void));
Bit o trickiness here -- ARGS+BYTES is the base of the stack frame Bit o trickiness here -- ARGS+BYTES is the base of the stack frame
for this function. This has been allocated by ffi_call. We also for this function. This has been allocated by ffi_call. We also
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment