Message ID | 1443788657-14537-2-git-send-email-james.hogan@imgtec.com |
---|---|
State | New |
Headers | show |
On 2015-10-02 13:24, James Hogan wrote: > We already have a TLADDR_ARGS definition, so rearrange the order > slightly and use it in the definition of debug_insn_start, instead of > having an #ifdef. > > Signed-off-by: James Hogan <james.hogan@imgtec.com> > Reviewed-by: Richard Henderson <rth@twiddle.net> > --- > tcg/tcg-opc.h | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) Reviewed-by: Aurelien Jarno <aurelien@aurel32.net> Note that it will conflict with the "tcg: Rename debug_insn_start to insn_start" patch that Richard has posted on the list, but it should be trivial to solve it.
diff --git a/tcg/tcg-opc.h b/tcg/tcg-opc.h index 02bbf3038709..f72ce9bf195a 100644 --- a/tcg/tcg-opc.h +++ b/tcg/tcg-opc.h @@ -174,17 +174,13 @@ DEF(muluh_i64, 1, 2, 0, IMPL(TCG_TARGET_HAS_muluh_i64)) DEF(mulsh_i64, 1, 2, 0, IMPL(TCG_TARGET_HAS_mulsh_i64)) /* QEMU specific */ -#if TARGET_LONG_BITS > TCG_TARGET_REG_BITS -DEF(debug_insn_start, 0, 0, 2, TCG_OPF_NOT_PRESENT) -#else -DEF(debug_insn_start, 0, 0, 1, TCG_OPF_NOT_PRESENT) -#endif -DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_END) -DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_END) - #define TLADDR_ARGS (TARGET_LONG_BITS <= TCG_TARGET_REG_BITS ? 1 : 2) #define DATA64_ARGS (TCG_TARGET_REG_BITS == 64 ? 1 : 2) +DEF(debug_insn_start, 0, 0, TLADDR_ARGS, TCG_OPF_NOT_PRESENT) +DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_END) +DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_END) + DEF(qemu_ld_i32, 1, TLADDR_ARGS, 1, TCG_OPF_CALL_CLOBBER | TCG_OPF_SIDE_EFFECTS) DEF(qemu_st_i32, 0, TLADDR_ARGS + 1, 1,