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

Darwin/aarch64: size_t assumptions

Browse Source
This commit is contained in:
Zachary Waldowski
2013-11-30 03:03:37 -05:00
parent 9775446b64
commit 0278284e47
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/aarch64/ffi.c
View File

@@ -65,13 +65,13 @@ static inline void ffi_clear_cache(void *start, void *end)
} }
static void * static void *
get_x_addr (struct call_context *context, unsigned n) get_x_addr (struct call_context *context, size_t n)
{ {
return &context->x[n]; return &context->x[n];
} }
static void * static void *
get_s_addr (struct call_context *context, unsigned n) get_s_addr (struct call_context *context, size_t n)
{ {
#if defined __AARCH64EB__ #if defined __AARCH64EB__
return &context->v[n].d[1].s[1]; return &context->v[n].d[1].s[1];
@@ -81,7 +81,7 @@ get_s_addr (struct call_context *context, unsigned n)
} }
static void * static void *
get_d_addr (struct call_context *context, unsigned n) get_d_addr (struct call_context *context, size_t n)
{ {
#if defined __AARCH64EB__ #if defined __AARCH64EB__
return &context->v[n].d[1]; return &context->v[n].d[1];
@@ -91,7 +91,7 @@ get_d_addr (struct call_context *context, unsigned n)
} }
static void * static void *
get_v_addr (struct call_context *context, unsigned n) get_v_addr (struct call_context *context, size_t n)
{ {
return &context->v[n]; return &context->v[n];
} }
@@ -207,7 +207,7 @@ ffi_call_SYSV (unsigned (*)(struct call_context *context, unsigned char *,
extended_cif *), extended_cif *),
struct call_context *context, struct call_context *context,
extended_cif *, extended_cif *,
unsigned, size_t,
void (*fn)(void)); void (*fn)(void));
extern void extern void
@@ -388,14 +388,14 @@ is_v_register_candidate (ffi_type *ty)
struct arg_state struct arg_state
{ {
unsigned ngrn; /* Next general-purpose register number. */ size_t ngrn; /* Next general-purpose register number. */
unsigned nsrn; /* Next vector register number. */ size_t nsrn; /* Next vector register number. */
unsigned nsaa; /* Next stack offset. */ size_t nsaa; /* Next stack offset. */
}; };
/* Initialize a procedure call argument marshalling state. */ /* Initialize a procedure call argument marshalling state. */
static void static void
arg_init (struct arg_state *state, unsigned call_frame_size) arg_init (struct arg_state *state, size_t call_frame_size)
{ {
state->ngrn = 0; state->ngrn = 0;
state->nsrn = 0; state->nsrn = 0;
@@ -405,7 +405,7 @@ arg_init (struct arg_state *state, unsigned call_frame_size)
/* Return the number of available consecutive core argument /* Return the number of available consecutive core argument
registers. */ registers. */
static unsigned static size_t
available_x (struct arg_state *state) available_x (struct arg_state *state)
{ {
return N_X_ARG_REG - state->ngrn; return N_X_ARG_REG - state->ngrn;
@@ -414,7 +414,7 @@ available_x (struct arg_state *state)
/* Return the number of available consecutive vector argument /* Return the number of available consecutive vector argument
registers. */ registers. */
static unsigned static size_t
available_v (struct arg_state *state) available_v (struct arg_state *state)
{ {
return N_V_ARG_REG - state->nsrn; return N_V_ARG_REG - state->nsrn;
@@ -450,8 +450,8 @@ allocate_to_v (struct call_context *context, struct arg_state *state)
/* Allocate an aligned slot on the stack and return a pointer to it. */ /* Allocate an aligned slot on the stack and return a pointer to it. */
static void * static void *
allocate_to_stack (struct arg_state *state, void *stack, unsigned alignment, allocate_to_stack (struct arg_state *state, void *stack, size_t alignment,
unsigned size) size_t size)
{ {
void *allocation; void *allocation;
@@ -757,7 +757,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
case FFI_SYSV: case FFI_SYSV:
{ {
struct call_context context; struct call_context context;
unsigned stack_bytes; size_t stack_bytes;
/* Figure out the total amount of stack space we need, the /* Figure out the total amount of stack space we need, the
above call frame space needs to be 16 bytes aligned to above call frame space needs to be 16 bytes aligned to
@@ -809,7 +809,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
} }
else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG) else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
{ {
unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)); size_t size = ALIGN (cif->rtype->size, sizeof (UINT64));
memcpy (rvalue, get_x_addr (&context, 0), size); memcpy (rvalue, get_x_addr (&context, 0), size);
} }
else else
@@ -1093,7 +1093,7 @@ ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
} }
else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG) else if ((cif->rtype->size + 7) / 8 < N_X_ARG_REG)
{ {
unsigned size = ALIGN (cif->rtype->size, sizeof (UINT64)) ; size_t size = ALIGN (cif->rtype->size, sizeof (UINT64)) ;
memcpy (get_x_addr (context, 0), rvalue, size); memcpy (get_x_addr (context, 0), rvalue, size);
} }
else else
@@ -1112,4 +1112,3 @@ ffi_closure_SYSV_inner (ffi_closure *closure, struct call_context *context,
(closure->fun) (cif, rvalue, avalue, closure->user_data); (closure->fun) (cif, rvalue, avalue, closure->user_data);
} }
} }

2
src/aarch64/sysv.S
View File

@@ -63,7 +63,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
extended_cif *), extended_cif *),
struct call_context *context, struct call_context *context,
extended_cif *, extended_cif *,
unsigned required_stack_size, size_t required_stack_size,
void (*fn)(void)); void (*fn)(void));
Therefore on entry we have: Therefore on entry we have: