aboutsummaryrefslogtreecommitdiff
path: root/sim/mn10300/simops.c
diff options
context:
space:
mode:
Diffstat (limited to 'sim/mn10300/simops.c')
-rw-r--r--sim/mn10300/simops.c124
1 files changed, 58 insertions, 66 deletions
diff --git a/sim/mn10300/simops.c b/sim/mn10300/simops.c
index c0243c2..3d82952 100644
--- a/sim/mn10300/simops.c
+++ b/sim/mn10300/simops.c
@@ -2709,60 +2709,57 @@ void OP_FCFF0000 (insn, extension)
void OP_DF0000 (insn, extension)
unsigned long insn, extension;
{
- unsigned int sp;
+ unsigned int sp, offset;
unsigned long mask;
State.regs[REG_SP] += insn & 0xff;
sp = State.regs[REG_SP];
+ offset = -4;
mask = (insn & 0xff00) >> 8;
- if (mask & 0x8)
+ if (mask & 0x80)
{
- sp += 4;
- State.regs[REG_LAR] = load_word (sp);
- sp += 4;
- State.regs[REG_LIR] = load_word (sp);
- sp += 4;
- State.regs[REG_MDR] = load_word (sp);
- sp += 4;
- State.regs[REG_A0 + 1] = load_word (sp);
- sp += 4;
- State.regs[REG_A0] = load_word (sp);
- sp += 4;
- State.regs[REG_D0 + 1] = load_word (sp);
- sp += 4;
- State.regs[REG_D0] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0 + 2] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x10)
+ if (mask & 0x40)
{
- State.regs[REG_A0 + 3] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0 + 3] = load_word (sp + offset);
+ offset -= 4;
}
if (mask & 0x20)
{
- State.regs[REG_A0 + 2] = load_word (sp);
- sp += 4;
+ State.regs[REG_A0 + 2] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x40)
+ if (mask & 0x10)
{
- State.regs[REG_D0 + 3] = load_word (sp);
- sp += 4;
+ State.regs[REG_A0 + 3] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x80)
+ if (mask & 0x8)
{
- State.regs[REG_D0 + 2] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_D0 + 1] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_A0] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_A0 + 1] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_MDR] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_LIR] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_LAR] = load_word (sp + offset);
+ offset -= 4;
}
- /* And make sure to update the stack pointer. */
- State.regs[REG_SP] = sp;
-
/* Restore the PC value. */
State.regs[REG_PC] = (State.mem[sp] | (State.mem[sp+1] << 8)
| (State.mem[sp+2] << 16) | (State.mem[sp+3] << 24));
@@ -2773,62 +2770,57 @@ void OP_DF0000 (insn, extension)
void OP_DE0000 (insn, extension)
unsigned long insn, extension;
{
- unsigned int sp;
+ unsigned int sp, offset;
unsigned long mask;
- sp = State.regs[REG_SP] + (insn & 0xff);
- State.regs[REG_SP] = sp;
- State.regs[REG_PC] = State.regs[REG_MDR] - 3;
-
+ State.regs[REG_SP] += (insn & 0xff);
sp = State.regs[REG_SP];
+ State.regs[REG_PC] = State.regs[REG_MDR] - 3;
+ offset = -4;
mask = (insn & 0xff00) >> 8;
- if (mask & 0x8)
+ if (mask & 0x80)
{
- sp += 4;
- State.regs[REG_LAR] = load_word (sp);
- sp += 4;
- State.regs[REG_LIR] = load_word (sp);
- sp += 4;
- State.regs[REG_MDR] = load_word (sp);
- sp += 4;
- State.regs[REG_A0 + 1] = load_word (sp);
- sp += 4;
- State.regs[REG_A0] = load_word (sp);
- sp += 4;
- State.regs[REG_D0 + 1] = load_word (sp);
- sp += 4;
- State.regs[REG_D0] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0 + 2] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x10)
+ if (mask & 0x40)
{
- State.regs[REG_A0 + 3] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0 + 3] = load_word (sp + offset);
+ offset -= 4;
}
if (mask & 0x20)
{
- State.regs[REG_A0 + 2] = load_word (sp);
- sp += 4;
+ State.regs[REG_A0 + 2] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x40)
+ if (mask & 0x10)
{
- State.regs[REG_D0 + 3] = load_word (sp);
- sp += 4;
+ State.regs[REG_A0 + 3] = load_word (sp + offset);
+ offset -= 4;
}
- if (mask & 0x80)
+ if (mask & 0x8)
{
- State.regs[REG_D0 + 2] = load_word (sp);
- sp += 4;
+ State.regs[REG_D0] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_D0 + 1] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_A0] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_A0 + 1] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_MDR] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_LIR] = load_word (sp + offset);
+ offset -= 4;
+ State.regs[REG_LAR] = load_word (sp + offset);
+ offset -= 4;
}
-
- /* And make sure to update the stack pointer. */
- State.regs[REG_SP] = sp;
}
/* rets */