ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-microblaze: Fallback to our latest CPU version 

Today, when running QEMU in linux-user or with boards that don't
select a specific CPU version, we treat it as an invalid version
and log a message.

Instead, if no specific version was selected, fallback to our
latest CPU version.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
This commit is contained in:
Edgar E. Iglesias 2018-04-16 22:23:05 +02:00
parent 0e9033c8c5
commit 4c8ac10737
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/microblaze/cpu.c
View File

@ -72,6 +72,9 @@ static const struct {
{NULL, 0}, {NULL, 0},
}; };
/* If no specific version gets selected, default to the following. */
#define DEFAULT_CPU_VERSION "10.0"
static void mb_cpu_set_pc(CPUState *cs, vaddr value) static void mb_cpu_set_pc(CPUState *cs, vaddr value)
{ {
MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
@ -141,6 +144,7 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp)
MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs);
CPUMBState *env = &cpu->env; CPUMBState *env = &cpu->env;
uint8_t version_code = 0; uint8_t version_code = 0;
const char *version;
int i = 0; int i = 0;
Error *local_err = NULL; Error *local_err = NULL;
@ -162,8 +166,9 @@ static void mb_cpu_realizefn(DeviceState *dev, Error **errp)
| PVR2_FPU_EXC_MASK \ | PVR2_FPU_EXC_MASK \
| 0; | 0;
for (i = 0; mb_cpu_lookup[i].name && cpu->cfg.version; i++) { version = cpu->cfg.version ? cpu->cfg.version : DEFAULT_CPU_VERSION;
if (strcmp(mb_cpu_lookup[i].name, cpu->cfg.version) == 0) { for (i = 0; mb_cpu_lookup[i].name && version; i++) {
if (strcmp(mb_cpu_lookup[i].name, version) == 0) {
version_code = mb_cpu_lookup[i].version_id; version_code = mb_cpu_lookup[i].version_id;
break; break;
} }