Commit 1768987b authored by Richard Henderson's avatar Richard Henderson
Browse files

tcg: Restart TB generation after constant pool overflow 



This is part b of relocation overflow handling.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 7ecd02a0

tcg/tcg-pool.inc.c

+7 −5
Original line number Diff line number Diff line
@@ -121,14 +121,14 @@ static inline void new_pool_l8(TCGContext *s, int rtype, tcg_insn_unit *label, 
/* 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)

static int tcg_out_pool_finalize(TCGContext *s)

{

    TCGLabelPoolData *p = s->pool_labels;

    TCGLabelPoolData *l = NULL;

    void *a;



    if (p == NULL) {

        return true;

        return 0;

    }



    /* ??? Round up to qemu_icache_linesize, but then do not round
@@ -142,15 +142,17 @@ static bool tcg_out_pool_finalize(TCGContext *s) 
        size_t size = sizeof(tcg_target_ulong) * p->nlong;

        if (!l || l->nlong != p->nlong || memcmp(l->data, p->data, size)) {

            if (unlikely(a > s->code_gen_highwater)) {

                return false;

                return -1;

            }

            memcpy(a, p->data, size);

            a += size;

            l = p;

        }

        patch_reloc(p->label, p->rtype, (intptr_t)a - size, p->addend);

        if (!patch_reloc(p->label, p->rtype, (intptr_t)a - size, p->addend)) {

            return -2;

        }

    }



    s->code_ptr = a;

    return true;

    return 0;

}

tcg/tcg.c

+5 −4
Original line number Diff line number Diff line
@@ -1019,8 +1019,8 @@ void tcg_prologue_init(TCGContext *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);

        int result = tcg_out_pool_finalize(s);

        tcg_debug_assert(result == 0);

    }

#endif
@@ -4005,8 +4005,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) 
    }

#endif

#ifdef TCG_TARGET_NEED_POOL_LABELS

    if (!tcg_out_pool_finalize(s)) {

        return -1;

    i = tcg_out_pool_finalize(s);

    if (i < 0) {

        return i;

    }

#endif

    if (!tcg_resolve_relocs(s)) {