|
@@ -38,6 +38,7 @@
|
|
#include "exec/translate-all.h"
|
|
#include "exec/translate-all.h"
|
|
#include "exec/log.h"
|
|
#include "exec/log.h"
|
|
#include "hw/core/accel-cpu.h"
|
|
#include "hw/core/accel-cpu.h"
|
|
|
|
+#include "trace/trace-root.h"
|
|
|
|
|
|
uintptr_t qemu_host_page_size;
|
|
uintptr_t qemu_host_page_size;
|
|
intptr_t qemu_host_page_mask;
|
|
intptr_t qemu_host_page_mask;
|
|
@@ -285,6 +286,8 @@ int cpu_breakpoint_insert(CPUState *cpu, vaddr pc, int flags,
|
|
if (breakpoint) {
|
|
if (breakpoint) {
|
|
*breakpoint = bp;
|
|
*breakpoint = bp;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ trace_breakpoint_insert(cpu->cpu_index, pc, flags);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -303,13 +306,14 @@ int cpu_breakpoint_remove(CPUState *cpu, vaddr pc, int flags)
|
|
}
|
|
}
|
|
|
|
|
|
/* Remove a specific breakpoint by reference. */
|
|
/* Remove a specific breakpoint by reference. */
|
|
-void cpu_breakpoint_remove_by_ref(CPUState *cpu, CPUBreakpoint *breakpoint)
|
|
|
|
|
|
+void cpu_breakpoint_remove_by_ref(CPUState *cpu, CPUBreakpoint *bp)
|
|
{
|
|
{
|
|
- QTAILQ_REMOVE(&cpu->breakpoints, breakpoint, entry);
|
|
|
|
|
|
+ QTAILQ_REMOVE(&cpu->breakpoints, bp, entry);
|
|
|
|
|
|
- breakpoint_invalidate(cpu, breakpoint->pc);
|
|
|
|
|
|
+ breakpoint_invalidate(cpu, bp->pc);
|
|
|
|
|
|
- g_free(breakpoint);
|
|
|
|
|
|
+ trace_breakpoint_remove(cpu->cpu_index, bp->pc, bp->flags);
|
|
|
|
+ g_free(bp);
|
|
}
|
|
}
|
|
|
|
|
|
/* Remove all matching breakpoints. */
|
|
/* Remove all matching breakpoints. */
|
|
@@ -337,6 +341,7 @@ void cpu_single_step(CPUState *cpu, int enabled)
|
|
/* XXX: only flush what is necessary */
|
|
/* XXX: only flush what is necessary */
|
|
tb_flush(cpu);
|
|
tb_flush(cpu);
|
|
}
|
|
}
|
|
|
|
+ trace_breakpoint_singlestep(cpu->cpu_index, enabled);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|