From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3NS-0005aM-33 for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tl3NI-0000eK-2k for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:21648) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tl3NH-0000dR-Pj for qemu-devel@nongnu.org; Tue, 18 Dec 2012 15:02:47 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qBIK2lPJ019526 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Dec 2012 15:02:47 -0500 Received: from blackpad.lan.raisama.net (vpn1-6-125.gru2.redhat.com [10.97.6.125]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qBIK2kiT022791 for ; Tue, 18 Dec 2012 15:02:46 -0500 From: Eduardo Habkost Date: Tue, 18 Dec 2012 18:04:12 -0200 Message-Id: <1355861053-11460-20-git-send-email-ehabkost@redhat.com> In-Reply-To: <1355861053-11460-1-git-send-email-ehabkost@redhat.com> References: <1355861053-11460-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 19/20] target-unicore32: replace uc32_cpu_init() with generic_cpu_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Eduardo Habkost --- target-unicore32/cpu.h | 2 +- target-unicore32/helper.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index 43bdd84..ad6fee4 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -122,7 +122,7 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong val, target_ulong mask) #define UC32_HWCAP_CMOV 4 /* 1 << 2 */ #define UC32_HWCAP_UCF64 8 /* 1 << 3 */ -#define cpu_init uc32_cpu_init +#define cpu_init(m) generic_cpu_init(TYPE_UNICORE32_CPU, m) #define cpu_exec uc32_cpu_exec #define cpu_signal_handler uc32_cpu_signal_handler #define cpu_handle_mmu_fault uc32_cpu_handle_mmu_fault diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index 927e591..731bd5c 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -23,18 +23,6 @@ #define DPRINTF(fmt, ...) do {} while (0) #endif -CPUState *uc32_cpu_init(const char *cpu_model) -{ - UniCore32CPU *cpu; - - if (object_class_by_name(cpu_model) == NULL) { - return NULL; - } - cpu = UNICORE32_CPU(object_new(cpu_model)); - cpu_realize(CPU(cpu), NULL); - return CPU(cpu); -} - uint32_t HELPER(clo)(uint32_t x) { return clo32(x); -- 1.7.11.7