diff --git a/hw/xbox/dsp/dsp_cpu.c b/hw/xbox/dsp/dsp_cpu.c index b34a7c44b2..e7b77e9939 100644 --- a/hw/xbox/dsp/dsp_cpu.c +++ b/hw/xbox/dsp/dsp_cpu.c @@ -364,7 +364,7 @@ void dsp56k_init_cpu(dsp_core_t* dsp) } - dsp->in_disasm_mode = false; + dsp->executing_for_disasm = false; // start_time = SDL_GetTicks(); dsp->num_inst = 0; } @@ -381,17 +381,12 @@ static OpcodeEntry lookup_opcode(uint32_t op) { return r; } -typedef enum { - DSP_TRACE_MODE, - DSP_DISASM_MODE -} dsp_trace_disasm_t; - static uint16_t disasm_instruction(dsp_core_t* dsp, dsp_trace_disasm_t mode) { uint32_t value; + dsp->disasm_mode = mode; if (mode == DSP_TRACE_MODE) { - dsp->isInDisasmMode = false; if (dsp->disasm_prev_inst_pc == dsp->pc) { if (!dsp->disasm_is_looping) { fprintf(stderr, "Looping on DSP instruction at PC = $%04x\n", dsp->disasm_prev_inst_pc); @@ -400,9 +395,6 @@ static uint16_t disasm_instruction(dsp_core_t* dsp, dsp_trace_disasm_t mode) return 0; } } - else { - dsp->isInDisasmMode = true; - } dsp->disasm_prev_inst_pc = dsp->pc; dsp->disasm_is_looping = false; @@ -559,7 +551,7 @@ uint16_t dsp56k_execute_one_disasm_instruction(dsp_core_t* dsp, FILE *out, uint3 dsp_core_t dsp_core_save; /* Set DSP in disasm mode */ - dsp->in_disasm_mode = true; + dsp->executing_for_disasm = true; /* Save DSP context before executing instruction */ memcpy(&dsp_core_save, dsp, sizeof(dsp_core_t)); @@ -579,7 +571,7 @@ uint16_t dsp56k_execute_one_disasm_instruction(dsp_core_t* dsp, FILE *out, uint3 memcpy(dsp, &dsp_core_save, sizeof(dsp_core_t)); /* Unset DSP in disasm mode */ - dsp->in_disasm_mode = false; + dsp->executing_for_disasm = false; return instruction_length; } @@ -600,7 +592,7 @@ void dsp56k_execute_instruction(dsp_core_t* dsp) /* Disasm current instruction ? (trace mode only) */ if (TRACE_DSP_DISASM) { /* Call disasm_instruction only when DSP is called in trace mode */ - if (dsp->in_disasm_mode == false) { + if (!dsp->executing_for_disasm) { disasm_return = disasm_instruction(dsp, DSP_TRACE_MODE); if (disasm_return != 0 && TRACE_DSP_DISASM_REG) { @@ -626,7 +618,7 @@ void dsp56k_execute_instruction(dsp_core_t* dsp) /* Disasm current instruction ? (trace mode only) */ if (TRACE_DSP_DISASM) { /* Display only when DSP is called in trace mode */ - if (!dsp->in_disasm_mode) { + if (!dsp->executing_for_disasm) { if (disasm_return != 0) { fprintf(stderr, "%s", disasm_get_instruction_text(dsp)); @@ -1036,7 +1028,7 @@ static void dsp_write_reg(dsp_core_t* dsp, uint32_t numreg, uint32_t value) /* Stack underflow or overflow detected, raise interrupt */ dsp56k_add_interrupt(dsp, DSP_INTER_STACK_ERROR); dsp->registers[DSP_REG_SP] = value & (3<in_disasm_mode) { + if (!dsp->executing_for_disasm) { fprintf(stderr, "Dsp: Stack Overflow or Underflow\n"); } if (dsp->exception_debugging) { @@ -1081,7 +1073,7 @@ static void dsp_stack_push(dsp_core_t* dsp, uint32_t curpc, uint32_t cursr, uint if ((stack_error==0) && (stack & (1<in_disasm_mode) + if (!dsp->executing_for_disasm) fprintf(stderr,"Dsp: Stack Overflow\n"); if (dsp->exception_debugging) assert(false); @@ -1118,7 +1110,7 @@ static void dsp_stack_pop(dsp_core_t* dsp, uint32_t *newpc, uint32_t *newsr) if ((stack_error==0) && (stack & (1<in_disasm_mode) + if (!dsp->executing_for_disasm) fprintf(stderr,"Dsp: Stack underflow\n"); if (dsp->exception_debugging) assert(false); diff --git a/hw/xbox/dsp/dsp_dis.inl b/hw/xbox/dsp/dsp_dis.inl index 7e37831095..73421e7724 100644 --- a/hw/xbox/dsp/dsp_dis.inl +++ b/hw/xbox/dsp/dsp_dis.inl @@ -210,12 +210,13 @@ static int dis_calc_ea(dsp_core_t* dsp, uint32_t ea_mode, char *dest) static void dis_undefined(dsp_core_t* dsp) { - /* In Disasm mode, display dc instruction_opcode */ - if (dsp->isInDisasmMode) + if (dsp->disasm_mode == DSP_DISASM_MODE) { + /* In Disasm mode, display dc instruction_opcode */ sprintf(dsp->disasm_str_instr, "dc $%06x", dsp->disasm_cur_inst); - /* In trace mode, display unknown instruction */ - else + } else { + /* In trace mode, display unknown instruction */ sprintf(dsp->disasm_str_instr, "$%06x unknown instruction", dsp->disasm_cur_inst); + } } static void dis_add_long(dsp_core_t* dsp) diff --git a/hw/xbox/dsp/dsp_emu.inl b/hw/xbox/dsp/dsp_emu.inl index 5f4504858c..814c8e9f8f 100644 --- a/hw/xbox/dsp/dsp_emu.inl +++ b/hw/xbox/dsp/dsp_emu.inl @@ -4,7 +4,7 @@ typedef void (*emu_func_t)(dsp_core_t* dsp); static void emu_undefined(dsp_core_t* dsp) { - if (!dsp->in_disasm_mode) { + if (!dsp->executing_for_disasm) { dsp->cur_inst_len = 0; fprintf(stderr, "Dsp: 0x%04x: 0x%06x Illegal instruction\n",dsp->pc, dsp->cur_inst); /* Add some artificial CPU cycles to avoid being stuck in an infinite loop */ diff --git a/hw/xbox/dsp/dsp_int.h b/hw/xbox/dsp/dsp_int.h index 61fc1af929..325abedbb9 100644 --- a/hw/xbox/dsp/dsp_int.h +++ b/hw/xbox/dsp/dsp_int.h @@ -134,6 +134,10 @@ #define DSP_INTER_SSI_TRX_DATA_E 0xa #define DSP_INTER_SSI_TRX_DATA 0xb +typedef enum { + DSP_TRACE_MODE, + DSP_DISASM_MODE +} dsp_trace_disasm_t; typedef struct dsp_interrupt_s { const uint16_t inter; @@ -193,7 +197,7 @@ struct dsp_core_s { /* DSP is in disasm mode ? */ /* If yes, stack overflow, underflow and illegal instructions messages are not displayed */ - bool in_disasm_mode; + bool executing_for_disasm; char str_disasm_memory[2][50]; /* Buffer for memory change text in disasm mode */ uint32_t disasm_memory_ptr; /* Pointer for memory change in disasm mode */ @@ -208,7 +212,7 @@ struct dsp_core_s { bool disasm_is_looping; /* Used to display dc instead of unknown instruction for illegal opcodes */ - bool isInDisasmMode; + dsp_trace_disasm_t disasm_mode; uint32_t disasm_cur_inst; uint16_t disasm_cur_inst_len;