1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-27 13:30:31 +02:00

Fix a couple bugs related to aarch64 literal pools

This commit is contained in:
Andy Wingo 2019-05-16 11:03:49 +02:00
parent 9c9389ad2b
commit 9638e4f169
2 changed files with 5 additions and 6 deletions

View file

@ -115,8 +115,8 @@ DEFINE_ENCODER(size, 2, 22, unsigned, uint32_t)
return ret; \ return ret; \
} }
DEFINE_PATCHABLE_INSTRUCTION(jmp, simm26, JCC_WITH_VENEER, 2); DEFINE_PATCHABLE_INSTRUCTION(jmp, simm26, JMP_WITH_VENEER, 2);
DEFINE_PATCHABLE_INSTRUCTION(jcc, simm19, JMP_WITH_VENEER, 2); DEFINE_PATCHABLE_INSTRUCTION(jcc, simm19, JCC_WITH_VENEER, 2);
DEFINE_PATCHABLE_INSTRUCTION(load_from_pool, simm19, LOAD_FROM_POOL, 2); DEFINE_PATCHABLE_INSTRUCTION(load_from_pool, simm19, LOAD_FROM_POOL, 2);
struct veneer struct veneer

View file

@ -1281,13 +1281,12 @@ remove_pending_literal(jit_state_t *_jit, jit_reloc_t src)
{ {
for (size_t i = _jit->pool->size; i--; ) { for (size_t i = _jit->pool->size; i--; ) {
if (_jit->pool->entries[i].reloc.offset == src.offset) { if (_jit->pool->entries[i].reloc.offset == src.offset) {
for (size_t j = i + 1; j < _jit->pool->size; j++) { for (size_t j = i + 1; j < _jit->pool->size; j++)
_jit->pool->entries[j-1] = _jit->pool->entries[j]; _jit->pool->entries[j-1] = _jit->pool->entries[j];
_jit->pool->size--; _jit->pool->size--;
return; return;
} }
} }
}
abort(); abort();
} }