riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

pull-loongarch_20250610 

-----BEGIN PGP SIGNATURE-----
 
 iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCaEfZDQAKCRBAov/yOSY+
 3z/XA/4vGGLAiCX6EN+t4E9sh7BWrt8fgbxBFSZapXVLGaeHDV3Y4IUHlLGy9RZT
 3OtfE+5qvXPt1iz5l4IygmJh6wk7kN05Qw7XkV18hO5TqmYINdbmeuwvK0vmH6x+
 nTxSRke0CMmwYKg3bYDFVS1CRgfPX1zfRb1VKB1PnkKaZcHPNQ==
 =jC/2
 -----END PGP SIGNATURE-----

Merge tag 'pull-loongarch-20250610' of https://github.com/gaosong715/qemu into staging

pull-loongarch_20250610

# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCaEfZDQAKCRBAov/yOSY+
# 3z/XA/4vGGLAiCX6EN+t4E9sh7BWrt8fgbxBFSZapXVLGaeHDV3Y4IUHlLGy9RZT
# 3OtfE+5qvXPt1iz5l4IygmJh6wk7kN05Qw7XkV18hO5TqmYINdbmeuwvK0vmH6x+
# nTxSRke0CMmwYKg3bYDFVS1CRgfPX1zfRb1VKB1PnkKaZcHPNQ==
# =jC/2
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 10 Jun 2025 03:04:45 EDT
# gpg:                using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B8FF 1DA0 D2FD CB2D A09C  6C2C 40A2 FFF2 3926 3EDF

* tag 'pull-loongarch-20250610' of https://github.com/gaosong715/qemu:
  hw/loongarch/virt: Remove global variables about memmap tables
  hw/loongarch/virt: Remove global variables about initrd
  target/loongarch: add check for fcond
  hw/loongarch/virt: inform guest of kvm
  hw/intc/loongarch_extioi: Fix typo issue about register EXTIOI_COREISR_END
  hw/intc/loongarch_pch: Convert to little endian with ID register
  hw/loongarch/virt: Fix big endian support with MCFG table

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
pull/287/head
Stefan Hajnoczi 10 months ago
parent
bc98ffdc75 ffe89c1762
commit
8887c7d114
9 changed files with 87 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hw/intc/loongarch_pch_pic.c
  2. 52
      hw/loongarch/boot.c
  3. 4
      hw/loongarch/virt-acpi-build.c
  4. 27
      hw/loongarch/virt.c
  5. 2
      include/hw/intc/loongarch_extioi_common.h
  6. 5
      include/hw/loongarch/boot.h
  7. 2
      include/hw/loongarch/virt.h
  8. 25
      target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
  9. 16
      target/loongarch/tcg/insn_trans/trans_vec.c.inc

2
hw/intc/loongarch_pch_pic.c
View File

