factor

hw/xbox/dsp/Makefile.objs

@@ -1 +1 @@
-obj-y += dsp.o dsp_cpu.o dsp_disasm.o
+obj-y += dsp.o dsp_cpu.o

hw/xbox/dsp/dsp.c

@@ -27,7 +27,6 @@
 #include <assert.h>
 
 #include "dsp_cpu.h"
-#include "dsp_disasm.h"
 #include "dsp_int.h"
 
 #include "dsp.h"
@@ -52,7 +51,7 @@ void dsp_init(void)
 
     memset(&dsp_core, 0, sizeof(dsp_core_t));
 
-    dsp56k_init_cpu();
+    dsp56k_init_cpu(&dsp_core);
     save_cycles = 0;
 }
 
@@ -99,7 +98,7 @@ void dsp_run(int cycles)
     //  fprintf(stderr, "--> %d\n", save_cycles);
     while (save_cycles > 0)
     {
-        dsp56k_execute_instruction();
+        dsp56k_execute_instruction(&dsp_core);
         save_cycles -= dsp_core.instr_cycle;
     }
 
@@ -157,7 +156,7 @@ uint32_t dsp_disasm_address(FILE *out, uint32_t lowerAdr, uint32_t UpperAdr)
     uint32_t dsp_pc;
 
     for (dsp_pc=lowerAdr; dsp_pc<=UpperAdr; dsp_pc++) {
-        dsp_pc += dsp56k_execute_one_disasm_instruction(out, dsp_pc);
+        dsp_pc += dsp56k_execute_one_disasm_instruction(&dsp_core, out, dsp_pc);
     }
     return dsp_pc;
 }
@@ -197,7 +196,7 @@ uint32_t dsp_read_memory(uint32_t address, char space_id, const char **mem_str)
         assert(false);
     }
 
-    return dsp56k_read_memory(space, address);
+    return dsp56k_read_memory(&dsp_core, space, address);
 }
 
 
@@ -504,5 +503,5 @@ void dsp_core_reset(void)
     dsp_core.loop_rep = 0;
 
     DPRINTF("Dsp: reset done\n");
-    dsp56k_init_cpu();
+    dsp56k_init_cpu(&dsp_core);
 }

hw/xbox/dsp/dsp.h

@@ -27,6 +27,9 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+typedef struct dsp_core_s dsp_core_t;
 
 /* Dsp commands */
 bool dsp_process_irq(void);

hw/xbox/dsp/dsp_cpu.h

@@ -25,15 +25,17 @@
 #include <stdio.h>
 #include <stdint.h>
 
-/* Functions */
-void dsp56k_init_cpu(void);		/* Set dsp_core to use */
-void dsp56k_execute_instruction(void);	/* Execute 1 instruction */
-uint16_t dsp56k_execute_one_disasm_instruction(FILE *out, uint32_t pc);	/* Execute 1 instruction in disasm mode */
+#include "dsp.h"
 
-uint32_t dsp56k_read_memory(int space, uint32_t address);
-void dsp56k_write_memory(int space, uint32_t address, uint32_t value);
+/* Functions */
+void dsp56k_init_cpu(dsp_core_t* dsp);		/* Set dsp_core to use */
+void dsp56k_execute_instruction(dsp_core_t* dsp);	/* Execute 1 instruction */
+uint16_t dsp56k_execute_one_disasm_instruction(dsp_core_t* dsp, FILE *out, uint32_t pc);	/* Execute 1 instruction in disasm mode */
+
+uint32_t dsp56k_read_memory(dsp_core_t* dsp, int space, uint32_t address);
+void dsp56k_write_memory(dsp_core_t* dsp, int space, uint32_t address, uint32_t value);
 
 /* Interrupt relative functions */
-void dsp56k_add_interrupt(uint16_t inter);
+void dsp56k_add_interrupt(dsp_core_t* dsp, uint16_t inter);
 
 #endif	/* DSP_CPU_H */

hw/xbox/dsp/dsp_disasm.h

