fix x86 build, minor refactoring

[pcsx_rearmed.git] / frontend / plugin.c

diff --git a/frontend/plugin.c b/frontend/plugin.c
index bea6eb5..ca359d7 100644 (file)
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "plugin_lib.h"
 #include "plugin.h"
 
 static int dummy_func() {
@@ -42,18 +43,22 @@ extern void SPUasync(unsigned int);
 extern void SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static uint8_t CurByte;
+static uint8_t pad_buf[] = { 0x41, 0x5A, 0xFF, 0xFF };
+static uint8_t pad_byte;
 
 static unsigned char PADstartPoll(int pad) {
-       CurByte = 0;
+       pad_byte = 0;
+       pad_buf[2] = ~keystate;
+       pad_buf[3] = ~keystate >> 8;
+
        return 0xFF;
 }
 
 static unsigned char PADpoll(unsigned char value) {
-       static uint8_t buf[] = {0x41, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80};
-       if (CurByte >= 4)
+       if (pad_byte >= 4)
                return 0;
-       return buf[CurByte++];
+
+       return pad_buf[pad_byte++];
 }
 
 /* GPU */
@@ -199,3 +204,82 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym)
        return NULL;
 }
 
+#ifdef PCNT
+
+/* basic profile stuff */
+#include "pcnt.h"
+
+unsigned int pcounters[PCNT_CNT];
+unsigned int pcounter_starts[PCNT_CNT];
+
+#define pc_hook_func(name, args, pargs, cnt) \
+extern void (*name) args; \
+static void (*o_##name) args; \
+static void w_##name args \
+{ \
+       unsigned int pc_start = pcnt_get(); \
+       o_##name pargs; \
+       pcounters[cnt] += pcnt_get() - pc_start; \
+}
+
+#define pc_hook_func_ret(retn, name, args, pargs, cnt) \
+extern retn (*name) args; \
+static retn (*o_##name) args; \
+static retn w_##name args \
+{ \
+       retn ret; \
+       unsigned int pc_start = pcnt_get(); \
+       ret = o_##name pargs; \
+       pcounters[cnt] += pcnt_get() - pc_start; \
+       return ret; \
+}
+
+pc_hook_func              (GPU_writeStatus, (uint32_t a0), (a0), PCNT_GPU)
+pc_hook_func              (GPU_writeData, (uint32_t a0), (a0), PCNT_GPU)
+pc_hook_func              (GPU_writeDataMem, (uint32_t *a0, int a1), (a0, a1), PCNT_GPU)
+pc_hook_func_ret(uint32_t, GPU_readStatus, (void), (), PCNT_GPU)
+pc_hook_func_ret(uint32_t, GPU_readData, (void), (), PCNT_GPU)
+pc_hook_func              (GPU_readDataMem, (uint32_t *a0, int a1), (a0, a1), PCNT_GPU)
+pc_hook_func_ret(long,     GPU_dmaChain, (uint32_t *a0, int32_t a1), (a0, a1), PCNT_GPU)
+pc_hook_func              (GPU_updateLace, (void), (), PCNT_GPU)
+
+pc_hook_func              (SPU_writeRegister, (unsigned long a0, unsigned short a1), (a0, a1), PCNT_SPU)
+pc_hook_func_ret(unsigned short,SPU_readRegister, (unsigned long a0), (a0), PCNT_SPU)
+pc_hook_func              (SPU_writeDMA, (unsigned short a0), (a0), PCNT_SPU)
+pc_hook_func_ret(unsigned short,SPU_readDMA, (void), (), PCNT_SPU)
+pc_hook_func              (SPU_writeDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU)
+pc_hook_func              (SPU_readDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU)
+pc_hook_func              (SPU_playADPCMchannel, (void *a0), (a0), PCNT_SPU)
+pc_hook_func              (SPU_async, (unsigned int a0), (a0), PCNT_SPU)
+pc_hook_func              (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU)
+
+#define hook_it(name) { \
+       o_##name = name; \
+       name = w_##name; \
+}
+
+void pcnt_hook_plugins(void)
+{
+       /* test it first */
+       pcnt_get();
+
+       hook_it(GPU_writeStatus);
+       hook_it(GPU_writeData);
+       hook_it(GPU_writeDataMem);
+       hook_it(GPU_readStatus);
+       hook_it(GPU_readData);
+       hook_it(GPU_readDataMem);
+       hook_it(GPU_dmaChain);
+       hook_it(GPU_updateLace);
+       hook_it(SPU_writeRegister);
+       hook_it(SPU_readRegister);
+       hook_it(SPU_writeDMA);
+       hook_it(SPU_readDMA);
+       hook_it(SPU_writeDMAMem);
+       hook_it(SPU_readDMAMem);
+       hook_it(SPU_playADPCMchannel);
+       hook_it(SPU_async);
+       hook_it(SPU_playCDDAchannel);
+}
+
+#endif