On 18.07.2017 13:08, Marc-André Lureau wrote:
> On Mon, Jul 17, 2017 at 11:09 PM, Philippe Mathieu-Daudé
> <f4...@amsat.org> wrote:
>> Applied using the Coccinelle semantic patch
>> scripts/coccinelle/use_osdep.cocci
>> (also added braces to satisfy checkpatch)
[...]
>> diff --git a/target/microblaze/op_helper.c b/target/microblaze/op_helper.c
>> index 1e07e21c1c..41ab52fb7a 100644
>> --- a/target/microblaze/op_helper.c
>> +++ b/target/microblaze/op_helper.c
>> @@ -108,8 +108,9 @@ void helper_debug(CPUMBState *env)
>> (env->sregs[SR_MSR] & MSR_IE));
>> for (i = 0; i < 32; i++) {
>> qemu_log("r%2.2d=%8.8x ", i, env->regs[i]);
>> - if ((i + 1) % 4 == 0)
>> + if (QEMU_IS_ALIGNED(i + 1, 4)) {
>> qemu_log("\n");
>> + }
>> }
>> qemu_log("\n\n");
>> }
>> diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
>> index cb65d1e129..ae7b3c71b0 100644
>> --- a/target/microblaze/translate.c
>> +++ b/target/microblaze/translate.c
>> @@ -1839,9 +1839,10 @@ void mb_cpu_dump_state(CPUState *cs, FILE *f,
>> fprintf_function cpu_fprintf,
>>
>> for (i = 0; i < 32; i++) {
>> cpu_fprintf(f, "r%2.2d=%8.8x ", i, env->regs[i]);
>> - if ((i + 1) % 4 == 0)
>> + if (QEMU_IS_ALIGNED(i + 1, 4)) {
>> cpu_fprintf(f, "\n");
>> }
>> + }
>> cpu_fprintf(f, "\n\n");
>> }
I'd also vote to keep the original code here ... it's about pretty
printing, not about checking the alignment of addresses.
Thomas
