X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=e741a1ad1826708d1f8ed633439628c9c910a69a;hp=bea6eb5d954ae86d46adc8048e703f67c2eed491;hb=82ed88ebe25a0312aab83623b5a983bd96f3d830;hpb=e906c010e1bea71ed4df425be97ce45dc777818c diff --git a/frontend/plugin.c b/frontend/plugin.c index bea6eb5d..e741a1ad 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -9,17 +9,16 @@ #include #include +#include "plugin_lib.h" #include "plugin.h" +#include "../libpcsxcore/psemu_plugin_defs.h" +#include "../libpcsxcore/system.h" +#include "../plugins/cdrcimg/cdrcimg.h" static int dummy_func() { return 0; } -static long CDRreadTrack(unsigned char *time) { - fprintf(stderr, "CDRreadTrack\n"); - return -1; -} - /* SPU */ extern long SPUopen(void); extern long SPUinit(void); @@ -39,21 +38,27 @@ extern long SPUtest(void); extern void SPUabout(void); extern long SPUfreeze(unsigned int, void *); extern void SPUasync(unsigned int); -extern void SPUplayCDDAchannel(short *, int); +extern int SPUplayCDDAchannel(short *, int); /* PAD */ -static uint8_t CurByte; - -static unsigned char PADstartPoll(int pad) { - CurByte = 0; - return 0xFF; +static long PADreadPort1(PadDataS *pad) +{ + pad->controllerType = in_type1; + pad->buttonStatus = ~in_keystate; + if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) { + pad->leftJoyX = in_a1[0]; + pad->leftJoyY = in_a1[1]; + pad->rightJoyX = in_a2[0]; + pad->rightJoyY = in_a2[1]; + } + return 0; } -static unsigned char PADpoll(unsigned char value) { - static uint8_t buf[] = {0x41, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80}; - if (CurByte >= 4) - return 0; - return buf[CurByte++]; +static long PADreadPort2(PadDataS *pad) +{ + pad->controllerType = in_type2; + pad->buttonStatus = ~in_keystate >> 16; + return 0; } /* GPU */ @@ -69,17 +74,9 @@ extern uint32_t GPUreadData(void); extern void GPUreadDataMem(uint32_t *, int); extern long GPUdmaChain(uint32_t *,uint32_t); extern void GPUupdateLace(void); -extern long GPUconfigure(void); -extern long GPUtest(void); -extern void GPUabout(void); -extern void GPUmakeSnapshot(void); -extern void GPUkeypressed(int); -extern void GPUdisplayText(char *); extern long GPUfreeze(uint32_t, void *); -extern long GPUgetScreenPic(unsigned char *); -extern long GPUshowScreenPic(unsigned char *); -extern void GPUclearDynarec(void (*callback)(void)); -extern void GPUvBlank(int); +extern void GPUvBlank(int, uint32_t *, uint32_t *); +extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs); #define DUMMY(id, name) \ @@ -88,6 +85,7 @@ extern void GPUvBlank(int); #define DIRECT(id, name) \ { id, #name, name } +#define DUMMY_GPU(name) DUMMY(PLUGIN_GPU, name) #define DUMMY_CDR(name) DUMMY(PLUGIN_CDR, name) #define DUMMY_PAD(name) DUMMY(PLUGIN_PAD, name) #define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name) @@ -119,7 +117,6 @@ static const struct { DUMMY_CDR(CDRsetfilename), DUMMY_CDR(CDRreadCDDA), DUMMY_CDR(CDRgetTE), - DIRECT(PLUGIN_CDR, CDRreadTrack), /* SPU */ DIRECT_SPU(SPUconfigure), DIRECT_SPU(SPUabout), @@ -141,27 +138,26 @@ static const struct { DIRECT_SPU(SPUasync), DIRECT_SPU(SPUplayCDDAchannel), /* PAD */ - DUMMY_PAD(PADconfigure), - DUMMY_PAD(PADabout), DUMMY_PAD(PADinit), DUMMY_PAD(PADshutdown), - DUMMY_PAD(PADtest), DUMMY_PAD(PADopen), DUMMY_PAD(PADclose), + DUMMY_PAD(PADsetSensitive), + DIRECT_PAD(PADreadPort1), + DIRECT_PAD(PADreadPort2), +/* DUMMY_PAD(PADquery), - DUMMY_PAD(PADreadPort1), - DUMMY_PAD(PADreadPort2), + DUMMY_PAD(PADconfigure), + DUMMY_PAD(PADtest), + DUMMY_PAD(PADabout), DUMMY_PAD(PADkeypressed), - DUMMY_PAD(PADsetSensitive), - DIRECT_PAD(PADstartPoll), - DIRECT_PAD(PADpoll), + DUMMY_PAD(PADstartPoll), + DUMMY_PAD(PADpoll), +*/ /* GPU */ DIRECT_GPU(GPUupdateLace), DIRECT_GPU(GPUinit), DIRECT_GPU(GPUshutdown), - DIRECT_GPU(GPUconfigure), - DIRECT_GPU(GPUtest), - DIRECT_GPU(GPUabout), DIRECT_GPU(GPUopen), DIRECT_GPU(GPUclose), DIRECT_GPU(GPUreadStatus), @@ -171,20 +167,30 @@ static const struct { DIRECT_GPU(GPUwriteData), DIRECT_GPU(GPUwriteDataMem), DIRECT_GPU(GPUdmaChain), + DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUvBlank), + DIRECT_GPU(GPUrearmedCallbacks), + + DUMMY_GPU(GPUdisplayText), +/* DIRECT_GPU(GPUkeypressed), - DIRECT_GPU(GPUdisplayText), DIRECT_GPU(GPUmakeSnapshot), - DIRECT_GPU(GPUfreeze), + DIRECT_GPU(GPUconfigure), + DIRECT_GPU(GPUtest), + DIRECT_GPU(GPUabout), DIRECT_GPU(GPUgetScreenPic), DIRECT_GPU(GPUshowScreenPic), +*/ // DIRECT_GPU(GPUclearDynarec), -// DIRECT_GPU(GPUvBlank), }; void *plugin_link(enum builtint_plugins_e id, const char *sym) { int i; + if (id == PLUGIN_CDRCIMG) + return cdrcimg_get_sym(sym); + for (i = 0; i < ARRAY_SIZE(plugin_funcs); i++) { if (id != plugin_funcs[i].id) continue; @@ -195,7 +201,106 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym) return plugin_funcs[i].func; } - fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, sym); + //fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, sym); return NULL; } +void plugin_call_rearmed_cbs(void) +{ + extern void *hGPUDriver; + void (*rearmed_set_cbs)(const struct rearmed_cbs *cbs); + + rearmed_set_cbs = SysLoadSym(hGPUDriver, "GPUrearmedCallbacks"); + if (rearmed_set_cbs != NULL) + rearmed_set_cbs(&pl_rearmed_cbs); +} + +#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_ret(int, 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) +{ + pcnt_init(); + + 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); +} + +// hooked into recompiler +void pcnt_gte_start(int op) +{ + pcnt_start(PCNT_GTE); +} + +void pcnt_gte_end(int op) +{ + pcnt_end(PCNT_GTE); +} + +#endif