yizhi-js-lib/favicon-trap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support changing cpu model for sparc

Browse Source
This commit is contained in:
lazymio
2021-11-04 19:22:08 +01:00
parent b0280f5e55
commit 64452e249d
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
qemu/target/sparc/cpu.c
View File

@ -510,21 +510,12 @@ static void sparc_cpu_class_init(struct uc_struct *uc, CPUClass *oc)
cc->tcg_initialize = sparc_tcg_init; cc->tcg_initialize = sparc_tcg_init;
} }
SPARCCPU *cpu_sparc_init(struct uc_struct *uc, const char *cpu_model) SPARCCPU *cpu_sparc_init(struct uc_struct *uc)
{ {
SPARCCPU *cpu; SPARCCPU *cpu;
CPUState *cs; CPUState *cs;
CPUClass *cc; CPUClass *cc;
SPARCCPUClass *scc; SPARCCPUClass *scc;
int i;
if (cpu_model == NULL) {
#ifdef TARGET_SPARC64
cpu_model = "Sun UltraSparc IV";
#else
cpu_model = "LEON3";
#endif
}
cpu = malloc(sizeof(*cpu)); cpu = malloc(sizeof(*cpu));
if (cpu == NULL) { if (cpu == NULL) {
@ -532,6 +523,17 @@ SPARCCPU *cpu_sparc_init(struct uc_struct *uc, const char *cpu_model)
} }
memset(cpu, 0, sizeof(*cpu)); memset(cpu, 0, sizeof(*cpu));
if (uc->cpu_model == INT_MAX) {
#ifdef TARGET_SPARC64
uc->cpu_model = 11; // Sun UltraSparc IV
#else
uc->cpu_model = 12;
#endif
} else if (uc->cpu_model >= ARRAY_SIZE(sparc_defs)) {
free(cpu);
return NULL;
}
cs = (CPUState *)cpu; cs = (CPUState *)cpu;
cc = (CPUClass *)&cpu->cc; cc = (CPUClass *)&cpu->cc;
cs->cc = cc; cs->cc = cc;
@ -546,16 +548,8 @@ SPARCCPU *cpu_sparc_init(struct uc_struct *uc, const char *cpu_model)
cpu_common_initfn(uc, cs); cpu_common_initfn(uc, cs);
/* init SPARC types scc->def */ /* init SPARC types scc->def */
scc = SPARC_CPU_CLASS(cc); scc = SPARC_CPU_CLASS(cc);
for (i = 0; i < ARRAY_SIZE(sparc_defs); i++) { scc->cpu_def = &sparc_defs[uc->cpu_model];
if (strcmp(cpu_model, sparc_defs[i].name) == 0) {
scc->cpu_def = &sparc_defs[i];
break;
}
}
if (i == ARRAY_SIZE(sparc_defs)) {
free(cpu);
return NULL;
}
/* init SPARCCPU */ /* init SPARCCPU */
sparc_cpu_initfn(uc, cs); sparc_cpu_initfn(uc, cs);
/* realize SPARCCPU */ /* realize SPARCCPU */

2
qemu/target/sparc/cpu.h
View File

@ -815,6 +815,6 @@ static inline bool tb_am_enabled(int tb_flags)
#endif #endif
} }
SPARCCPU *cpu_sparc_init(struct uc_struct *uc, const char *cpu_model); SPARCCPU *cpu_sparc_init(struct uc_struct *uc);
#endif #endif

2
qemu/target/sparc/unicorn.c
View File

@ -175,7 +175,7 @@ static int sparc_cpus_init(struct uc_struct *uc, const char *cpu_model)
{ {
SPARCCPU *cpu; SPARCCPU *cpu;
cpu = cpu_sparc_init(uc, cpu_model); cpu = cpu_sparc_init(uc);
if (cpu == NULL) { if (cpu == NULL) {
return -1; return -1;
} }

2
qemu/target/sparc/unicorn64.c
View File

@ -181,7 +181,7 @@ static int sparc_cpus_init(struct uc_struct *uc, const char *cpu_model)
{ {
SPARCCPU *cpu; SPARCCPU *cpu;
cpu = cpu_sparc_init(uc, cpu_model); cpu = cpu_sparc_init(uc);
if (cpu == NULL) { if (cpu == NULL) {
return -1; return -1;
} }