# HG changeset patch
# User nkeynes
# Date 1200301738 0
# Node ID 4945fa2ed24f8230962f2d96083fd405ff126d44
# Parent  c3a03d8eb9ff53ddfe152d79a328931bfabf515e
Fix TRAPA in emulator core

--- a/src/sh4/sh4core.c	Mon Jan 14 09:04:03 2008 +0000
+++ b/src/sh4/sh4core.c	Mon Jan 14 09:08:58 2008 +0000
@@ -1693,9 +1693,9 @@
                         { /* TRAPA #imm */
                         uint32_t imm = (ir&0xFF); 
                         CHECKSLOTILLEGAL();
-                        MMIO_WRITE( MMU, TRA, imm<<2 );
                         sh4r.pc += 2;
-                        sh4_raise_exception( EXC_TRAP );
+                        sh4_raise_trap( imm );
+                        return TRUE;
                         }
                         break;
                     case 0x4:
--- a/src/sh4/sh4core.in	Mon Jan 14 09:04:03 2008 +0000
+++ b/src/sh4/sh4core.in	Mon Jan 14 09:08:58 2008 +0000
@@ -635,9 +635,9 @@
 :}
 TRAPA #imm {:
     CHECKSLOTILLEGAL();
-    MMIO_WRITE( MMU, TRA, imm<<2 );
     sh4r.pc += 2;
-    sh4_raise_exception( EXC_TRAP );
+    sh4_raise_trap( imm );
+    return TRUE;
 :}
 RTS {: 
     CHECKSLOTILLEGAL();