| Message ID | 20220607204557.658541-26-richard.henderson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 189878ae237d443571250f76655161d91c018889 |
| Headers | show |
| Series | semihosting cleanup | expand |
On 13:45 Tue 07 Jun , Richard Henderson wrote: > We've already loaded cs->env_ptr into a local variable; use it. > Since env is unconditionally used, we don't need a dummy use. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Luc Michel <lmichel@kalray.eu> > --- > semihosting/arm-compat-semi.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c > index 5e442e549d..adb4e5b581 100644 > --- a/semihosting/arm-compat-semi.c > +++ b/semihosting/arm-compat-semi.c > @@ -553,7 +553,6 @@ void do_common_semihosting(CPUState *cs) > GuestFD *gf; > int64_t elapsed; > > - (void) env; /* Used implicitly by arm lock_user macro */ > nr = common_semi_arg(cs, 0) & 0xffffffffU; > args = common_semi_arg(cs, 1); > > @@ -636,12 +635,12 @@ void do_common_semihosting(CPUState *cs) > break; > > case TARGET_SYS_WRITEC: > - qemu_semihosting_console_outc(cs->env_ptr, args); > + qemu_semihosting_console_outc(env, args); > common_semi_set_ret(cs, 0xdeadbeef); > break; > > case TARGET_SYS_WRITE0: > - ret = qemu_semihosting_console_outs(cs->env_ptr, args); > + ret = qemu_semihosting_console_outs(env, args); > common_semi_set_ret(cs, ret); > break; > > @@ -672,7 +671,7 @@ void do_common_semihosting(CPUState *cs) > break; > > case TARGET_SYS_READC: > - ret = qemu_semihosting_console_inc(cs->env_ptr); > + ret = qemu_semihosting_console_inc(env); > common_semi_set_ret(cs, ret); > break; > > -- > 2.34.1 >
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c index 5e442e549d..adb4e5b581 100644 --- a/semihosting/arm-compat-semi.c +++ b/semihosting/arm-compat-semi.c @@ -553,7 +553,6 @@ void do_common_semihosting(CPUState *cs) GuestFD *gf; int64_t elapsed; - (void) env; /* Used implicitly by arm lock_user macro */ nr = common_semi_arg(cs, 0) & 0xffffffffU; args = common_semi_arg(cs, 1); @@ -636,12 +635,12 @@ void do_common_semihosting(CPUState *cs) break; case TARGET_SYS_WRITEC: - qemu_semihosting_console_outc(cs->env_ptr, args); + qemu_semihosting_console_outc(env, args); common_semi_set_ret(cs, 0xdeadbeef); break; case TARGET_SYS_WRITE0: - ret = qemu_semihosting_console_outs(cs->env_ptr, args); + ret = qemu_semihosting_console_outs(env, args); common_semi_set_ret(cs, ret); break; @@ -672,7 +671,7 @@ void do_common_semihosting(CPUState *cs) break; case TARGET_SYS_READC: - ret = qemu_semihosting_console_inc(cs->env_ptr); + ret = qemu_semihosting_console_inc(env); common_semi_set_ret(cs, ret); break;
We've already loaded cs->env_ptr into a local variable; use it. Since env is unconditionally used, we don't need a dummy use. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- semihosting/arm-compat-semi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)