aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--target-arm/helper.c2
-rw-r--r--target-arm/translate.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 4ff30c1a8..b62523b19 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -675,7 +675,7 @@ void do_interrupt_v7m(CPUARMState *env)
env->regs[13] += 4;
xpsr |= 0x200;
}
- /* Switch to the hander mode. */
+ /* Switch to the handler mode. */
v7m_push(env, xpsr);
v7m_push(env, env->regs[15]);
v7m_push(env, env->regs[14]);
diff --git a/target-arm/translate.c b/target-arm/translate.c
index 9ff3ff816..f1695decd 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -6372,7 +6372,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
break;
case 1:
if ((insn & 0x00700020) == 0) {
- /* Hafword pack. */
+ /* Halfword pack. */
tmp = load_reg(s, rn);
tmp2 = load_reg(s, rm);
shift = (insn >> 7) & 0x1f;
@@ -6455,7 +6455,7 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
dead_tmp(tmp2);
}
}
- store_reg(s, rd, tmp2);
+ store_reg(s, rd, tmp);
} else if ((insn & 0x003f0f60) == 0x003f0f20) {
/* rev */
tmp = load_reg(s, rm);