l = &s->labels[label_index];
if (l->has_value) {
- /* FIXME: This is wrong. We can not resolve the relocation
- immediately because the caller has not yet written the
- initial value. */
+ /* FIXME: This may break relocations on RISC targets that
+ modify instruction fields in place. The caller may not have
+ written the initial value. */
patch_reloc(code_ptr, type, l->u.value + addend);
} else {
/* add a new relocation entry */
return s->code_ptr - gen_code_buf;
}
-static uint8_t *dummy_code_buf;
-
/* Return the index of the micro operation such as the pc after is <
- offset bytes from the start of the TB.
- We have to use a dummy code buffer here to avoid clobbering the
- oringinal code. Because we terminate code generation part way through
- we can end up with unresolved relocations. Return -1 if not found. */
-int dyngen_code_search_pc(TCGContext *s, long offset)
+ offset bytes from the start of the TB. The contents of gen_code_buf must
+ not be changed, though writing the same values is ok.
+ Return -1 if not found. */
+int dyngen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset)
{
- if (!dummy_code_buf)
- dummy_code_buf = qemu_malloc(code_gen_max_block_size());
- return tcg_gen_code_common(s, dummy_code_buf, offset);
+ return tcg_gen_code_common(s, gen_code_buf, offset);
}
void tcg_func_start(TCGContext *s);
int dyngen_code(TCGContext *s, uint8_t *gen_code_buf);
-int dyngen_code_search_pc(TCGContext *s, long offset);
+int dyngen_code_search_pc(TCGContext *s, uint8_t *gen_code_buf, long offset);
void tcg_set_frame(TCGContext *s, int reg,
tcg_target_long start, tcg_target_long size);
s->tb_jmp_offset = NULL;
s->tb_next = tb->tb_next;
#endif
- j = dyngen_code_search_pc(s, searched_pc - tc_ptr);
+ j = dyngen_code_search_pc(s, (uint8_t *)tc_ptr, searched_pc - tc_ptr);
if (j < 0)
return -1;
/* now find start of instruction before */