notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spu: remove some strange rounding
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
emu_if.c
diff --git
a/libpcsxcore/new_dynarec/emu_if.c
b/libpcsxcore/new_dynarec/emu_if.c
index
f9ee641
..
bf64e0f
100644
(file)
--- a/
libpcsxcore/new_dynarec/emu_if.c
+++ b/
libpcsxcore/new_dynarec/emu_if.c
@@
-46,12
+46,16
@@
static void schedule_timeslice(void)
next_interupt = c + min;
}
next_interupt = c + min;
}
+static void unusedInterrupt()
+{
+}
+
typedef void (irq_func)();
static irq_func * const irq_funcs[] = {
[PSXINT_SIO] = sioInterrupt,
[PSXINT_CDR] = cdrInterrupt,
typedef void (irq_func)();
static irq_func * const irq_funcs[] = {
[PSXINT_SIO] = sioInterrupt,
[PSXINT_CDR] = cdrInterrupt,
- [PSXINT_CDREAD] = cdrReadInterrupt,
+ [PSXINT_CDREAD] = cdr
PlaySeek
ReadInterrupt,
[PSXINT_GPUDMA] = gpuInterrupt,
[PSXINT_MDECOUTDMA] = mdec1Interrupt,
[PSXINT_SPUDMA] = spuInterrupt,
[PSXINT_GPUDMA] = gpuInterrupt,
[PSXINT_MDECOUTDMA] = mdec1Interrupt,
[PSXINT_SPUDMA] = spuInterrupt,
@@
-59,7
+63,7
@@
static irq_func * const irq_funcs[] = {
[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
[PSXINT_CDRDMA] = cdrDmaInterrupt,
[PSXINT_CDRLID] = cdrLidSeekInterrupt,
[PSXINT_GPUOTCDMA] = gpuotcInterrupt,
[PSXINT_CDRDMA] = cdrDmaInterrupt,
[PSXINT_CDRLID] = cdrLidSeekInterrupt,
- [PSXINT_CDRPLAY
] = cdrPlay
Interrupt,
+ [PSXINT_CDRPLAY
_OLD] = unused
Interrupt,
[PSXINT_SPU_UPDATE] = spuUpdate,
[PSXINT_RCNT] = psxRcntUpdate,
};
[PSXINT_SPU_UPDATE] = spuUpdate,
[PSXINT_RCNT] = psxRcntUpdate,
};
@@
-88,7
+92,8
@@
static void irq_test(void)
void gen_interupt()
{
void gen_interupt()
{
- evprintf(" +ge %08x, %u->%u\n", psxRegs.pc, psxRegs.cycle, next_interupt);
+ evprintf(" +ge %08x, %u->%u (%d)\n", psxRegs.pc, psxRegs.cycle,
+ next_interupt, next_interupt - psxRegs.cycle);
irq_test();
//psxBranchTest();
irq_test();
//psxBranchTest();
@@
-296,7
+301,6
@@
static int ari64_init()
static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
extern void (*psxCP2[64])();
extern void psxNULL();
static u32 scratch_buf[8*8*2] __attribute__((aligned(64)));
extern void (*psxCP2[64])();
extern void psxNULL();
- extern unsigned char *out;
size_t i;
new_dynarec_init();
size_t i;
new_dynarec_init();
@@
-326,10
+330,6
@@
static int ari64_init()
zeromem_ptr = zero_mem;
scratch_buf_ptr = scratch_buf;
zeromem_ptr = zero_mem;
scratch_buf_ptr = scratch_buf;
- SysPrintf("Mapped (RAM/scrp/ROM/LUTs/TC):\n");
- SysPrintf("%p/%p/%p/%p/%p\n",
- psxM, psxH, psxR, mem_rtab, out);
-
return 0;
}
return 0;
}
@@
-337,7
+337,7
@@
static void ari64_reset()
{
printf("ari64_reset\n");
new_dyna_pcsx_mem_reset();
{
printf("ari64_reset\n");
new_dyna_pcsx_mem_reset();
- invalidate_all_pages();
+
new_dynarec_
invalidate_all_pages();
new_dyna_restore();
pending_exception = 1;
}
new_dyna_restore();
pending_exception = 1;
}
@@
-367,21
+367,11
@@
static void ari64_execute()
static void ari64_clear(u32 addr, u32 size)
{
static void ari64_clear(u32 addr, u32 size)
{
- u32 start, end, main_ram;
-
size *= 4; /* PCSX uses DMA units (words) */
evprintf("ari64_clear %08x %04x\n", addr, size);
size *= 4; /* PCSX uses DMA units (words) */
evprintf("ari64_clear %08x %04x\n", addr, size);
- /* check for RAM mirrors */
- main_ram = (addr & 0xffe00000) == 0x80000000;
-
- start = addr >> 12;
- end = (addr + size) >> 12;
-
- for (; start <= end; start++)
- if (!main_ram || !invalid_code[start])
- invalidate_block(start);
+ new_dynarec_invalidate_range(addr, addr + size);
}
static void ari64_notify(int note, void *data) {
}
static void ari64_notify(int note, void *data) {
@@
-448,15
+438,14
@@
int new_dynarec_hacks;
void *psxH_ptr;
void *zeromem_ptr;
u8 zero_mem[0x1000];
void *psxH_ptr;
void *zeromem_ptr;
u8 zero_mem[0x1000];
-unsigned char *out;
void *mem_rtab;
void *scratch_buf_ptr;
void new_dynarec_init() {}
void new_dyna_start(void *context) {}
void new_dynarec_cleanup() {}
void new_dynarec_clear_full() {}
void *mem_rtab;
void *scratch_buf_ptr;
void new_dynarec_init() {}
void new_dyna_start(void *context) {}
void new_dynarec_cleanup() {}
void new_dynarec_clear_full() {}
-void invalidate_all_pages() {}
-void
invalidate_block(unsigned int block
) {}
+void
new_dynarec_
invalidate_all_pages() {}
+void
new_dynarec_invalidate_range(unsigned int start, unsigned int end
) {}
void new_dyna_pcsx_mem_init(void) {}
void new_dyna_pcsx_mem_reset(void) {}
void new_dyna_pcsx_mem_load_state(void) {}
void new_dyna_pcsx_mem_init(void) {}
void new_dyna_pcsx_mem_reset(void) {}
void new_dyna_pcsx_mem_load_state(void) {}
@@
-664,7
+653,8
@@
void do_insn_cmp(void)
//if (psxRegs.cycle == 166172) breakme();
if (which_event >= 0 && event_cycles[which_event] != ev_cycles) {
//if (psxRegs.cycle == 166172) breakme();
if (which_event >= 0 && event_cycles[which_event] != ev_cycles) {
- printf("bad ev_cycles #%d: %08x %08x\n", which_event, event_cycles[which_event], ev_cycles);
+ printf("bad ev_cycles #%d: %u %u / %u\n", which_event,
+ event_cycles[which_event], ev_cycles, psxRegs.cycle);
fatal = 1;
}
fatal = 1;
}