proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-05 01:48:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm

Browse Source 
* 'target-arm.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  target-arm: Rename CPU types
  target-arm: Fix TCG temp leaks for WI and UNDEF VFP sysreg writes
This commit is contained in:
Aurelien Jarno 2013-01-31 23:33:14 +01:00
commit 810ded1379
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target-arm/cpu.c
View File

@ -204,12 +204,15 @@ void arm_cpu_realize(ARMCPU *cpu)
static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
{ {
ObjectClass *oc; ObjectClass *oc;
char *typename;
if (!cpu_model) { if (!cpu_model) {
return NULL; return NULL;
} }
oc = object_class_by_name(cpu_model); typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpu_model);
oc = object_class_by_name(typename);
g_free(typename);
if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) || if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) ||
object_class_is_abstract(oc)) { object_class_is_abstract(oc)) {
return NULL; return NULL;
@ -789,14 +792,15 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
static void cpu_register(const ARMCPUInfo *info) static void cpu_register(const ARMCPUInfo *info)
{ {
TypeInfo type_info = { TypeInfo type_info = {
.name = info->name,
.parent = TYPE_ARM_CPU, .parent = TYPE_ARM_CPU,
.instance_size = sizeof(ARMCPU), .instance_size = sizeof(ARMCPU),
.instance_init = info->initfn, .instance_init = info->initfn,
.class_size = sizeof(ARMCPUClass), .class_size = sizeof(ARMCPUClass),
}; };
type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
type_register(&type_info); type_register(&type_info);
g_free((void *)type_info.name);
} }
static const TypeInfo arm_cpu_type_info = { static const TypeInfo arm_cpu_type_info = {

11
target-arm/helper.c
View File

@ -1303,9 +1303,9 @@ static gint arm_cpu_list_compare(gconstpointer a, gconstpointer b)
name_a = object_class_get_name(class_a); name_a = object_class_get_name(class_a);
name_b = object_class_get_name(class_b); name_b = object_class_get_name(class_b);
if (strcmp(name_a, "any") == 0) { if (strcmp(name_a, "any-" TYPE_ARM_CPU) == 0) {
return 1; return 1;
} else if (strcmp(name_b, "any") == 0) { } else if (strcmp(name_b, "any-" TYPE_ARM_CPU) == 0) {
return -1; return -1;
} else { } else {
return strcmp(name_a, name_b); return strcmp(name_a, name_b);
@ -1316,9 +1316,14 @@ static void arm_cpu_list_entry(gpointer data, gpointer user_data)
{ {
ObjectClass *oc = data; ObjectClass *oc = data;
CPUListState *s = user_data; CPUListState *s = user_data;
const char *typename;
char *name;
typename = object_class_get_name(oc);
name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_ARM_CPU));
(*s->cpu_fprintf)(s->file, " %s\n", (*s->cpu_fprintf)(s->file, " %s\n",
object_class_get_name(oc)); name);
g_free(name);
} }
void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf) void arm_cpu_list(FILE *f, fprintf_function cpu_fprintf)

5
target-arm/translate.c
View File

@ -2737,7 +2737,6 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn)
} }
} else { } else {
/* arm->vfp */ /* arm->vfp */
tmp = load_reg(s, rd);
if (insn & (1 << 21)) { if (insn & (1 << 21)) {
rn >>= 1; rn >>= 1;
/* system register */ /* system register */
@ -2748,6 +2747,7 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn)
/* Writes are ignored. */ /* Writes are ignored. */
break; break;
case ARM_VFP_FPSCR: case ARM_VFP_FPSCR:
tmp = load_reg(s, rd);
gen_helper_vfp_set_fpscr(cpu_env, tmp); gen_helper_vfp_set_fpscr(cpu_env, tmp);
tcg_temp_free_i32(tmp); tcg_temp_free_i32(tmp);
gen_lookup_tb(s); gen_lookup_tb(s);
@ -2757,18 +2757,21 @@ static int disas_vfp_insn(CPUARMState * env, DisasContext *s, uint32_t insn)
return 1; return 1;
/* TODO: VFP subarchitecture support. /* TODO: VFP subarchitecture support.
* For now, keep the EN bit only */ * For now, keep the EN bit only */
tmp = load_reg(s, rd);
tcg_gen_andi_i32(tmp, tmp, 1 << 30); tcg_gen_andi_i32(tmp, tmp, 1 << 30);
store_cpu_field(tmp, vfp.xregs[rn]); store_cpu_field(tmp, vfp.xregs[rn]);
gen_lookup_tb(s); gen_lookup_tb(s);
break; break;
case ARM_VFP_FPINST: case ARM_VFP_FPINST:
case ARM_VFP_FPINST2: case ARM_VFP_FPINST2:
tmp = load_reg(s, rd);
store_cpu_field(tmp, vfp.xregs[rn]); store_cpu_field(tmp, vfp.xregs[rn]);
break; break;
default: default:
return 1; return 1;
} }
} else { } else {
tmp = load_reg(s, rd);
gen_vfp_msr(tmp); gen_vfp_msr(tmp);
gen_mov_vreg_F0(0, rn); gen_mov_vreg_F0(0, rn);
} }