On 18/05/2021 17:11, Richard Henderson wrote:
> Instead of returning non-zero for failure, return true for success.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Bruno Larsen (billionai)<bruno.larsen@eldorado.org.br>
> ---
> target/ppc/mmu-radix64.c | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c
> index 76a5cc8cdb..7af3e697b2 100644
> --- a/target/ppc/mmu-radix64.c
> +++ b/target/ppc/mmu-radix64.c
> @@ -464,10 +464,10 @@ static int ppc_radix64_process_scoped_xlate(PowerPCCPU *cpu,
> * | = On | Process Scoped | Scoped |
> * +-------------+----------------+---------------+
> */
> -static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> - MMUAccessType access_type,
> - hwaddr *raddr, int *psizep, int *protp,
> - bool guest_visible)
> +static bool ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> + MMUAccessType access_type,
> + hwaddr *raddr, int *psizep, int *protp,
> + bool guest_visible)
> {
> CPUPPCState *env = &cpu->env;
> uint64_t lpid, pid;
> @@ -493,7 +493,7 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> }
> *protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
> *psizep = TARGET_PAGE_BITS;
> - return 0;
> + return true;
> }
>
> /*
> @@ -511,7 +511,7 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> if (guest_visible) {
> ppc_radix64_raise_segi(cpu, access_type, eaddr);
> }
> - return 1;
> + return false;
> }
>
> /* Get Process Table */
> @@ -524,13 +524,13 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> if (guest_visible) {
> ppc_radix64_raise_si(cpu, access_type, eaddr, DSISR_NOPTE);
> }
> - return 1;
> + return false;
> }
> if (!validate_pate(cpu, lpid, &pate)) {
> if (guest_visible) {
> ppc_radix64_raise_si(cpu, access_type, eaddr, DSISR_R_BADCONFIG);
> }
> - return 1;
> + return false;
> }
> }
>
> @@ -550,7 +550,7 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> pate, &g_raddr, &prot,
> &psize, guest_visible);
> if (ret) {
> - return ret;
> + return false;
> }
> *psizep = MIN(*psizep, psize);
> *protp &= prot;
> @@ -574,7 +574,7 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> &prot, &psize, false,
> guest_visible);
> if (ret) {
> - return ret;
> + return false;
> }
> *psizep = MIN(*psizep, psize);
> *protp &= prot;
> @@ -583,7 +583,7 @@ static int ppc_radix64_xlate(PowerPCCPU *cpu, vaddr eaddr,
> }
> }
>
> - return 0;
> + return true;
> }
>
> int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
> @@ -594,8 +594,8 @@ int ppc_radix64_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
> hwaddr raddr;
>
> /* Translate eaddr to raddr (where raddr is addr qemu needs for access) */
> - if (ppc_radix64_xlate(cpu, eaddr, access_type, &raddr,
> - &page_size, &prot, true)) {
> + if (!ppc_radix64_xlate(cpu, eaddr, access_type, &raddr,
> + &page_size, &prot, true)) {
> return 1;
> }
>
> @@ -609,8 +609,8 @@ hwaddr ppc_radix64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong eaddr)
> int psize, prot;
> hwaddr raddr;
>
> - if (ppc_radix64_xlate(cpu, eaddr, MMU_DATA_LOAD, &raddr,
> - &psize, &prot, false)) {
> + if (!ppc_radix64_xlate(cpu, eaddr, MMU_DATA_LOAD, &raddr,
> + &psize, &prot, false)) {
> return -1;
> }
>
--
Bruno Piazera Larsen
Instituto de Pesquisas ELDORADO
<https://www.eldorado.org.br/?utm_campaign=assinatura_de_e-mail&utm_medium=email&utm_source=RD+Station>
Departamento Computação Embarcada
Analista de Software Trainee
Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>