Merge branch 'master' of blueswir1@git.sv.gnu.org:/srv/git/qemu
This commit is contained in:
commit
48e77a3653
|
@ -77,7 +77,7 @@ static void cris_shift_ccs(CPUState *env)
|
|||
int cpu_cris_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
|
||||
int mmu_idx, int is_softmmu)
|
||||
{
|
||||
struct cris_mmu_result_t res;
|
||||
struct cris_mmu_result res;
|
||||
int prot, miss;
|
||||
int r = -1;
|
||||
target_ulong phy;
|
||||
|
@ -191,7 +191,7 @@ void do_interrupt(CPUState *env)
|
|||
target_phys_addr_t cpu_get_phys_page_debug(CPUState * env, target_ulong addr)
|
||||
{
|
||||
uint32_t phy = addr;
|
||||
struct cris_mmu_result_t res;
|
||||
struct cris_mmu_result res;
|
||||
int miss;
|
||||
miss = cris_mmu_translate(&res, env, addr, 0, 0);
|
||||
if (!miss)
|
||||
|
|
|
@ -123,7 +123,7 @@ static void dump_tlb(CPUState *env, int mmu)
|
|||
#endif
|
||||
|
||||
/* rw 0 = read, 1 = write, 2 = exec. */
|
||||
static int cris_mmu_translate_page(struct cris_mmu_result_t *res,
|
||||
static int cris_mmu_translate_page(struct cris_mmu_result *res,
|
||||
CPUState *env, uint32_t vaddr,
|
||||
int rw, int usermode)
|
||||
{
|
||||
|
@ -324,7 +324,7 @@ void cris_mmu_flush_pid(CPUState *env, uint32_t pid)
|
|||
}
|
||||
}
|
||||
|
||||
int cris_mmu_translate(struct cris_mmu_result_t *res,
|
||||
int cris_mmu_translate(struct cris_mmu_result *res,
|
||||
CPUState *env, uint32_t vaddr,
|
||||
int rw, int mmu_idx)
|
||||
{
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#define CRIS_MMU_ERR_WRITE 2
|
||||
#define CRIS_MMU_ERR_FLUSH 3
|
||||
|
||||
struct cris_mmu_result_t
|
||||
struct cris_mmu_result
|
||||
{
|
||||
uint32_t phy;
|
||||
int prot;
|
||||
|
@ -12,6 +12,6 @@ struct cris_mmu_result_t
|
|||
|
||||
void cris_mmu_init(CPUState *env);
|
||||
void cris_mmu_flush_pid(CPUState *env, uint32_t pid);
|
||||
int cris_mmu_translate(struct cris_mmu_result_t *res,
|
||||
int cris_mmu_translate(struct cris_mmu_result *res,
|
||||
CPUState *env, uint32_t vaddr,
|
||||
int rw, int mmu_idx);
|
||||
|
|
Loading…
Reference in a new issue