From 7c49af6e1fdc0f010b98a7cd35778176546eb017 Mon Sep 17 00:00:00 2001
From: espes <espes@pequalsnp.com>
Date: Fri, 12 Jun 2015 11:11:08 +1000
Subject: [PATCH] ...

---
 hw/xbox/dsp/dsp.c     |  2 +-
 hw/xbox/dsp/dsp.h     |  3 +--
 hw/xbox/dsp/dsp_cpu.c | 10 ++++++----
 hw/xbox/dsp/dsp_cpu.h |  2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hw/xbox/dsp/dsp.c b/hw/xbox/dsp/dsp.c
index 7809134735..1207428800 100644
--- a/hw/xbox/dsp/dsp.c
+++ b/hw/xbox/dsp/dsp.c
@@ -1,5 +1,5 @@
 /*
-    DSP56300 emulation
+    DSP56300 emulator
 
     Copyright (c) 2015 espes
 
diff --git a/hw/xbox/dsp/dsp.h b/hw/xbox/dsp/dsp.h
index fdc60c7389..fcb8393686 100644
--- a/hw/xbox/dsp/dsp.h
+++ b/hw/xbox/dsp/dsp.h
@@ -1,5 +1,5 @@
 /*
-    DSP56300 emulation
+    DSP56300 emulator
 
     Copyright (c) 2015 espes
 
@@ -32,7 +32,6 @@
 typedef struct dsp_core_s dsp_core_t;
 
 /* Dsp commands */
-bool dsp_process_irq(void);
 void dsp_init(void);
 void dsp_uninit(void);
 void dsp_reset(void);
diff --git a/hw/xbox/dsp/dsp_cpu.c b/hw/xbox/dsp/dsp_cpu.c
index d0be870cc3..b34a7c44b2 100644
--- a/hw/xbox/dsp/dsp_cpu.c
+++ b/hw/xbox/dsp/dsp_cpu.c
@@ -1,6 +1,8 @@
 /*
     DSP56300 emulator
 
+    Copyright (c) 2015 espes
+
     Adapted from Hatari DSP M56001 emulation
     (C) 2003-2008 ARAnyM developer team
 
@@ -554,13 +556,13 @@ const char* disasm_get_instruction_text(dsp_core_t* dsp)
  * */
 uint16_t dsp56k_execute_one_disasm_instruction(dsp_core_t* dsp, FILE *out, uint32_t pc)
 {
-    // dsp_core_t dsp_core_save;
+    dsp_core_t dsp_core_save;
 
     /* Set DSP in disasm mode */
     dsp->in_disasm_mode = true;
 
     /* Save DSP context before executing instruction */
-    // memcpy(&dsp_core_save, &dsp_core, sizeof(dsp_core));
+    memcpy(&dsp_core_save, dsp, sizeof(dsp_core_t));
 
     /* execute and disasm instruction */
     dsp->pc = pc;
@@ -574,7 +576,7 @@ uint16_t dsp56k_execute_one_disasm_instruction(dsp_core_t* dsp, FILE *out, uint3
     fprintf(out, "%s", disasm_get_instruction_text(dsp));
 
     /* Restore DSP context after executing instruction */
-    // memcpy(&dsp_core, &dsp_core_save, sizeof(dsp_core));
+    memcpy(dsp, &dsp_core_save, sizeof(dsp_core_t));
     
     /* Unset DSP in disasm mode */
     dsp->in_disasm_mode = false;
@@ -624,7 +626,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 == false) {
+        if (!dsp->in_disasm_mode) {
             if (disasm_return != 0) {
                 fprintf(stderr, "%s", disasm_get_instruction_text(dsp));
                 
diff --git a/hw/xbox/dsp/dsp_cpu.h b/hw/xbox/dsp/dsp_cpu.h
index 3d282dbef3..ca4482c7b9 100644
--- a/hw/xbox/dsp/dsp_cpu.h
+++ b/hw/xbox/dsp/dsp_cpu.h
@@ -1,6 +1,8 @@
 /*
     DSP56300 emulator
 
+    Copyright (c) 2015 espes
+
     Adapted from Hatari DSP M56001 emulation
     (C) 2003-2008 ARAnyM developer team