Search
lxdream.org :: lxdream :: r576:4945fa2ed24f
lxdream 0.9.1
released Jun 29
Download Now
changeset576:4945fa2ed24f lxdream-mmu
parent575:c3a03d8eb9ff
child577:a181aeacd6e8
authornkeynes
dateMon Jan 14 09:08:58 2008 +0000 (12 years ago)
branchlxdream-mmu
Fix TRAPA in emulator core
src/sh4/sh4core.c
src/sh4/sh4core.in
1.1 --- a/src/sh4/sh4core.c Mon Jan 14 09:04:03 2008 +0000
1.2 +++ b/src/sh4/sh4core.c Mon Jan 14 09:08:58 2008 +0000
1.3 @@ -1693,9 +1693,9 @@
1.4 { /* TRAPA #imm */
1.5 uint32_t imm = (ir&0xFF);
1.6 CHECKSLOTILLEGAL();
1.7 - MMIO_WRITE( MMU, TRA, imm<<2 );
1.8 sh4r.pc += 2;
1.9 - sh4_raise_exception( EXC_TRAP );
1.10 + sh4_raise_trap( imm );
1.11 + return TRUE;
1.12 }
1.13 break;
1.14 case 0x4:
2.1 --- a/src/sh4/sh4core.in Mon Jan 14 09:04:03 2008 +0000
2.2 +++ b/src/sh4/sh4core.in Mon Jan 14 09:08:58 2008 +0000
2.3 @@ -635,9 +635,9 @@
2.4 :}
2.5 TRAPA #imm {:
2.6 CHECKSLOTILLEGAL();
2.7 - MMIO_WRITE( MMU, TRA, imm<<2 );
2.8 sh4r.pc += 2;
2.9 - sh4_raise_exception( EXC_TRAP );
2.10 + sh4_raise_trap( imm );
2.11 + return TRUE;
2.12 :}
2.13 RTS {:
2.14 CHECKSLOTILLEGAL();
.