[v7,1/9] tcg: pass down TranslationBlock to tcg_code_gen

Commit Message

Alex Bennée Feb. 22, 2016, 3:59 p.m. UTC

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: Alex Bennée <[e-mail]>

---
v1
 - checkpatch fixes
v5
 - much simplified due to changes since last posting
v6
 - remove needless tweaking of gen_code_buf in tb_gen_code
---
 tcg/tcg.c       | 6 +++---
 tcg/tcg.h       | 2 +-
 translate-all.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

Comments

Richard Henderson Feb. 26, 2016, 8:19 p.m. UTC | #1

On 02/22/2016 07:59 AM, Alex Bennée wrote:
> 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: Alex Bennée <[e-mail]>
> 
> ---
> v1
>  - checkpatch fixes
> v5
>  - much simplified due to changes since last posting
> v6
>  - remove needless tweaking of gen_code_buf in tb_gen_code
> ---
>  tcg/tcg.c       | 6 +++---
>  tcg/tcg.h       | 2 +-
>  translate-all.c | 2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Richard Henderson  <[e-mail]>


r~

Patch

diff --git a/tcg/tcg.c b/tcg/tcg.c
index 0317c9e..b76d978 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -2269,7 +2269,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;
 
@@ -2328,8 +2328,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);
 
diff --git a/tcg/tcg.h b/tcg/tcg.h
index 83da5fb..10af870 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -626,7 +626,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);
 
diff --git a/translate-all.c b/translate-all.c
index e9f409b..b3207fe 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -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;
     }