SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Introduce BP_CPU as a breakpoint type (Jan Kiszka)

Browse Source 
Add another breakpoint/watchpoint type to BP_GDB: BP_CPU. This type is
intended for hardware-assisted break/watchpoint emulations like the x86
architecture requires.

To keep the highest priority for BP_GDB breakpoints, this type is
always inserted at the head of break/watchpoint lists, thus is found
first when looking up the origin of a debug interruption.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5746 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2008-11-18 20:56:59 +00:00
parent dde2367e20
commit 2dc9f4117c
2 changed files with 39 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-all.h
View File

@ -768,6 +768,7 @@ void cpu_reset_interrupt(CPUState *env, int mask);
#define BP_STOP_BEFORE_ACCESS 0x04 #define BP_STOP_BEFORE_ACCESS 0x04
#define BP_WATCHPOINT_HIT 0x08 #define BP_WATCHPOINT_HIT 0x08
#define BP_GDB 0x10 #define BP_GDB 0x10
#define BP_CPU 0x20
int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags, int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags,
CPUBreakpoint **breakpoint); CPUBreakpoint **breakpoint);

42
exec.c
View File

@ -1302,7 +1302,7 @@ int cpu_watchpoint_insert(CPUState *env, target_ulong addr, target_ulong len,
int flags, CPUWatchpoint **watchpoint) int flags, CPUWatchpoint **watchpoint)
{ {
target_ulong len_mask = ~(len - 1); target_ulong len_mask = ~(len - 1);
CPUWatchpoint *wp; CPUWatchpoint *wp, *prev_wp;
/* sanity checks: allow power-of-2 lengths, deny unaligned watchpoints */ /* sanity checks: allow power-of-2 lengths, deny unaligned watchpoints */
if ((len != 1 && len != 2 && len != 4 && len != 8) || (addr & ~len_mask)) { if ((len != 1 && len != 2 && len != 4 && len != 8) || (addr & ~len_mask)) {
@ -1318,11 +1318,26 @@ int cpu_watchpoint_insert(CPUState *env, target_ulong addr, target_ulong len,
wp->len_mask = len_mask; wp->len_mask = len_mask;
wp->flags = flags; wp->flags = flags;
/* keep all GDB-injected watchpoints in front */
if (!(flags & BP_GDB) && env->watchpoints) {
prev_wp = env->watchpoints;
while (prev_wp->next != NULL && (prev_wp->next->flags & BP_GDB))
prev_wp = prev_wp->next;
} else {
prev_wp = NULL;
}
/* Insert new watchpoint */
if (prev_wp) {
wp->next = prev_wp->next;
prev_wp->next = wp;
} else {
wp->next = env->watchpoints; wp->next = env->watchpoints;
wp->prev = NULL; env->watchpoints = wp;
}
if (wp->next) if (wp->next)
wp->next->prev = wp; wp->next->prev = wp;
env->watchpoints = wp; wp->prev = prev_wp;
tlb_flush_page(env, addr); tlb_flush_page(env, addr);
@ -1378,7 +1393,7 @@ int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags,
CPUBreakpoint **breakpoint) CPUBreakpoint **breakpoint)
{ {
#if defined(TARGET_HAS_ICE) #if defined(TARGET_HAS_ICE)
CPUBreakpoint *bp; CPUBreakpoint *bp, *prev_bp;
bp = qemu_malloc(sizeof(*bp)); bp = qemu_malloc(sizeof(*bp));
if (!bp) if (!bp)
@ -1387,11 +1402,26 @@ int cpu_breakpoint_insert(CPUState *env, target_ulong pc, int flags,
bp->pc = pc; bp->pc = pc;
bp->flags = flags; bp->flags = flags;
/* keep all GDB-injected breakpoints in front */
if (!(flags & BP_GDB) && env->breakpoints) {
prev_bp = env->breakpoints;
while (prev_bp->next != NULL && (prev_bp->next->flags & BP_GDB))
prev_bp = prev_bp->next;
} else {
prev_bp = NULL;
}
/* Insert new breakpoint */
if (prev_bp) {
bp->next = prev_bp->next;
prev_bp->next = bp;
} else {
bp->next = env->breakpoints; bp->next = env->breakpoints;
bp->prev = NULL; env->breakpoints = bp;
}
if (bp->next) if (bp->next)
bp->next->prev = bp; bp->next->prev = bp;
env->breakpoints = bp; bp->prev = prev_bp;
breakpoint_invalidate(env, pc); breakpoint_invalidate(env, pc);