traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the GCC-4.8 compiler happy by moving declarations to the top of the function.

This commit is contained in:
Raymond Hettinger 2013-07-19 19:52:04 -07:00
parent 520ad57916
commit 5ea0f80165
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/_ctypes/libffi_osx/ffi.c
View File

@ -38,12 +38,13 @@ initialize_aggregate(
/*@out@*/ ffi_type* arg) /*@out@*/ ffi_type* arg)
{ {
/*@-usedef@*/ /*@-usedef@*/
ffi_type** ptr;
if (arg == NULL || arg->elements == NULL || if (arg == NULL || arg->elements == NULL ||
arg->size != 0 || arg->alignment != 0) arg->size != 0 || arg->alignment != 0)
return FFI_BAD_TYPEDEF; return FFI_BAD_TYPEDEF;
ffi_type** ptr = &(arg->elements[0]); ptr = &(arg->elements[0]);
while ((*ptr) != NULL) while ((*ptr) != NULL)
{ {
@ -135,16 +136,16 @@ ffi_prep_cif(
/*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype, /*@dependent@*/ /*@out@*/ /*@partial@*/ ffi_type* rtype,
/*@dependent@*/ ffi_type** atypes) /*@dependent@*/ ffi_type** atypes)
{ {
unsigned int bytes = 0;
unsigned int i;
ffi_type** ptr;
if (cif == NULL) if (cif == NULL)
return FFI_BAD_TYPEDEF; return FFI_BAD_TYPEDEF;
if (abi <= FFI_FIRST_ABI || abi > FFI_DEFAULT_ABI) if (abi <= FFI_FIRST_ABI || abi > FFI_DEFAULT_ABI)
return FFI_BAD_ABI; return FFI_BAD_ABI;
unsigned int bytes = 0;
unsigned int i;
ffi_type** ptr;
cif->abi = abi; cif->abi = abi;
cif->arg_types = atypes; cif->arg_types = atypes;
cif->nargs = nargs; cif->nargs = nargs;

11
Modules/_ctypes/libffi_osx/x86/x86-ffi64.c
View File

@ -225,14 +225,16 @@ classify_argument(
/* Merge the fields of structure. */ /* Merge the fields of structure. */
for (ptr = type->elements; *ptr != NULL; ptr++) for (ptr = type->elements; *ptr != NULL; ptr++)
{ {
int num, pos;
byte_offset = ALIGN(byte_offset, (*ptr)->alignment); byte_offset = ALIGN(byte_offset, (*ptr)->alignment);
int num = classify_argument(*ptr, subclasses, byte_offset % 8); num = classify_argument(*ptr, subclasses, byte_offset % 8);
if (num == 0) if (num == 0)
return 0; return 0;
int pos = byte_offset / 8; pos = byte_offset / 8;
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
{ {
@ -589,11 +591,12 @@ ffi_prep_closure(
void (*fun)(ffi_cif*, void*, void**, void*), void (*fun)(ffi_cif*, void*, void**, void*),
void* user_data) void* user_data)
{ {
volatile unsigned short* tramp;
if (cif->abi != FFI_UNIX64) if (cif->abi != FFI_UNIX64)
return FFI_BAD_ABI; return FFI_BAD_ABI;
volatile unsigned short* tramp = tramp = (volatile unsigned short*)&closure->tramp[0];
(volatile unsigned short*)&closure->tramp[0];
tramp[0] = 0xbb49; /* mov <code>, %r11 */ tramp[0] = 0xbb49; /* mov <code>, %r11 */
*(void* volatile*)&tramp[1] = ffi_closure_unix64; *(void* volatile*)&tramp[1] = ffi_closure_unix64;