@ -82,7 +82,7 @@ static uint64_t pch_pic_read(void *opaque, hwaddr addr, uint64_t field_mask)
addr -= offset; addr -= offset;
switch (addr) { switch (addr) {
case PCH_PIC_INT_ID: case PCH_PIC_INT_ID:
val = s->id.data; val = cpu_to_le64(s->id.data);
break; break;
case PCH_PIC_INT_MASK: case PCH_PIC_INT_MASK:
val = s->int_mask; val = s->int_mask;

52
hw/loongarch/boot.c
View File

@ -35,12 +35,6 @@ struct loongarch_linux_hdr {
uint32_t pe_header_offset; uint32_t pe_header_offset;
} QEMU_PACKED; } QEMU_PACKED;
struct memmap_entry *memmap_table;
unsigned memmap_entries;
ram_addr_t initrd_offset;
uint64_t initrd_size;
static const unsigned int slave_boot_code[] = { static const unsigned int slave_boot_code[] = {
/* Configure reset ebase. */ /* Configure reset ebase. */
0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */ 0x0400302c, /* csrwr $t0, LOONGARCH_CSR_EENTRY */
@ -94,12 +88,16 @@ static inline void *guidcpy(void *dst, const void *src)
return memcpy(dst, src, sizeof(efi_guid_t)); return memcpy(dst, src, sizeof(efi_guid_t));
} }
static void init_efi_boot_memmap(struct efi_system_table *systab, static void init_efi_boot_memmap(MachineState *ms,
struct efi_system_table *systab,
void *p, void *start) void *p, void *start)
{ {
unsigned i; unsigned i;
struct efi_boot_memmap *boot_memmap = p; struct efi_boot_memmap *boot_memmap = p;
efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID; efi_guid_t tbl_guid = LINUX_EFI_BOOT_MEMMAP_GUID;
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
struct memmap_entry *memmap_table;
unsigned int memmap_entries;
/* efi_configuration_table 1 */ /* efi_configuration_table 1 */
guidcpy(&systab->tables[0].guid, &tbl_guid); guidcpy(&systab->tables[0].guid, &tbl_guid);
@ -111,6 +109,8 @@ static void init_efi_boot_memmap(struct efi_system_table *systab,
boot_memmap->map_size = 0; boot_memmap->map_size = 0;
efi_memory_desc_t *map = p + sizeof(struct efi_boot_memmap); efi_memory_desc_t *map = p + sizeof(struct efi_boot_memmap);
memmap_table = lvms->memmap_table;
memmap_entries = lvms->memmap_entries;
for (i = 0; i < memmap_entries; i++) { for (i = 0; i < memmap_entries; i++) {
map = (void *)boot_memmap + sizeof(*map); map = (void *)boot_memmap + sizeof(*map);
map[i].type = memmap_table[i].type; map[i].type = memmap_table[i].type;
@ -121,7 +121,8 @@ static void init_efi_boot_memmap(struct efi_system_table *systab,
} }
} }
static void init_efi_initrd_table(struct efi_system_table *systab, static void init_efi_initrd_table(struct loongarch_boot_info *info,
struct efi_system_table *systab,
void *p, void *start) void *p, void *start)
{ {
efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID; efi_guid_t tbl_guid = LINUX_EFI_INITRD_MEDIA_GUID;
@ -132,8 +133,8 @@ static void init_efi_initrd_table(struct efi_system_table *systab,
systab->tables[1].table = (struct efi_configuration_table *)(p - start); systab->tables[1].table = (struct efi_configuration_table *)(p - start);
systab->nr_tables = 2; systab->nr_tables = 2;
initrd_table->base = initrd_offset; initrd_table->base = info->initrd_addr;
initrd_table->size = initrd_size; initrd_table->size = info->initrd_size;
} }
static void init_efi_fdt_table(struct efi_system_table *systab) static void init_efi_fdt_table(struct efi_system_table *systab)
@ -146,10 +147,12 @@ static void init_efi_fdt_table(struct efi_system_table *systab)
systab->nr_tables = 3; systab->nr_tables = 3;
} }
static void init_systab(struct loongarch_boot_info *info, void *p, void *start) static void init_systab(MachineState *ms,
struct loongarch_boot_info *info, void *p, void *start)
{ {
void *bp_tables_start; void *bp_tables_start;
struct efi_system_table *systab = p; struct efi_system_table *systab = p;
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
info->a2 = p - start; info->a2 = p - start;
@ -166,10 +169,10 @@ static void init_systab(struct loongarch_boot_info *info, void *p, void *start)
systab->tables = p; systab->tables = p;
bp_tables_start = p; bp_tables_start = p;
init_efi_boot_memmap(systab, p, start); init_efi_boot_memmap(ms, systab, p, start);
p += ROUND_UP(sizeof(struct efi_boot_memmap) + p += ROUND_UP(sizeof(struct efi_boot_memmap) +
sizeof(efi_memory_desc_t) * memmap_entries, 64 * KiB); sizeof(efi_memory_desc_t) * lvms->memmap_entries, 64 * KiB);
init_efi_initrd_table(systab, p, start); init_efi_initrd_table(info, systab, p, start);
p += ROUND_UP(sizeof(struct efi_initrd), 64 * KiB); p += ROUND_UP(sizeof(struct efi_initrd), 64 * KiB);
init_efi_fdt_table(systab); init_efi_fdt_table(systab);
@ -276,8 +279,8 @@ static ram_addr_t alloc_initrd_memory(struct loongarch_boot_info *info,
static int64_t load_kernel_info(struct loongarch_boot_info *info) static int64_t load_kernel_info(struct loongarch_boot_info *info)
{ {
uint64_t kernel_entry, kernel_low, kernel_high; uint64_t kernel_entry, kernel_low, kernel_high, initrd_offset = 0;
ssize_t kernel_size; ssize_t kernel_size, initrd_size;
kernel_size = load_elf(info->kernel_filename, NULL, kernel_size = load_elf(info->kernel_filename, NULL,
cpu_loongarch_virt_to_phys, NULL, cpu_loongarch_virt_to_phys, NULL,
@ -313,8 +316,9 @@ static int64_t load_kernel_info(struct loongarch_boot_info *info)
info->initrd_filename); info->initrd_filename);
exit(1); exit(1);
} }
} else {
initrd_size = 0; info->initrd_addr = initrd_offset;
info->initrd_size = initrd_size;
} }
return kernel_entry; return kernel_entry;
@ -369,17 +373,19 @@ static void loongarch_firmware_boot(LoongArchVirtMachineState *lvms,
fw_cfg_add_kernel_info(info, lvms->fw_cfg); fw_cfg_add_kernel_info(info, lvms->fw_cfg);
} }
static void init_boot_rom(struct loongarch_boot_info *info, void *p) static void init_boot_rom(MachineState *ms,
struct loongarch_boot_info *info, void *p)
{ {
void *start = p; void *start = p;
init_cmdline(info, p, start); init_cmdline(info, p, start);
p += COMMAND_LINE_SIZE; p += COMMAND_LINE_SIZE;
init_systab(info, p, start); init_systab(ms, info, p, start);
} }
static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info) static void loongarch_direct_kernel_boot(MachineState *ms,
struct loongarch_boot_info *info)
{ {
void *p, *bp; void *p, *bp;
int64_t kernel_addr = VIRT_FLASH0_BASE; int64_t kernel_addr = VIRT_FLASH0_BASE;
@ -397,7 +403,7 @@ static void loongarch_direct_kernel_boot(struct loongarch_boot_info *info)
/* Load cmdline and system tables at [0 - 1 MiB] */ /* Load cmdline and system tables at [0 - 1 MiB] */
p = g_malloc0(1 * MiB); p = g_malloc0(1 * MiB);
bp = p; bp = p;
init_boot_rom(info, p); init_boot_rom(ms, info, p);
rom_add_blob_fixed_as("boot_info", bp, 1 * MiB, 0, &address_space_memory); rom_add_blob_fixed_as("boot_info", bp, 1 * MiB, 0, &address_space_memory);
/* Load slave boot code at pflash0 . */ /* Load slave boot code at pflash0 . */
@ -437,6 +443,6 @@ void loongarch_load_kernel(MachineState *ms, struct loongarch_boot_info *info)
if (lvms->bios_loaded) { if (lvms->bios_loaded) {
loongarch_firmware_boot(lvms, info); loongarch_firmware_boot(lvms, info);
} else { } else {
loongarch_direct_kernel_boot(info); loongarch_direct_kernel_boot(ms, info);
} }
} }

4
hw/loongarch/virt-acpi-build.c
View File

@ -575,8 +575,8 @@ static void acpi_build(AcpiBuildTables *tables, MachineState *machine)
acpi_add_table(table_offsets, tables_blob); acpi_add_table(table_offsets, tables_blob);
{ {
AcpiMcfgInfo mcfg = { AcpiMcfgInfo mcfg = {
.base = cpu_to_le64(VIRT_PCI_CFG_BASE), .base = VIRT_PCI_CFG_BASE,
.size = cpu_to_le64(VIRT_PCI_CFG_SIZE), .size = VIRT_PCI_CFG_SIZE,
}; };
build_mcfg(tables_blob, tables->linker, &mcfg, lvms->oem_id, build_mcfg(tables_blob, tables->linker, &mcfg, lvms->oem_id,
lvms->oem_table_id); lvms->oem_table_id);

27
hw/loongarch/virt.c
View File

@ -136,6 +136,10 @@ static void virt_build_smbios(LoongArchVirtMachineState *lvms)
return; return;
} }
if (kvm_enabled()) {
product = "KVM Virtual Machine";
}
smbios_set_defaults("QEMU", product, mc->name); smbios_set_defaults("QEMU", product, mc->name);
smbios_get_tables(ms, SMBIOS_ENTRY_POINT_TYPE_64, smbios_get_tables(ms, SMBIOS_ENTRY_POINT_TYPE_64,
@ -168,8 +172,15 @@ static void virt_powerdown_req(Notifier *notifier, void *opaque)
acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS); acpi_send_event(s->acpi_ged, ACPI_POWER_DOWN_STATUS);
} }
static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type) static void memmap_add_entry(MachineState *ms, uint64_t address,
uint64_t length, uint32_t type)
{ {
LoongArchVirtMachineState *lvms = LOONGARCH_VIRT_MACHINE(ms);
struct memmap_entry *memmap_table;
unsigned int memmap_entries;
memmap_table = lvms->memmap_table;
memmap_entries = lvms->memmap_entries;
/* Ensure there are no duplicate entries. */ /* Ensure there are no duplicate entries. */
for (unsigned i = 0; i < memmap_entries; i++) { for (unsigned i = 0; i < memmap_entries; i++) {
assert(memmap_table[i].address != address); assert(memmap_table[i].address != address);
@ -182,6 +193,8 @@ static void memmap_add_entry(uint64_t address, uint64_t length, uint32_t type)
memmap_table[memmap_entries].type = cpu_to_le32(type); memmap_table[memmap_entries].type = cpu_to_le32(type);
memmap_table[memmap_entries].reserved = 0; memmap_table[memmap_entries].reserved = 0;
memmap_entries++; memmap_entries++;
lvms->memmap_table = memmap_table;
lvms->memmap_entries = memmap_entries;
} }
static DeviceState *create_acpi_ged(DeviceState *pch_pic, static DeviceState *create_acpi_ged(DeviceState *pch_pic,
@ -619,13 +632,13 @@ static void fw_cfg_add_memory(MachineState *ms)
} }
if (size >= gap) { if (size >= gap) {
memmap_add_entry(base, gap, 1); memmap_add_entry(ms, base, gap, 1);
size -= gap; size -= gap;
base = VIRT_HIGHMEM_BASE; base = VIRT_HIGHMEM_BASE;
} }
if (size) { if (size) {
memmap_add_entry(base, size, 1); memmap_add_entry(ms, base, size, 1);
base += size; base += size;
} }
@ -640,7 +653,7 @@ static void fw_cfg_add_memory(MachineState *ms)
* lowram: [base, +(gap - numa_info[0].node_mem)) * lowram: [base, +(gap - numa_info[0].node_mem))
* highram: [VIRT_HIGHMEM_BASE, +(ram_size - gap)) * highram: [VIRT_HIGHMEM_BASE, +(ram_size - gap))
*/ */
memmap_add_entry(base, gap - numa_info[0].node_mem, 1); memmap_add_entry(ms, base, gap - numa_info[0].node_mem, 1);
size = ram_size - gap; size = ram_size - gap;
base = VIRT_HIGHMEM_BASE; base = VIRT_HIGHMEM_BASE;
} else { } else {
@ -648,7 +661,7 @@ static void fw_cfg_add_memory(MachineState *ms)
} }
if (size) { if (size) {
memmap_add_entry(base, size, 1); memmap_add_entry(ms, base, size, 1);
} }
} }
@ -734,8 +747,8 @@ static void virt_init(MachineState *machine)
rom_set_fw(lvms->fw_cfg); rom_set_fw(lvms->fw_cfg);
if (lvms->fw_cfg != NULL) { if (lvms->fw_cfg != NULL) {
fw_cfg_add_file(lvms->fw_cfg, "etc/memmap", fw_cfg_add_file(lvms->fw_cfg, "etc/memmap",
memmap_table, lvms->memmap_table,
sizeof(struct memmap_entry) * (memmap_entries)); sizeof(struct memmap_entry) * lvms->memmap_entries);
} }
/* Initialize the IO interrupt subsystem */ /* Initialize the IO interrupt subsystem */

