RSP HLE plugin. Compile and run on the OpenPandora
[mupen64plus-pandora.git] / source / mupen64plus-rsp-hle / src / ucode2.cpp
diff --git a/source/mupen64plus-rsp-hle/src/ucode2.cpp b/source/mupen64plus-rsp-hle/src/ucode2.cpp
new file mode 100644 (file)
index 0000000..dd15689
--- /dev/null
@@ -0,0 +1,930 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *   Mupen64plus-rsp-hle - ucode2.cpp                                      *
+ *   Mupen64Plus homepage: http://code.google.com/p/mupen64plus/           *
+ *   Copyright (C) 2009 Richard Goedeken                                   *
+ *   Copyright (C) 2002 Hacktarux                                          *
+ *                                                                         *
+ *   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.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+# include <string.h>
+# include <stdio.h>
+
+extern "C" {
+  #include "m64p_types.h"
+  #include "hle.h"
+  #include "alist_internal.h"
+}
+
+extern u8 BufferSpace[0x10000];
+
+static void SPNOOP (u32 inst1, u32 inst2) {
+    DebugMessage(M64MSG_ERROR, "Unknown/Unimplemented Audio Command %i in ABI 2", (int)(inst1 >> 24));
+}
+extern u16 AudioInBuffer;       // 0x0000(T8)
+extern u16 AudioOutBuffer;      // 0x0002(T8)
+extern u16 AudioCount;          // 0x0004(T8)
+extern u32 loopval;         // 0x0010(T8)
+extern u32 SEGMENTS[0x10];
+
+extern u16 adpcmtable[0x88];
+
+extern const u16 ResampleLUT [0x200];
+
+bool isMKABI = false;
+bool isZeldaABI = false;
+
+extern "C" void init_ucode2() { isMKABI = isZeldaABI = false; }
+
+static void LOADADPCM2 (u32 inst1, u32 inst2) { // Loads an ADPCM table - Works 100% Now 03-13-01
+    u32 v0;
+    v0 = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
+    u16 *table = (u16 *)(rsp.RDRAM+v0); // Zelda2 Specific...
+
+    for (u32 x = 0; x < ((inst1&0xffff)>>0x4); x++) {
+        adpcmtable[(0x0+(x<<3))^S] = table[0];
+        adpcmtable[(0x1+(x<<3))^S] = table[1];
+
+        adpcmtable[(0x2+(x<<3))^S] = table[2];
+        adpcmtable[(0x3+(x<<3))^S] = table[3];
+
+        adpcmtable[(0x4+(x<<3))^S] = table[4];
+        adpcmtable[(0x5+(x<<3))^S] = table[5];
+
+        adpcmtable[(0x6+(x<<3))^S] = table[6];
+        adpcmtable[(0x7+(x<<3))^S] = table[7];
+        table += 8;
+    }
+}
+
+static void SETLOOP2 (u32 inst1, u32 inst2) {
+    loopval = inst2 & 0xffffff; // No segment?
+}
+
+static void SETBUFF2 (u32 inst1, u32 inst2) {
+    AudioInBuffer   = u16(inst1);            // 0x00
+    AudioOutBuffer  = u16((inst2 >> 0x10)); // 0x02
+    AudioCount      = u16(inst2);            // 0x04
+}
+
+static void ADPCM2 (u32 inst1, u32 inst2) { // Verified to be 100% Accurate...
+    unsigned char Flags=(u8)(inst1>>16)&0xff;
+    //unsigned short Gain=(u16)(inst1&0xffff);
+    unsigned int Address=(inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
+    unsigned short inPtr=0;
+    //short *out=(s16 *)(testbuff+(AudioOutBuffer>>2));
+    short *out=(short *)(BufferSpace+AudioOutBuffer);
+    //unsigned char *in=(unsigned char *)(BufferSpace+AudioInBuffer);
+    short count=(short)AudioCount;
+    unsigned char icode;
+    unsigned char code;
+    int vscale;
+    unsigned short index;
+    unsigned short j;
+    int a[8];
+    short *book1,*book2;
+
+    u8 srange;
+    u8 mask1;
+    u8 mask2;
+    u8 shifter;
+
+    memset(out,0,32);
+
+    if (Flags & 0x4) { // Tricky lil Zelda MM and ABI2!!! hahaha I know your secrets! :DDD
+        srange = 0xE;
+        mask1 = 0xC0;
+        mask2 = 0x30;
+        shifter = 10;
+    } else {
+        srange = 0xC;
+        mask1 = 0xf0;
+        mask2 = 0x0f;
+        shifter = 12;
+    }
+
+    if(!(Flags&0x1))
+    {
+        if(Flags&0x2)
+        {/*
+            for(int i=0;i<16;i++)
+            {
+                out[i]=*(short *)&rsp.RDRAM[(loopval+i*2)^2];
+            }*/
+            memcpy(out,&rsp.RDRAM[loopval],32);
+        }
+        else
+        {/*
+            for(int i=0;i<16;i++)
+            {
+                out[i]=*(short *)&rsp.RDRAM[(Address+i*2)^2];
+            }*/
+            memcpy(out,&rsp.RDRAM[Address],32);
+        }
+    }
+
+    int l1=out[14^S];
+    int l2=out[15^S];
+    int inp1[8];
+    int inp2[8];
+    out+=16;
+    while(count>0) {
+        code=BufferSpace[(AudioInBuffer+inPtr)^S8];
+        index=code&0xf;
+        index<<=4;
+        book1=(short *)&adpcmtable[index];
+        book2=book1+8;
+        code>>=4;
+        vscale=(0x8000>>((srange-code)-1));
+        
+        inPtr++;
+        j=0;
+
+        while(j<8) {
+            icode=BufferSpace[(AudioInBuffer+inPtr)^S8];
+            inPtr++;
+
+            inp1[j]=(s16)((icode&mask1) << 8);          // this will in effect be signed
+            if(code<srange) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
+            //else int catchme=1;
+            j++;
+
+            inp1[j]=(s16)((icode&mask2)<<shifter);
+            if(code<srange) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
+            //else int catchme=1;
+            j++;
+
+            if (Flags & 4) {
+                inp1[j]=(s16)((icode&0xC) << 12);           // this will in effect be signed
+                if(code < 0xE) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
+                //else int catchme=1;
+                j++;
+
+                inp1[j]=(s16)((icode&0x3) << 14);
+                if(code < 0xE) inp1[j]=((int)((int)inp1[j]*(int)vscale)>>16);
+                //else int catchme=1;
+                j++;
+            } // end flags
+        } // end while
+
+
+
+        j=0;
+        while(j<8) {
+            icode=BufferSpace[(AudioInBuffer+inPtr)^S8];
+            inPtr++;
+
+            inp2[j]=(s16)((icode&mask1) << 8);
+            if(code<srange) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
+            //else int catchme=1;
+            j++;
+
+            inp2[j]=(s16)((icode&mask2)<<shifter);
+            if(code<srange) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
+            //else int catchme=1;
+            j++;
+
+            if (Flags & 4) {
+                inp2[j]=(s16)((icode&0xC) << 12);
+                if(code < 0xE) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
+                //else int catchme=1;
+                j++;
+
+                inp2[j]=(s16)((icode&0x3) << 14);
+                if(code < 0xE) inp2[j]=((int)((int)inp2[j]*(int)vscale)>>16);
+                //else int catchme=1;
+                j++;
+            } // end flags
+        }
+
+        a[0]= (int)book1[0]*(int)l1;
+        a[0]+=(int)book2[0]*(int)l2;
+        a[0]+=(int)inp1[0]*(int)2048;
+
+        a[1] =(int)book1[1]*(int)l1;
+        a[1]+=(int)book2[1]*(int)l2;
+        a[1]+=(int)book2[0]*inp1[0];
+        a[1]+=(int)inp1[1]*(int)2048;
+
+        a[2] =(int)book1[2]*(int)l1;
+        a[2]+=(int)book2[2]*(int)l2;
+        a[2]+=(int)book2[1]*inp1[0];
+        a[2]+=(int)book2[0]*inp1[1];
+        a[2]+=(int)inp1[2]*(int)2048;
+
+        a[3] =(int)book1[3]*(int)l1;
+        a[3]+=(int)book2[3]*(int)l2;
+        a[3]+=(int)book2[2]*inp1[0];
+        a[3]+=(int)book2[1]*inp1[1];
+        a[3]+=(int)book2[0]*inp1[2];
+        a[3]+=(int)inp1[3]*(int)2048;
+
+        a[4] =(int)book1[4]*(int)l1;
+        a[4]+=(int)book2[4]*(int)l2;
+        a[4]+=(int)book2[3]*inp1[0];
+        a[4]+=(int)book2[2]*inp1[1];
+        a[4]+=(int)book2[1]*inp1[2];
+        a[4]+=(int)book2[0]*inp1[3];
+        a[4]+=(int)inp1[4]*(int)2048;
+
+        a[5] =(int)book1[5]*(int)l1;
+        a[5]+=(int)book2[5]*(int)l2;
+        a[5]+=(int)book2[4]*inp1[0];
+        a[5]+=(int)book2[3]*inp1[1];
+        a[5]+=(int)book2[2]*inp1[2];
+        a[5]+=(int)book2[1]*inp1[3];
+        a[5]+=(int)book2[0]*inp1[4];
+        a[5]+=(int)inp1[5]*(int)2048;
+
+        a[6] =(int)book1[6]*(int)l1;
+        a[6]+=(int)book2[6]*(int)l2;
+        a[6]+=(int)book2[5]*inp1[0];
+        a[6]+=(int)book2[4]*inp1[1];
+        a[6]+=(int)book2[3]*inp1[2];
+        a[6]+=(int)book2[2]*inp1[3];
+        a[6]+=(int)book2[1]*inp1[4];
+        a[6]+=(int)book2[0]*inp1[5];
+        a[6]+=(int)inp1[6]*(int)2048;
+
+        a[7] =(int)book1[7]*(int)l1;
+        a[7]+=(int)book2[7]*(int)l2;
+        a[7]+=(int)book2[6]*inp1[0];
+        a[7]+=(int)book2[5]*inp1[1];
+        a[7]+=(int)book2[4]*inp1[2];
+        a[7]+=(int)book2[3]*inp1[3];
+        a[7]+=(int)book2[2]*inp1[4];
+        a[7]+=(int)book2[1]*inp1[5];
+        a[7]+=(int)book2[0]*inp1[6];
+        a[7]+=(int)inp1[7]*(int)2048;
+
+        for(j=0;j<8;j++)
+        {
+            a[j^S]>>=11;
+            if(a[j^S]>32767) a[j^S]=32767;
+            else if(a[j^S]<-32768) a[j^S]=-32768;
+            *(out++)=a[j^S];
+        }
+        l1=a[6];
+        l2=a[7];
+
+        a[0]= (int)book1[0]*(int)l1;
+        a[0]+=(int)book2[0]*(int)l2;
+        a[0]+=(int)inp2[0]*(int)2048;
+
+        a[1] =(int)book1[1]*(int)l1;
+        a[1]+=(int)book2[1]*(int)l2;
+        a[1]+=(int)book2[0]*inp2[0];
+        a[1]+=(int)inp2[1]*(int)2048;
+
+        a[2] =(int)book1[2]*(int)l1;
+        a[2]+=(int)book2[2]*(int)l2;
+        a[2]+=(int)book2[1]*inp2[0];
+        a[2]+=(int)book2[0]*inp2[1];
+        a[2]+=(int)inp2[2]*(int)2048;
+
+        a[3] =(int)book1[3]*(int)l1;
+        a[3]+=(int)book2[3]*(int)l2;
+        a[3]+=(int)book2[2]*inp2[0];
+        a[3]+=(int)book2[1]*inp2[1];
+        a[3]+=(int)book2[0]*inp2[2];
+        a[3]+=(int)inp2[3]*(int)2048;
+
+        a[4] =(int)book1[4]*(int)l1;
+        a[4]+=(int)book2[4]*(int)l2;
+        a[4]+=(int)book2[3]*inp2[0];
+        a[4]+=(int)book2[2]*inp2[1];
+        a[4]+=(int)book2[1]*inp2[2];
+        a[4]+=(int)book2[0]*inp2[3];
+        a[4]+=(int)inp2[4]*(int)2048;
+
+        a[5] =(int)book1[5]*(int)l1;
+        a[5]+=(int)book2[5]*(int)l2;
+        a[5]+=(int)book2[4]*inp2[0];
+        a[5]+=(int)book2[3]*inp2[1];
+        a[5]+=(int)book2[2]*inp2[2];
+        a[5]+=(int)book2[1]*inp2[3];
+        a[5]+=(int)book2[0]*inp2[4];
+        a[5]+=(int)inp2[5]*(int)2048;
+
+        a[6] =(int)book1[6]*(int)l1;
+        a[6]+=(int)book2[6]*(int)l2;
+        a[6]+=(int)book2[5]*inp2[0];
+        a[6]+=(int)book2[4]*inp2[1];
+        a[6]+=(int)book2[3]*inp2[2];
+        a[6]+=(int)book2[2]*inp2[3];
+        a[6]+=(int)book2[1]*inp2[4];
+        a[6]+=(int)book2[0]*inp2[5];
+        a[6]+=(int)inp2[6]*(int)2048;
+
+        a[7] =(int)book1[7]*(int)l1;
+        a[7]+=(int)book2[7]*(int)l2;
+        a[7]+=(int)book2[6]*inp2[0];
+        a[7]+=(int)book2[5]*inp2[1];
+        a[7]+=(int)book2[4]*inp2[2];
+        a[7]+=(int)book2[3]*inp2[3];
+        a[7]+=(int)book2[2]*inp2[4];
+        a[7]+=(int)book2[1]*inp2[5];
+        a[7]+=(int)book2[0]*inp2[6];
+        a[7]+=(int)inp2[7]*(int)2048;
+
+        for(j=0;j<8;j++)
+        {
+            a[j^S]>>=11;
+            if(a[j^S]>32767) a[j^S]=32767;
+            else if(a[j^S]<-32768) a[j^S]=-32768;
+            *(out++)=a[j^S];
+        }
+        l1=a[6];
+        l2=a[7];
+
+        count-=32;
+    }
+    out-=16;
+    memcpy(&rsp.RDRAM[Address],out,32);
+}
+
+static void CLEARBUFF2 (u32 inst1, u32 inst2) {
+    u16 addr = (u16)(inst1 & 0xffff);
+    u16 count = (u16)(inst2 & 0xffff);
+    if (count > 0)
+        memset(BufferSpace+addr, 0, count);
+}
+
+static void LOADBUFF2 (u32 inst1, u32 inst2) { // Needs accuracy verification...
+    u32 v0;
+    u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
+    v0 = (inst2 & 0xfffffc);// + SEGMENTS[(inst2>>24)&0xf];
+    memcpy (BufferSpace+(inst1&0xfffc), rsp.RDRAM+v0, (cnt+3)&0xFFFC);
+}
+
+static void SAVEBUFF2 (u32 inst1, u32 inst2) { // Needs accuracy verification...
+    u32 v0;
+    u32 cnt = (((inst1 >> 0xC)+3)&0xFFC);
+    v0 = (inst2 & 0xfffffc);// + SEGMENTS[(inst2>>24)&0xf];
+    memcpy (rsp.RDRAM+v0, BufferSpace+(inst1&0xfffc), (cnt+3)&0xFFFC);
+}
+
+
+static void MIXER2 (u32 inst1, u32 inst2) { // Needs accuracy verification...
+    u16 dmemin  = (u16)(inst2 >> 0x10);
+    u16 dmemout = (u16)(inst2 & 0xFFFF);
+    u32 count   = ((inst1 >> 12) & 0xFF0);
+    s32 gain    = (s16)(inst1 & 0xFFFF);
+    s32 temp;
+
+    for (unsigned int x=0; x < count; x+=2) { // I think I can do this a lot easier 
+
+        temp = (*(s16 *)(BufferSpace+dmemin+x) * gain) >> 15;
+        temp += *(s16 *)(BufferSpace+dmemout+x);
+            
+        if ((s32)temp > 32767) 
+            temp = 32767;
+        if ((s32)temp < -32768) 
+            temp = -32768;
+
+        *(u16 *)(BufferSpace+dmemout+x) = (u16)(temp & 0xFFFF);
+    }
+}
+
+
+static void RESAMPLE2 (u32 inst1, u32 inst2) {
+    unsigned char Flags=(u8)((inst1>>16)&0xff);
+    unsigned int Pitch=((inst1&0xffff))<<1;
+    u32 addy = (inst2 & 0xffffff);// + SEGMENTS[(inst2>>24)&0xf];
+    unsigned int Accum=0;
+    unsigned int location;
+    s16 *lut;
+    short *dst;
+    s16 *src;
+    dst=(short *)(BufferSpace);
+    src=(s16 *)(BufferSpace);
+    u32 srcPtr=(AudioInBuffer/2);
+    u32 dstPtr=(AudioOutBuffer/2);
+    s32 temp;
+    s32 accum;
+
+    if (addy > (1024*1024*8))
+        addy = (inst2 & 0xffffff);
+
+    srcPtr -= 4;
+
+    if ((Flags & 0x1) == 0) {   
+        for (int x=0; x < 4; x++) //memcpy (src+srcPtr, rsp.RDRAM+addy, 0x8);
+            src[(srcPtr+x)^S] = ((u16 *)rsp.RDRAM)[((addy/2)+x)^S];
+        Accum = *(u16 *)(rsp.RDRAM+addy+10);
+    } else {
+        for (int x=0; x < 4; x++)
+            src[(srcPtr+x)^S] = 0;//*(u16 *)(rsp.RDRAM+((addy+x)^2));
+    }
+
+    for(int i=0;i < ((AudioCount+0xf)&0xFFF0)/2;i++)    {
+        location = (((Accum * 0x40) >> 0x10) * 8);
+        //location = (Accum >> 0xa) << 0x3;
+        lut = (s16 *)(((u8 *)ResampleLUT) + location);
+
+        temp =  ((s32)*(s16*)(src+((srcPtr+0)^S))*((s32)((s16)lut[0])));
+        accum = (s32)(temp >> 15);
+
+        temp = ((s32)*(s16*)(src+((srcPtr+1)^S))*((s32)((s16)lut[1])));
+        accum += (s32)(temp >> 15);
+
+        temp = ((s32)*(s16*)(src+((srcPtr+2)^S))*((s32)((s16)lut[2])));
+        accum += (s32)(temp >> 15);
+        
+        temp = ((s32)*(s16*)(src+((srcPtr+3)^S))*((s32)((s16)lut[3])));
+        accum += (s32)(temp >> 15);
+
+        if (accum > 32767) accum = 32767;
+        if (accum < -32768) accum = -32768;
+
+        dst[dstPtr^S] = (s16)(accum);
+        dstPtr++;
+        Accum += Pitch;
+        srcPtr += (Accum>>16);
+        Accum&=0xffff;
+    }
+    for (int x=0; x < 4; x++)
+        ((u16 *)rsp.RDRAM)[((addy/2)+x)^S] = src[(srcPtr+x)^S];
+    *(u16 *)(rsp.RDRAM+addy+10) = (u16)Accum;
+    //memcpy (RSWORK, src+srcPtr, 0x8);
+}
+
+static void DMEMMOVE2 (u32 inst1, u32 inst2) { // Needs accuracy verification...
+    u32 v0, v1;
+    u32 cnt;
+    if ((inst2 & 0xffff)==0)
+        return;
+    v0 = (inst1 & 0xFFFF);
+    v1 = (inst2 >> 0x10);
+    //assert ((v1 & 0x3) == 0);
+    //assert ((v0 & 0x3) == 0);
+    u32 count = ((inst2+3) & 0xfffc);
+    //v0 = (v0) & 0xfffc;
+    //v1 = (v1) & 0xfffc;
+
+    //memcpy (dmem+v1, dmem+v0, count-1);
+    for (cnt = 0; cnt < count; cnt++) {
+        *(u8 *)(BufferSpace+((cnt+v1)^S8)) = *(u8 *)(BufferSpace+((cnt+v0)^S8));
+    }
+}
+
+static u32 t3, s5, s6;
+static u16 env[8];
+
+static void ENVSETUP1 (u32 inst1, u32 inst2) {
+    u32 tmp;
+
+    //fprintf (dfile, "ENVSETUP1: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
+    t3 = inst1 & 0xFFFF;
+    tmp = (inst1 >> 0x8) & 0xFF00;
+    env[4] = (u16)tmp;
+    tmp += t3;
+    env[5] = (u16)tmp;
+    s5 = inst2 >> 0x10;
+    s6 = inst2 & 0xFFFF;
+    //fprintf (dfile, " t3 = %X / s5 = %X / s6 = %X / env[4] = %X / env[5] = %X\n", t3, s5, s6, env[4], env[5]);
+}
+
+static void ENVSETUP2 (u32 inst1, u32 inst2) {
+    u32 tmp;
+
+    //fprintf (dfile, "ENVSETUP2: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
+    tmp = (inst2 >> 0x10);
+    env[0] = (u16)tmp;
+    tmp += s5;
+    env[1] = (u16)tmp;
+    tmp = inst2 & 0xffff;
+    env[2] = (u16)tmp;
+    tmp += s6;
+    env[3] = (u16)tmp;
+    //fprintf (dfile, " env[0] = %X / env[1] = %X / env[2] = %X / env[3] = %X\n", env[0], env[1], env[2], env[3]);
+}
+
+static void ENVMIXER2 (u32 inst1, u32 inst2) {
+    //fprintf (dfile, "ENVMIXER: inst1 = %08X, inst2 = %08X\n", inst1, inst2);
+
+    s16 *bufft6, *bufft7, *buffs0, *buffs1;
+    s16 *buffs3;
+    s32 count;
+    u32 adder;
+
+    s16 vec9, vec10;
+
+    s16 v2[8];
+
+    buffs3 = (s16 *)(BufferSpace + ((inst1 >> 0x0c)&0x0ff0));
+    bufft6 = (s16 *)(BufferSpace + ((inst2 >> 0x14)&0x0ff0));
+    bufft7 = (s16 *)(BufferSpace + ((inst2 >> 0x0c)&0x0ff0));
+    buffs0 = (s16 *)(BufferSpace + ((inst2 >> 0x04)&0x0ff0));
+    buffs1 = (s16 *)(BufferSpace + ((inst2 << 0x04)&0x0ff0));
+
+
+    v2[0] = 0 - (s16)((inst1 & 0x2) >> 1);
+    v2[1] = 0 - (s16)((inst1 & 0x1));
+    v2[2] = 0 - (s16)((inst1 & 0x8) >> 1);
+    v2[3] = 0 - (s16)((inst1 & 0x4) >> 1);
+
+    count = (inst1 >> 8) & 0xff;
+
+    if (!isMKABI) {
+        s5 *= 2; s6 *= 2; t3 *= 2;
+        adder = 0x10;
+    } else {
+        inst1 = 0;
+        adder = 0x8;
+        t3 = 0;
+    }
+
+
+    while (count > 0) {
+        int temp, x;
+        for (x=0; x < 0x8; x++) {
+            vec9  = (s16)(((s32)buffs3[x^S] * (u32)env[0]) >> 0x10) ^ v2[0];
+            vec10 = (s16)(((s32)buffs3[x^S] * (u32)env[2]) >> 0x10) ^ v2[1];
+            temp = bufft6[x^S] + vec9;
+            if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+            bufft6[x^S] = temp;
+            temp = bufft7[x^S] + vec10;
+            if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+            bufft7[x^S] = temp;
+            vec9  = (s16)(((s32)vec9  * (u32)env[4]) >> 0x10) ^ v2[2];
+            vec10 = (s16)(((s32)vec10 * (u32)env[4]) >> 0x10) ^ v2[3];
+            if (inst1 & 0x10) {
+                temp = buffs0[x^S] + vec10;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs0[x^S] = temp;
+                temp = buffs1[x^S] + vec9;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs1[x^S] = temp;
+            } else {
+                temp = buffs0[x^S] + vec9;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs0[x^S] = temp;
+                temp = buffs1[x^S] + vec10;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs1[x^S] = temp;
+            }
+        }
+
+        if (!isMKABI)
+        for (x=0x8; x < 0x10; x++) {
+            vec9  = (s16)(((s32)buffs3[x^S] * (u32)env[1]) >> 0x10) ^ v2[0];
+            vec10 = (s16)(((s32)buffs3[x^S] * (u32)env[3]) >> 0x10) ^ v2[1];
+            temp = bufft6[x^S] + vec9;
+            if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+            bufft6[x^S] = temp;
+           temp = bufft7[x^S] + vec10;
+            if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+            bufft7[x^S] = temp;
+            vec9  = (s16)(((s32)vec9  * (u32)env[5]) >> 0x10) ^ v2[2];
+            vec10 = (s16)(((s32)vec10 * (u32)env[5]) >> 0x10) ^ v2[3];
+            if (inst1 & 0x10) {
+                temp = buffs0[x^S] + vec10;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs0[x^S] = temp;
+                temp = buffs1[x^S] + vec9;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs1[x^S] = temp;
+            } else {
+                temp = buffs0[x^S] + vec9;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs0[x^S] = temp;
+                temp = buffs1[x^S] + vec10;
+                if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+                buffs1[x^S] = temp;
+            }
+        }
+        bufft6 += adder; bufft7 += adder;
+        buffs0 += adder; buffs1 += adder;
+        buffs3 += adder; count  -= adder;
+        env[0] += (u16)s5; env[1] += (u16)s5;
+        env[2] += (u16)s6; env[3] += (u16)s6;
+        env[4] += (u16)t3; env[5] += (u16)t3;
+    }
+}
+
+static void DUPLICATE2(u32 inst1, u32 inst2) {
+    unsigned short Count = (inst1 >> 16) & 0xff;
+    unsigned short In  = inst1&0xffff;
+    unsigned short Out = (inst2>>16);
+
+    unsigned short buff[64];
+    
+    memcpy(buff,BufferSpace+In,128);
+
+    while(Count) {
+        memcpy(BufferSpace+Out,buff,128);
+        Out+=128;
+        Count--;
+    }
+}
+/*
+static void INTERL2 (u32 inst1, u32 inst2) { // Make your own...
+    short Count = inst1 & 0xffff;
+    unsigned short  Out   = inst2 & 0xffff;
+    unsigned short In     = (inst2 >> 16);
+
+    short *src,*dst,tmp;
+    src=(short *)&BufferSpace[In];
+    dst=(short *)&BufferSpace[Out];
+    while(Count)
+    {
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        *(dst++)=*(src++);
+        src++;
+        Count-=8;
+    }
+}
+*/
+
+static void INTERL2 (u32 inst1, u32 inst2) {
+    short Count = inst1 & 0xffff;
+    unsigned short  Out   = inst2 & 0xffff;
+    unsigned short In     = (inst2 >> 16);
+
+    unsigned char *src,*dst/*,tmp*/;
+    src=(unsigned char *)(BufferSpace);//[In];
+    dst=(unsigned char *)(BufferSpace);//[Out];
+    while(Count) {
+        *(short *)(dst+(Out^S8)) = *(short *)(src+(In^S8));
+        Out += 2;
+        In  += 4;
+        Count--;
+    }
+}
+
+static void INTERLEAVE2 (u32 inst1, u32 inst2) { // Needs accuracy verification...
+    u32 inL, inR;
+    u16 *outbuff;
+    u16 *inSrcR;
+    u16 *inSrcL;
+    u16 Left, Right, Left2, Right2;
+    u32 count;
+    count   = ((inst1 >> 12) & 0xFF0);
+    if (count == 0) {
+        outbuff = (u16 *)(AudioOutBuffer+BufferSpace);
+        count = AudioCount;
+    } else {
+        outbuff = (u16 *)((inst1&0xFFFF)+BufferSpace);
+    }
+
+    inR = inst2 & 0xFFFF;
+    inL = (inst2 >> 16) & 0xFFFF;
+
+    inSrcR = (u16 *)(BufferSpace+inR);
+    inSrcL = (u16 *)(BufferSpace+inL);
+
+    for (u32 x = 0; x < (count/4); x++) {
+        Left=*(inSrcL++);
+        Right=*(inSrcR++);
+        Left2=*(inSrcL++);
+        Right2=*(inSrcR++);
+
+#ifdef M64P_BIG_ENDIAN
+        *(outbuff++)=Right;
+        *(outbuff++)=Left;
+        *(outbuff++)=Right2;
+        *(outbuff++)=Left2;
+#else
+        *(outbuff++)=Right2;
+        *(outbuff++)=Left2;
+        *(outbuff++)=Right;
+        *(outbuff++)=Left;
+#endif
+    }
+}
+
+static void ADDMIXER (u32 inst1, u32 inst2) {
+    short Count   = (inst1 >> 12) & 0x00ff0;
+    u16 InBuffer  = (inst2 >> 16);
+    u16 OutBuffer = inst2 & 0xffff;
+
+    s16 *inp, *outp;
+    s32 temp;
+    inp  = (s16 *)(BufferSpace + InBuffer);
+    outp = (s16 *)(BufferSpace + OutBuffer);
+    for (int cntr = 0; cntr < Count; cntr+=2) {
+        temp = *outp + *inp;
+        if (temp > 32767)  temp = 32767; if (temp < -32768) temp = -32768;
+        *(outp++) = temp;
+        inp++;
+    }
+}
+
+static void HILOGAIN (u32 inst1, u32 inst2) {
+    u16 cnt = inst1 & 0xffff;
+    u16 out = (inst2 >> 16) & 0xffff;
+    s16 hi  = (s16)((inst1 >> 4) & 0xf000);
+    u16 lo  = (inst1 >> 20) & 0xf;
+    s16 *src;
+
+    src = (s16 *)(BufferSpace+out);
+    s32 tmp, val;
+
+    while(cnt) {
+        val = (s32)*src;
+        //tmp = ((val * (s32)hi) + ((u64)(val * lo) << 16) >> 16);
+        tmp = ((val * (s32)hi) >> 16) + (u32)(val * lo);
+        if ((s32)tmp > 32767) tmp = 32767;
+        else if ((s32)tmp < -32768) tmp = -32768;
+        *src = tmp;
+        src++;
+        cnt -= 2;
+    }
+}
+
+static void FILTER2 (u32 inst1, u32 inst2) {
+            static int cnt = 0;
+            static s16 *lutt6;
+            static s16 *lutt5;
+            u8 *save = (rsp.RDRAM+(inst2&0xFFFFFF));
+            u8 t4 = (u8)((inst1 >> 0x10) & 0xFF);
+            int x;
+
+            if (t4 > 1) { // Then set the cnt variable
+                cnt = (inst1 & 0xFFFF);
+                lutt6 = (s16 *)save;
+//              memcpy (dmem+0xFE0, rsp.RDRAM+(inst2&0xFFFFFF), 0x10);
+                return;
+            }
+
+            if (t4 == 0) {
+//              memcpy (dmem+0xFB0, rsp.RDRAM+(inst2&0xFFFFFF), 0x20);
+                lutt5 = (short *)(save+0x10);
+            }
+
+            lutt5 = (short *)(save+0x10);
+
+//          lutt5 = (short *)(dmem + 0xFC0);
+//          lutt6 = (short *)(dmem + 0xFE0);
+            for (x = 0; x < 8; x++) {
+                s32 a;
+                a = (lutt5[x] + lutt6[x]) >> 1;
+                lutt5[x] = lutt6[x] = (short)a;
+            }
+            short *inp1, *inp2; 
+            s32 out1[8];
+            s16 outbuff[0x3c0], *outp;
+            u32 inPtr = (u32)(inst1&0xffff);
+            inp1 = (short *)(save);
+            outp = outbuff;
+            inp2 = (short *)(BufferSpace+inPtr);
+            for (x = 0; x < cnt; x+=0x10) {
+                out1[1] =  inp1[0]*lutt6[6];
+                out1[1] += inp1[3]*lutt6[7];
+                out1[1] += inp1[2]*lutt6[4];
+                out1[1] += inp1[5]*lutt6[5];
+                out1[1] += inp1[4]*lutt6[2];
+                out1[1] += inp1[7]*lutt6[3];
+                out1[1] += inp1[6]*lutt6[0];
+                out1[1] += inp2[1]*lutt6[1]; // 1
+
+                out1[0] =  inp1[3]*lutt6[6];
+                out1[0] += inp1[2]*lutt6[7];
+                out1[0] += inp1[5]*lutt6[4];
+                out1[0] += inp1[4]*lutt6[5];
+                out1[0] += inp1[7]*lutt6[2];
+                out1[0] += inp1[6]*lutt6[3];
+                out1[0] += inp2[1]*lutt6[0];
+                out1[0] += inp2[0]*lutt6[1];
+
+                out1[3] =  inp1[2]*lutt6[6];
+                out1[3] += inp1[5]*lutt6[7];
+                out1[3] += inp1[4]*lutt6[4];
+                out1[3] += inp1[7]*lutt6[5];
+                out1[3] += inp1[6]*lutt6[2];
+                out1[3] += inp2[1]*lutt6[3];
+                out1[3] += inp2[0]*lutt6[0];
+                out1[3] += inp2[3]*lutt6[1];
+
+                out1[2] =  inp1[5]*lutt6[6];
+                out1[2] += inp1[4]*lutt6[7];
+                out1[2] += inp1[7]*lutt6[4];
+                out1[2] += inp1[6]*lutt6[5];
+                out1[2] += inp2[1]*lutt6[2];
+                out1[2] += inp2[0]*lutt6[3];
+                out1[2] += inp2[3]*lutt6[0];
+                out1[2] += inp2[2]*lutt6[1];
+
+                out1[5] =  inp1[4]*lutt6[6];
+                out1[5] += inp1[7]*lutt6[7];
+                out1[5] += inp1[6]*lutt6[4];
+                out1[5] += inp2[1]*lutt6[5];
+                out1[5] += inp2[0]*lutt6[2];
+                out1[5] += inp2[3]*lutt6[3];
+                out1[5] += inp2[2]*lutt6[0];
+                out1[5] += inp2[5]*lutt6[1];
+
+                out1[4] =  inp1[7]*lutt6[6];
+                out1[4] += inp1[6]*lutt6[7];
+                out1[4] += inp2[1]*lutt6[4];
+                out1[4] += inp2[0]*lutt6[5];
+                out1[4] += inp2[3]*lutt6[2];
+                out1[4] += inp2[2]*lutt6[3];
+                out1[4] += inp2[5]*lutt6[0];
+                out1[4] += inp2[4]*lutt6[1];
+
+                out1[7] =  inp1[6]*lutt6[6];
+                out1[7] += inp2[1]*lutt6[7];
+                out1[7] += inp2[0]*lutt6[4];
+                out1[7] += inp2[3]*lutt6[5];
+                out1[7] += inp2[2]*lutt6[2];
+                out1[7] += inp2[5]*lutt6[3];
+                out1[7] += inp2[4]*lutt6[0];
+                out1[7] += inp2[7]*lutt6[1];
+
+                out1[6] =  inp2[1]*lutt6[6];
+                out1[6] += inp2[0]*lutt6[7];
+                out1[6] += inp2[3]*lutt6[4];
+                out1[6] += inp2[2]*lutt6[5];
+                out1[6] += inp2[5]*lutt6[2];
+                out1[6] += inp2[4]*lutt6[3];
+                out1[6] += inp2[7]*lutt6[0];
+                out1[6] += inp2[6]*lutt6[1];
+                outp[1] = /*CLAMP*/((out1[1]+0x4000) >> 0xF);
+                outp[0] = /*CLAMP*/((out1[0]+0x4000) >> 0xF);
+                outp[3] = /*CLAMP*/((out1[3]+0x4000) >> 0xF);
+                outp[2] = /*CLAMP*/((out1[2]+0x4000) >> 0xF);
+                outp[5] = /*CLAMP*/((out1[5]+0x4000) >> 0xF);
+                outp[4] = /*CLAMP*/((out1[4]+0x4000) >> 0xF);
+                outp[7] = /*CLAMP*/((out1[7]+0x4000) >> 0xF);
+                outp[6] = /*CLAMP*/((out1[6]+0x4000) >> 0xF);
+                inp1 = inp2;
+                inp2 += 8;
+                outp += 8;
+            }
+//          memcpy (rsp.RDRAM+(inst2&0xFFFFFF), dmem+0xFB0, 0x20);
+            memcpy (save, inp2-8, 0x10);
+            memcpy (BufferSpace+(inst1&0xffff), outbuff, cnt);
+}
+
+static void SEGMENT2 (u32 inst1, u32 inst2) {
+    if (isZeldaABI) {
+        FILTER2 (inst1, inst2);
+        return;
+    }
+    if ((inst1 & 0xffffff) == 0) {
+        isMKABI = true;
+        //SEGMENTS[(inst2>>24)&0xf] = (inst2 & 0xffffff);
+    } else {
+        isMKABI = false;
+        isZeldaABI = true;
+        FILTER2 (inst1, inst2);
+    }
+}
+
+static void UNKNOWN (u32 inst1, u32 inst2) {
+}
+/*
+void (*ABI2[0x20])(void) = {
+    SPNOOP, ADPCM2, CLEARBUFF2, SPNOOP, SPNOOP, RESAMPLE2, SPNOOP, SEGMENT2,
+    SETBUFF2, SPNOOP, DMEMMOVE2, LOADADPCM2, MIXER2, INTERLEAVE2, HILOGAIN, SETLOOP2,
+    SPNOOP, INTERL2, ENVSETUP1, ENVMIXER2, LOADBUFF2, SAVEBUFF2, ENVSETUP2, SPNOOP,
+    SPNOOP, SPNOOP, SPNOOP, SPNOOP, SPNOOP, SPNOOP, SPNOOP, SPNOOP
+};*/
+
+extern "C" const acmd_callback_t ABI2[0x20] = {
+    SPNOOP , ADPCM2, CLEARBUFF2, UNKNOWN, ADDMIXER, RESAMPLE2, UNKNOWN, SEGMENT2,
+    SETBUFF2 , DUPLICATE2, DMEMMOVE2, LOADADPCM2, MIXER2, INTERLEAVE2, HILOGAIN, SETLOOP2,
+    SPNOOP, INTERL2 , ENVSETUP1, ENVMIXER2, LOADBUFF2, SAVEBUFF2, ENVSETUP2, SPNOOP,
+    HILOGAIN , SPNOOP, DUPLICATE2 , UNKNOWN    , SPNOOP  , SPNOOP    , SPNOOP  , SPNOOP
+};
+/*
+void (*ABI2[0x20])(void) = {
+    SPNOOP , ADPCM2, CLEARBUFF2, SPNOOP, SPNOOP, RESAMPLE2  , SPNOOP  , SEGMENT2,
+    SETBUFF2 , DUPLICATE2, DMEMMOVE2, LOADADPCM2, MIXER2, INTERLEAVE2, SPNOOP, SETLOOP2,
+    SPNOOP, INTERL2 , ENVSETUP1, ENVMIXER2, LOADBUFF2, SAVEBUFF2, ENVSETUP2, SPNOOP,
+    SPNOOP , SPNOOP, SPNOOP , SPNOOP    , SPNOOP  , SPNOOP    , SPNOOP  , SPNOOP
+};*/
+/* NOTES:
+
+  FILTER/SEGMENT - Still needs to be finished up... add FILTER?
+  UNKNOWWN #27   - Is this worth doing?  Looks like a pain in the ass just for WaveRace64
+*/
+