From c73c3aa081cae0e565b8669ad7fba192749f8397 Mon Sep 17 00:00:00 2001 From: pbrook Date: Sun, 29 Apr 2007 19:06:34 +0000 Subject: Fix ARM fine pagetables. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2742 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-arm/helper.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 111b846..bae4c9f 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -372,7 +372,13 @@ static int get_phys_addr(CPUState *env, uint32_t address, int access_type, code = 13; } else { /* Lookup l2 entry. */ - table = (desc & 0xfffffc00) | ((address >> 10) & 0x3fc); + if (type == 1) { + /* Coarse pagetable. */ + table = (desc & 0xfffffc00) | ((address >> 10) & 0x3fc); + } else { + /* Fine pagetable. */ + table = (desc & 0xfffff000) | ((address >> 8) & 0xffc); + } desc = ldl_phys(table); switch (desc & 3) { case 0: /* Page translation fault. */ -- cgit v1.1