--- hatari/src/falcon/dsp.c 2019/04/09 08:48:46 1.1.1.4 +++ hatari/src/falcon/dsp.c 2019/04/09 08:50:31 1.1.1.6 @@ -28,6 +28,7 @@ #include "dsp.h" #include "crossbar.h" #include "configuration.h" +#include "cycInt.h" #if ENABLE_DSP_EMU #include "m68000.h" @@ -43,14 +44,10 @@ #define Dprintf(a) #endif -#define BITMASK(x) ((1<<(x))-1) - #define DSP_HW_OFFSET 0xFFA200 #if ENABLE_DSP_EMU -static dsp_core_t dsp_core; -static dsp_core_t dsp_core_save; static Sint32 save_cycles; #endif static bool bDspDebugging; @@ -82,10 +79,10 @@ static void DSP_TriggerHostInterrupt(voi void DSP_Init(void) { #if ENABLE_DSP_EMU - if (ConfigureParams.System.nDSPType != DSP_TYPE_EMU) + if (bDspEnabled || ConfigureParams.System.nDSPType != DSP_TYPE_EMU) return; - dsp_core_init(&dsp_core, DSP_TriggerHostInterrupt); - dsp56k_init_cpu(&dsp_core); + dsp_core_init(DSP_TriggerHostInterrupt); + dsp56k_init_cpu(); bDspEnabled = true; save_cycles = 0; #endif @@ -98,9 +95,9 @@ void DSP_Init(void) void DSP_UnInit(void) { #if ENABLE_DSP_EMU - if (ConfigureParams.System.nDSPType != DSP_TYPE_EMU) + if (!bDspEnabled) return; - dsp_core_shutdown(&dsp_core); + dsp_core_shutdown(); bDspEnabled = false; #endif } @@ -112,7 +109,7 @@ void DSP_UnInit(void) void DSP_Reset(void) { #if ENABLE_DSP_EMU - dsp_core_reset(&dsp_core); + dsp_core_reset(); bDspHostInterruptPending = false; save_cycles = 0; #endif @@ -140,32 +137,32 @@ void DSP_MemorySnapShot_Capture(bool bSa void DSP_Run(int nHostCycles) { #if ENABLE_DSP_EMU - /* Cycles emulation should be correctly tuned now */ - Sint32 i = nHostCycles * ( DSP_FREQ / CPU_FREQ ) - save_cycles + 1; - Sint32 dsp_cycle = 0; + save_cycles += nHostCycles * 2; - if (dsp_core.running == 0) - return; + if (dsp_core.running == 0) + return; - if (unlikely(bDspDebugging)) { - while (i > dsp_cycle) - { - DebugDsp_Check(); - dsp56k_execute_instruction(); - dsp_cycle += dsp_core.instr_cycle; - } - } else { - while (i > dsp_cycle) - { - dsp56k_execute_instruction(); - dsp_cycle += dsp_core.instr_cycle; - } - } + if (save_cycles <= 0) + return; + + if (unlikely(bDspDebugging)) { + while (save_cycles > 0) + { + DebugDsp_Check(); + dsp56k_execute_instruction(); + save_cycles -= dsp_core.instr_cycle; + } + } else { + // fprintf(stderr, "--> %d\n", save_cycles); + while (save_cycles > 0) + { + dsp56k_execute_instruction(); + save_cycles -= dsp_core.instr_cycle; + } + } - /* Adjust cycles for next run */ - save_cycles = i - dsp_cycle; #endif -} +} /** * Enable/disable DSP debugging mode @@ -176,7 +173,7 @@ void DSP_SetDebugging(bool enabled) } /** - * Get DSP program counter (for disassembler) + * Get DSP program counter (for debugging) */ Uint16 DSP_GetPC(void) { @@ -188,6 +185,19 @@ Uint16 DSP_GetPC(void) return 0; } +/** + * Get current DSP instruction cycles (for profiling) + */ +Uint16 DSP_GetInstrCycles(void) +{ +#if ENABLE_DSP_EMU + if (bDspEnabled) + return dsp_core.instr_cycle; + else +#endif + return 0; +} + /** * Disassemble DSP code between given addresses, return next PC address @@ -196,23 +206,9 @@ Uint32 DSP_DisasmAddress(Uint16 lowerAdr { #if ENABLE_DSP_EMU Uint32 dsp_pc; - dsp_core_t *ptr1, *ptr2; - - ptr1 = &dsp_core; - ptr2 = &dsp_core_save; - - for (dsp_pc=lowerAdr; dsp_pc<=UpperAdr; dsp_pc++) { - /* Save DSP context before executing instruction */ - memcpy(ptr2, ptr1, sizeof(dsp_core)); - - /* execute and disasm instruction */ - dsp_core.pc = dsp_pc; - dsp_pc += dsp56k_disasm() - 1; - dsp56k_execute_instruction(); - fprintf(stderr, "%s", dsp56k_getInstructionText()); - /* Restore DSP context after executing instruction */ - memcpy(ptr1, ptr2, sizeof(dsp_core)); + for (dsp_pc=lowerAdr; dsp_pc<=UpperAdr; dsp_pc++) { + dsp_pc += dsp56k_execute_one_disasm_instruction(dsp_pc); } return dsp_pc; #else @@ -594,7 +590,7 @@ void DSP_SsiWriteRxValue(Uint32 value) void DSP_SsiReceive_SC0(void) { #if ENABLE_DSP_EMU - dsp_core_ssi_Receive_SC0(&dsp_core); + dsp_core_ssi_Receive_SC0(); #endif } @@ -607,7 +603,7 @@ void DSP_SsiTransmit_SC0(void) void DSP_SsiReceive_SC1(Uint32 FrameCounter) { #if ENABLE_DSP_EMU - dsp_core_ssi_Receive_SC1(&dsp_core, FrameCounter); + dsp_core_ssi_Receive_SC1(FrameCounter); #endif } @@ -621,7 +617,7 @@ void DSP_SsiTransmit_SC1(void) void DSP_SsiReceive_SC2(Uint32 FrameCounter) { #if ENABLE_DSP_EMU - dsp_core_ssi_Receive_SC2(&dsp_core, FrameCounter); + dsp_core_ssi_Receive_SC2(FrameCounter); #endif } @@ -635,7 +631,7 @@ void DSP_SsiTransmit_SC2(Uint32 frame) void DSP_SsiReceive_SCK(void) { #if ENABLE_DSP_EMU - dsp_core_ssi_Receive_SCK(&dsp_core); + dsp_core_ssi_Receive_SCK(); #endif } @@ -647,15 +643,22 @@ void DSP_SsiTransmit_SCK(void) /** * Read access wrapper for ioMemTabFalcon (DSP Host port) + * DSP Host interface port is accessed by the 68030 in Byte mode. + * A move.w value,$ffA206 results in 2 bus access for the 68030. */ void DSP_HandleReadAccess(void) { Uint32 addr; Uint8 value; + bool multi_access = false; + for (addr = IoAccessBaseAddress; addr < IoAccessBaseAddress+nIoMemAccessSize; addr++) { #if ENABLE_DSP_EMU - value = dsp_core_read_host(&dsp_core, addr-DSP_HW_OFFSET); + value = dsp_core_read_host(addr-DSP_HW_OFFSET); + if (multi_access == true) + M68000_AddCycles(4); + multi_access = true; #else /* this value prevents TOS from hanging in the DSP init code */ value = 0xff; @@ -668,17 +671,24 @@ void DSP_HandleReadAccess(void) /** * Write access wrapper for ioMemTabFalcon (DSP Host port) + * DSP Host interface port is accessed by the 68030 in Byte mode. + * A move.w value,$ffA206 results in 2 bus access for the 68030. */ void DSP_HandleWriteAccess(void) { Uint32 addr; Uint8 value; + bool multi_access = false; + for (addr = IoAccessBaseAddress; addr < IoAccessBaseAddress+nIoMemAccessSize; addr++) { value = IoMem_ReadByte(addr); Dprintf(("HWput_b(0x%08x,0x%02x) at 0x%08x\n", addr, value, m68k_getpc())); #if ENABLE_DSP_EMU - dsp_core_write_host(&dsp_core, addr-DSP_HW_OFFSET, value); + dsp_core_write_host(addr-DSP_HW_OFFSET, value); + if (multi_access == true) + M68000_AddCycles(4); + multi_access = true; #endif } }