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

added printout when misaligned word writes/reads are performed 

git-svn-id: https://mspsim.svn.sourceforge.net/svnroot/mspsim/mspsim@431 23d1a52b-0c3c-0410-b72d-8f29ab48fe35
This commit is contained in:
joxe 2008-12-02 18:12:00 +00:00
parent 803f5811af
commit ee4c805b39
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/autorun.sc
View File

@ -3,4 +3,4 @@
#exec rm log.txt
#log CC2420 >log.txt
#printcalls >log.txt
start
#start

2
se/sics/mspsim/core/MSP430Constants.java
View File

@ -105,7 +105,7 @@ public interface MSP430Constants {
};
public static final String[] REGISTER_NAMES = {
"PC", "SP", "SR", "CG1", "CG2"
"PC", "SP", "SR", "CG1", "CG2"
};
public static final int PC = 0;

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

@ -598,7 +598,11 @@ public class MSP430Core extends Chip implements MSP430Constants {
address &= 0xffff;
val = memory[address] & 0xff;
if (word) {
val |= (memory[(address + 1) & 0xffff] << 8);
val |= (memory[(address + 1) & 0xffff] << 8);
if ((address & 1) != 0) {
System.out.println("**** Illegal read - misaligned word from: " +
Utils.hex16(address) + " at " + Utils.hex16(reg[PC]));
}
}
}
if (breakPoints[address] != null) {
@ -620,7 +624,11 @@ public class MSP430Core extends Chip implements MSP430Constants {
// TODO: add check for Flash / RAM!
memory[dstAddress] = dst & 0xff;
if (word) {
memory[dstAddress + 1] = (dst >> 8) & 0xff;
memory[dstAddress + 1] = (dst >> 8) & 0xff;
if ((dstAddress & 1) != 0) {
System.out.println("**** Illegal write - misaligned word to: " +
Utils.hex16(dstAddress) + " at " + Utils.hex16(reg[PC]));
}
}
}
}
@ -785,6 +793,7 @@ public class MSP430Core extends Chip implements MSP430Constants {
cycles++;
break;
case AM_INDEX:
// TODO: needs to handle if SR is used!
dstAddress = readRegisterCG(dstRegister, ad) +
memory[pc] + (memory[pc + 1] << 8);
@ -812,12 +821,6 @@ public class MSP430Core extends Chip implements MSP430Constants {
}
break;
}
// case AM_IND_AUTOINC:
// dstAddress = readRegister(dstRegister);
// writeRegister(dstRegister, dstAddress + (word ? 2 : 1));
// cycles += 3;
// break;
// }
}
@ -1035,6 +1038,7 @@ public class MSP430Core extends Chip implements MSP430Constants {
// PC Could have changed above!
pc = readRegister(PC);
if (dstRegister == 2) {
/* absolute mode */
dstAddress = memory[pc] + (memory[pc + 1] << 8);
} else {
// CG here???
@ -1112,8 +1116,8 @@ public class MSP430Core extends Chip implements MSP430Constants {
sr = readRegister(SR);
sr = (sr & ~(CARRY | OVERFLOW)) | (dst >= src ? CARRY : 0);
tmp = dst - src;
tmp = (dst - src);
if (((src ^ tmp) & b) == 0 && (((src ^ dst) & b) != 0)) {
sr |= OVERFLOW;
}