tcg: check for CONFIG_DEBUG_TCG instead of NDEBUG

Check for CONFIG_DEBUG_TCG instead of NDEBUG, drop now useless code.

Backports commit 8d8fdbae010aa75a23f0307172e81034125aba6e from qemu
This commit is contained in:
Aurelien Jarno 2018-02-23 13:55:11 -05:00 committed by Lioncash
parent 355ed7cd08
commit 6060ab6596
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
8 changed files with 10 additions and 15 deletions

View file

@ -18,14 +18,14 @@
makes things much cleaner. */
QEMU_BUILD_BUG_ON(TCG_TYPE_I32 != 0 || TCG_TYPE_I64 != 1);
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"%x0", "%x1", "%x2", "%x3", "%x4", "%x5", "%x6", "%x7",
"%x8", "%x9", "%x10", "%x11", "%x12", "%x13", "%x14", "%x15",
"%x16", "%x17", "%x18", "%x19", "%x20", "%x21", "%x22", "%x23",
"%x24", "%x25", "%x26", "%x27", "%x28", "%fp", "%x30", "%sp",
};
#endif /* NDEBUG */
#endif /* CONFIG_DEBUG_TCG */
static const int tcg_target_reg_alloc_order[] = {
TCG_REG_X20, TCG_REG_X21, TCG_REG_X22, TCG_REG_X23,

View file

@ -67,7 +67,7 @@ bool use_idiv_instructions_rt;
# define USING_SOFTMMU 0
#endif
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"%r0",
"%r1",

View file

@ -24,7 +24,7 @@
#include "tcg-be-ldst.h"
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
#if TCG_TARGET_REG_BITS == 64
"%rax", "%rcx", "%rdx", "%rbx", "%rsp", "%rbp", "%rsi", "%rdi",

View file

@ -35,7 +35,7 @@
#define LO_OFF (MIPS_BE * 4)
#define HI_OFF (4 - LO_OFF)
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"zero",
"at",

View file

@ -95,7 +95,7 @@ static bool have_isa_2_06;
#define TCG_GUEST_BASE_REG 0
#endif
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"r0",
"r1",

View file

@ -226,7 +226,7 @@ typedef enum S390Opcode {
RX_STH = 0x40,
} S390Opcode;
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"%r0", "%r1", "%r2", "%r3", "%r4", "%r5", "%r6", "%r7",
"%r8", "%r9", "%r10" "%r11" "%r12" "%r13" "%r14" "%r15"

View file

@ -24,7 +24,7 @@
#include "tcg-be-null.h"
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = {
"%g0",
"%g1",

View file

@ -31,11 +31,6 @@
/* Define to jump the ELF file used to communicate with GDB. */
#undef DEBUG_JIT
#if !defined(CONFIG_DEBUG_TCG) && !defined(NDEBUG)
/* define it to suppress various consistency checks (faster) */
#define NDEBUG
#endif
#include "qemu/cutils.h"
#include "qemu/host-utils.h"
#include "qemu/timer.h"
@ -1652,7 +1647,7 @@ static void tcg_liveness_analysis(TCGContext *s)
}
#endif
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
static void dump_regs(TCGContext *s)
{
TCGTemp *ts;
@ -2504,7 +2499,7 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)
tcg_reg_alloc_op(s, def, opc, args, dead_args, sync_args);
break;
}
#ifndef NDEBUG
#ifdef CONFIG_DEBUG_TCG
check_regs(s);
#endif
/* Test for (pending) buffer overflow. The assumption is that any