notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SH2 drc, dummy soc for GP2X
[picodrive.git]
/
cpu
/
sh2
/
sh2.c
diff --git
a/cpu/sh2/sh2.c
b/cpu/sh2/sh2.c
index
bda1c93
..
cd07bef
100644
(file)
--- a/
cpu/sh2/sh2.c
+++ b/
cpu/sh2/sh2.c
@@
-1,37
+1,51
@@
#include <string.h>
#include "sh2.h"
#include <string.h>
#include "sh2.h"
+#include "compiler.h"
#define I 0xf0
#define I 0xf0
-
void
sh2_init(SH2 *sh2, int is_slave)
+
int
sh2_init(SH2 *sh2, int is_slave)
{
{
+ int ret = 0;
+
memset(sh2, 0, sizeof(*sh2));
sh2->is_slave = is_slave;
memset(sh2, 0, sizeof(*sh2));
sh2->is_slave = is_slave;
+#ifdef DRC_SH2
+ ret = sh2_drc_init(sh2);
+#endif
+ return ret;
+}
+
+void sh2_finish(SH2 *sh2)
+{
+#ifdef DRC_SH2
+ sh2_drc_finish(sh2);
+#endif
}
void sh2_reset(SH2 *sh2)
{
}
void sh2_reset(SH2 *sh2)
{
- sh2->pc = p32x_sh2_read32(0, sh2
->is_slave
);
- sh2->r[15] = p32x_sh2_read32(4, sh2
->is_slave
);
+ sh2->pc = p32x_sh2_read32(0, sh2);
+ sh2->r[15] = p32x_sh2_read32(4, sh2);
sh2->sr = I;
sh2->vbr = 0;
sh2->pending_int_irq = 0;
}
sh2->sr = I;
sh2->vbr = 0;
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);
sh2->r[15] -= 4;
{
sh2->irq_callback(sh2->is_slave, level);
sh2->r[15] -= 4;
- p32x_sh2_write32(sh2->r[15], sh2->sr, sh2
->is_slave);
/* push SR onto stack */
+ p32x_sh2_write32(sh2->r[15], sh2->sr, sh2
);
/* push SR onto stack */
sh2->r[15] -= 4;
sh2->r[15] -= 4;
- p32x_sh2_write32(sh2->r[15], sh2->pc, sh2
->is_slave);
/* push PC onto stack */
+ p32x_sh2_write32(sh2->r[15], sh2->pc, sh2
);
/* push PC onto stack */
/* set I flags in SR */
sh2->sr = (sh2->sr & ~I) | (level << 4);
/* fetch PC */
/* set I flags in SR */
sh2->sr = (sh2->sr & ~I) | (level << 4);
/* fetch PC */
- sh2->pc = p32x_sh2_read32(sh2->vbr + vector * 4, sh2
->is_slave
);
+ sh2->pc = p32x_sh2_read32(sh2->vbr + vector * 4, sh2);
/* 13 cycles at best */
sh2->cycles_done += 13;
/* 13 cycles at best */
sh2->cycles_done += 13;
@@
-41,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;
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)
{
}
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;
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;
}
}