RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

32x: change irq hadling, make it more drc friendly

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@816 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-10-14 14:46:38 +00:00
parent a8b03e2d4d
commit 6add7875b5
5 changed files with 46 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
cpu/sh2/compiler.c
View file

@ -318,15 +318,16 @@ static void *sh2_translate(SH2 *sh2, block_desc *other_block)
}
end_op:
if (delayed_op == 1) {
if (delayed_op == 1)
emit_move_r_r(SHR_PC, SHR_PPC);
break;
}
if (test_irq && delayed_op != 2) {
emith_pass_arg(1, sh2);
emith_call(sh2_test_irq);
break;
}
if (delayed_op == 1)
break;
#if (DRC_DEBUG & 2)
host_dasm(tcache_dsm_ptr, (char *)tcache_ptr - (char *)tcache_dsm_ptr);
@ -372,8 +373,13 @@ void __attribute__((noinline)) sh2_drc_dispatcher(SH2 *sh2)
{
while (((signed int)sh2->sr >> 12) > 0)
{
block_desc *bd = HASH_FUNC(sh2->pc_hashtab, sh2->pc);
void *block = NULL;
block_desc *bd;
// FIXME: must avoid doing it so often..
sh2_test_irq(sh2);
bd = HASH_FUNC(sh2->pc_hashtab, sh2->pc);
if (bd != NULL) {
if (bd->addr == sh2->pc)
@ -407,10 +413,16 @@ void sh2_execute(SH2 *sh2, int cycles)
static void __attribute__((regparm(1))) sh2_test_irq(SH2 *sh2)
{
if (sh2->pending_irl > sh2->pending_int_irq)
sh2_irl_irq(sh2, sh2->pending_irl);
else
sh2_internal_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
if (sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
{
if (sh2->pending_irl > sh2->pending_int_irq)
sh2_do_irq(sh2, sh2->pending_irl, 64 + sh2->pending_irl/2);
else {
sh2_do_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
sh2->pending_int_irq = 0; // auto-clear
sh2->pending_level = sh2->pending_irl;
}
}
}
int sh2_drc_init(SH2 *sh2)

20
cpu/sh2/mame/sh2pico.c
View file

@ -48,6 +48,18 @@ void sh2_execute(SH2 *sh2_, int cycles)
{
UINT32 opcode;
if (sh2->test_irq && !sh2->delay && sh2->pending_level > ((sh2->sr >> 4) & 0x0f))
{
if (sh2->pending_irl > sh2->pending_int_irq)
sh2_do_irq(sh2, sh2->pending_irl, 64 + sh2->pending_irl/2);
else {
sh2_do_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
sh2->pending_int_irq = 0; // auto-clear
sh2->pending_level = sh2->pending_irl;
}
sh2->test_irq = 0;
}
if (sh2->delay)
{
sh2->ppc = sh2->delay;
@ -83,14 +95,6 @@ void sh2_execute(SH2 *sh2_, int cycles)
default: op1111(opcode); break;
}
if (sh2->test_irq && !sh2->delay)
{
if (sh2->pending_irl > sh2->pending_int_irq)
sh2_irl_irq(sh2, sh2->pending_irl);
else
sh2_internal_irq(sh2, sh2->pending_int_irq, sh2->pending_int_vector);
sh2->test_irq = 0;
}
sh2->icount--;
}
while (sh2->icount > 0 || sh2->delay); /* can't interrupt before delay */

19
cpu/sh2/sh2.c
View file

@ -32,7 +32,7 @@ void sh2_reset(SH2 *sh2)
sh2->pending_int_irq = 0;
}
static void sh2_do_irq(SH2 *sh2, int level, int vector)
void sh2_do_irq(SH2 *sh2, int level, int vector)
{
sh2->irq_callback(sh2->is_slave, level);
@ -55,20 +55,23 @@ static void sh2_do_irq(SH2 *sh2, int level, int vector)
void sh2_irl_irq(SH2 *sh2, int level)
{
sh2->pending_irl = level;
if (level <= ((sh2->sr >> 4) & 0x0f))
return;
if (level > sh2->pending_int_irq)
sh2->pending_level = level;
else
sh2->pending_level = sh2->pending_int_irq;
sh2_do_irq(sh2, level, 64 + level/2);
sh2->test_irq = 1;
}
void sh2_internal_irq(SH2 *sh2, int level, int vector)
{
// FIXME: multiple internal irqs not handled..
// assuming internal irqs never clear until accepted
sh2->pending_int_irq = level;
sh2->pending_int_vector = vector;
if (level <= ((sh2->sr >> 4) & 0x0f))
return;
if (level > sh2->pending_level)
sh2->pending_level = level;
sh2_do_irq(sh2, level, vector);
sh2->pending_int_irq = 0; // auto-clear
sh2->test_irq = 1;
}

2
cpu/sh2/sh2.h
View file

@ -31,6 +31,7 @@ typedef struct
void **pc_hashtab; // 70
// common
int pending_level; // MAX(pending_irl, pending_int_irq)
int pending_irl;
int pending_int_irq; // internal irq
int pending_int_vector;
@ -48,6 +49,7 @@ void sh2_finish(SH2 *sh2);
void sh2_reset(SH2 *sh2);
void sh2_irl_irq(SH2 *sh2, int level);
void sh2_internal_irq(SH2 *sh2, int level, int vector);
void sh2_do_irq(SH2 *sh2, int level, int vector);
void sh2_execute(SH2 *sh2, int cycles);

2
pico/pico_int.h
View file

@ -259,7 +259,7 @@ extern SH2 sh2s[2];
#define sh2_reg(c, x) (c) ? ssh2.r[x] : msh2.r[x]
#define sh2_gbr(c) (c) ? ssh2.gbr : msh2.gbr
#define sh2_vbr(c) (c) ? ssh2.vbr : msh2.vbr
#define sh2_sr(c) (c) ? ssh2.sr : msh2.sr
#define sh2_sr(c) (((c) ? ssh2.sr : msh2.sr) & 0xfff)
#define sh2_set_gbr(c, v) \
{ if (c) ssh2.gbr = v; else msh2.gbr = v; }