2
include/hw/intc/loongarch_extioi_common.h
View File

@ -35,7 +35,7 @@
#define EXTIOI_ISR_START (0x700 - APIC_OFFSET) #define EXTIOI_ISR_START (0x700 - APIC_OFFSET)
#define EXTIOI_ISR_END (0x720 - APIC_OFFSET) #define EXTIOI_ISR_END (0x720 - APIC_OFFSET)
#define EXTIOI_COREISR_START (0x800 - APIC_OFFSET) #define EXTIOI_COREISR_START (0x800 - APIC_OFFSET)
#define EXTIOI_COREISR_END (0xB20 - APIC_OFFSET) #define EXTIOI_COREISR_END (0x820 - APIC_OFFSET)
#define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET) #define EXTIOI_COREMAP_START (0xC00 - APIC_OFFSET)
#define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET) #define EXTIOI_COREMAP_END (0xD00 - APIC_OFFSET)
#define EXTIOI_SIZE 0x800 #define EXTIOI_SIZE 0x800

5
include/hw/loongarch/boot.h
View File

@ -102,11 +102,10 @@ struct loongarch_boot_info {
const char *kernel_cmdline; const char *kernel_cmdline;
const char *initrd_filename; const char *initrd_filename;
uint64_t a0, a1, a2; uint64_t a0, a1, a2;
uint64_t initrd_addr;
uint64_t initrd_size;
}; };
extern struct memmap_entry *memmap_table;
extern unsigned memmap_entries;
struct memmap_entry { struct memmap_entry {
uint64_t address; uint64_t address;
uint64_t length; uint64_t length;

2
include/hw/loongarch/virt.h
View File

@ -63,6 +63,8 @@ struct LoongArchVirtMachineState {
struct loongarch_boot_info bootinfo; struct loongarch_boot_info bootinfo;
DeviceState *ipi; DeviceState *ipi;
DeviceState *extioi; DeviceState *extioi;
struct memmap_entry *memmap_table;
unsigned int memmap_entries;
}; };
#define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt") #define TYPE_LOONGARCH_VIRT_MACHINE MACHINE_TYPE_NAME("virt")

25
target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
View File

@ -4,10 +4,15 @@
*/ */
/* bit0(signaling/quiet) bit1(lt) bit2(eq) bit3(un) bit4(neq) */ /* bit0(signaling/quiet) bit1(lt) bit2(eq) bit3(un) bit4(neq) */
static uint32_t get_fcmp_flags(int cond) static uint32_t get_fcmp_flags(DisasContext *ctx, int cond)
{ {
uint32_t flags = 0; uint32_t flags = 0;
/*check cond , cond =[0-8,10,12] */
if ((cond > 8) &&(cond != 10) && (cond != 12)) {
return -1;
}
if (cond & 0x1) { if (cond & 0x1) {
flags |= FCMP_LT; flags |= FCMP_LT;
} }
@ -26,9 +31,14 @@ static uint32_t get_fcmp_flags(int cond)
static bool trans_fcmp_cond_s(DisasContext *ctx, arg_fcmp_cond_s *a) static bool trans_fcmp_cond_s(DisasContext *ctx, arg_fcmp_cond_s *a)
{ {
TCGv var, src1, src2; TCGv var, src1, src2;
uint32_t flags; uint32_t flags = get_fcmp_flags(ctx, a->fcond >>1);
void (*fn)(TCGv, TCGv_env, TCGv, TCGv, TCGv_i32); void (*fn)(TCGv, TCGv_env, TCGv, TCGv, TCGv_i32);
if (flags == -1) {
generate_exception(ctx, EXCCODE_INE);
return true;
}
if (!avail_FP_SP(ctx)) { if (!avail_FP_SP(ctx)) {
return false; return false;
} }
@ -39,8 +49,6 @@ static bool trans_fcmp_cond_s(DisasContext *ctx, arg_fcmp_cond_s *a)
src1 = get_fpr(ctx, a->fj); src1 = get_fpr(ctx, a->fj);
src2 = get_fpr(ctx, a->fk); src2 = get_fpr(ctx, a->fk);
fn = (a->fcond & 1 ? gen_helper_fcmp_s_s : gen_helper_fcmp_c_s); fn = (a->fcond & 1 ? gen_helper_fcmp_s_s : gen_helper_fcmp_c_s);
flags = get_fcmp_flags(a->fcond >> 1);
fn(var, tcg_env, src1, src2, tcg_constant_i32(flags)); fn(var, tcg_env, src1, src2, tcg_constant_i32(flags));
tcg_gen_st8_tl(var, tcg_env, offsetof(CPULoongArchState, cf[a->cd])); tcg_gen_st8_tl(var, tcg_env, offsetof(CPULoongArchState, cf[a->cd]));
@ -50,9 +58,14 @@ static bool trans_fcmp_cond_s(DisasContext *ctx, arg_fcmp_cond_s *a)
static bool trans_fcmp_cond_d(DisasContext *ctx, arg_fcmp_cond_d *a) static bool trans_fcmp_cond_d(DisasContext *ctx, arg_fcmp_cond_d *a)
{ {
TCGv var, src1, src2; TCGv var, src1, src2;
uint32_t flags; uint32_t flags = get_fcmp_flags(ctx, a->fcond >> 1);
void (*fn)(TCGv, TCGv_env, TCGv, TCGv, TCGv_i32); void (*fn)(TCGv, TCGv_env, TCGv, TCGv, TCGv_i32);
if (flags == -1) {
generate_exception(ctx, EXCCODE_INE);
return true;
}
if (!avail_FP_DP(ctx)) { if (!avail_FP_DP(ctx)) {
return false; return false;
} }
@ -63,8 +76,6 @@ static bool trans_fcmp_cond_d(DisasContext *ctx, arg_fcmp_cond_d *a)
src1 = get_fpr(ctx, a->fj); src1 = get_fpr(ctx, a->fj);
src2 = get_fpr(ctx, a->fk); src2 = get_fpr(ctx, a->fk);
fn = (a->fcond & 1 ? gen_helper_fcmp_s_d : gen_helper_fcmp_c_d); fn = (a->fcond & 1 ? gen_helper_fcmp_s_d : gen_helper_fcmp_c_d);
flags = get_fcmp_flags(a->fcond >> 1);
fn(var, tcg_env, src1, src2, tcg_constant_i32(flags)); fn(var, tcg_env, src1, src2, tcg_constant_i32(flags));
tcg_gen_st8_tl(var, tcg_env, offsetof(CPULoongArchState, cf[a->cd])); tcg_gen_st8_tl(var, tcg_env, offsetof(CPULoongArchState, cf[a->cd]));

16
target/loongarch/tcg/insn_trans/trans_vec.c.inc
View File

@ -4655,19 +4655,23 @@ TRANS(xvslti_du, LASX, do_xcmpi, MO_64, TCG_COND_LTU)
static bool do_vfcmp_cond_s(DisasContext *ctx, arg_vvv_fcond *a, uint32_t sz) static bool do_vfcmp_cond_s(DisasContext *ctx, arg_vvv_fcond *a, uint32_t sz)
{ {
uint32_t flags; uint32_t flags = get_fcmp_flags(ctx, a->fcond >> 1);
void (*fn)(TCGv_env, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32); void (*fn)(TCGv_env, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32);
TCGv_i32 vd = tcg_constant_i32(a->vd); TCGv_i32 vd = tcg_constant_i32(a->vd);
TCGv_i32 vj = tcg_constant_i32(a->vj); TCGv_i32 vj = tcg_constant_i32(a->vj);
TCGv_i32 vk = tcg_constant_i32(a->vk); TCGv_i32 vk = tcg_constant_i32(a->vk);
TCGv_i32 oprsz = tcg_constant_i32(sz); TCGv_i32 oprsz = tcg_constant_i32(sz);
if(flags == -1){
generate_exception(ctx, EXCCODE_INE);
return true;
}
if (!check_vec(ctx, sz)) { if (!check_vec(ctx, sz)) {
return true; return true;
} }
fn = (a->fcond & 1 ? gen_helper_vfcmp_s_s : gen_helper_vfcmp_c_s); fn = (a->fcond & 1 ? gen_helper_vfcmp_s_s : gen_helper_vfcmp_c_s);
flags = get_fcmp_flags(a->fcond >> 1);
fn(tcg_env, oprsz, vd, vj, vk, tcg_constant_i32(flags)); fn(tcg_env, oprsz, vd, vj, vk, tcg_constant_i32(flags));
return true; return true;
@ -4675,19 +4679,23 @@ static bool do_vfcmp_cond_s(DisasContext *ctx, arg_vvv_fcond *a, uint32_t sz)
static bool do_vfcmp_cond_d(DisasContext *ctx, arg_vvv_fcond *a, uint32_t sz) static bool do_vfcmp_cond_d(DisasContext *ctx, arg_vvv_fcond *a, uint32_t sz)
{ {
uint32_t flags; uint32_t flags = get_fcmp_flags(ctx, a->fcond >> 1);
void (*fn)(TCGv_env, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32); void (*fn)(TCGv_env, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32);
TCGv_i32 vd = tcg_constant_i32(a->vd); TCGv_i32 vd = tcg_constant_i32(a->vd);
TCGv_i32 vj = tcg_constant_i32(a->vj); TCGv_i32 vj = tcg_constant_i32(a->vj);
TCGv_i32 vk = tcg_constant_i32(a->vk); TCGv_i32 vk = tcg_constant_i32(a->vk);
TCGv_i32 oprsz = tcg_constant_i32(sz); TCGv_i32 oprsz = tcg_constant_i32(sz);
if (flags == -1) {
generate_exception(ctx, EXCCODE_INE);
return true;
}
if (!check_vec(ctx, sz)) { if (!check_vec(ctx, sz)) {
return true; return true;
} }
fn = (a->fcond & 1 ? gen_helper_vfcmp_s_d : gen_helper_vfcmp_c_d); fn = (a->fcond & 1 ? gen_helper_vfcmp_s_d : gen_helper_vfcmp_c_d);
flags = get_fcmp_flags(a->fcond >> 1);
fn(tcg_env, oprsz, vd, vj, vk, tcg_constant_i32(flags)); fn(tcg_env, oprsz, vd, vj, vk, tcg_constant_i32(flags));
return true; return true;

Write Preview
Loading…
Cancel
Save