From d382fbf6604d127ca6e6a2ced4e2d2d91463ee64 Mon Sep 17 00:00:00 2001 From: Joakim Eriksson Date: Sun, 11 Sep 2011 17:49:01 +0200 Subject: [PATCH] fixed bug in IOPort config --- se/sics/mspsim/config/MSP430f1611Config.java | 14 ++++++++------ se/sics/mspsim/config/MSP430f2617Config.java | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/se/sics/mspsim/config/MSP430f1611Config.java b/se/sics/mspsim/config/MSP430f1611Config.java index a0c19cc..bd9005a 100644 --- a/se/sics/mspsim/config/MSP430f1611Config.java +++ b/se/sics/mspsim/config/MSP430f1611Config.java @@ -109,13 +109,15 @@ public class MSP430f1611Config extends MSP430Config { ioUnits.add(dma); // Add port 1,2 with interrupt capability! - ioUnits.add(new IOPort(cpu, 1, 4, cpu.memory, 0x20)); - ioUnits.add(new IOPort(cpu, 2, 1, cpu.memory, 0x28)); + IOPort io1; + IOPort io2; + ioUnits.add(io1 = new IOPort(cpu, 1, 4, cpu.memory, 0x20)); + ioUnits.add(io2 = new IOPort(cpu, 2, 1, cpu.memory, 0x28)); for (int i = 0, n = 8; i < n; i++) { - cpu.memOut[0x20 + i] = ioUnits.get(0); - cpu.memOut[0x28 + i] = ioUnits.get(1); - cpu.memIn[0x20 + i] = ioUnits.get(0); - cpu.memIn[0x28 + i] = ioUnits.get(1); + cpu.memOut[0x20 + i] = io1; + cpu.memOut[0x28 + i] = io2; + cpu.memIn[0x20 + i] = io1; + cpu.memIn[0x28 + i] = io2; } // Add port 3,4 & 5,6 diff --git a/se/sics/mspsim/config/MSP430f2617Config.java b/se/sics/mspsim/config/MSP430f2617Config.java index c185b55..eace51e 100644 --- a/se/sics/mspsim/config/MSP430f2617Config.java +++ b/se/sics/mspsim/config/MSP430f2617Config.java @@ -110,13 +110,15 @@ public class MSP430f2617Config extends MSP430Config { cpu.memIn[7] = usciA1; // Add port 1,2 with interrupt capability! - ioUnits.add(new IOPort(cpu, 1, 4, cpu.memory, 0x20)); - ioUnits.add(new IOPort(cpu, 2, 1, cpu.memory, 0x28)); + IOPort io1; + IOPort io2; + ioUnits.add(io1 = new IOPort(cpu, 1, 4, cpu.memory, 0x20)); + ioUnits.add(io2 = new IOPort(cpu, 2, 1, cpu.memory, 0x28)); for (int i = 0, n = 8; i < n; i++) { - cpu.memOut[0x20 + i] = ioUnits.get(0); - cpu.memOut[0x28 + i] = ioUnits.get(1); - cpu.memIn[0x20 + i] = ioUnits.get(0); - cpu.memIn[0x28 + i] = ioUnits.get(1); + cpu.memOut[0x20 + i] = io1; + cpu.memOut[0x28 + i] = io2; + cpu.memIn[0x20 + i] = io1; + cpu.memIn[0x28 + i] = io2; } // Add port 3,4 & 5,6