On 27 July 2017 at 23:58, Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > On 07/27/2017 07:43 PM, Philippe Mathieu-Daudé wrote: >> >> On 07/27/2017 07:59 AM, Peter Maydell wrote: > > [...] >>> >>> - u32p += env->cp15.c6_rgnr; >>> + u32p += env->pmsav7.rnr; >>> tlb_flush(CPU(cpu)); /* Mappings may have changed - purge! */ >>> *u32p = value; >>> } >>> @@ -2447,7 +2447,7 @@ static const ARMCPRegInfo pmsav7_cp_reginfo[] = { >>> .readfn = pmsav7_read, .writefn = pmsav7_write, .resetfn = >>> pmsav7_reset }, >>> { .name = "RGNR", .cp = 15, .crn = 6, .opc1 = 0, .crm = 2, .opc2 = >>> 0, >> >> >> "RGNR" -> "RNR" > > > Ah "RGNR" for -R and "RNR" for -M hmmm... still better keep the name > matching the field, "rnr".
It's a bit awkward, yes -- we're going to get a mismatch one way or the other. In this patch I wanted only to change the field name, not anything else (it's already a bit borderline for 2.10). thanks -- PMM