natas_hw
/
mspsim
mirror of https://github.com/contiki-ng/mspsim
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed CALLA INDX

This commit is contained in:
Joakim Eriksson 2012-10-11 10:41:18 +02:00
parent 2e46eed2ee
commit 8954bd75a9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
se/sics/mspsim/core/MSP430Core.java
View File

@ -1361,9 +1361,17 @@ public class MSP430Core extends Chip implements MSP430Constants {
dst = readRegister(dstRegister);
/* what happens if wrapping here??? */
System.out.println("CALLA INDX: Reg = " + Utils.hex20(dst) + " Mem: " +
currentSegment.read(pc, AccessMode.WORD, AccessType.READ));
dst += currentSegment.read(pc, AccessMode.WORD, AccessType.READ);
/* read the index which is from -15 bit - +15 bit. - so extend sign to 20-bit */
int v = currentSegment.read(pc, AccessMode.WORD, AccessType.READ);
if ((v & 0x8000) != 0) {
v |= 0xf0000;
}
System.out.println("CALLA INDX: Reg = " + Utils.hex20(dst) + " INDX: " + v);
dst += v;
dst &= 0xfffff;
System.out.println("CALLA INDX => " + Utils.hex20(dst));
dst = currentSegment.read(dst, AccessMode.WORD20, AccessType.READ);
System.out.println("CALLA Read from INDX => " + Utils.hex20(dst));