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

Fixed immediate mode for 20 bit instructions

This commit is contained in:
Niclas Finne 2012-10-17 15:28:52 +02:00
parent 5d39de63c6
commit dbbc771224
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1830,7 +1830,8 @@ public class MSP430Core extends Chip implements MSP430Constants {
}
// When is PC incremented - assuming immediately after "read"?
incRegister(PC, 2);
pc += 2;
writeRegister(PC, pc);
cycles += dstRegMode ? 3 : 6;
break;
}
@ -1842,9 +1843,10 @@ public class MSP430Core extends Chip implements MSP430Constants {
case AM_IND_AUTOINC:
if (srcRegister == PC) {
/* PC is always handled as word */
srcAddress = readRegister(PC);
pc += 2;
incRegister(PC, 2);
src = currentSegment.read(pc, mode != AccessMode.BYTE ? AccessMode.WORD : AccessMode.BYTE, AccessType.READ);
src += extSrc;
pc += 2;
writeRegister(PC, pc);
cycles += dstRegMode ? 2 : 5;
} else {
srcAddress = readRegister(srcRegister);
@ -1864,13 +1866,6 @@ public class MSP430Core extends Chip implements MSP430Constants {
if (op != MOV) {
dst = readRegister(dstRegister);
dst &= mode.mask;
//XXX if (word) {
// dst &= 0xffff;
// } else if (wordx20) {
// dst &= 0xfffff;
// } else {
// dst &= 0xff;
// }
}
} else {
// PC Could have changed above!