summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-02-06 16:36:11 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-02-06 16:36:11 -0600
commit3f23624c848b8f1c88e4305fe01e19b2520bfd3d (patch)
tree4b96eb061deb943a904fff41bae81415896114f0
parent8a14952c9d2f5fa2b3caa6dc286b62ed5d26bca7 (diff)
parent2a0e1ad66e4177dddc6c8fb7aeadc095aafac828 (diff)
downloadqemu-3f23624c848b8f1c88e4305fe01e19b2520bfd3d.tar.gz
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Michael Tokarev (1) and Stefan Weil (1) # Via Stefan Hajnoczi * stefanha/trivial-patches: vnc: recognize Hungarian doubleacutes target-m68k: Fix comment
-rw-r--r--target-m68k/translate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index e763195f86..3f1478cc20 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -574,7 +574,7 @@ static inline TCGv gen_ea_once(CPUM68KState *env, DisasContext *s,
return gen_ldst(s, opsize, tmp, val, what);
}
-/* Generate code to load/store a value ito/from an EA. If VAL > 0 this is
+/* Generate code to load/store a value from/into an EA. If VAL > 0 this is
a write otherwise it is a read (0 == sign extend, -1 == zero extend).
ADDRP is non-null for readwrite operands. */
static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn,