yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-28 06:16:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Add "-cpu max" support

Browse source 
Add support for "-cpu max" for ARM guests. This CPU type behaves
like "-cpu host" when KVM is enabled, and like a system CPU with
the maximum possible feature set otherwise. (Note that this means
it won't be migratable across versions, as we will likely add
features to it in future.)

Backports commit bab52d4bba3f22921a690a887b4bd0342f2754cd from qemu
This commit is contained in:
Peter Maydell 2018-03-12 09:47:18 -04:00 committed by Lioncash
parent 44d8c38138
commit 7388fff079
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
3 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/target/arm/cpu-qom.h
View file

@ -30,6 +30,8 @@
#define ARM_CPU_GET_CLASS(uc, obj) \
OBJECT_GET_CLASS(uc, ARMCPUClass, (obj), TYPE_ARM_CPU)
#define TYPE_ARM_MAX_CPU "max-" TYPE_ARM_CPU
/**
* ARMCPUClass:
* @parent_realize: The parent class' realize handler.

18
qemu/target/arm/cpu.c
View file

@ -1466,6 +1466,21 @@ static void pxa270c5_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->reset_sctlr = 0x00000078;
}
#ifndef TARGET_AARCH64
/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);
* otherwise, a CPU with as many features enabled as our emulation supports.
* The version of '-cpu max' for qemu-system-aarch64 is defined in cpu64.c;
* this only needs to handle 32 bits.
*/
static void arm_max_initfn(struct uc_struct *uc, Object *obj, void *opaque)
{
cortex_a15_initfn(uc, obj, opaque);
/* In future we might add feature bits here even if the
* real-world A15 doesn't implement them.
*/
}
#endif
#ifdef CONFIG_USER_ONLY
static void arm_any_initfn(struct uc_struct *uc, Object *obj, void *opaque)
{
@ -1530,6 +1545,9 @@ static const ARMCPUInfo arm_cpus[] = {
{ "pxa270-b1", pxa270b1_initfn },
{ "pxa270-c0", pxa270c0_initfn },
{ "pxa270-c5", pxa270c5_initfn },
#ifndef TARGET_AARCH64
{ "max", arm_max_initfn },
#endif
#ifdef CONFIG_USER_ONLY
{ "any", arm_any_initfn },
#endif

14
qemu/target/arm/cpu64.c
View file

@ -190,6 +190,19 @@ static void aarch64_a53_initfn(struct uc_struct *uc, Object *obj, void *opaque)
define_arm_cp_regs(cpu, cortex_a57_a53_cp_reginfo);
}
/* -cpu max: if KVM is enabled, like -cpu host (best possible with this host);
* otherwise, a CPU with as many features enabled as our emulation supports.
* The version of '-cpu max' for qemu-system-arm is defined in cpu.c;
* this only needs to handle 64 bits.
*/
static void aarch64_max_initfn(struct uc_struct *uc, Object *obj, void *opaque)
{
aarch64_a57_initfn(uc, obj, opaque);
/* In future we might add feature bits here even if the
* real-world A57 doesn't implement them.
*/
}
// Unicorn: enabled for the general use-case as well.
static void aarch64_any_initfn(struct uc_struct *uc, Object *obj, void *opaque)
{
@ -224,6 +237,7 @@ typedef struct ARMCPUInfo {
static const ARMCPUInfo aarch64_cpus[] = {
{ "cortex-a57", aarch64_a57_initfn },
{ "cortex-a53", aarch64_a53_initfn },
{ "max", aarch64_max_initfn },
// Unicorn: enabled for the general use case as well
{ "any", aarch64_any_initfn },
{ NULL }