hw/timer/renesas_tmr.c cleanup read operation.
PATCH 1/1 hw/timer/renesas_tmr.c cleanup read operation.
Cleanup read operation.
This module different return of access size.
Signed-off-by Yoshinori Sato <[email protected]>
--- hw/timer/renesas_tmr.c | 106 ++++++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 49 deletions(-)
hw/timer/renesas_tmr.c +57 -49
@@ -187,59 +187,67 @@ static uint64_t tmr_read(void *opaque, hwaddr addr, unsigned size) addr);return UINT64_MAX ; } -switch (addr &0x0e ) { -case A_TCR : - ret =0 ; - ret =FIELD_DP8 (ret,TCR ,CCLR , -FIELD_EX8 (tmr->tcr[ch],TCR ,CCLR )); - ret =FIELD_DP8 (ret,TCR ,OVIE , -FIELD_EX8 (tmr->tcr[ch],TCR ,OVIE )); - ret =FIELD_DP8 (ret,TCR ,CMIEA , -FIELD_EX8 (tmr->tcr[ch],TCR ,CMIEA )); - ret =FIELD_DP8 (ret,TCR ,CMIEB , -FIELD_EX8 (tmr->tcr[ch],TCR ,CMIEB )); -return ret; -case A_TCSR : - ret =0 ; - ret =FIELD_DP8 (ret,TCSR ,OSA , -FIELD_EX8 (tmr->tcsr[ch],TCSR ,OSA )); - ret =FIELD_DP8 (ret,TCSR ,OSB , -FIELD_EX8 (tmr->tcsr[ch],TCSR ,OSB )); -switch (ch) { -case 0 : - ret =FIELD_DP8 (ret,TCSR ,ADTE , -FIELD_EX8 (tmr->tcsr[ch],TCSR ,ADTE )); -break ; -case 1 :/* CH1 ADTE unimplement always 1 */ - ret =FIELD_DP8 (ret,TCSR ,ADTE ,1 ); -break ; - } -return ret; -case A_TCORA : -if (size ==1 ) { +switch (size) { +case 1 : +switch (addr &0x0e ) { +case A_TCR : + ret =0 ; + ret =FIELD_DP8 (ret,TCR ,CCLR , +FIELD_EX8 (tmr->tcr[ch],TCR ,CCLR )); + ret =FIELD_DP8 (ret,TCR ,OVIE , +FIELD_EX8 (tmr->tcr[ch],TCR ,OVIE )); + ret =FIELD_DP8 (ret,TCR ,CMIEA , +FIELD_EX8 (tmr->tcr[ch],TCR ,CMIEA )); + ret =FIELD_DP8 (ret,TCR ,CMIEB , +FIELD_EX8 (tmr->tcr[ch],TCR ,CMIEB )); +return ret; +case A_TCSR : + ret =0 ; + ret =FIELD_DP8 (ret,TCSR ,OSA , +FIELD_EX8 (tmr->tcsr[ch],TCSR ,OSA )); + ret =FIELD_DP8 (ret,TCSR ,OSB , +FIELD_EX8 (tmr->tcsr[ch],TCSR ,OSB )); +switch (ch) { +case 0 : + ret =FIELD_DP8 (ret,TCSR ,ADTE , +FIELD_EX8 (tmr->tcsr[ch],TCSR ,ADTE )); +break ; +case 1 :/* CH1 ADTE unimplement always 1 */ + ret =FIELD_DP8 (ret,TCSR ,ADTE ,1 ); +break ; + } +return ret; +case A_TCORA :return tmr->tcora[ch]; - }else if (ch ==0 ) { -return concat_reg (tmr->tcora); - } -case A_TCORB : -if (size ==1 ) { +case A_TCORB :return tmr->tcorb[ch]; - }else { -return concat_reg (tmr->tcorb); - } -case A_TCNT : -return read_tcnt (tmr, size, ch); -case A_TCCR : -if (size ==1 ) { +case A_TCNT : +return read_tcnt (tmr, size, ch); +case A_TCCR :return read_tccr (tmr->tccr[ch]); - }else { -return read_tccr (tmr->tccr[0 ]) <<8 |read_tccr (tmr->tccr[1 ]); +default : +qemu_log_mask (LOG_UNIMP ,"renesas_tmr: Register 0x%" HWADDR_PRIX +" not implemented\n" , + addr); +break ; + } +case 2 : +switch (addr) { +case A_TCORA : +return concat_reg (tmr->tcora); +case A_TCORB : +return concat_reg (tmr->tcora); +case A_TCNT : +return read_tcnt (tmr, size, ch); +case A_TCCR : +return read_tccr (tmr->tccr[ch]) <<8 |read_tccr (tmr->tccr[1 ]); +default : +qemu_log_mask (LOG_GUEST_ERROR , +"renesas_tmr: Register 0x%" HWADDR_PRIX +" invalid access size\n" , + addr); +break ; } -default : -qemu_log_mask (LOG_UNIMP ,"renesas_tmr: Register 0x%" HWADDR_PRIX -" not implemented\n" , - addr); -break ; }return UINT64_MAX ; }
Signature · 1 line
2.20.1
Quoted 2 lines · Yoshinori Sato
Cleanup read operation.
This module different return of access size.
The last sentence is hard to read, could you maybe rephrase it?
hw/timer/renesas_tmr.c static uint64_t tmr_read(void *opaque, hwaddr addr, unsigned size) · line 228
Quoted 6 lines
hw/timer/renesas_tmr.c +1
-4-case A_TCORB : -if (size ==1 ) { +case A_TCORB :return tmr->tcorb[ch]; - }else { -return concat_reg (tmr->tcorb);
So with size == 2 and addr == TCORB you were returning tmr->tcorb here...
Quoted 13 lines
hw/timer/renesas_tmr.c +5
-7- } -case A_TCNT : -return read_tcnt (tmr, size, ch); -case A_TCCR : -if (size ==1 ) { +case A_TCNT : +return read_tcnt (tmr, size, ch); +case A_TCCR :return read_tccr (tmr->tccr[ch]); - }else { -return read_tccr (tmr->tccr[0 ]) <<8 |read_tccr (tmr->tccr[1 ]); +default : + qemu_log_mask(LOG_UNIMP, "renesas_tmr: Register 0x%" HWADDR_PRIX
hw/timer/renesas_tmr.c static uint64_t tmr_read(void *opaque, hwaddr addr, unsigned size) · line 239
Quoted 10 lines
hw/timer/renesas_tmr.c +10
-0+" not implemented\n" , + addr); +break ; + } +case 2 : +switch (addr) { +case A_TCORA : +return concat_reg (tmr->tcora); +case A_TCORB : +return concat_reg (tmr->tcora);
... but in the new code, you are now returning tmr->tcora ... copy-n-paste error?
Quoted 10 lines
hw/timer/renesas_tmr.c +9
-0+case A_TCNT : +return read_tcnt (tmr, size, ch); +case A_TCCR : +return read_tccr (tmr->tccr[ch]) <<8 |read_tccr (tmr->tccr[1 ]); +default : +qemu_log_mask (LOG_GUEST_ERROR , +"renesas_tmr: Register 0x%" HWADDR_PRIX +" invalid access size\n" , + addr);
hw/timer/renesas_tmr.c static uint64_t tmr_read(void *opaque, hwaddr addr, unsigned size) · line 253
Quoted 10 lines
hw/timer/renesas_tmr.c +1
-5+break ; } -default : -qemu_log_mask (LOG_UNIMP ,"renesas_tmr: Register 0x%" HWADDR_PRIX -" not implemented\n" , - addr); -break ; }return UINT64_MAX ; }
Thomas