OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

QOM CPUState refactorings / X86CPU

Browse Source 
* X86CPU IA32e 1GB paging support
 * Performance quickfix for CPU() cast macro
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTOabnAAoJEPou0S0+fgE/ob4QAL2DBPLq+QPWYUg8JRe3+8DW
 czMcgxQ2G1vSr8mpMSTWePW0qwX1M/nsmxreOsZ4cWL38UzwZNKqGVHN3a/YXvrv
 4Aw7acLKK91FE2SLvtvM1KsIQlzbRlIUxaRCldfubIKbSgqKMYZooMOKlTnzpXkx
 rLa4Tx+nUxTIQXZ1PJ5XTXBk5KYnVJaVrUBp22MWsmt5crKoKnNYAxniqemx6S9M
 ImqQLrpmnj3tjhZzpF2+1fSbnTmrMLdO8CNUDFgCDZzHr+rs5oLRwdVvk3FPQbNW
 NO59TtBmEDZ1jyGpktI5D0/4GD5ctU1zsirehWai4VspN6qmBS7slW9Nk//KnvvW
 pf3zoQwzN7JUq0+ZkVPjnWsrUm7TWlkSQZjXdD4qtTAOR31EOt+oE0FdWqnYiPDr
 pwh8zl2jv+2wW1fewqSSvcRKFZJSsYjYu0fDxoFf0zSnj764Q5RYil7CWkpXxb4p
 cS4u40SBITe9D68BxgYrVlf8slmTIGVXSNWuNH9QFOu1B/0ZQFbp7CO0rHru9PJH
 8/63j4zpROGPuZvviiltKgv4iYhmBGhub0yr3GQvu7cDKbrNVMGCUFzcnQKcABn8
 ZHEzpz5YU9H6mpfQ/r9Pi4DiTvl6jBnu89/EmCKVLNIZYNKCSjtk7pS9XderesTE
 6qq3jG0uejLnDHfqYLUp
 =gmXa
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-2.0' into staging

QOM CPUState refactorings / X86CPU

* X86CPU IA32e 1GB paging support
* Performance quickfix for CPU() cast macro

# gpg: Signature made Mon 31 Mar 2014 18:33:27 BST using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-cpu-for-2.0:
  cpu: Avoid QOM casts for CPU()
  target-i386: x86_cpu_get_phys_page_debug(): support 1GB page translation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-03-31 18:47:14 +01:00
commit 7d4d7975e5
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/qom/cpu.h
View File

@ -53,7 +53,12 @@ typedef uint64_t vaddr;
#define TYPE_CPU "cpu"
#define CPU(obj) OBJECT_CHECK(CPUState, (obj), TYPE_CPU)
/* Since this macro is used a lot in hot code paths and in conjunction with
* FooCPU *foo_env_get_cpu(), we deviate from usual QOM practice by using
* an unchecked cast.
*/
#define CPU(obj) ((CPUState *)(obj))
#define CPU_CLASS(class) OBJECT_CLASS_CHECK(CPUClass, (class), TYPE_CPU)
#define CPU_GET_CLASS(obj) OBJECT_GET_CLASS(CPUClass, (obj), TYPE_CPU)

11
target-i386/helper.c
View File

@ -941,6 +941,14 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
pdpe = ldq_phys(cs->as, pdpe_addr);
if (!(pdpe & PG_PRESENT_MASK))
return -1;
if (pdpe & PG_PSE_MASK) {
page_size = 1024 * 1024 * 1024;
pte = pdpe & ~( (page_size - 1) & ~0xfff);
pte &= ~(PG_NX_MASK | PG_HI_USER_MASK);
goto out;
}
} else
#endif
{
@ -993,6 +1001,9 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
pte = pte & env->a20_mask;
}
#ifdef TARGET_X86_64
out:
#endif
page_offset = (addr & TARGET_PAGE_MASK) & (page_size - 1);
paddr = (pte & TARGET_PAGE_MASK) + page_offset;
return paddr;