From patchwork Mon Dec 3 03:07:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 203282 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 505352C007B for ; Mon, 3 Dec 2012 14:10:09 +1100 (EST) Received: from localhost ([::1]:54807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfMQ1-0006oz-KT for incoming@patchwork.ozlabs.org; Sun, 02 Dec 2012 22:10:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:59601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfMPr-0006oZ-EY for qemu-devel@nongnu.org; Sun, 02 Dec 2012 22:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TfMPq-0005ZU-5z for qemu-devel@nongnu.org; Sun, 02 Dec 2012 22:09:55 -0500 Received: from [222.73.24.84] (port=62665 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TfMPp-0005ZJ-Dc for qemu-devel@nongnu.org; Sun, 02 Dec 2012 22:09:54 -0500 X-IronPort-AV: E=Sophos;i="4.83,359,1352044800"; d="scan'208";a="6318252" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 03 Dec 2012 11:08:00 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id qB33BQao013195; Mon, 3 Dec 2012 11:11:26 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.225.128]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2012120311091185-202874 ; Mon, 3 Dec 2012 11:09:11 +0800 From: liguang To: afaerber@suse.de, ehabkost@redhat.com, imammedo@redhat.com, blauwirbel@gmail.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org Date: Mon, 3 Dec 2012 11:07:27 +0800 Message-Id: <1354504047-11615-1-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/03 11:09:11, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2012/12/03 11:09:12, Serialize complete at 2012/12/03 11:09:12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: liguang Subject: [Qemu-devel] [PATCH] target-i386:slightly refactor dr7 related function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 1. define names of breakpoints in dr7 2. slightly refactor bits field of breakpoint related functions. Signed-off-by: liguang --- target-i386/cpu.h | 6 ++++ target-i386/helper.c | 59 ++++++++++++++++++++++++++++---------------- target-i386/machine.c | 2 +- target-i386/misc_helper.c | 4 +- target-i386/seg_helper.c | 4 +- 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 90ef1ff..2da6ea0 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -231,6 +231,12 @@ #define DR7_TYPE_SHIFT 16 #define DR7_LEN_SHIFT 18 #define DR7_FIXED_1 0x00000400 +#define DR7_L0_3 0x55 +#define DR7_MAX_BP 4 +#define DR7_BP_INST 0x0 +#define DR7_DATA_WR 0x1 +#define DR7_IO_RW 0x2 +#define DR7_DATA_RW 0x3 #define PG_PRESENT_BIT 0 #define PG_RW_BIT 1 diff --git a/target-i386/helper.c b/target-i386/helper.c index bf206cf..54d6712 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -966,27 +966,26 @@ hwaddr cpu_get_phys_page_debug(CPUX86State *env, target_ulong addr) void hw_breakpoint_insert(CPUX86State *env, int index) { - int type, err = 0; + int type = 0, err = 0; switch (hw_breakpoint_type(env->dr[7], index)) { - case 0: + case DR7_BP_INST: if (hw_breakpoint_enabled(env->dr[7], index)) err = cpu_breakpoint_insert(env, env->dr[index], BP_CPU, &env->cpu_breakpoint[index]); break; - case 1: + case DR7_DATA_WR: type = BP_CPU | BP_MEM_WRITE; - goto insert_wp; - case 2: - /* No support for I/O watchpoints yet */ - break; - case 3: - type = BP_CPU | BP_MEM_ACCESS; - insert_wp: + case DR7_DATA_RW: + if (!type) + type = BP_CPU | BP_MEM_ACCESS; err = cpu_watchpoint_insert(env, env->dr[index], hw_breakpoint_len(env->dr[7], index), type, &env->cpu_watchpoint[index]); break; + case DR7_IO_RW: + /* No support for I/O watchpoints yet */ + break; } if (err) env->cpu_breakpoint[index] = NULL; @@ -997,15 +996,15 @@ void hw_breakpoint_remove(CPUX86State *env, int index) if (!env->cpu_breakpoint[index]) return; switch (hw_breakpoint_type(env->dr[7], index)) { - case 0: + case DR7_BP_INST: if (hw_breakpoint_enabled(env->dr[7], index)) cpu_breakpoint_remove_by_ref(env, env->cpu_breakpoint[index]); break; - case 1: - case 3: + case DR7_DATA_WR: + case DR7_DATA_RW: cpu_watchpoint_remove_by_ref(env, env->cpu_watchpoint[index]); break; - case 2: + case DR7_IO_RW: /* No support for I/O watchpoints yet */ break; } @@ -1014,22 +1013,38 @@ void hw_breakpoint_remove(CPUX86State *env, int index) int check_hw_breakpoints(CPUX86State *env, int force_dr6_update) { target_ulong dr6; - int reg, type; + int index, type = 0; int hit_enabled = 0; dr6 = env->dr[6] & ~0xf; - for (reg = 0; reg < 4; reg++) { - type = hw_breakpoint_type(env->dr[7], reg); - if ((type == 0 && env->dr[reg] == env->eip) || - ((type & 1) && env->cpu_watchpoint[reg] && - (env->cpu_watchpoint[reg]->flags & BP_WATCHPOINT_HIT))) { - dr6 |= 1 << reg; - if (hw_breakpoint_enabled(env->dr[7], reg)) + for (index = 0; index < DR7_MAX_BP; index++) { + switch (hw_breakpoint_type(env->dr[7], index)) { + case DR7_BP_INST: + if (env->dr[index] != env->eip) + break; + type = 1; + break; + case DR7_DATA_WR: + case DR7_DATA_RW: + if (!env->cpu_watchpoint[index]) + break; + if (!(env->cpu_watchpoint[index]->flags & BP_WATCHPOINT_HIT)) + break; + type = 1; + break; + case DR7_IO_RW: + break; + } + if (type) { + dr6 |= 1 << index; + if (hw_breakpoint_enabled(env->dr[7], index)) hit_enabled = 1; + type = 0; } } if (hit_enabled || force_dr6_update) env->dr[6] = dr6; + return hit_enabled; } diff --git a/target-i386/machine.c b/target-i386/machine.c index 4771508..a4b1a1e 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -265,7 +265,7 @@ static int cpu_post_load(void *opaque, int version_id) cpu_breakpoint_remove_all(env, BP_CPU); cpu_watchpoint_remove_all(env, BP_CPU); - for (i = 0; i < 4; i++) + for (i = 0; i < DR7_MAX_BP; i++) hw_breakpoint_insert(env, i); tlb_flush(env, 1); diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c index a020379..5ee0863 100644 --- a/target-i386/misc_helper.c +++ b/target-i386/misc_helper.c @@ -197,11 +197,11 @@ void helper_movl_drN_T0(CPUX86State *env, int reg, target_ulong t0) env->dr[reg] = t0; hw_breakpoint_insert(env, reg); } else if (reg == 7) { - for (i = 0; i < 4; i++) { + for (i = 0; i < DR7_MAX_BP; i++) { hw_breakpoint_remove(env, i); } env->dr[7] = t0; - for (i = 0; i < 4; i++) { + for (i = 0; i < DR7_MAX_BP; i++) { hw_breakpoint_insert(env, i); } } else { diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c index ff93374..317187b 100644 --- a/target-i386/seg_helper.c +++ b/target-i386/seg_helper.c @@ -465,8 +465,8 @@ static void switch_tss(CPUX86State *env, int tss_selector, #ifndef CONFIG_USER_ONLY /* reset local breakpoints */ - if (env->dr[7] & 0x55) { - for (i = 0; i < 4; i++) { + if (env->dr[7] & DR7_L0_3) { + for (i = 0; i < DR7_MAX_BP; i++) { if (hw_breakpoint_enabled(env->dr[7], i) == 0x1) { hw_breakpoint_remove(env, i); }