mirror of https://github.com/xemu-project/xemu.git
target/arm: Perform override check early in add_cpreg_to_hashtable
Perform the override check early, so that it is still done even when we decide to discard an unreachable cpreg. Use assert not printf+abort. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 20220501055028.646596-18-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
10748a9652
commit
dc44545b0d
target/arm
|
@ -8538,6 +8538,14 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r,
|
|||
g_assert_not_reached();
|
||||
}
|
||||
|
||||
/* Overriding of an existing definition must be explicitly requested. */
|
||||
if (!(r->type & ARM_CP_OVERRIDE)) {
|
||||
const ARMCPRegInfo *oldreg = get_arm_cp_reginfo(cpu->cp_regs, key);
|
||||
if (oldreg) {
|
||||
assert(oldreg->type & ARM_CP_OVERRIDE);
|
||||
}
|
||||
}
|
||||
|
||||
/* Combine cpreg and name into one allocation. */
|
||||
name_len = strlen(name) + 1;
|
||||
r2 = g_malloc(sizeof(*r2) + name_len);
|
||||
|
@ -8622,20 +8630,6 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r,
|
|||
assert(!raw_accessors_invalid(r2));
|
||||
}
|
||||
|
||||
/* Overriding of an existing definition must be explicitly
|
||||
* requested.
|
||||
*/
|
||||
if (!(r->type & ARM_CP_OVERRIDE)) {
|
||||
const ARMCPRegInfo *oldreg = get_arm_cp_reginfo(cpu->cp_regs, key);
|
||||
if (oldreg && !(oldreg->type & ARM_CP_OVERRIDE)) {
|
||||
fprintf(stderr, "Register redefined: cp=%d %d bit "
|
||||
"crn=%d crm=%d opc1=%d opc2=%d, "
|
||||
"was %s, now %s\n", r2->cp, 32 + 32 * is64,
|
||||
r2->crn, r2->crm, r2->opc1, r2->opc2,
|
||||
oldreg->name, r2->name);
|
||||
g_assert_not_reached();
|
||||
}
|
||||
}
|
||||
g_hash_table_insert(cpu->cp_regs, (gpointer)(uintptr_t)key, r2);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue