Commit 7b8a354d authored Jan 11, 2016 by Peter Maydell

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160111-1' into staging



target-arm queue:
 * i.MX: move i.MX31 CCM object to register array
 * xilinx_axidma: remove dead code
 * disas/libvixl: Update to upstream VIXL 1.12
 * virt: Support legacy -nic command line syntax

# gpg: Signature made Mon 11 Jan 2016 16:05:58 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>"
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"

* remotes/pmaydell/tags/pull-target-arm-20160111-1:
  hw/arm/virt: Support legacy -nic command line syntax
  disas/libvixl: Update to upstream VIXL 1.12
  hw/dma/xilinx_axidma: remove dead code
  i.MX: move i.MX31 CCM object to register array

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

parents ac0d9dbf fea9b3ca

disas/arm-a64.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@
		* along with this program. If not, see <http://www.gnu.org/licenses/>.
		*/

		#include "a64/disasm-a64.h"
		#include "vixl/a64/disasm-a64.h"

		extern "C" {
		#include "disas/bfd.h"

disas/libvixl/Makefile.objs

+5 −4

Original line number	Diff line number	Diff line
		libvixl_OBJS = utils.o \
		a64/instructions-a64.o \
		a64/decoder-a64.o \
		a64/disasm-a64.o
		libvixl_OBJS = vixl/utils.o \
		vixl/compiler-intrinsics.o \
		vixl/a64/instructions-a64.o \
		vixl/a64/decoder-a64.o \
		vixl/a64/disasm-a64.o

		$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS)

disas/libvixl/README

+1 −2

Original line number	Diff line number	Diff line
		@@ -2,11 +2,10 @@
		The code in this directory is a subset of libvixl:
		https://github.com/armvixl/vixl
		(specifically, it is the set of files needed for disassembly only,
		taken from libvixl 1.7).
		taken from libvixl 1.12).
		Bugfixes should preferably be sent upstream initially.

		The disassembler does not currently support the entire A64 instruction
		set. Notably:
		* No Advanced SIMD support.
		* Limited support for system instructions.
		* A few miscellaneous integer and floating point instructions are missing.

disas/libvixl/a64/assembler-a64.h→disas/libvixl/vixl/a64/assembler-a64.h

+4624 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

disas/libvixl/a64/constants-a64.h→disas/libvixl/vixl/a64/constants-a64.h

+935 −32

File changed and moved.

Preview size limit exceeded, changes collapsed.