From a6968d46964fc9c7ff97928b435e2769c4eafa0a Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Sat, 29 Aug 2015 04:12:56 +0200
Subject: [PATCH] Support for 'and #xx, D'

---
 hw/xbox/dsp/dsp_cpu.c   |  2 +-
 hw/xbox/dsp/dsp_dis.inl |  7 +++++++
 hw/xbox/dsp/dsp_emu.inl | 26 +++++++++++++++++++-------
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/hw/xbox/dsp/dsp_cpu.c b/hw/xbox/dsp/dsp_cpu.c
index 73663a60b0..ff00e543d1 100644
--- a/hw/xbox/dsp/dsp_cpu.c
+++ b/hw/xbox/dsp/dsp_cpu.c
@@ -162,7 +162,7 @@ static bool match_MMMRRR(uint32_t op)
 static const OpcodeEntry nonparallel_opcodes[] = {
     { "0000000101iiiiii1000d000", "add #xx, D", dis_add_imm, emu_add_imm },
     { "00000001010000001100d000", "add #xxxx, D", dis_add_long, emu_add_long },
-    { "0000000101iiiiii1000d110", "and #xx, D", NULL, NULL },
+    { "0000000101iiiiii1000d110", "and #xx, D", dis_and_imm, emu_and_imm },
     { "00000001010000001100d110", "and #xxxx, D", dis_and_long, emu_and_long },
     { "00000000iiiiiiii101110EE", "andi #xx, D", dis_andi, emu_andi },
     { "0000110000011101SiiiiiiD", "asl #ii, S2, D", dis_asl_imm, emu_asl_imm },
diff --git a/hw/xbox/dsp/dsp_dis.inl b/hw/xbox/dsp/dsp_dis.inl
index 7b629b6ba1..d8d3797ed2 100644
--- a/hw/xbox/dsp/dsp_dis.inl
+++ b/hw/xbox/dsp/dsp_dis.inl
@@ -258,6 +258,13 @@ static void dis_add_long(dsp_core_t* dsp)
     sprintf(dsp->disasm_str_instr, "add #$%04x,%s", xxxx, registers_name[accname]);
 }
 
+static void dis_and_imm(dsp_core_t* dsp)
+{
+    uint32_t xx = (dsp->disasm_cur_inst >> 8) & BITMASK(6);
+    uint32_t accname = ((dsp->disasm_cur_inst >> 3) & 1) ? DSP_REG_B : DSP_REG_A;
+    sprintf(dsp->disasm_str_instr, "and #$%02x,%s", xx, registers_name[accname]);
+}
+
 static void dis_and_long(dsp_core_t* dsp)
 {
     dsp->disasm_cur_inst_len++;
diff --git a/hw/xbox/dsp/dsp_emu.inl b/hw/xbox/dsp/dsp_emu.inl
index eae9d62921..0889633703 100644
--- a/hw/xbox/dsp/dsp_emu.inl
+++ b/hw/xbox/dsp/dsp_emu.inl
@@ -5809,7 +5809,7 @@ static void emu_add_x(dsp_core_t* dsp, uint32_t x, uint32_t d)
 
     uint16_t newsr = dsp_add56(source, dest);
 
-    if ((dsp->cur_inst >> 3) & 1) {
+    if (d) {
         dsp->registers[DSP_REG_B2] = dest[0];
         dsp->registers[DSP_REG_B1] = dest[1];
         dsp->registers[DSP_REG_B0] = dest[2];
@@ -5840,25 +5840,37 @@ static void emu_add_long(dsp_core_t* dsp)
     emu_add_x(dsp, xxxx, d);
 }
 
-static void emu_and_long(dsp_core_t* dsp)
+static void emu_and_x(dsp_core_t* dsp, uint32_t x, uint32_t d)
 {
-    uint32_t xxxx = read_memory_p(dsp, dsp->pc+1);
-    dsp->cur_inst_len++;
-
     int dstreg;
-    if ((dsp->cur_inst >> 3) & 1) {
+    if (d) {
         dstreg = DSP_REG_B1;
     } else {
         dstreg = DSP_REG_A1;
     }
 
-    dsp->registers[dstreg] &= xxxx;
+    dsp->registers[dstreg] &= x;
 
     dsp->registers[DSP_REG_SR] &= BITMASK(16)-((1<<DSP_SR_N)|(1<<DSP_SR_Z)|(1<<DSP_SR_V));
     dsp->registers[DSP_REG_SR] |= ((dsp->registers[dstreg]>>23) & 1)<<DSP_SR_N;
     dsp->registers[DSP_REG_SR] |= (dsp->registers[dstreg]==0)<<DSP_SR_Z;
 }
 
+static void emu_and_imm(dsp_core_t* dsp)
+{
+    uint32_t xx = (dsp->cur_inst >> 8) & BITMASK(6);
+    uint32_t d = (dsp->cur_inst >> 3) & 1;
+    emu_and_x(dsp, xx, d);
+}
+
+static void emu_and_long(dsp_core_t* dsp)
+{
+    uint32_t xxxx = read_memory_p(dsp, dsp->pc+1);
+    dsp->cur_inst_len++;
+    uint32_t d = (dsp->cur_inst >> 3) & 1;
+    emu_and_x(dsp, xxxx, d);
+}
+
 static void emu_andi(dsp_core_t* dsp)
 {
     uint32_t regnum, value;