OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

PPC Breakpoints for gdb-stub (Jason Wessel)

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1933 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2006-05-22 21:50:20 +00:00
parent cae41b10a4
commit ea4e754f5a
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target-ppc/op.c
View File

@ -204,6 +204,11 @@ PPC_OP(update_nip)
env->nip = PARAM(1); env->nip = PARAM(1);
} }
PPC_OP(debug)
{
do_raise_exception(EXCP_DEBUG);
}
/* Segment registers load and store with immediate index */ /* Segment registers load and store with immediate index */
PPC_OP(load_srin) PPC_OP(load_srin)
{ {

23
target-ppc/translate.c
View File

@ -148,6 +148,7 @@ typedef struct DisasContext {
#endif #endif
int fpu_enabled; int fpu_enabled;
ppc_spr_t *spr_cb; /* Needed to check rights for mfspr/mtspr */ ppc_spr_t *spr_cb; /* Needed to check rights for mfspr/mtspr */
int singlestep_enabled;
} DisasContext; } DisasContext;
struct opc_handler_t { struct opc_handler_t {
@ -1738,10 +1739,14 @@ static inline void gen_goto_tb(DisasContext *ctx, int n, target_ulong dest)
gen_op_set_T1(dest); gen_op_set_T1(dest);
gen_op_b_T1(); gen_op_b_T1();
gen_op_set_T0((long)tb + n); gen_op_set_T0((long)tb + n);
if (ctx->singlestep_enabled)
gen_op_debug();
gen_op_exit_tb(); gen_op_exit_tb();
} else { } else {
gen_op_set_T1(dest); gen_op_set_T1(dest);
gen_op_b_T1(); gen_op_b_T1();
if (ctx->singlestep_enabled)
gen_op_debug();
gen_op_set_T0(0); gen_op_set_T0(0);
gen_op_exit_tb(); gen_op_exit_tb();
} }
@ -2520,12 +2525,22 @@ int gen_intermediate_code_internal (CPUState *env, TranslationBlock *tb,
ctx.mem_idx = ((1 - msr_pr) << 1) | msr_le; ctx.mem_idx = ((1 - msr_pr) << 1) | msr_le;
#endif #endif
ctx.fpu_enabled = msr_fp; ctx.fpu_enabled = msr_fp;
ctx.singlestep_enabled = env->singlestep_enabled;
#if defined (DO_SINGLE_STEP) && 0 #if defined (DO_SINGLE_STEP) && 0
/* Single step trace mode */ /* Single step trace mode */
msr_se = 1; msr_se = 1;
#endif #endif
/* Set env in case of segfault during code fetch */ /* Set env in case of segfault during code fetch */
while (ctx.exception == EXCP_NONE && gen_opc_ptr < gen_opc_end) { while (ctx.exception == EXCP_NONE && gen_opc_ptr < gen_opc_end) {
if (env->nb_breakpoints > 0) {
for(j = 0; j < env->nb_breakpoints; j++) {
if (env->breakpoints[j] == ctx.nip) {
gen_op_update_nip(ctx.nip);
gen_op_debug();
break;
}
}
}
if (search_pc) { if (search_pc) {
j = gen_opc_ptr - gen_opc_buf; j = gen_opc_ptr - gen_opc_buf;
if (lj < j) { if (lj < j) {
@ -2616,8 +2631,12 @@ int gen_intermediate_code_internal (CPUState *env, TranslationBlock *tb,
ctx.exception != EXCP_TRAP)) { ctx.exception != EXCP_TRAP)) {
RET_EXCP(ctxp, EXCP_TRACE, 0); RET_EXCP(ctxp, EXCP_TRACE, 0);
} }
/* if we reach a page boundary, stop generation */
if ((ctx.nip & (TARGET_PAGE_SIZE - 1)) == 0) { /* if we reach a page boundary or are single stepping, stop
* generation
*/
if (((ctx.nip & (TARGET_PAGE_SIZE - 1)) == 0) ||
(env->singlestep_enabled)) {
break; break;
} }
#if defined (DO_SINGLE_STEP) #if defined (DO_SINGLE_STEP)