yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 09:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: Allow constant pool entries in the prologue

Browse source 
Both ARMv6 and AArch64 currently may drop complex guest_base values
into the constant pool. But generic code wasn't expecting that, and
the pool is not emitted. Correct that.

Backports commit 5b38ee31616d1532c3c3a6dc644a9160d608ed2f from qemu
This commit is contained in:
Richard Henderson 2018-03-05 11:25:48 -05:00 committed by Lioncash
parent 1212c9b73c
commit ef3f552229
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
qemu/tcg/tcg.c
View file

@ -406,12 +406,32 @@ void tcg_prologue_init(TCGContext *s)
/* Put the prologue at the beginning of code_gen_buffer. */ /* Put the prologue at the beginning of code_gen_buffer. */
buf0 = s->code_gen_buffer; buf0 = s->code_gen_buffer;
total_size = s->code_gen_buffer_size;
s->code_ptr = buf0; s->code_ptr = buf0;
s->code_buf = buf0; s->code_buf = buf0;
s->data_gen_ptr = NULL;
s->code_gen_prologue = buf0; s->code_gen_prologue = buf0;
/* Compute a high-water mark, at which we voluntarily flush the buffer
and start over. The size here is arbitrary, significantly larger
than we expect the code generation for any one opcode to require. */
s->code_gen_highwater = s->code_gen_buffer + (total_size - TCG_HIGHWATER);
#ifdef TCG_TARGET_NEED_POOL_LABELS
s->pool_labels = NULL;
#endif
/* Generate the prologue. */ /* Generate the prologue. */
tcg_target_qemu_prologue(s); tcg_target_qemu_prologue(s);
#ifdef TCG_TARGET_NEED_POOL_LABELS
/* Allow the prologue to put e.g. guest_base into a pool entry. */
{
bool ok = tcg_out_pool_finalize(s);
tcg_debug_assert(ok);
}
#endif
buf1 = s->code_ptr; buf1 = s->code_ptr;
flush_icache_range((uintptr_t)buf0, (uintptr_t)buf1); flush_icache_range((uintptr_t)buf0, (uintptr_t)buf1);
@ -420,14 +440,9 @@ void tcg_prologue_init(TCGContext *s)
s->code_gen_ptr = buf1; s->code_gen_ptr = buf1;
s->code_gen_buffer = buf1; s->code_gen_buffer = buf1;
s->code_buf = buf1; s->code_buf = buf1;
total_size = s->code_gen_buffer_size - prologue_size; total_size -= prologue_size;
s->code_gen_buffer_size = total_size; s->code_gen_buffer_size = total_size;
/* Compute a high-water mark, at which we voluntarily flush the buffer
and start over. The size here is arbitrary, significantly larger
than we expect the code generation for any one opcode to require. */
s->code_gen_highwater = s->code_gen_buffer + (total_size - TCG_HIGHWATER);
// Unicorn: commented out // Unicorn: commented out
// tcg_register_jit(s->code_gen_buffer, total_size); // tcg_register_jit(s->code_gen_buffer, total_size);
@ -436,8 +451,28 @@ void tcg_prologue_init(TCGContext *s)
size_t size = tcg_current_code_size(s); size_t size = tcg_current_code_size(s);
qemu_log("PROLOGUE: [size=%zu]\n", size); qemu_log("PROLOGUE: [size=%zu]\n", size);
qemu_log("PROLOGUE: [size=%zu]\n", prologue_size); qemu_log("PROLOGUE: [size=%zu]\n", prologue_size);
// Unicorn: commented out if (s->data_gen_ptr) {
//log_disas(buf0, prologue_size); size_t code_size = s->data_gen_ptr - buf0;
size_t data_size = prologue_size - code_size;
size_t i;
// Unicorn: commented out
//log_disas(buf0, code_size);
for (i = 0; i < data_size; i += sizeof(tcg_target_ulong)) {
if (sizeof(tcg_target_ulong) == 8) {
qemu_log("0x%08" PRIxPTR ": .quad 0x%016" PRIx64 "\n",
(uintptr_t)s->data_gen_ptr + i,
*(uint64_t *)(s->data_gen_ptr + i));
} else {
qemu_log("0x%08" PRIxPTR ": .long 0x%08x\n",
(uintptr_t)s->data_gen_ptr + i,
*(uint32_t *)(s->data_gen_ptr + i));
}
}
} else {
log_disas(buf0, prologue_size);
}
qemu_log("\n"); qemu_log("\n");
qemu_log_flush(); qemu_log_flush();
} }