mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-09 21:40:33 +02:00
Merge branch 'size-data' into 'master'
Allow jit_begin_data to declare max data size See merge request wingo/lightening!9
This commit is contained in:
commit
a6fc30d810
3 changed files with 10 additions and 10 deletions
|
@ -661,7 +661,7 @@ FOR_EACH_INSTRUCTION(DECLARE_INSTRUCTION)
|
|||
# define jit_truncr_f(j,u,v) jit_truncr_f_l(j,u,v)
|
||||
#endif
|
||||
|
||||
void jit_begin_data(jit_state_t *);
|
||||
void jit_begin_data(jit_state_t *, size_t max_size_or_zero);
|
||||
void jit_end_data(jit_state_t *);
|
||||
void jit_emit_u8(jit_state_t *, uint8_t);
|
||||
void jit_emit_u16(jit_state_t *, uint16_t);
|
||||
|
|
|
@ -484,12 +484,16 @@ jit_patch_there(jit_state_t* _jit, jit_reloc_t reloc, jit_pointer_t addr)
|
|||
}
|
||||
|
||||
void
|
||||
jit_begin_data(jit_state_t *j)
|
||||
jit_begin_data(jit_state_t *j, size_t max_size_or_zero)
|
||||
{
|
||||
#ifdef JIT_NEEDS_LITERAL_POOL
|
||||
if (j->pool->size)
|
||||
emit_literal_pool(j, NO_GUARD_NEEDED);
|
||||
ASSERT(j->overflow || j->pool->size == 0);
|
||||
if (j->pool->size) {
|
||||
uint8_t *deadline = j->start + j->pool->deadline;
|
||||
// Emit a literal pool now if the data might overwrite the deadline.
|
||||
// Emitting data won't add entries to the pool.
|
||||
if (max_size_or_zero == 0 || j->pc.uc + max_size_or_zero >= deadline)
|
||||
emit_literal_pool(j, NO_GUARD_NEEDED);
|
||||
}
|
||||
#endif
|
||||
|
||||
ASSERT(!j->emitting_data);
|
||||
|
@ -499,10 +503,6 @@ jit_begin_data(jit_state_t *j)
|
|||
void
|
||||
jit_end_data(jit_state_t *j)
|
||||
{
|
||||
#ifdef JIT_NEEDS_LITERAL_POOL
|
||||
ASSERT(j->overflow || j->pool->size == 0);
|
||||
#endif
|
||||
|
||||
ASSERT(j->emitting_data);
|
||||
j->emitting_data = 0;
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@ run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
|
|||
jit_ldxr(j, JIT_R1, JIT_R1, JIT_R0);
|
||||
jit_jmpr(j, JIT_R1);
|
||||
|
||||
jit_begin_data (j);
|
||||
jit_begin_data (j, (NTARGETS + 1) * sizeof(intptr_t));
|
||||
jit_align(j, sizeof(intptr_t));
|
||||
jit_patch_here(j, table);
|
||||
jit_reloc_t targets[NTARGETS];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue