ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #449 from gpakosz/align-macros

Browse Source 
Prefix ALIGN_DOWN macro with FFI_
This commit is contained in:
Tom Tromey
2018-09-18 08:26:31 -06:00
committed by GitHub
parent 980908b47b e6eac7863e
commit b11b08ca8d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ffi_common.h
View File

@@ -77,7 +77,7 @@ void ffi_type_test(ffi_type *a, char *file, int line);
/* v cast to size_t and aligned up to a multiple of a */ /* v cast to size_t and aligned up to a multiple of a */
#define FFI_ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1) #define FFI_ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1)
/* v cast to size_t and aligned down to a multiple of a */ /* v cast to size_t and aligned down to a multiple of a */
#define ALIGN_DOWN(v, a) (((size_t) (v)) & -a) #define FFI_ALIGN_DOWN(v, a) (((size_t) (v)) & -a)
/* Perform machine dependent cif processing */ /* Perform machine dependent cif processing */
ffi_status ffi_prep_cif_machdep(ffi_cif *cif); ffi_status ffi_prep_cif_machdep(ffi_cif *cif);

2
src/frv/ffi.c
View File

@@ -107,7 +107,7 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
count += z; count += z;
} }
return (stack + ((count > 24) ? 24 : ALIGN_DOWN(count, 8))); return (stack + ((count > 24) ? 24 : FFI_ALIGN_DOWN(count, 8)));
} }
/* Perform machine dependent cif processing */ /* Perform machine dependent cif processing */

2
src/metag/ffi.c
View File

@@ -61,7 +61,7 @@ unsigned int ffi_prep_args(char *stack, extended_cif *ecif)
argp -= z; argp -= z;
/* Align if necessary */ /* Align if necessary */
argp = (char *) ALIGN_DOWN(ALIGN_DOWN(argp, (*p_arg)->alignment), 4); argp = (char *) FFI_ALIGN_DOWN(FFI_ALIGN_DOWN(argp, (*p_arg)->alignment), 4);
if (z < sizeof(int)) { if (z < sizeof(int)) {
z = sizeof(int); z = sizeof(int);

2
src/moxie/ffi.c
View File

@@ -100,7 +100,7 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
count += z; count += z;
} }
return (stack + ((count > 24) ? 24 : ALIGN_DOWN(count, 8))); return (stack + ((count > 24) ? 24 : FFI_ALIGN_DOWN(count, 8)));
} }
/* Perform machine dependent cif processing */ /* Perform machine dependent cif processing */