Commit 5bd2ec3d authored by Alex Bennée's avatar Alex Bennée Committed by Paolo Bonzini
Browse files

tcg: pass down TranslationBlock to tcg_code_gen 



My later debugging patches need access to the origin PC which is held in
the TranslationBlock structure. Pass down the whole structure as it also
holds the information about the code start point.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Message-Id: <1458052224-9316-3-git-send-email-alex.bennee@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f348b6d1

tcg/tcg.c

+3 −3
Original line number Diff line number Diff line
@@ -2328,7 +2328,7 @@ void tcg_dump_op_count(FILE *f, fprintf_function cpu_fprintf) 
#endif





int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf)

int tcg_gen_code(TCGContext *s, TranslationBlock *tb)

{

    int i, oi, oi_next, num_insns;
@@ -2387,8 +2387,8 @@ int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf) 


    tcg_reg_alloc_start(s);



    s->code_buf = gen_code_buf;

    s->code_ptr = gen_code_buf;

    s->code_buf = tb->tc_ptr;

    s->code_ptr = tb->tc_ptr;



    tcg_out_tb_init(s);

tcg/tcg.h

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ void tcg_context_init(TCGContext *s); 
void tcg_prologue_init(TCGContext *s);

void tcg_func_start(TCGContext *s);



int tcg_gen_code(TCGContext *s, tcg_insn_unit *gen_code_buf);

int tcg_gen_code(TCGContext *s, TranslationBlock *tb);



void tcg_set_frame(TCGContext *s, TCGReg reg, intptr_t start, intptr_t size);

translate-all.c

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, 
       the tcg optimization currently hidden inside tcg_gen_code.  All

       that should be required is to flush the TBs, allocate a new TB,

       re-initialize it per above, and re-do the actual code generation.  */

    gen_code_size = tcg_gen_code(&tcg_ctx, gen_code_buf);

    gen_code_size = tcg_gen_code(&tcg_ctx, tb);

    if (unlikely(gen_code_size < 0)) {

        goto buffer_overflow;

    }