mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 19:50:24 +02:00
Code Activity

Account for saved return address when locating args

Browse source 
Also, fix alignment to be in bytes rather than bits.  Oops!
This commit is contained in:
Andy Wingo 2019-04-26 14:38:29 +02:00
parent ac972e1dba
commit 89fd69fc00
2 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lightening/lightening.c
View file

@ -68,12 +68,26 @@ struct jit_state
# define UNLIKELY(exprn) exprn # define UNLIKELY(exprn) exprn
#endif #endif
enum stack_state
{
BEFORE_CALL,
AFTER_CALL
};
static jit_bool_t jit_get_cpu(void); static jit_bool_t jit_get_cpu(void);
static jit_bool_t jit_init(jit_state_t *); static jit_bool_t jit_init(jit_state_t *);
static void jit_flush(void *fptr, void *tptr); static void jit_flush(void *fptr, void *tptr);
static void jit_try_shorten(jit_state_t *_jit, jit_reloc_t reloc, static void jit_try_shorten(jit_state_t *_jit, jit_reloc_t reloc,
jit_pointer_t addr); jit_pointer_t addr);
struct abi_arg_iterator;
static void reset_abi_arg_iterator(struct abi_arg_iterator *iter, size_t argc,
const jit_operand_t *args,
enum stack_state state);
static void next_abi_arg(struct abi_arg_iterator *iter,
jit_operand_t *arg);
jit_bool_t jit_bool_t
init_jit(void) init_jit(void)
{ {
@ -830,7 +844,7 @@ jit_align_stack(jit_state_t *_jit, size_t expand)
size_t new_size = _jit->frame_size + expand; size_t new_size = _jit->frame_size + expand;
// Align stack to double-word boundaries. This isn't really a // Align stack to double-word boundaries. This isn't really a
// principle but it does work for Aarch32, AArch64 and x86-64. // principle but it does work for Aarch32, AArch64 and x86-64.
size_t alignment = __WORDSIZE * 2; size_t alignment = __WORDSIZE / 8 * 2;
size_t aligned_size = (new_size + alignment - 1) & ~(alignment - 1); size_t aligned_size = (new_size + alignment - 1) & ~(alignment - 1);
size_t diff = aligned_size - _jit->frame_size; size_t diff = aligned_size - _jit->frame_size;
if (diff) if (diff)
@ -855,7 +869,7 @@ prepare_call_args(jit_state_t *_jit, size_t argc, jit_operand_t args[])
struct abi_arg_iterator iter; struct abi_arg_iterator iter;
// Compute shuffle destinations and space for spilled arguments. // Compute shuffle destinations and space for spilled arguments.
reset_abi_arg_iterator(&iter, argc, args); reset_abi_arg_iterator(&iter, argc, args, BEFORE_CALL);
for (size_t i = 0; i < argc; i++) for (size_t i = 0; i < argc; i++)
next_abi_arg(&iter, &dst[i]); next_abi_arg(&iter, &dst[i]);
@ -908,7 +922,7 @@ jit_locate_args(jit_state_t *_jit, size_t argc, jit_operand_t args[])
{ {
struct abi_arg_iterator iter; struct abi_arg_iterator iter;
reset_abi_arg_iterator(&iter, argc, args); reset_abi_arg_iterator(&iter, argc, args, AFTER_CALL);
for (size_t i = 0; i < argc; i++) for (size_t i = 0; i < argc; i++)
next_abi_arg(&iter, &args[i]); next_abi_arg(&iter, &args[i]);
} }

6
lightening/x86.c
View file

@ -315,11 +315,15 @@ round_size_up_to_words(size_t bytes)
static void static void
reset_abi_arg_iterator(struct abi_arg_iterator *iter, size_t argc, reset_abi_arg_iterator(struct abi_arg_iterator *iter, size_t argc,
const jit_operand_t *args) const jit_operand_t *args, enum stack_state state)
{ {
memset(iter, 0, sizeof *iter); memset(iter, 0, sizeof *iter);
iter->argc = argc; iter->argc = argc;
iter->args = args; iter->args = args;
if (state == AFTER_CALL)
iter->stack_size = __WORDSIZE / 8; // Saved return address.
else
ASSERT(state == BEFORE_CALL);
} }
static void static void