Commit 5dae13cd authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-or-20170214' into staging 



Queued openrisc patches

# gpg: Signature made Mon 13 Feb 2017 21:21:03 GMT
# gpg:                using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC  16A4 AD12 70CC 4DD0 279B

* remotes/rth/tags/pull-or-20170214: (24 commits)
  target/openrisc: Optimize for r0 being zero
  target/openrisc: Tidy handling of delayed branches
  target/openrisc: Tidy ppc/npc implementation
  target/openrisc: Optimize l.jal to next
  target/openrisc: Fix madd
  target/openrisc: Implement muld, muldu, macu, msbu
  target/openrisc: Represent MACHI:MACLO as a single unit
  target/openrisc: Implement msync
  target/openrisc: Enable trap, csync, msync, psync for user mode
  target/openrisc: Set flags on helpers
  target/openrisc: Use movcond where appropriate
  target/openrisc: Keep SR_CY and SR_OV in a separate variables
  target/openrisc: Keep SR_F in a separate variable
  target/openrisc: Invert the decoding in dec_calc
  target/openrisc: Put SR[OVE] in TB flags
  target/openrisc: Streamline arithmetic and OVE
  target/openrisc: Rationalize immediate extraction
  target/openrisc: Tidy insn dumping
  target/openrisc: Implement lwa, swa
  target/openrisc: Fix exception handling status registers
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ec7a9bd5 6597c28d

configure

+3 −3
Original line number Diff line number Diff line
@@ -5843,7 +5843,7 @@ target_name=$(echo $target | cut -d '-' -f 1) 
target_bigendian="no"



case "$target_name" in

  armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or32|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  armeb|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppcemb|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  target_bigendian=yes

  ;;

esac
@@ -5937,7 +5937,7 @@ case "$target_name" in 
  ;;

  nios2)

  ;;

  or32)

  or1k)

    TARGET_ARCH=openrisc

    TARGET_BASE_ARCH=openrisc

  ;;
@@ -6145,7 +6145,7 @@ for i in $ARCH $TARGET_BASE_ARCH ; do 
  nios2)

    disas_config "NIOS2"

  ;;

  or32)

  or1k)

    disas_config "OPENRISC"

  ;;

  ppc*)

default-configs/or1k-linux-user.mak

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Default configuration for or1k-linux-user

default-configs/or32-softmmu.mak→default-configs/or1k-softmmu.mak

+4 −0
Original line number Diff line number Diff line 
# Default configuration for or32-softmmu

# Default configuration for or1k-softmmu



CONFIG_SERIAL=y

CONFIG_OPENCORES_ETH=y

default-configs/or32-linux-user.mak

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
# Default configuration for or32-linux-user

hw/openrisc/openrisc_sim.c

+2 −2
Original line number Diff line number Diff line
@@ -139,10 +139,10 @@ static void openrisc_sim_init(MachineState *machine) 


static void openrisc_sim_machine_init(MachineClass *mc)

{

    mc->desc = "or32 simulation";

    mc->desc = "or1k simulation";

    mc->init = openrisc_sim_init;

    mc->max_cpus = 1;

    mc->is_default = 1;

}



DEFINE_MACHINE("or32-sim", openrisc_sim_machine_init)
 
DEFINE_MACHINE("or1k-sim", openrisc_sim_machine_init)