Commit e00a56db authored by Bastian Koppelmann's avatar Bastian Koppelmann
Browse files

target/tricore: Implement tricore_cpu_get_phys_page_debug 



this also removes tricore_cpu_get_phys_page_attrs_debug() as it was a
temporary fix from b190f477.

Signed-off-by: default avatarBastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20200529072148.284037-5-kbastian@mail.uni-paderborn.de>
parent 1ed8739a

target/tricore/cpu.c

+1 −9
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ 
#include "exec/exec-all.h"

#include "qemu/error-report.h"



static hwaddr tricore_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,

                                         MemTxAttrs *attrs)

{

    error_report("function cpu_get_phys_page_attrs_debug not "

                    "implemented, aborting");

    return -1;

}



static inline void set_feature(CPUTriCoreState *env, int feature)

{

    env->features |= 1ULL << feature;
@@ -161,7 +153,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data) 
    cc->dump_state = tricore_cpu_dump_state;

    cc->set_pc = tricore_cpu_set_pc;

    cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb;

    cc->get_phys_page_attrs_debug = tricore_cpu_get_phys_page_attrs_debug;

    cc->get_phys_page_debug = tricore_cpu_get_phys_page_debug;

    cc->tcg_initialize = tricore_tcg_init;

    cc->tlb_fill = tricore_cpu_tlb_fill;

}

target/tricore/helper.c

+13 −0
Original line number Diff line number Diff line
@@ -42,6 +42,19 @@ static int get_physical_address(CPUTriCoreState *env, hwaddr *physical, 


    return ret;

}



hwaddr tricore_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)

{

    TriCoreCPU *cpu = TRICORE_CPU(cs);

    hwaddr phys_addr;

    int prot;

    int mmu_idx = cpu_mmu_index(&cpu->env, false);



    if (get_physical_address(&cpu->env, &phys_addr, &prot, addr, 0, mmu_idx)) {

        return -1;

    }

    return phys_addr;

}

#endif



/* TODO: Add exeption support*/