Commit 4124ea4f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20171229' into staging 



Queued TCG patches

# gpg: Signature made Fri 29 Dec 2017 20:44:06 GMT
# gpg:                using RSA key 0x64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-tcg-20171229:
  tcg: add cs_base and flags to -d exec output
  tcg: Allow 6 arguments to TCG helpers
  tcg: Add tcg_signed_cond
  tcg: Generalize TCGOp parameters
  tcg: Dynamically allocate TCGOps
  tcg: Remove TCGV_UNUSED* and TCGV_IS_UNUSED*
  target/moxie: Fix tlb_fill
  target/*helper: don't check retaddr before calling cpu_restore_state

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 799044b6 4fad446b

accel/tcg/cpu-exec.c

+4 −2
Original line number Diff line number Diff line
@@ -146,8 +146,10 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) 
    uint8_t *tb_ptr = itb->tc.ptr;



    qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,

                           "Trace %p [%d: " TARGET_FMT_lx "] %s\n",

                           itb->tc.ptr, cpu->cpu_index, itb->pc,

                           "Trace %d: %p ["

                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n",

                           cpu->cpu_index, itb->tc.ptr,

                           itb->cs_base, itb->pc, itb->flags,

                           lookup_symbol(itb->pc));



#if defined(DEBUG_DISAS)

accel/tcg/tcg-runtime.c

+3 −2
Original line number Diff line number Diff line
@@ -156,8 +156,9 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env) 
        return tcg_ctx->code_gen_epilogue;

    }

    qemu_log_mask_and_addr(CPU_LOG_EXEC, pc,

                           "Chain %p [%d: " TARGET_FMT_lx "] %s\n",

                           tb->tc.ptr, cpu->cpu_index, pc,

                           "Chain %d: %p ["

                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#x] %s\n",

                           cpu->cpu_index, tb->tc.ptr, cs_base, pc, flags,

                           lookup_symbol(pc));

    return tb->tc.ptr;

}

include/exec/gen-icount.h

+3 −6
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


/* Helpers for instruction counting code generation.  */



static int icount_start_insn_idx;

static TCGOp *icount_start_insn;



static inline void gen_tb_start(TranslationBlock *tb)

{
@@ -26,8 +26,8 @@ static inline void gen_tb_start(TranslationBlock *tb) 
        /* We emit a movi with a dummy immediate argument. Keep the insn index

         * of the movi so that we later (when we know the actual insn count)

         * can update the immediate argument with the actual insn count.  */

        icount_start_insn_idx = tcg_op_buf_count();

        tcg_gen_movi_i32(imm, 0xdeadbeef);

        icount_start_insn = tcg_last_op();



        tcg_gen_sub_i32(count, count, imm);

        tcg_temp_free_i32(imm);
@@ -48,14 +48,11 @@ static inline void gen_tb_end(TranslationBlock *tb, int num_insns) 
    if (tb_cflags(tb) & CF_USE_ICOUNT) {

        /* Update the num_insn immediate parameter now that we know

         * the actual insn count.  */

        tcg_set_insn_param(icount_start_insn_idx, 1, num_insns);

        tcg_set_insn_param(icount_start_insn, 1, num_insns);

    }



    gen_set_label(tcg_ctx->exitreq_label);

    tcg_gen_exit_tb((uintptr_t)tb + TB_EXIT_REQUESTED);



    /* Terminate the linked list.  */

    tcg_ctx->gen_op_buf[tcg_ctx->gen_op_buf[0].prev].next = 0;

}



static inline void gen_io_start(void)

include/exec/helper-gen.h

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ 
  tcg_gen_callN(HELPER(name), dh_retvar(ret), 5, args);                 \

}



#define DEF_HELPER_FLAGS_6(name, flags, ret, t1, t2, t3, t4, t5, t6)    \

static inline void glue(gen_helper_, name)(dh_retvar_decl(ret)          \

    dh_arg_decl(t1, 1),  dh_arg_decl(t2, 2), dh_arg_decl(t3, 3),        \

    dh_arg_decl(t4, 4), dh_arg_decl(t5, 5), dh_arg_decl(t6, 6))         \

{                                                                       \

  TCGTemp *args[6] = { dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3),     \

                     dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6) };     \

  tcg_gen_callN(HELPER(name), dh_retvar(ret), 6, args);                 \

}



#include "helper.h"

#include "trace/generated-helpers.h"

#include "trace/generated-helpers-wrappers.h"
@@ -67,6 +77,7 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \ 
#undef DEF_HELPER_FLAGS_3

#undef DEF_HELPER_FLAGS_4

#undef DEF_HELPER_FLAGS_5

#undef DEF_HELPER_FLAGS_6

#undef GEN_HELPER



#endif /* HELPER_GEN_H */

include/exec/helper-head.h

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 
    DEF_HELPER_FLAGS_4(name, 0, ret, t1, t2, t3, t4)

#define DEF_HELPER_5(name, ret, t1, t2, t3, t4, t5) \

    DEF_HELPER_FLAGS_5(name, 0, ret, t1, t2, t3, t4, t5)

#define DEF_HELPER_6(name, ret, t1, t2, t3, t4, t5, t6) \

    DEF_HELPER_FLAGS_6(name, 0, ret, t1, t2, t3, t4, t5, t6)



/* MAX_OPC_PARAM_IARGS must be set to n if last entry is DEF_HELPER_FLAGS_n. */