[Mspsim-commit] SF.net SVN: mspsim: [288] mspsim/se/sics/mspsim/core/MSP430Core.java

[<jo...@us...>]

Revision: 288
          http://mspsim.svn.sourceforge.net/mspsim/?rev=288&view=rev
Author:   joxe
Date:     2008-06-11 14:59:07 -0700 (Wed, 11 Jun 2008)

Log Message:
-----------
fixed index out of bounds bug for IO addresses (< 0x200).

Modified Paths:
--------------
    mspsim/se/sics/mspsim/core/MSP430Core.java

Modified: mspsim/se/sics/mspsim/core/MSP430Core.java
===================================================================
--- mspsim/se/sics/mspsim/core/MSP430Core.java	2008-06-02 10:44:49 UTC (rev 287)
+++ mspsim/se/sics/mspsim/core/MSP430Core.java	2008-06-11 21:59:07 UTC (rev 288)
@@ -597,7 +597,8 @@
 //    if (breakPoints[address] != null) {
 //      breakPoints[address].call
 //    }
-    if (address < 0x200 && memIn[address] != null) {
+    // Only word reads at 0x1fe which is highest address...
+    if (address < 0x1ff && memIn[address] != null) {
       val = memIn[address].read(address, word, cycles);
     } else {
       address &= 0xffff;
@@ -614,7 +615,8 @@
       breakPoints[dstAddress].cpuAction(CPUMonitor.MEMORY_WRITE, dstAddress, dst);
     }
 
-    if (dstAddress <= 0x200 && memOut[dstAddress] != null) {
+    // Only word writes at 0x1fe which is highest address...
+    if (dstAddress < 0x1ff && memOut[dstAddress] != null) {
       if (!word) dst &= 0xff;
       memOut[dstAddress].write(dstAddress, dst, word, cycles);
     } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.