Commit 204aa60b authored Jan 30, 2020 by Peter Maydell

Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jan-29-2020' into staging



MIPS queue for January 29th, 2020

# gpg: Signature made Wed 29 Jan 2020 18:29:43 GMT
# gpg:                using RSA key D4972A8967F75A65
# gpg: Good signature from "Aleksandar Markovic <amarkovic@wavecomp.com>" [full]
# Primary key fingerprint: 8526 FBF1 5DA3 811F 4A01  DD75 D497 2A89 67F7 5A65

* remotes/amarkovic/tags/mips-queue-jan-29-2020:
  target/mips: Add implementation of GINVT instruction
  target/mips: Amend CP0 WatchHi register implementation
  hw/core/loader: Let load_elf() populate a field with CPU-specific flags
  target/mips: semihosting: Remove 'uhi_done' label in helper_do_semihosting()
  disas: Add a field for target-dependant data to disassemble_info
  target/mips: Rectify documentation on deprecating MIPS r4k machine

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

parents a09a2b5a 99029be1

disas/mips.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -1409,6 +1409,16 @@ const struct mips_opcode mips_builtin_opcodes[] =
		{"dvp", "t", 0x41600024, 0xffe0ffff, TRAP\|WR_t, 0, I32R6},
		{"evp", "", 0x41600004, 0xffffffff, TRAP, 0, I32R6},
		{"evp", "t", 0x41600004, 0xffe0ffff, TRAP\|WR_t, 0, I32R6},
		{"ginvi", "v", 0x7c00003d, 0xfc1ffcff, TRAP \| INSN_TLB, 0, I32R6},
		{"ginvt", "v", 0x7c0000bd, 0xfc1ffcff, TRAP \| INSN_TLB, 0, I32R6},
		{"crc32b", "t,v,t", 0x7c00000f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32h", "t,v,t", 0x7c00004f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32w", "t,v,t", 0x7c00008f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32d", "t,v,t", 0x7c0000cf, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I64R6},
		{"crc32cb", "t,v,t", 0x7c00010f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32ch", "t,v,t", 0x7c00014f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32cw", "t,v,t", 0x7c00018f, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I32R6},
		{"crc32cd", "t,v,t", 0x7c0001cf, 0xfc00ff3f, WR_d \| RD_s \| RD_t, 0, I64R6},

		/* MSA */
		{"sll.b", "+d,+e,+f", 0x7800000d, 0xffe0003f, WR_VD\|RD_VS\|RD_VT, 0, MSA},

hw/alpha/dp264.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ static void clipper_init(MachineState *machine)
		exit(1);
		}
		size = load_elf(palcode_filename, NULL, cpu_alpha_superpage_to_phys,
		NULL, &palcode_entry, &palcode_low, &palcode_high,
		NULL, &palcode_entry, &palcode_low, &palcode_high, NULL,
		0, EM_ALPHA, 0, 0);
		if (size < 0) {
		error_report("could not load palcode '%s'", palcode_filename);
		@@ -134,7 +134,7 @@ static void clipper_init(MachineState *machine)
		uint64_t param_offset;

		size = load_elf(kernel_filename, NULL, cpu_alpha_superpage_to_phys,
		NULL, &kernel_entry, &kernel_low, &kernel_high,
		NULL, &kernel_entry, &kernel_low, &kernel_high, NULL,
		0, EM_ALPHA, 0, 0);
		if (size < 0) {
		error_report("could not load kernel '%s'", kernel_filename);

hw/arm/armv7m.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -331,7 +331,7 @@ void armv7m_load_kernel(ARMCPU cpu, const char kernel_filename, int mem_size)

		if (kernel_filename) {
		image_size = load_elf_as(kernel_filename, NULL, NULL, NULL,
		&entry, &lowaddr,
		&entry, &lowaddr, NULL,
		NULL, big_endian, EM_ARM, 1, 0, as);
		if (image_size < 0) {
		image_size = load_image_targphys_as(kernel_filename, 0,

hw/arm/boot.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -903,7 +903,7 @@ static int64_t arm_load_elf(struct arm_boot_info info, uint64_t pentry,
		}

		ret = load_elf_as(info->kernel_filename, NULL, NULL, NULL,
		pentry, lowaddr, highaddr, big_endian, elf_machine,
		pentry, lowaddr, highaddr, NULL, big_endian, elf_machine,
		1, data_swab, as);
		if (ret <= 0) {
		/* The header loaded but the image didn't */

hw/core/generic-loader.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ static void generic_loader_realize(DeviceState dev, Error *errp)

		if (!s->force_raw) {
		size = load_elf_as(s->file, NULL, NULL, NULL, &entry, NULL, NULL,
		big_endian, 0, 0, 0, as);
		NULL, big_endian, 0, 0, 0, as);

		if (size < 0) {
		size = load_uimage_as(s->file, &entry, NULL, NULL, NULL, NULL,