mips: move hw/mips/cputimer.c to target/mips/
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Wed, 20 Sep 2017 19:49:29 +0000 (16:49 -0300)
committerYongbok Kim <yongbok.kim@imgtec.com>
Thu, 21 Sep 2017 12:24:34 +0000 (13:24 +0100)
This timer is a required part of the MIPS32/MIPS64 System Control coprocessor
(CP0). Moving it with the other architecture related files will allow an opaque
use of CPUMIPSState* in the next commit (introduce "internal.h").

also remove it from 'user' targets, remove an unnecessary include.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
hw/mips/Makefile.objs
target/mips/Makefile.objs
target/mips/cp0_timer.c [moved from hw/mips/cputimer.c with 99% similarity]

index 48cd2ef50e6bfacf396dbac7eb27c3c87bcc1a06..17a311aaba3526783f2980e883ed2d5005dacf08 100644 (file)
@@ -1,5 +1,5 @@
 obj-y += mips_r4k.o mips_malta.o mips_mipssim.o
-obj-y += addr.o cputimer.o mips_int.o
+obj-y += addr.o mips_int.o
 obj-$(CONFIG_JAZZ) += mips_jazz.o
 obj-$(CONFIG_FULONG) += mips_fulong2e.o
 obj-y += gt64xxx_pci.o
index bc5ed8511f81faee15f8ac3db7ff2cec60ef12f5..651f36f51763953ba9b3ae9a123b13272497d3a4 100644 (file)
@@ -1,4 +1,4 @@
 obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o
 obj-y += gdbstub.o msa_helper.o mips-semi.o
-obj-$(CONFIG_SOFTMMU) += machine.o
+obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o
 obj-$(CONFIG_KVM) += kvm.o
similarity index 99%
rename from hw/mips/cputimer.c
rename to target/mips/cp0_timer.c
index 8a166b3ea746a009968775cf689fca76dfaf0733..a9a58c56045a0c54d7f69bf0e2f13fde655244d6 100644 (file)
@@ -21,7 +21,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
 #include "hw/mips/cpudevs.h"
 #include "qemu/timer.h"
 #include "sysemu/kvm.h"