Message ID | 1435107109-12500-1-git-send-email-laurent@vivier.eu |
---|---|
State | New |
Headers | show |
On Wed, 24 Jun 2015 02:51:49 +0200 Laurent Vivier <laurent@vivier.eu> wrote: > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > target-m68k/translate.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/target-m68k/translate.c b/target-m68k/translate.c > index d6c478f..bc83a6e 100644 > --- a/target-m68k/translate.c > +++ b/target-m68k/translate.c > @@ -297,8 +297,7 @@ static TCGv gen_addr_index(uint16_t ext, TCGv tmp) > > /* Handle a base + index + displacement effective addresss. > A NULL_QREG base means pc-relative. */ > -static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, int opsize, > - TCGv base) > +static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) > { > uint32_t offset; > uint16_t ext; > @@ -529,7 +528,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, > return tmp; > case 6: /* Indirect index + displacement. */ > reg = AREG(insn, 0); > - return gen_lea_indexed(env, s, opsize, reg); > + return gen_lea_indexed(env, s, reg); > case 7: /* Other */ > switch (insn & 7) { > case 0: /* Absolute short. */ > @@ -545,7 +544,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, > s->pc += 2; > return tcg_const_i32(offset); > case 3: /* pc index+displacement. */ > - return gen_lea_indexed(env, s, opsize, NULL_QREG); > + return gen_lea_indexed(env, s, NULL_QREG); > case 4: /* Immediate. */ > default: > return NULL_QREG; Reviewed-by: Thomas Huth <huth@tuxfamily.org>
diff --git a/target-m68k/translate.c b/target-m68k/translate.c index d6c478f..bc83a6e 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -297,8 +297,7 @@ static TCGv gen_addr_index(uint16_t ext, TCGv tmp) /* Handle a base + index + displacement effective addresss. A NULL_QREG base means pc-relative. */ -static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, int opsize, - TCGv base) +static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base) { uint32_t offset; uint16_t ext; @@ -529,7 +528,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, return tmp; case 6: /* Indirect index + displacement. */ reg = AREG(insn, 0); - return gen_lea_indexed(env, s, opsize, reg); + return gen_lea_indexed(env, s, reg); case 7: /* Other */ switch (insn & 7) { case 0: /* Absolute short. */ @@ -545,7 +544,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn, s->pc += 2; return tcg_const_i32(offset); case 3: /* pc index+displacement. */ - return gen_lea_indexed(env, s, opsize, NULL_QREG); + return gen_lea_indexed(env, s, NULL_QREG); case 4: /* Immediate. */ default: return NULL_QREG;
Signed-off-by: Laurent Vivier <laurent@vivier.eu> --- target-m68k/translate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)