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
This commit is contained in:
Anthony Liguori 2013-02-06 16:36:11 -06:00
commit 3f23624c84

View File

@ -574,7 +574,7 @@ static inline TCGv gen_ea_once(CPUM68KState *env, DisasContext *s,
return gen_ldst(s, opsize, tmp, val, what); 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). a write otherwise it is a read (0 == sign extend, -1 == zero extend).
ADDRP is non-null for readwrite operands. */ ADDRP is non-null for readwrite operands. */
static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn, static TCGv gen_ea(CPUM68KState *env, DisasContext *s, uint16_t insn,