wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidental change.

Browse Source
This commit is contained in:
Dan Witte 2010-04-07 15:29:41 -07:00
parent b065d2092c
commit 2249bd76de
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/ctypes/libffi/msvcc.sh
View File

@ -42,7 +42,7 @@
# format and translated into something sensible for cl or ml.
#
args="-nologo"
args="-nologo -W3"
md=-MD
cl="cl"
ml="ml"

8
js/src/ctypes/libffi/src/powerpc/ffi_darwin.c
View File

@ -344,7 +344,7 @@ ffi_status
ffi_prep_cif_machdep (ffi_cif *cif)
{
/* All this is for the DARWIN ABI. */
unsigned i;
int i;
ffi_type **ptr;
unsigned bytes;
int fparg_count = 0, intarg_count = 0;
@ -542,11 +542,11 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
{
case FFI_AIX:
ffi_call_AIX(&ecif, -(long)cif->bytes, cif->flags, ecif.rvalue, fn,
FFI_FN(ffi_prep_args));
ffi_prep_args);
break;
case FFI_DARWIN:
ffi_call_DARWIN(&ecif, -(long)cif->bytes, cif->flags, ecif.rvalue, fn,
FFI_FN(ffi_prep_args));
ffi_prep_args);
break;
default:
FFI_ASSERT(0);
@ -812,7 +812,7 @@ ffi_closure_helper_DARWIN (ffi_closure *closure, void *rvalue,
if (arg_types[i]->elements[0]->type == FFI_TYPE_DOUBLE)
size_al = ALIGN(arg_types[i]->size, 8);
if (size_al < 3 && cif->abi == FFI_DARWIN)
avalue[i] = (uintptr_t) pgr + 4 - size_al;
avalue[i] = (void*) pgr + 4 - size_al;
else
avalue[i] = (void*) pgr;
pgr += (size_al + 3) / 4;

16
js/src/ctypes/libffi/src/x86/ffi.c
View File

@ -209,7 +209,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
#endif
{
cif->flags = FFI_TYPE_STRUCT;
/* allocate space for return value pointer */
// allocate space for return value pointer
cif->bytes += ALIGN(sizeof(void*), FFI_SIZEOF_ARG);
}
break;
@ -234,7 +234,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
}
#ifdef X86_WIN64
/* ensure space for storing four registers */
// ensure space for storing four registers
cif->bytes += 4 * sizeof(ffi_arg);
#endif
@ -292,8 +292,8 @@ void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
#ifdef X86_WIN64
case FFI_WIN64:
{
/* Make copies of all struct arguments
NOTE: not sure if responsibility should be here or in caller */
// Make copies of all struct arguments
// NOTE: not sure if responsibility should be here or in caller
unsigned int i;
for (i=0; i < cif->nargs;i++) {
size_t size = cif->arg_types[i]->size;
@ -585,10 +585,10 @@ ffi_prep_raw_closure_loc (ffi_raw_closure* closure,
return FFI_BAD_ABI;
}
/* we currently don't support certain kinds of arguments for raw
closures. This should be implemented by a separate assembly language
routine, since it would require argument processing, something we
don't do now for performance. */
// we currently don't support certain kinds of arguments for raw
// closures. This should be implemented by a separate assembly language
// routine, since it would require argument processing, something we
// don't do now for performance.
for (i = cif->nargs-1; i >= 0; i--)
{

2
js/src/ctypes/libffi/src/x86/ffitarget.h
View File

@ -38,7 +38,7 @@
#ifdef X86_WIN64
#define FFI_SIZEOF_ARG 8
#define USE_BUILTIN_FFS 0 /* not yet implemented in mingw-64 */
#define USE_BUILTIN_FFS 0 // not yet implemented in mingw-64
#endif
/* ---- Generic type definitions ----------------------------------------- */