sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed DADD implementation. 

Implemented DADD as addition of BCD numbers like it is supposed to be.
This commit is contained in:
Mario Werner 2013-02-11 17:00:51 +01:00 committed by Daniel Beer
parent ef41b1cbab
commit 47c0349de2
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/sim.c
View File

@ -210,6 +210,8 @@ static int step_double(struct sim_device *dev, uint16_t ins)
uint32_t res_data; uint32_t res_data;
uint32_t msb = is_byte ? 0x80 : 0x8000; uint32_t msb = is_byte ? 0x80 : 0x8000;
uint32_t mask = is_byte ? 0xff : 0xffff; uint32_t mask = is_byte ? 0xff : 0xffff;
uint32_t shiftMask = 0x000f;
uint32_t i = 0;
int cycles; int cycles;
if (amode_dst == MSP430_AMODE_REGISTER && dreg == MSP430_REG_PC) { if (amode_dst == MSP430_AMODE_REGISTER && dreg == MSP430_REG_PC) {
@ -272,17 +274,24 @@ static int step_double(struct sim_device *dev, uint16_t ins)
break; break;
case MSP430_OP_DADD: case MSP430_OP_DADD:
res_data = src_data + dst_data; res_data = 0;
if (dev->regs[MSP430_REG_SR] & MSP430_SR_C) if (dev->regs[MSP430_REG_SR] & MSP430_SR_C)
res_data++; res_data++;
shiftMask = 0x000f;
for(i = 0; i < 4; ++i)
{
res_data += (src_data & shiftMask) + (dst_data & shiftMask);
if( (res_data & (0x1f << (i*4))) > (9 << (i*4)))
res_data += 6 << (i*4);
shiftMask = shiftMask << 4;
}
dev->regs[MSP430_REG_SR] &= ~ARITH_BITS; dev->regs[MSP430_REG_SR] &= ~ARITH_BITS;
if (!(res_data & mask)) if (!(res_data & mask))
dev->regs[MSP430_REG_SR] |= MSP430_SR_Z; dev->regs[MSP430_REG_SR] |= MSP430_SR_Z;
if (res_data == 1) if (res_data & msb)
dev->regs[MSP430_REG_SR] |= MSP430_SR_N; dev->regs[MSP430_REG_SR] |= MSP430_SR_N;
if ((is_byte && res_data > 99) || if (res_data & (msb << 1))
(!is_byte && res_data > 9999))
dev->regs[MSP430_REG_SR] |= MSP430_SR_C; dev->regs[MSP430_REG_SR] |= MSP430_SR_C;
break; break;