| Message ID | 20170622124204.19407-24-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 22, 2017 at 02:41:56PM +0200, Marc-André Lureau wrote: > I used the clang-tidy qemu-round check to generate the fix: > https://github.com/elmarco/clang-tools-extra > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> > --- > target/ppc/mem_helper.c | 2 +- > target/ppc/translate.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c > index e6383c6bfa..a34e604db3 100644 > --- a/target/ppc/mem_helper.c > +++ b/target/ppc/mem_helper.c > @@ -111,7 +111,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, > uint32_t ra, uint32_t rb) > { > if (likely(xer_bc != 0)) { > - int num_used_regs = (xer_bc + 3) / 4; > + int num_used_regs = DIV_ROUND_UP(xer_bc, 4); > if (unlikely((ra != 0 && lsw_reg_in_range(reg, num_used_regs, ra)) || > lsw_reg_in_range(reg, num_used_regs, rb))) { > raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, > diff --git a/target/ppc/translate.c b/target/ppc/translate.c > index c0cd64d927..76f9ccde25 100644 > --- a/target/ppc/translate.c > +++ b/target/ppc/translate.c > @@ -2882,7 +2882,7 @@ static void gen_lswi(DisasContext *ctx) > } > if (nb == 0) > nb = 32; > - nr = (nb + 3) / 4; > + nr = DIV_ROUND_UP(nb, 4); > if (unlikely(lsw_reg_in_range(start, nr, ra))) { > gen_inval_exception(ctx, POWERPC_EXCP_INVAL_LSWX); > return;
diff --git a/target/ppc/mem_helper.c b/target/ppc/mem_helper.c index e6383c6bfa..a34e604db3 100644 --- a/target/ppc/mem_helper.c +++ b/target/ppc/mem_helper.c @@ -111,7 +111,7 @@ void helper_lswx(CPUPPCState *env, target_ulong addr, uint32_t reg, uint32_t ra, uint32_t rb) { if (likely(xer_bc != 0)) { - int num_used_regs = (xer_bc + 3) / 4; + int num_used_regs = DIV_ROUND_UP(xer_bc, 4); if (unlikely((ra != 0 && lsw_reg_in_range(reg, num_used_regs, ra)) || lsw_reg_in_range(reg, num_used_regs, rb))) { raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, diff --git a/target/ppc/translate.c b/target/ppc/translate.c index c0cd64d927..76f9ccde25 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -2882,7 +2882,7 @@ static void gen_lswi(DisasContext *ctx) } if (nb == 0) nb = 32; - nr = (nb + 3) / 4; + nr = DIV_ROUND_UP(nb, 4); if (unlikely(lsw_reg_in_range(start, nr, ra))) { gen_inval_exception(ctx, POWERPC_EXCP_INVAL_LSWX); return;
I used the clang-tidy qemu-round check to generate the fix: https://github.com/elmarco/clang-tools-extra Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- target/ppc/mem_helper.c | 2 +- target/ppc/translate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)