[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/20] target-i386: Introduce hw_{local, global}_bre
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 18/20] target-i386: Introduce hw_{local, global}_breakpoint_enabled() |
Date: |
Tue, 15 Jan 2013 10:27:36 +0100 |
From: liguang <address@hidden>
hw_breakpoint_enabled() returned a bit field indicating whether a local
breakpoint and/or global breakpoint was enabled. Avoid this number magic
by using explicit boolean helper functions hw_local_breakpoint_enabled()
and hw_global_breakpoint_enabled(), to aid readability.
Reuse them for the hw_breakpoint_enabled() implementation and change
its return type to bool.
While at it, fix Coding Style issues (missing braces).
Signed-off-by: liguang <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/cpu.h | 15 +++++++++++++--
target-i386/helper.c | 9 ++++++---
target-i386/seg_helper.c | 3 ++-
3 Dateien geändert, 21 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 6682022..1e850a7 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1014,9 +1014,20 @@ int cpu_x86_handle_mmu_fault(CPUX86State *env,
target_ulong addr,
#define cpu_handle_mmu_fault cpu_x86_handle_mmu_fault
void cpu_x86_set_a20(CPUX86State *env, int a20_state);
-static inline int hw_breakpoint_enabled(unsigned long dr7, int index)
+static inline bool hw_local_breakpoint_enabled(unsigned long dr7, int index)
{
- return (dr7 >> (index * 2)) & 3;
+ return (dr7 >> (index * 2)) & 1;
+}
+
+static inline bool hw_global_breakpoint_enabled(unsigned long dr7, int index)
+{
+ return (dr7 >> (index * 2)) & 2;
+
+}
+static inline bool hw_breakpoint_enabled(unsigned long dr7, int index)
+{
+ return hw_global_breakpoint_enabled(dr7, index) ||
+ hw_local_breakpoint_enabled(dr7, index);
}
static inline int hw_breakpoint_type(unsigned long dr7, int index)
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 1fceb91..ebdd6a5 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -970,9 +970,10 @@ void hw_breakpoint_insert(CPUX86State *env, int index)
switch (hw_breakpoint_type(env->dr[7], index)) {
case DR7_TYPE_BP_INST:
- if (hw_breakpoint_enabled(env->dr[7], index))
+ if (hw_breakpoint_enabled(env->dr[7], index)) {
err = cpu_breakpoint_insert(env, env->dr[index], BP_CPU,
&env->cpu_breakpoint[index]);
+ }
break;
case DR7_TYPE_DATA_WR:
type = BP_CPU | BP_MEM_WRITE;
@@ -998,8 +999,9 @@ void hw_breakpoint_remove(CPUX86State *env, int index)
return;
switch (hw_breakpoint_type(env->dr[7], index)) {
case DR7_TYPE_BP_INST:
- if (hw_breakpoint_enabled(env->dr[7], index))
+ if (hw_breakpoint_enabled(env->dr[7], index)) {
cpu_breakpoint_remove_by_ref(env, env->cpu_breakpoint[index]);
+ }
break;
case DR7_TYPE_DATA_WR:
case DR7_TYPE_DATA_RW:
@@ -1024,8 +1026,9 @@ int check_hw_breakpoints(CPUX86State *env, int
force_dr6_update)
((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))
+ if (hw_breakpoint_enabled(env->dr[7], reg)) {
hit_enabled = 1;
+ }
}
}
if (hit_enabled || force_dr6_update)
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index c40bd96..3247dee 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -467,7 +467,8 @@ static void switch_tss(CPUX86State *env, int tss_selector,
/* reset local breakpoints */
if (env->dr[7] & DR7_LOCAL_BP_MASK) {
for (i = 0; i < DR7_MAX_BP; i++) {
- if (hw_breakpoint_enabled(env->dr[7], i) == 0x1) {
+ if (hw_local_breakpoint_enabled(env->dr[7], i) &&
+ !hw_global_breakpoint_enabled(env->dr[7], i)) {
hw_breakpoint_remove(env, i);
}
}
--
1.7.10.4
- Re: [Qemu-devel] [PATCH 06/20] xen: Simplify halting of first CPU, (continued)
- [Qemu-devel] [PATCH 07/20] exec: Return CPUState from qemu_get_cpu(), Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 08/20] kvm: Add fake KVM constants to avoid #ifdefs on KVM-specific code, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 11/20] target-i386: kvm_check_features_against_host(): Use feature_word_info, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 13/20] target-i386: check/enforce: Check all feature words, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 09/20] target-i386: Disable kvm_mmu by default, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 04/20] cpu: Move cpu_index field to CPUState, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 10/20] target-i386/cpu: Introduce FeatureWord typedefs, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 12/20] target-i386/cpu.c: Add feature name array for ext4_features, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 14/20] target-i386: Move setting defaults out of cpu_x86_parse_featurestr(), Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 18/20] target-i386: Introduce hw_{local, global}_breakpoint_enabled(),
Andreas Färber <=
- [Qemu-devel] [PATCH 17/20] target-i386: Define DR7 bit field constants, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 16/20] target-i386: Move kvm_check_features_against_host() check to realize time, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 15/20] target-i386: cpu_x86_register() consolidate freeing resources, Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 20/20] target-i386: Use switch in check_hw_breakpoints(), Andreas Färber, 2013/01/15
- [Qemu-devel] [PATCH 19/20] target-i386: Avoid goto in hw_breakpoint_insert(), Andreas Färber, 2013/01/15
- Re: [Qemu-devel] [PULL] QOM CPUState patch queue 2013-01-15, Anthony Liguori, 2013/01/15