[Qemu-commits] [qemu/qemu] 5502b6: mips: move hw/mips/cputimer.c to target/mips/

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5502b66fc7d0bebd08b9b7017cb7e8b5261c3a2d
      
https://github.com/qemu/qemu/commit/5502b66fc7d0bebd08b9b7017cb7e8b5261c3a2d
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M hw/mips/Makefile.objs
    R hw/mips/cputimer.c
    M target/mips/Makefile.objs
    A target/mips/cp0_timer.c

  Log Message:
  -----------
  mips: move hw/mips/cputimer.c to target/mips/

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é <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: 26aa3d9aecbb6fe9bce808a1d127191bdf3cc3d2
      
https://github.com/qemu/qemu/commit/26aa3d9aecbb6fe9bce808a1d127191bdf3cc3d2
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M target/mips/cp0_timer.c
    M target/mips/cpu.c
    M target/mips/cpu.h
    M target/mips/gdbstub.c
    M target/mips/helper.c
    A target/mips/internal.h
    M target/mips/kvm.c
    M target/mips/machine.c
    M target/mips/msa_helper.c
    M target/mips/op_helper.c
    M target/mips/translate.c

  Log Message:
  -----------
  mips: introduce internal.h and cleanup cpu.h

no logical change, only code movement (and fix a comment typo).

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: 27e38392ca07f97edfb2257b6a1394a04d84e8d5
      
https://github.com/qemu/qemu/commit/27e38392ca07f97edfb2257b6a1394a04d84e8d5
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M target/mips/internal.h
    M target/mips/translate.c

  Log Message:
  -----------
  mips: split cpu_mips_realize_env() out of cpu_mips_init()

so it can be used in mips_cpu_realizefn() in the next commit

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: df4dc10284e1d871db8adb512816a561473ffe3e
      
https://github.com/qemu/qemu/commit/df4dc10284e1d871db8adb512816a561473ffe3e
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M target/mips/cpu.c
    M target/mips/translate.c

  Log Message:
  -----------
  mips: call cpu_mips_realize_env() from mips_cpu_realizefn()

This changes the order between cpu_mips_realize_env() and
cpu_exec_initfn(), but cpu_exec_initfn() don't have anything that
depends on cpu_mips_realize_env() being called first.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Igor Mammedov <address@hidden>
Tested-by: James Hogan <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: 41da212c9ce9482fcfd490170c2611470254f8dc
      
https://github.com/qemu/qemu/commit/41da212c9ce9482fcfd490170c2611470254f8dc
  Author: Igor Mammedov <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M target/mips/cpu-qom.h
    M target/mips/cpu.c
    M target/mips/internal.h
    M target/mips/translate.c
    M target/mips/translate_init.c

  Log Message:
  -----------
  mips: MIPSCPU model subclasses

Register separate QOM types for each mips cpu model,
so it would be possible to reuse generic CPU creation
routines.

Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: use internal.h, use void* to hold cpu_def in MIPSCPUClass,
 mark MIPSCPU abstract, address Eduardo Habkost review]
Tested-by: James Hogan <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: c4c8146cfd0fc3f95418fbc82a2eded594675022
      
https://github.com/qemu/qemu/commit/c4c8146cfd0fc3f95418fbc82a2eded594675022
  Author: Igor Mammedov <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M hw/mips/cps.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_mipssim.c
    M hw/mips/mips_r4k.c
    M target/mips/cpu.h
    M target/mips/translate.c

  Log Message:
  -----------
  mips: replace cpu_mips_init() with cpu_generic_init()

now cpu_mips_init() reimplements subset of cpu_generic_init()
tasks, so just drop it and use cpu_generic_init() directly.

Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Hervé Poussineau <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
[PMD: use internal.h instead of cpu.h]
Tested-by: James Hogan <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: 2a2be359c4335607c7f746cf27c412c08ab89aff
      
https://github.com/qemu/qemu/commit/2a2be359c4335607c7f746cf27c412c08ab89aff
  Author: Eric Blake <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M target/mips/dsp_helper.c

  Log Message:
  -----------
  mips: Improve macro parenthesization

Although none of the existing macro call-sites were broken,
it's always better to write macros that properly parenthesize
arguments that can be complex expressions, so that the intended
order of operations is not broken.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Yongbok Kim <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>


  Commit: 9ee660e7c138595224b65ddc1c5712549f0a278c
      
https://github.com/qemu/qemu/commit/9ee660e7c138595224b65ddc1c5712549f0a278c
  Author: Peter Maydell <address@hidden>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M hw/mips/Makefile.objs
    M hw/mips/cps.c
    R hw/mips/cputimer.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/mips/mips_mipssim.c
    M hw/mips/mips_r4k.c
    M target/mips/Makefile.objs
    A target/mips/cp0_timer.c
    M target/mips/cpu-qom.h
    M target/mips/cpu.c
    M target/mips/cpu.h
    M target/mips/dsp_helper.c
    M target/mips/gdbstub.c
    M target/mips/helper.c
    A target/mips/internal.h
    M target/mips/kvm.c
    M target/mips/machine.c
    M target/mips/msa_helper.c
    M target/mips/op_helper.c
    M target/mips/translate.c
    M target/mips/translate_init.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/yongbok/tags/mips-20170921' into staging

MIPS patches 2017-09-21

Changes:
QOMify MIPS cpu
Improve macro parenthesization

# gpg: Signature made Thu 21 Sep 2017 13:50:37 BST
# gpg:                using RSA key 0x2238EB86D5F797C2
# gpg: Good signature from "Yongbok Kim <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 8600 4CF5 3415 A5D9 4CFA  2B5C 2238 EB86 D5F7 97C2

* remotes/yongbok/tags/mips-20170921:
  mips: Improve macro parenthesization
  mips: replace cpu_mips_init() with cpu_generic_init()
  mips: MIPSCPU model subclasses
  mips: call cpu_mips_realize_env() from mips_cpu_realizefn()
  mips: split cpu_mips_realize_env() out of cpu_mips_init()
  mips: introduce internal.h and cleanup cpu.h
  mips: move hw/mips/cputimer.c to target/mips/

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ff5667ed53c5...9ee660e7c138