X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2Fsh2%2Fsh2.c;h=cd07bef801b5576261a56b210dad50dc254117e6;hb=bcf65fd674528896fe1bc233c8bab617f6b2c86e;hp=87343b056321e16ec005b4bb06002c3606f01fdf;hpb=6add7875b54904ff2a6c4b49a1b6e82a3c888a6d;p=picodrive.git diff --git a/cpu/sh2/sh2.c b/cpu/sh2/sh2.c index 87343b0..cd07bef 100644 --- a/cpu/sh2/sh2.c +++ b/cpu/sh2/sh2.c @@ -25,8 +25,8 @@ void sh2_finish(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; @@ -37,15 +37,15 @@ void sh2_do_irq(SH2 *sh2, int level, int vector) 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; - 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 */ - 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;