revision 576:4945fa2ed24f
summary |
tree |
shortlog |
changelog |
graph |
changeset |
raw | bz2 | zip | gz changeset | 576:4945fa2ed24f |
parent | 575:c3a03d8eb9ff |
child | 577:a181aeacd6e8 |
author | nkeynes |
date | Mon Jan 14 09:08:58 2008 +0000 (15 years ago) |
branch | lxdream-mmu |
Fix TRAPA in emulator core
1.1 --- a/src/sh4/sh4core.c Mon Jan 14 09:04:03 2008 +00001.2 +++ b/src/sh4/sh4core.c Mon Jan 14 09:08:58 2008 +00001.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 +00002.2 +++ b/src/sh4/sh4core.in Mon Jan 14 09:08:58 2008 +00002.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();
.