From b4c02ee3eca4e7ef38692e2b4ebc51f214b245a0 Mon Sep 17 00:00:00 2001
From: Niclas Finne <nfi@sics.se>
Date: Tue, 4 Dec 2012 15:35:28 +0100
Subject: [PATCH] Bug fix in mova index2reg and reg2index

---
 se/sics/mspsim/core/MSP430Core.java | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/se/sics/mspsim/core/MSP430Core.java b/se/sics/mspsim/core/MSP430Core.java
index 7f56f5a..0eb1d35 100644
--- a/se/sics/mspsim/core/MSP430Core.java
+++ b/se/sics/mspsim/core/MSP430Core.java
@@ -1110,9 +1110,6 @@ public class MSP430Core extends Chip implements MSP430Constants {
 	    if(index > 0x8000) {
 		index = -(0x10000 - index);
 	    }
-	    if(indexModifier > 0x8000) {
-		indexModifier = -(0x10000 - indexModifier);
-	    }
             writeRegister(dstData, currentSegment.read(indexModifier + index, AccessMode.WORD20, AccessType.READ));
 	    writeRegister(PC, pc += 2);
             updateStatus = false;
@@ -1135,9 +1132,6 @@ public class MSP430Core extends Chip implements MSP430Constants {
 	    if(index > 0x8000) {
 		index = -(0x10000 - index);
 	    }
-	    if(indexModifier > 0x8000) {
-		indexModifier = -(0x10000 - indexModifier);
-	    }
 	    currentSegment.write(indexModifier + index, readRegister(srcData), AccessMode.WORD20);
 	    writeRegister(PC, pc += 2);
             updateStatus = false;