@@ -702,6 +702,7 @@ struct TCGContext {
void *code_gen_buffer;
size_t code_gen_buffer_size;
void *code_gen_ptr;
+ void *data_gen_ptr;
/* Threshold to flush the translated code buffer. */
void *code_gen_highwater;
@@ -716,6 +717,9 @@ struct TCGContext {
#ifdef TCG_TARGET_NEED_LDST_LABELS
struct TCGLabelQemuLdst *ldst_labels;
#endif
+#ifdef TCG_TARGET_NEED_POOL_LABELS
+ struct TCGLabelPoolData *pool_labels;
+#endif
TCGTempSet free_temps[TCG_TYPE_COUNT * 2];
TCGTemp temps[TCG_MAX_TEMPS]; /* globals first, temps after */
@@ -1329,7 +1329,27 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
qemu_log_in_addr_range(tb->pc)) {
qemu_log_lock();
qemu_log("OUT: [size=%d]\n", gen_code_size);
- log_disas(tb->tc_ptr, gen_code_size);
+ if (tcg_ctx.data_gen_ptr) {
+ size_t code_size = tcg_ctx.data_gen_ptr - tb->tc_ptr;
+ size_t data_size = gen_code_size - code_size;
+ size_t i;
+
+ log_disas(tb->tc_ptr, 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)tcg_ctx.data_gen_ptr + i,
+ *(uint64_t *)(tcg_ctx.data_gen_ptr + i));
+ } else {
+ qemu_log("0x%08" PRIxPTR ": .long 0x%08x\n",
+ (uintptr_t)tcg_ctx.data_gen_ptr + i,
+ *(uint32_t *)(tcg_ctx.data_gen_ptr + i));
+ }
+ }
+ } else {
+ log_disas(tb->tc_ptr, gen_code_size);
+ }
qemu_log("\n");
qemu_log_flush();
qemu_log_unlock();
new file mode 100644
@@ -0,0 +1,85 @@
+/*
+ * TCG Backend Data: constant pool.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+typedef struct TCGLabelPoolData {
+ struct TCGLabelPoolData *next;
+ tcg_target_ulong data;
+ tcg_insn_unit *label;
+ intptr_t addend;
+ int type;
+} TCGLabelPoolData;
+
+
+static void new_pool_label(TCGContext *s, tcg_target_ulong data, int type,
+ tcg_insn_unit *label, intptr_t addend)
+{
+ TCGLabelPoolData *n = tcg_malloc(sizeof(*n));
+ TCGLabelPoolData *i, **pp;
+
+ n->data = data;
+ n->label = label;
+ n->type = type;
+ n->addend = addend;
+
+ /* Insertion sort on the pool. */
+ for (pp = &s->pool_labels; (i = *pp) && i->data < data; pp = &i->next) {
+ continue;
+ }
+ n->next = *pp;
+ *pp = n;
+}
+
+/* To be provided by cpu/tcg-target.inc.c. */
+static void tcg_out_nop_fill(tcg_insn_unit *p, int count);
+
+static bool tcg_out_pool_finalize(TCGContext *s)
+{
+ TCGLabelPoolData *p = s->pool_labels;
+ tcg_target_ulong d, *a;
+
+ if (p == NULL) {
+ return true;
+ }
+
+ /* ??? Round up to qemu_icache_linesize, but then do not round
+ again when allocating the next TranslationBlock structure. */
+ a = (void *)ROUND_UP((uintptr_t)s->code_ptr, sizeof(tcg_target_ulong));
+ tcg_out_nop_fill(s->code_ptr, (tcg_insn_unit *)a - s->code_ptr);
+ s->data_gen_ptr = a;
+
+ /* Ensure the first comparison fails. */
+ d = p->data + 1;
+
+ for (; p != NULL; p = p->next) {
+ if (p->data != d) {
+ d = p->data;
+ if (unlikely((void *)a > s->code_gen_highwater)) {
+ return false;
+ }
+ *a++ = d;
+ }
+ patch_reloc(p->label, p->type, (intptr_t)(a - 1), p->addend);
+ }
+
+ s->code_ptr = (void *)a;
+ return true;
+}
@@ -399,6 +399,7 @@ TranslationBlock *tcg_tb_alloc(TCGContext *s)
return NULL;
}
s->code_gen_ptr = next;
+ s->data_gen_ptr = NULL;
return tb;
}
@@ -2619,6 +2620,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)
#ifdef TCG_TARGET_NEED_LDST_LABELS
s->ldst_labels = NULL;
#endif
+#ifdef TCG_TARGET_NEED_POOL_LABELS
+ s->pool_labels = NULL;
+#endif
num_insns = -1;
for (oi = s->gen_op_buf[0].next; oi != 0; oi = oi_next) {
@@ -2698,6 +2702,11 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)
return -1;
}
#endif
+#ifdef TCG_TARGET_NEED_POOL_LABELS
+ if (!tcg_out_pool_finalize(s)) {
+ return -1;
+ }
+#endif
/* flush instruction cache */
flush_icache_range((uintptr_t)s->code_buf, (uintptr_t)s->code_ptr);