From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1K3yAE-0003xy-70 for qemu-devel@nongnu.org; Wed, 04 Jun 2008 14:56:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1K3yAB-0003vu-Nv for qemu-devel@nongnu.org; Wed, 04 Jun 2008 14:56:49 -0400 Received: from [199.232.76.173] (port=54255 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1K3yAB-0003vZ-HE for qemu-devel@nongnu.org; Wed, 04 Jun 2008 14:56:47 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:49307) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1K3yAB-0007Tj-7f for qemu-devel@nongnu.org; Wed, 04 Jun 2008 14:56:47 -0400 Received: from smtp05.web.de (fmsmtp05.dlan.cinetic.de [172.20.4.166]) by fmmailgate03.web.de (Postfix) with ESMTP id 6B15ADE31DA9 for ; Wed, 4 Jun 2008 20:56:46 +0200 (CEST) Received: from [88.65.37.28] (helo=[139.25.109.167]) by smtp05.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.109 #226) id 1K3yA9-0004Q5-00 for qemu-devel@nongnu.org; Wed, 04 Jun 2008 20:56:45 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <4846E56C.3070200@web.de> Message-ID: <4846E37F.4070706@web.de> Date: Wed, 04 Jun 2008 20:48:31 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4846E354.805@web.de> In-Reply-To: <4846E354.805@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH 3/3] remove unused TB cflags Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org TranslationBlock.cflags is unused, now that no one is interested in CF_SINGLE_INSN anymore. Also the other CF_* flags have no users, so let's clean this up. Signed-off-by: Jan Kiszka --- exec-all.h | 4 ---- exec.c | 7 ++----- target-i386/translate.c | 6 ++---- 3 files changed, 4 insertions(+), 13 deletions(-) Index: b/exec-all.h =================================================================== --- a/exec-all.h +++ b/exec-all.h @@ -123,10 +123,6 @@ typedef struct TranslationBlock { uint64_t flags; /* flags defining in which context the code was generated */ uint16_t size; /* size of target code for this block (1 <= size <= TARGET_PAGE_SIZE) */ - uint16_t cflags; /* compile flags */ -#define CF_TB_FP_USED 0x0002 /* fp ops are used in the TB */ -#define CF_FP_USED 0x0004 /* fp ops are used in the TB or in a chained TB */ -#define CF_SINGLE_INSN 0x0008 /* compile only a single instruction */ uint8_t *tc_ptr; /* pointer to the translated code */ /* next matching tb for physical address. */ Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -781,8 +781,7 @@ void tb_invalidate_phys_page_range(targe current_tb = tb_find_pc(env->mem_write_pc); } } - if (current_tb == tb && - !(current_tb->cflags & CF_SINGLE_INSN)) { + if (current_tb == tb) { /* If we are modifying the current TB, we must stop its execution. We could be more precise by checking that the modification is after the current PC, but it @@ -899,8 +898,7 @@ static void tb_invalidate_phys_page(targ n = (long)tb & 3; tb = (TranslationBlock *)((long)tb & ~3); #ifdef TARGET_HAS_PRECISE_SMC - if (current_tb == tb && - !(current_tb->cflags & CF_SINGLE_INSN)) { + if (current_tb == tb) { /* If we are modifying the current TB, we must stop its execution. We could be more precise by checking that the modification is after the current PC, but it @@ -1002,7 +1000,6 @@ TranslationBlock *tb_alloc(target_ulong return NULL; tb = &tbs[nb_tbs++]; tb->pc = pc; - tb->cflags = 0; return tb; } Index: b/target-i386/translate.c =================================================================== --- a/target-i386/translate.c +++ b/target-i386/translate.c @@ -7101,7 +7101,7 @@ static inline int gen_intermediate_code_ DisasContext dc1, *dc = &dc1; target_ulong pc_ptr; uint16_t *gen_opc_end; - int j, lj, cflags; + int j, lj; uint64_t flags; target_ulong pc_start; target_ulong cs_base; @@ -7110,7 +7110,6 @@ static inline int gen_intermediate_code_ pc_start = tb->pc; cs_base = tb->cs_base; flags = tb->flags; - cflags = tb->cflags; dc->pe = (flags >> HF_PE_SHIFT) & 1; dc->code32 = (flags >> HF_CS32_SHIFT) & 1; @@ -7206,8 +7205,7 @@ static inline int gen_intermediate_code_ the flag and abort the translation to give the irqs a change to be happen */ if (dc->tf || dc->singlestep_enabled || - (flags & HF_INHIBIT_IRQ_MASK) || - (cflags & CF_SINGLE_INSN)) { + (flags & HF_INHIBIT_IRQ_MASK)) { gen_jmp_im(pc_ptr - dc->cs_base); gen_eob(dc); break;