openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target-ppc: Introduce unrealizefn for PowerPCCPU 

Use it to clean up the opcode table, resolving a former TODO from Jocelyn.
Also switch from malloc() to g_malloc().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2013-06-09 22:11:49 +02:00 committed by Alexander Graf
parent ab8131afee
commit b048960f15
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target-ppc/cpu.h
View File

@ -886,6 +886,8 @@ struct ppc_segment_page_sizes {
/* The whole PowerPC CPU context */ /* The whole PowerPC CPU context */
#define NB_MMU_MODES 3 #define NB_MMU_MODES 3
#define PPC_CPU_OPCODES_LEN 0x40
struct CPUPPCState { struct CPUPPCState {
/* First are the most commonly used resources /* First are the most commonly used resources
* during translated code execution * during translated code execution
@ -1039,7 +1041,7 @@ struct CPUPPCState {
/* Those resources are used only during code translation */ /* Those resources are used only during code translation */
/* opcode handlers */ /* opcode handlers */
opc_handler_t *opcodes[0x40]; opc_handler_t *opcodes[PPC_CPU_OPCODES_LEN];
/* Those resources are used only in QEMU core */ /* Those resources are used only in QEMU core */
target_ulong hflags; /* hflags is a MSR & HFLAGS_MASK */ target_ulong hflags; /* hflags is a MSR & HFLAGS_MASK */

16
target-ppc/translate_init.c
View File

@ -7256,7 +7256,7 @@ static int create_new_table (opc_handler_t **table, unsigned char idx)
{ {
opc_handler_t **tmp; opc_handler_t **tmp;
tmp = malloc(0x20 * sizeof(opc_handler_t)); tmp = g_malloc(0x20 * sizeof(opc_handler_t));
fill_new_table(tmp, 0x20); fill_new_table(tmp, 0x20);
table[idx] = (opc_handler_t *)((uintptr_t)tmp | PPC_INDIRECT); table[idx] = (opc_handler_t *)((uintptr_t)tmp | PPC_INDIRECT);
@ -7864,6 +7864,19 @@ static void ppc_cpu_realizefn(DeviceState *dev, Error **errp)
#endif #endif
} }
static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp)
{
PowerPCCPU *cpu = POWERPC_CPU(dev);
CPUPPCState *env = &cpu->env;
int i;
for (i = 0; i < PPC_CPU_OPCODES_LEN; i++) {
if (env->opcodes[i] != &invalid_handler) {
g_free(env->opcodes[i]);
}
}
}
static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b) static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b)
{ {
ObjectClass *oc = (ObjectClass *)a; ObjectClass *oc = (ObjectClass *)a;
@ -8251,6 +8264,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
pcc->parent_realize = dc->realize; pcc->parent_realize = dc->realize;
dc->realize = ppc_cpu_realizefn; dc->realize = ppc_cpu_realizefn;
dc->unrealize = ppc_cpu_unrealizefn;
pcc->parent_reset = cc->reset; pcc->parent_reset = cc->reset;
cc->reset = ppc_cpu_reset; cc->reset = ppc_cpu_reset;