@@ -1,145 +0,0 @@
-/*
-    DSP56300 Disassembler
-
-    Copyright (c) 2015 espes
-
-    Adapted from Hatari DSP M56001 Disassembler
-    (C) 2003-2008 ARAnyM developer team
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef DSP_DISASM_H
-#define DSP_DISASM_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-extern uint32_t prev_inst_pc;
-extern bool isLooping;
-
-/* Used to display dc instead of unknown instruction for illegal opcodes */
-extern bool isInDisasmMode;
-
-extern uint32_t disasm_cur_inst;
-extern uint16_t disasm_cur_inst_len;
-extern char str_instr[50];
-extern char parallelmove_name[64];
-
-
-/* Functions */
-const char* dsp56k_get_instruction_text(void);
-
-/* Registers change */
-void dsp56k_disasm_reg_save(void);
-void dsp56k_disasm_reg_compare(void);
-
-
-typedef void (*dis_func_t)(void);
-
-void dis_undefined(void);
-
-/* Instructions without parallel moves */
-void dis_add_long(void);
-void dis_andi(void);
-void dis_bcc_long(void);
-void dis_bcc_imm(void);
-void dis_bchg_aa(void);
-void dis_bchg_ea(void);
-void dis_bchg_pp(void);
-void dis_bchg_reg(void);
-void dis_bclr_aa(void);
-void dis_bclr_ea(void);
-void dis_bclr_pp(void);
-void dis_bclr_reg(void);
-void dis_bra_imm(void);
-void dis_bset_aa(void);
-void dis_bset_ea(void);
-void dis_bset_pp(void);
-void dis_bset_reg(void);
-void dis_btst_aa(void);
-void dis_btst_ea(void);
-void dis_btst_pp(void);
-void dis_btst_reg(void);
-void dis_cmpu(void);
-void dis_div(void);
-void dis_enddo(void);
-void dis_illegal(void);
-void dis_jcc_imm(void);
-void dis_jcc_ea(void);
-void dis_jclr_aa(void);
-void dis_jclr_ea(void);
-void dis_jclr_pp(void);
-void dis_jclr_reg(void);
-void dis_jmp_ea(void);
-void dis_jmp_imm(void);
-void dis_jscc_ea(void);
-void dis_jscc_imm(void);
-void dis_jsclr_aa(void);
-void dis_jsclr_ea(void);
-void dis_jsclr_pp(void);
-void dis_jsclr_reg(void);
-void dis_jset_aa(void);
-void dis_jset_ea(void);
-void dis_jset_pp(void);
-void dis_jset_reg(void);
-void dis_jsr_ea(void);
-void dis_jsr_imm(void);
-void dis_jsset_aa(void);
-void dis_jsset_ea(void);
-void dis_jsset_pp(void);
-void dis_jsset_reg(void);
-void dis_lua(void);
-void dis_movem_ea(void);
-void dis_movem_aa(void);
-void dis_norm(void);
-void dis_ori(void);
-void dis_reset(void);
-void dis_rti(void);
-void dis_rts(void);
-void dis_stop(void);
-void dis_swi(void);
-void dis_tcc(void);
-void dis_wait(void);
-void dis_do_ea(void);
-void dis_do_aa(void);
-void dis_do_imm(void);
-void dis_do_reg(void);
-void dis_dor_imm(void);
-void dis_rep_aa(void);
-void dis_rep_ea(void);
-void dis_rep_imm(void);
-void dis_rep_reg(void);
-void dis_movec_aa(void);
-void dis_movec_ea(void);
-void dis_movec_imm(void);
-void dis_movec_reg(void);
-void dis_movep_0(void);
-void dis_movep_1(void);
-void dis_movep_23(void);
-
-void dis_movep_x_low(void);
-void dis_move_x_aa(void);
-
-/* Parallel moves */
-void dis_pm_class2(void);
-void dis_pm(void);
-void dis_pm_0(void);
-void dis_pm_1(void);
-void dis_pm_2(void);
-void dis_pm_4(void);
-void dis_pm_8(void);
-
-#endif /* DSP_DISASM_H */

hw/xbox/dsp/dsp_int.h

@@ -142,7 +142,7 @@ typedef struct dsp_interrupt_s {
     const char *name;
 } dsp_interrupt_t;
 
-typedef struct dsp_core_s {
+struct dsp_core_s {
     /* DSP executing instructions ? */
     int running;
     
@@ -176,7 +176,58 @@ typedef struct dsp_core_s {
     uint16_t interrupt_pipeline_count; /* used to prefetch correctly the 2 inter instructions */
     int16_t interrupt_ipl[12];     /* store the current IPL for each interrupt */
     uint16_t interrupt_isPending[12];  /* store if interrupt is pending for each interrupt */
-} dsp_core_t;
+
+
+    /* runtime data */
+
+    /* Instructions per second */
+#ifdef DSP_COUNT_IPS
+    uint32_t start_time;
+#endif
+    uint32_t num_inst;
+
+/* Length of current instruction */
+    uint32_t cur_inst_len; /* =0:jump, >0:increment */
+/* Current instruction */
+    uint32_t cur_inst;
+
+    /* DSP is in disasm mode ? */
+    /* If yes, stack overflow, underflow and illegal instructions messages are not displayed */
+    bool in_disasm_mode;
+
+    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 */
+
+    bool exception_debugging;
+
+
+    /* disasm data */
+
+    /* Previous instruction */
+    uint32_t disasm_prev_inst_pc;
+    bool disasm_is_looping;
+
+    /* Used to display dc instead of unknown instruction for illegal opcodes */
+    bool isInDisasmMode;
+
+    uint32_t disasm_cur_inst;
+    uint16_t disasm_cur_inst_len;
+
+    /* Current instruction */
+    char disasm_str_instr[50];
+    char disasm_str_instr2[120];
+    char disasm_parallelmove_name[64];
+
+    /**********************************
+     *  Register change
+     **********************************/
+
+    uint32_t disasm_registers_save[64];
+#if DSP_DISASM_REG_PC
+    uint32_t pc_save;
+#endif
+
+};
 
 /* DSP */
 extern dsp_core_t dsp_core;