From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KAnAb-0005gK-UJ for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:37:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KAnAZ-0005fO-Oz for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:37:24 -0400 Received: from [199.232.76.173] (port=33405 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KAnAZ-0005fC-HN for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:37:23 -0400 Received: from lizzard.sbs.de ([194.138.37.39]:22800) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KAnAZ-0004sf-6S for qemu-devel@nongnu.org; Mon, 23 Jun 2008 10:37:23 -0400 Received: from mail1.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m5NEZn7a002431 for ; Mon, 23 Jun 2008 16:35:49 +0200 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id m5NEZncn017918 for ; Mon, 23 Jun 2008 16:35:49 +0200 Resent-To: qemu-devel@nongnu.org Resent-Message-Id: <485FB4C4.1070300@siemens.com> Message-ID: <485FB36B.4030806@siemens.com> Date: Mon, 23 Jun 2008 16:30:03 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <485FB18E.1090801@siemens.com> In-Reply-To: <485FB18E.1090801@siemens.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 10/15] Remove premature memop TB terminations 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 Now that we can properly restore the pc on watchpoint hits, there is no more need for prematurely terminating TBs if watchpoints are present. Remove all related bits. Signed-off-by: Jan Kiszka --- exec.c | 4 ---- target-arm/translate.c | 6 ------ target-m68k/translate.c | 6 ------ 3 files changed, 16 deletions(-) Index: b/exec.c =================================================================== --- a/exec.c +++ b/exec.c @@ -1167,10 +1167,6 @@ int cpu_watchpoint_insert(CPUState *env, env->watchpoints = wp; tlb_flush_page(env, addr); - /* FIXME: This flush is needed because of the hack to make memory ops - terminate the TB. It can be removed once the proper IO trap and - re-execute bits are in. */ - tb_flush(env); if (watchpoint) *watchpoint = wp; Index: b/target-arm/translate.c =================================================================== --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -8650,12 +8650,6 @@ static inline int gen_intermediate_code_ gen_set_label(dc->condlabel); dc->condjmp = 0; } - /* Terminate the TB on memory ops if watchpoints are present. */ - /* FIXME: This should be replacd by the deterministic execution - * IRQ raising bits. */ - if (dc->is_mem && env->watchpoints) - break; - /* Translation stops when a conditional branch is enoutered. * Otherwise the subsequent code could get translated several times. * Also stop translation when a page boundary is reached. This Index: b/target-m68k/translate.c =================================================================== --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -2965,12 +2965,6 @@ gen_intermediate_code_internal(CPUState last_cc_op = dc->cc_op; dc->insn_pc = dc->pc; disas_m68k_insn(env, dc); - - /* Terminate the TB on memory ops if watchpoints are present. */ - /* FIXME: This should be replacd by the deterministic execution - * IRQ raising bits. */ - if (dc->is_mem && env->watchpoints) - break; } while (!dc->is_jmp && gen_opc_ptr < gen_opc_end && !env->singlestep_enabled && (pc_offset) < (TARGET_PAGE_SIZE - 32));