From 339894bec9bb99aaeb695173006322c37a102408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 11 Feb 2012 17:26:17 +0100 Subject: target-sh4: QOM'ify CPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Embed CPUSH4State as first member of SuperHCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber Reviewed-by: Peter Maydell --- Makefile.target | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index 4fbbabfe24..ace1182ca1 100644 --- a/Makefile.target +++ b/Makefile.target @@ -98,6 +98,7 @@ libobj-$(TARGET_CRIS) += cpu.o libobj-$(TARGET_LM32) += cpu.o libobj-$(TARGET_MICROBLAZE) += cpu.o libobj-$(TARGET_S390X) += cpu.o +libobj-$(TARGET_SH4) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o libobj-y += cpu.o -- cgit v1.2.1 From b9e7a234343501e2498680fd7bc0cd2aad947560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 15 Apr 2012 00:35:50 +0200 Subject: target-m68k: QOM'ify CPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Embed CPUM68KState as first member of QOM M68kCPU. Drop cpu_m68k_close() in favor of object_delete(). Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier --- Makefile.target | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index ace1182ca1..e735064be7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -96,6 +96,7 @@ libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o libobj-$(TARGET_ARM) += cpu.o libobj-$(TARGET_CRIS) += cpu.o libobj-$(TARGET_LM32) += cpu.o +libobj-$(TARGET_M68K) += cpu.o libobj-$(TARGET_MICROBLAZE) += cpu.o libobj-$(TARGET_S390X) += cpu.o libobj-$(TARGET_SH4) += cpu.o -- cgit v1.2.1 From 0f71a7095db6bc055bc5bb520d85ea650cca8a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 15 Apr 2012 23:29:19 +0200 Subject: target-mips: QOM'ify CPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Embed CPUMIPSState as first member of QOM MIPSCPU. Let CPUClass::reset() call cpu_state_reset() for now. Signed-off-by: Andreas Färber Reviewed-by: Richard Henderson --- Makefile.target | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index e735064be7..f7b2e7145a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -98,6 +98,9 @@ libobj-$(TARGET_CRIS) += cpu.o libobj-$(TARGET_LM32) += cpu.o libobj-$(TARGET_M68K) += cpu.o libobj-$(TARGET_MICROBLAZE) += cpu.o +ifeq ($(TARGET_BASE_ARCH), mips) +libobj-y += cpu.o +endif libobj-$(TARGET_S390X) += cpu.o libobj-$(TARGET_SH4) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) -- cgit v1.2.1 From 894a84e632e4e71eaa3588d7ca9854bf4d9027ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 20 Feb 2012 06:28:33 +0100 Subject: Makefile: Simplify compilation of target-*/cpu.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All targets except for ppc now have a standalone cpu.c file. Signed-off-by: Andreas Färber --- Makefile.target | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'Makefile.target') diff --git a/Makefile.target b/Makefile.target index f7b2e7145a..364aea2f5c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -87,32 +87,18 @@ libobj-y += op_helper.o endif endif libobj-y += helper.o -ifeq ($(TARGET_BASE_ARCH), i386) +ifneq ($(TARGET_BASE_ARCH), ppc) libobj-y += cpu.o endif libobj-$(TARGET_SPARC64) += vis_helper.o libobj-$(CONFIG_NEED_MMU) += mmu.o libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o -libobj-$(TARGET_ARM) += cpu.o -libobj-$(TARGET_CRIS) += cpu.o -libobj-$(TARGET_LM32) += cpu.o -libobj-$(TARGET_M68K) += cpu.o -libobj-$(TARGET_MICROBLAZE) += cpu.o -ifeq ($(TARGET_BASE_ARCH), mips) -libobj-y += cpu.o -endif -libobj-$(TARGET_S390X) += cpu.o -libobj-$(TARGET_SH4) += cpu.o ifeq ($(TARGET_BASE_ARCH), sparc) libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o -libobj-y += cpu.o endif libobj-$(TARGET_SPARC) += int32_helper.o libobj-$(TARGET_SPARC64) += int64_helper.o -libobj-$(TARGET_UNICORE32) += cpu.o -libobj-$(TARGET_XTENSA) += cpu.o libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o -libobj-$(TARGET_ALPHA) += cpu.o libobj-y += disas.o libobj-$(CONFIG_TCI_DIS) += tci-dis.o -- cgit v1.2.1