--- a/src/aica/armcore.c	Mon Jan 16 11:23:28 2006 +0000
+++ b/src/aica/armcore.c	Tue Jan 17 12:53:39 2006 +0000
@@ -1,5 +1,5 @@
 /**
- * $Id: armcore.c,v 1.18 2006-01-16 11:23:28 nkeynes Exp $
+ * $Id: armcore.c,v 1.19 2006-01-17 12:53:39 nkeynes Exp $
  * 
  * ARM7TDMI CPU emulation core.
  *
@@ -1149,11 +1149,16 @@
 	    }
 	    armr.r[15] = pc + 4 + operand;
 	} else { /* Load/store multiple */
+	    gboolean needRestore = FALSE;
 	    operand = RN(ir);
 	    
 	    switch( (ir & 0x01D00000) >> 20 ) {
 	    case 0: /* STMDA */
-		for( i=15; i>= 0; i-- ) {
+		if( ir & 0x8000 ) {
+		    arm_write_long( operand, armr.r[15]+4 );
+		    operand -= 4;
+		}
+		for( i=14; i>= 0; i-- ) {
 		    if( (ir & (1<<i)) ) {
 			arm_write_long( operand, armr.r[i] );
 			operand -= 4;
@@ -1169,7 +1174,11 @@
 		}
 		break;
 	    case 4: /* STMDA (S) */
-		for( i=15; i>= 0; i-- ) {
+		if( ir & 0x8000 ) {
+		    arm_write_long( operand, armr.r[15]+4 );
+		    operand -= 4;
+		}
+		for( i=14; i>= 0; i-- ) {
 		    if( (ir & (1<<i)) ) {
 			arm_write_long( operand, USER_R(i) );
 			operand -= 4;
@@ -1184,7 +1193,7 @@
 			    operand -= 4;
 			}
 		    }
-		    arm_restore_cpsr();
+		    needRestore = TRUE;
 		} else {
 		    for( i=15; i>= 0; i-- ) {
 			if( (ir & (1<<i)) ) {
@@ -1195,12 +1204,16 @@
 		}
 		break;
 	    case 8: /* STMIA */
-		for( i=0; i< 16; i++ ) {
+		for( i=0; i< 15; i++ ) {
 		    if( (ir & (1<<i)) ) {
 			arm_write_long( operand, armr.r[i] );
 			operand += 4;
 		    }
 		}
+		if( ir & 0x8000 ) {
+		    arm_write_long( operand, armr.r[15]+4 );
+		    operand += 4;
+		}
 		break;
 	    case 9: /* LDMIA */
 		for( i=0; i< 16; i++ ) {
@@ -1211,12 +1224,16 @@
 		}
 		break;
 	    case 12: /* STMIA (S) */
-		for( i=0; i< 16; i++ ) {
+		for( i=0; i< 15; i++ ) {
 		    if( (ir & (1<<i)) ) {
 			arm_write_long( operand, USER_R(i) );
 			operand += 4;
 		    }
 		}
+		if( ir & 0x8000 ) {
+		    arm_write_long( operand, armr.r[15]+4 );
+		    operand += 4;
+		}
 		break;
 	    case 13: /* LDMIA (S) */
 		if( (ir&0x00008000) ) { /* Load PC */
@@ -1226,7 +1243,7 @@
 			    operand += 4;
 			}
 		    }
-		    arm_restore_cpsr();
+		    needRestore = TRUE;
 		} else {
 		    for( i=0; i < 16; i++ ) {
 			if( (ir & (1<<i)) ) {
@@ -1237,7 +1254,11 @@
 		}
 		break;
 	    case 16: /* STMDB */
-		for( i=15; i>= 0; i-- ) {
+		if( ir & 0x8000 ) {
+		    operand -= 4;
+		    arm_write_long( operand, armr.r[15]+4 );
+		}
+		for( i=14; i>= 0; i-- ) {
 		    if( (ir & (1<<i)) ) {
 			operand -= 4;
 			arm_write_long( operand, armr.r[i] );
@@ -1253,7 +1274,11 @@
 		}
 		break;
 	    case 20: /* STMDB (S) */
-		for( i=15; i>= 0; i-- ) {
+		if( ir & 0x8000 ) {
+		    operand -= 4;
+		    arm_write_long( operand, armr.r[15]+4 );
+		}
+		for( i=14; i>= 0; i-- ) {
 		    if( (ir & (1<<i)) ) {
 			operand -= 4;
 			arm_write_long( operand, USER_R(i) );
@@ -1268,7 +1293,7 @@
 			    armr.r[i] = arm_read_long( operand );
 			}
 		    }
-		    arm_restore_cpsr();
+		    needRestore = TRUE;
 		} else {
 		    for( i=15; i>= 0; i-- ) {
 			if( (ir & (1<<i)) ) {
@@ -1279,12 +1304,16 @@
 		}
 		break;
 	    case 24: /* STMIB */
-		for( i=0; i< 16; i++ ) {
+		for( i=0; i< 15; i++ ) {
 		    if( (ir & (1<<i)) ) {
 			operand += 4;
 			arm_write_long( operand, armr.r[i] );
 		    }
 		}
+		if( ir & 0x8000 ) {
+		    operand += 4;
+		    arm_write_long( operand, armr.r[15]+4 );
+		}
 		break;
 	    case 25: /* LDMIB */
 		for( i=0; i< 16; i++ ) {
@@ -1295,12 +1324,16 @@
 		}
 		break;
 	    case 28: /* STMIB (S) */
-		for( i=0; i< 16; i++ ) {
+		for( i=0; i< 15; i++ ) {
 		    if( (ir & (1<<i)) ) {
 			operand += 4;
 			arm_write_long( operand, USER_R(i) );
 		    }
 		}
+		if( ir & 0x8000 ) {
+		    operand += 4;
+		    arm_write_long( operand, armr.r[15]+4 );
+		}
 		break;
 	    case 29: /* LDMIB (S) */
 		if( (ir&0x00008000) ) { /* Load PC */
@@ -1310,7 +1343,7 @@
 			    armr.r[i] = arm_read_long( operand );
 			}
 		    }
-		    arm_restore_cpsr();
+		    needRestore = TRUE;
 		} else {
 		    for( i=0; i < 16; i++ ) {
 			if( (ir & (1<<i)) ) {
@@ -1324,6 +1357,8 @@
 	    
 	    if( WFLAG(ir) ) 
 		LRN(ir) = operand;
+	    if( needRestore ) 
+		arm_restore_cpsr();
 	}
 	break;
     case 3: /* Copro */
@@ -1334,5 +1369,10 @@
 	}
 	break;
     }
+    if( armr.r[15] > 0x00200000 ) {
+	dreamcast_stop();
+	ERROR( "BRANCH to fishkill at %08X", pc );
+	return FALSE;
+    }
     return TRUE;
 }