From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TwrMA-0002Ik-Vl for qemu-devel@nongnu.org; Sun, 20 Jan 2013 04:38:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TwrM6-0007h1-64 for qemu-devel@nongnu.org; Sun, 20 Jan 2013 04:38:26 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 09:16:23 +0100 Message-Id: <1358669783-4401-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC qom-cpu v3] target-ppc: Introduce unrealizefn for PowerPCCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Alexander Graf , "open list:PowerPC" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , David Gibson 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=C3=A4rber Cc: David Gibson Cc: Markus Armbruster --- Based on my "CPUState QOM realizefn support" series v2 (1.5 material). From "QOM'ify Power Architecture CPU" v2: * Implemented unrealizefn instead of finalizefn, to address rejection by= dwg: create_new_table() is not called from the instance initializer. v1 -> v2: * Replace cpu_ppc_close() and its TODO with an implementation as a final= izefn. target-ppc/translate_init.c | 16 +++++++++++++++- 1 Datei ge=C3=A4ndert, 15 Zeilen hinzugef=C3=BCgt(+), 1 Zeile entfernt(-= ) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 786d871..2385571 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -9641,7 +9641,7 @@ static int create_new_table (opc_handler_t **table,= unsigned char idx) { opc_handler_t **tmp; =20 - tmp =3D malloc(0x20 * sizeof(opc_handler_t)); + tmp =3D g_malloc(0x20 * sizeof(opc_handler_t)); fill_new_table(tmp, 0x20); table[idx] =3D (opc_handler_t *)((uintptr_t)tmp | PPC_INDIRECT); =20 @@ -10236,6 +10236,19 @@ static void ppc_cpu_realizefn(DeviceState *dev, = Error **errp) #endif } =20 +static void ppc_cpu_unrealizefn(DeviceState *dev, Error **errp) +{ + PowerPCCPU *cpu =3D POWERPC_CPU(dev); + CPUPPCState *env =3D &cpu->env; + int i; + + for (i =3D 0; i < 0x40; i++) { + if (env->opcodes[i] !=3D &invalid_handler) { + g_free(env->opcodes[i]); + } + } +} + static gint ppc_cpu_compare_class_pvr(gconstpointer a, gconstpointer b) { ObjectClass *oc =3D (ObjectClass *)a; @@ -10568,6 +10581,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, v= oid *data) =20 pcc->parent_realize =3D dc->realize; dc->realize =3D ppc_cpu_realizefn; + dc->unrealize =3D ppc_cpu_unrealizefn; =20 pcc->parent_reset =3D cc->reset; cc->reset =3D ppc_cpu_reset; --=20 1.7.10.4