0076-tcg-remove-ifdef-endif-around-TCGOpcode-tests.patch

   1 From 3942910a66f682b98ac53ac2d2fba65b9c75eefd Mon Sep 17 00:00:00 2001
   2 From: Aurelien Jarno <aurelien@aurel32.net>
   3 Date: Fri, 21 Sep 2012 10:02:45 +0200
   4 Subject: [PATCH] tcg: remove #ifdef #endif around TCGOpcode tests
   5
   6 Commit 25c4d9cc changed all TCGOpcode enums to be available, so we don't
   7 need to #ifdef #endif the one that are available only on some targets.
   8 This makes the code easier to read.
   9
  10 Reviewed-by: Richard Henderson <rth@twiddle.net>
  11 Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
  12 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  13 ---
  14  tcg/tcg.c | 13 +------------
  15  1 file changed, 1 insertion(+), 12 deletions(-)
  16
  17 diff --git a/tcg/tcg.c b/tcg/tcg.c
  18 index 24ce830..93421cd 100644
  19 --- a/tcg/tcg.c
  20 +++ b/tcg/tcg.c
  21 @@ -937,11 +937,7 @@ void tcg_dump_ops(TCGContext *s)
  22                                                         args[nb_oargs + i]));
  23                  }
  24              }
  25 -        } else if (c == INDEX_op_movi_i32
  26 -#if TCG_TARGET_REG_BITS == 64
  27 -                   || c == INDEX_op_movi_i64
  28 -#endif
  29 -                   ) {
  30 +        } else if (c == INDEX_op_movi_i32 || c == INDEX_op_movi_i64) {
  31              tcg_target_ulong val;
  32              TCGHelperInfo *th;
  33
  34 @@ -993,14 +989,11 @@ void tcg_dump_ops(TCGContext *s)
  35              case INDEX_op_brcond_i32:
  36              case INDEX_op_setcond_i32:
  37              case INDEX_op_movcond_i32:
  38 -#if TCG_TARGET_REG_BITS == 32
  39              case INDEX_op_brcond2_i32:
  40              case INDEX_op_setcond2_i32:
  41 -#else
  42              case INDEX_op_brcond_i64:
  43              case INDEX_op_setcond_i64:
  44              case INDEX_op_movcond_i64:
  45 -#endif
  46                  if (args[k] < ARRAY_SIZE(cond_name) && cond_name[args[k]]) {
  47                      qemu_log(",%s", cond_name[args[k++]]);
  48                  } else {
  49 @@ -2095,16 +2088,12 @@ static inline int tcg_gen_code_common(TCGContext *s, uint8_t *gen_code_buf,
  50  #endif
  51          switch(opc) {
  52          case INDEX_op_mov_i32:
  53 -#if TCG_TARGET_REG_BITS == 64
  54          case INDEX_op_mov_i64:
  55 -#endif
  56              dead_args = s->op_dead_args[op_index];
  57              tcg_reg_alloc_mov(s, def, args, dead_args);
  58              break;
  59          case INDEX_op_movi_i32:
  60 -#if TCG_TARGET_REG_BITS == 64
  61          case INDEX_op_movi_i64:
  62 -#endif
  63              tcg_reg_alloc_movi(s, args);
  64              break;
  65          case INDEX_op_debug_insn_start:
  66 --
  67 1.7.12.1
  68