From cfb5a59e107cd94d9969c72f52f8efed6c509548 Mon Sep 17 00:00:00 2001
From: espes <espes@pequalsnp.com>
Date: Mon, 15 Jun 2015 13:36:43 +1000
Subject: [PATCH] some dma tweaks

---
 hw/xbox/dsp/dsp_dis.inl |  6 +++--
 hw/xbox/dsp/dsp_dma.c   | 51 ++++++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/hw/xbox/dsp/dsp_dis.inl b/hw/xbox/dsp/dsp_dis.inl
index 0b0aa6a958..78396ef070 100644
--- a/hw/xbox/dsp/dsp_dis.inl
+++ b/hw/xbox/dsp/dsp_dis.inl
@@ -314,7 +314,8 @@ static void dis_bcc_long(dsp_core_t* dsp) {
     char cond_name[16];
     dis_calc_cc(dsp, cc_code, cond_name);
 
-    sprintf(dsp->disasm_str_instr, "b%s p:$%06x", cond_name, xxxx);    
+    sprintf(dsp->disasm_str_instr, "b%s p:$%06x",
+        cond_name, (dsp->pc + xxxx) & BITMASK(24));
 }
 
 static void dis_bcc_imm(dsp_core_t* dsp) {
@@ -326,7 +327,8 @@ static void dis_bcc_imm(dsp_core_t* dsp) {
 
     dis_calc_cc(dsp, cc_code, cond_name);    
 
-    sprintf(dsp->disasm_str_instr,"b%s p:$%04x", cond_name, xxx);
+    sprintf(dsp->disasm_str_instr,"b%s p:$%06x",
+        cond_name, (dsp->pc + dsp_signextend(9, xxx)) & BITMASK(24) );
 }
 
 static void dis_bchg_aa(dsp_core_t* dsp)
diff --git a/hw/xbox/dsp/dsp_dma.c b/hw/xbox/dsp/dsp_dma.c
index 3a72f6e627..e15bedb01b 100644
--- a/hw/xbox/dsp/dsp_dma.c
+++ b/hw/xbox/dsp/dsp_dma.c
@@ -46,6 +46,14 @@
 
 #define NODE_CONTROL_DIRECTION (1 << 1)
 
+
+// #define DEBUG
+#ifdef DEBUG
+# define DPRINTF(s, ...)            printf(s, ## __VA_ARGS__)
+#else
+# define DPRINTF(format, ...)       do { } while (0)
+#endif
+
 static void dsp_dma_run(DSPDMAState *s)
 {
     if (!(s->control & DMA_CONTROL_RUNNING)
@@ -64,13 +72,24 @@ static void dsp_dma_run(DSPDMAState *s)
         uint32_t scratch_base = dsp56k_read_memory(s->core, DSP_SPACE_X, addr+5);
         uint32_t scratch_size = dsp56k_read_memory(s->core, DSP_SPACE_X, addr+6)+1;
 
-        // printf("\n\n\nQQQ DMA addr %x, control %x, count %x, dsp_offset %x, scratch_offset %x, base %x, size %x\n\n\n",
-        //     addr, control, count, dsp_offset, scratch_offset, scratch_base, scratch_size);
+        s->next_block = next_block;
+        if (s->next_block & NODE_POINTER_EOL) {
+            s->eol = true;
+        }
+
+
+        DPRINTF("\n\n\nDMA addr %x, control %x, count %x, "
+                 "dsp_offset %x, scratch_offset %x, base %x, size %x\n\n\n",
+                addr, control, count, dsp_offset,
+                scratch_offset, scratch_base, scratch_size);
 
         uint32_t format = (control >> 10) & 7;
         unsigned int item_size;
-        uint32_t item_mask;
+        uint32_t item_mask = 0xffffffff;
         switch(format) {
+        case 1:
+            item_size = 2;
+            break;
         case 2: //big-endian?
         case 6:
             item_size = 4;
@@ -86,12 +105,17 @@ static void dsp_dma_run(DSPDMAState *s)
         size_t scratch_addr;
         if (buf_id == 0xe) { // 'circular'?
             // assert(scratch_offset == 0);
-            assert(scratch_offset + count * item_size < scratch_size);
+            // assert(scratch_offset + count * item_size < scratch_size);
+            if (scratch_offset + count * item_size >= scratch_size) {
+                // This happens during the startup sound effect.
+                // I think it might actually be a bug in the code...
+                DPRINTF("skipping bad dma...\n");
+                continue;
+            }
             scratch_addr = scratch_base + scratch_offset; //??
-        } else if (buf_id == 0xf) { // 'offset'?
-            scratch_addr = scratch_offset;
         } else {
-            assert(false);
+            // assert(buf_id == 0xf) // 'offset'
+            scratch_addr = scratch_offset;
         }
 
         uint32_t mem_address;
@@ -120,6 +144,9 @@ static void dsp_dma_run(DSPDMAState *s)
                 uint32_t v = dsp56k_read_memory(s->core,
                     mem_space, mem_address+i);
                 switch(item_size) {
+                case 2:
+                    *(uint16_t*)(scratch_buf + i*2) = v;
+                    break;
                 case 4:
                     *(uint32_t*)(scratch_buf + i*4) = v;
                     break;
@@ -141,6 +168,9 @@ static void dsp_dma_run(DSPDMAState *s)
             for (i=0; i<count; i++) {
                 uint32_t v;
                 switch(item_size) {
+                case 2:
+                    v = *(uint16_t*)(scratch_buf + i*2);
+                    break;
                 case 4:
                     v = (*(uint32_t*)(scratch_buf + i*4)) & item_mask;
                     break;
@@ -148,18 +178,13 @@ static void dsp_dma_run(DSPDMAState *s)
                     assert(false);
                     break;
                 }
-                // printf("... %06x\n", v);
+                // DPRINTF("... %06x\n", v);
                 dsp56k_write_memory(s->core, mem_space, mem_address+i, v);
             }
         }
 
         free(scratch_buf);
 
-        s->next_block = next_block;
-
-        if (s->next_block & NODE_POINTER_EOL) {
-            s->eol = true;
-        }
     }
 }