mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'pull-target-arm-20240531' of https://git.linaro.org/people/pmaydell/qemu-arm into staging
target-arm: * hw/intc/arm_gic: Fix set pending of PPIs * hw/intc/arm_gic: Fix writes to GICD_ITARGETSRn * xilinx_zynq: Add cache controller * xilinx_zynq: Support up to two CPU cores * tests/avocado: update sbsa-ref firmware * sbsa-ref: move to Neoverse-N2 as default * More decodetree conversion of A64 ASIMD insns * docs/system/target-arm: Re-alphabetize board list * Implement FEAT WFxT and enable for '-cpu max' * hw/usb/hcd-ohci: Fix #1510, #303: pid not IN or OUT # -----BEGIN PGP SIGNATURE----- # # iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmZZvHgZHHBldGVyLm1h # eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3uArEACZgk0hqKtRcEzwdJi7w7ax # ta/Iyl7AA+ngmh0qcE8QX8rzZhcGcKhsaQ8dNESMIBqVi1fS0hmNrIUWhXqmvNmZ # 07WJvQx7Ki9YNX02frjkRZTwWozsbW8uoaXgnngFK93PNh/IoQBRP5T/LIZ5t3d7 # 7I/O/tnS/LZrL6wtP4EbRIEvZ4dfJe3X+uSCHSF8iOYrJLrZCsy/ItJqzY6Y0f96 # iUoOfXjrYH2hM9VkJGHIGy1r9nYRkCxXREQh7ahw/z6mv0nIB1YTS1eR0dH9D1yM # afdby8iPN7k+f3en+2dHfyPjani4vPd1/k9mgLnQtVLOHrdw2APs1Q59YwYhunhe # ZC0Fcp6jBSkcI6LHRY0bRtY0U3SBPrfkSD5sJrNH1obnsSvizeSU3uCq1QmKRCRY # FuARmE77ywY8CURiqfwPSrC/ecSnamueIQNKNPZVQ5ve3dbokp/Gr1eJgcq80ovK # wIKmNhJq60qBcj2zQ1aw1PP3+zvbZ/rl2j0abGbxBH3Kkp9AvALDiLRMciazVWph # vbx7e1Y90Zrs3ap1AAUFUyWexYPNvZWmSGOaWv6Wdt+1Yf/YDW9wrwjVd3eRG9rM # vgNMrccysBUNDpS4s0KSbqLy9AsjqAa41SiKipWFBekUyQFboNpTNfDNCspIPj9m # dnI4fyXkVmSCYFiW2akmjg== # =Jy5P # -----END PGP SIGNATURE----- # gpg: Signature made Fri 31 May 2024 05:03:04 AM PDT # gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE # gpg: issuer "peter.maydell@linaro.org" # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full] # gpg: aka "Peter Maydell <pmaydell@gmail.com>" [full] # gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full] # gpg: aka "Peter Maydell <peter@archaic.org.uk>" [unknown] * tag 'pull-target-arm-20240531' of https://git.linaro.org/people/pmaydell/qemu-arm: (43 commits) hw/usb/hcd-ohci: Fix #1510, #303: pid not IN or OUT target/arm: Implement FEAT WFxT and enable for '-cpu max' accel/tcg: Make TCGCPUOps::cpu_exec_halt return bool for whether to halt docs/system/target-arm: Re-alphabetize board list target/arm: Disable SVE extensions when SVE is disabled target/arm: Convert FCSEL to decodetree target/arm: Convert FMADD, FMSUB, FNMADD, FNMSUB to decodetree target/arm: Convert SQDMULH, SQRDMULH to decodetree target/arm: Tidy SQDMULH, SQRDMULH (vector) target/arm: Convert MLA, MLS to decodetree target/arm: Convert MUL, PMUL to decodetree target/arm: Convert SABA, SABD, UABA, UABD to decodetree target/arm: Convert SMAX, SMIN, UMAX, UMIN to decodetree target/arm: Convert SRHADD, URHADD to decodetree target/arm: Convert SRHADD, URHADD to gvec target/arm: Convert SHSUB, UHSUB to decodetree target/arm: Convert SHSUB, UHSUB to gvec target/arm: Convert SHADD, UHADD to decodetree target/arm: Convert SHADD, UHADD to gvec target/arm: Use TCG_COND_TSTNE in gen_cmtst_vec ... Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
@@ -682,11 +682,14 @@ static inline bool cpu_handle_halt(CPUState *cpu)
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
if (cpu->halted) {
|
||||
const TCGCPUOps *tcg_ops = cpu->cc->tcg_ops;
|
||||
bool leave_halt;
|
||||
|
||||
if (tcg_ops->cpu_exec_halt) {
|
||||
tcg_ops->cpu_exec_halt(cpu);
|
||||
leave_halt = tcg_ops->cpu_exec_halt(cpu);
|
||||
} else {
|
||||
leave_halt = cpu_has_work(cpu);
|
||||
}
|
||||
if (!cpu_has_work(cpu)) {
|
||||
if (!leave_halt) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -146,6 +146,7 @@ the following architecture extensions:
|
||||
- FEAT_UAO (Unprivileged Access Override control)
|
||||
- FEAT_VHE (Virtualization Host Extensions)
|
||||
- FEAT_VMID16 (16-bit VMID)
|
||||
- FEAT_WFxT (WFE and WFI instructions with timeout)
|
||||
- FEAT_XNX (Translation table stage 2 Unprivileged Execute-never)
|
||||
|
||||
For information on the specifics of these extensions, please refer
|
||||
|
||||
@@ -86,16 +86,16 @@ undocumented; you can get a complete list by running
|
||||
arm/bananapi_m2u.rst
|
||||
arm/b-l475e-iot01a.rst
|
||||
arm/sabrelite
|
||||
arm/highbank
|
||||
arm/digic
|
||||
arm/cubieboard
|
||||
arm/emcraft-sf2
|
||||
arm/highbank
|
||||
arm/musicpal
|
||||
arm/gumstix
|
||||
arm/mainstone
|
||||
arm/kzm
|
||||
arm/nrf
|
||||
arm/nseries
|
||||
arm/nrf
|
||||
arm/nuvoton
|
||||
arm/imx25-pdk
|
||||
arm/orangepi
|
||||
@@ -107,8 +107,8 @@ undocumented; you can get a complete list by running
|
||||
arm/stellaris
|
||||
arm/stm32
|
||||
arm/virt
|
||||
arm/xlnx-versal-virt
|
||||
arm/xenpvh
|
||||
arm/xlnx-versal-virt
|
||||
|
||||
Emulated CPU architecture support
|
||||
=================================
|
||||
|
||||
@@ -370,6 +370,7 @@ config ZYNQ
|
||||
select A9MPCORE
|
||||
select CADENCE # UART
|
||||
select PFLASH_CFI02
|
||||
select PL310 # cache controller
|
||||
select PL330
|
||||
select SDHCI
|
||||
select SSI_M25P80
|
||||
|
||||
+1
-1
@@ -891,7 +891,7 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data)
|
||||
|
||||
mc->init = sbsa_ref_init;
|
||||
mc->desc = "QEMU 'SBSA Reference' ARM Virtual Machine";
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("neoverse-n1");
|
||||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("neoverse-n2");
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
mc->max_cpus = 512;
|
||||
mc->pci_allow_0_address = true;
|
||||
|
||||
+34
-21
@@ -84,9 +84,12 @@ static const int dma_irqs[8] = {
|
||||
0xe3401000 + ARMV7_IMM16(extract32((val), 16, 16)), /* movt r1 ... */ \
|
||||
0xe5801000 + (addr)
|
||||
|
||||
#define ZYNQ_MAX_CPUS 2
|
||||
|
||||
struct ZynqMachineState {
|
||||
MachineState parent;
|
||||
Clock *ps_clk;
|
||||
ARMCPU *cpu[ZYNQ_MAX_CPUS];
|
||||
};
|
||||
|
||||
static void zynq_write_board_setup(ARMCPU *cpu,
|
||||
@@ -176,13 +179,13 @@ static inline int zynq_init_spi_flashes(uint32_t base_addr, qemu_irq irq,
|
||||
static void zynq_init(MachineState *machine)
|
||||
{
|
||||
ZynqMachineState *zynq_machine = ZYNQ_MACHINE(machine);
|
||||
ARMCPU *cpu;
|
||||
MemoryRegion *address_space_mem = get_system_memory();
|
||||
MemoryRegion *ocm_ram = g_new(MemoryRegion, 1);
|
||||
DeviceState *dev, *slcr;
|
||||
SysBusDevice *busdev;
|
||||
qemu_irq pic[64];
|
||||
int n;
|
||||
unsigned int smp_cpus = machine->smp.cpus;
|
||||
|
||||
/* max 2GB ram */
|
||||
if (machine->ram_size > 2 * GiB) {
|
||||
@@ -190,22 +193,27 @@ static void zynq_init(MachineState *machine)
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
cpu = ARM_CPU(object_new(machine->cpu_type));
|
||||
for (n = 0; n < smp_cpus; n++) {
|
||||
Object *cpuobj = object_new(machine->cpu_type);
|
||||
|
||||
/* By default A9 CPUs have EL3 enabled. This board does not
|
||||
* currently support EL3 so the CPU EL3 property is disabled before
|
||||
* realization.
|
||||
*/
|
||||
if (object_property_find(OBJECT(cpu), "has_el3")) {
|
||||
object_property_set_bool(OBJECT(cpu), "has_el3", false, &error_fatal);
|
||||
/*
|
||||
* By default A9 CPUs have EL3 enabled. This board does not currently
|
||||
* support EL3 so the CPU EL3 property is disabled before realization.
|
||||
*/
|
||||
if (object_property_find(cpuobj, "has_el3")) {
|
||||
object_property_set_bool(cpuobj, "has_el3", false, &error_fatal);
|
||||
}
|
||||
|
||||
object_property_set_int(cpuobj, "midr", ZYNQ_BOARD_MIDR,
|
||||
&error_fatal);
|
||||
object_property_set_int(cpuobj, "reset-cbar", MPCORE_PERIPHBASE,
|
||||
&error_fatal);
|
||||
|
||||
qdev_realize(DEVICE(cpuobj), NULL, &error_fatal);
|
||||
|
||||
zynq_machine->cpu[n] = ARM_CPU(cpuobj);
|
||||
}
|
||||
|
||||
object_property_set_int(OBJECT(cpu), "midr", ZYNQ_BOARD_MIDR,
|
||||
&error_fatal);
|
||||
object_property_set_int(OBJECT(cpu), "reset-cbar", MPCORE_PERIPHBASE,
|
||||
&error_fatal);
|
||||
qdev_realize(DEVICE(cpu), NULL, &error_fatal);
|
||||
|
||||
/* DDR remapped to address zero. */
|
||||
memory_region_add_subregion(address_space_mem, 0, machine->ram);
|
||||
|
||||
@@ -237,14 +245,19 @@ static void zynq_init(MachineState *machine)
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000);
|
||||
|
||||
dev = qdev_new(TYPE_A9MPCORE_PRIV);
|
||||
qdev_prop_set_uint32(dev, "num-cpu", 1);
|
||||
qdev_prop_set_uint32(dev, "num-cpu", smp_cpus);
|
||||
busdev = SYS_BUS_DEVICE(dev);
|
||||
sysbus_realize_and_unref(busdev, &error_fatal);
|
||||
sysbus_mmio_map(busdev, 0, MPCORE_PERIPHBASE);
|
||||
sysbus_connect_irq(busdev, 0,
|
||||
qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
|
||||
sysbus_connect_irq(busdev, 1,
|
||||
qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ));
|
||||
zynq_binfo.gic_cpu_if_addr = MPCORE_PERIPHBASE + 0x100;
|
||||
sysbus_create_varargs("l2x0", MPCORE_PERIPHBASE + 0x2000, NULL);
|
||||
for (n = 0; n < smp_cpus; n++) {
|
||||
DeviceState *cpudev = DEVICE(zynq_machine->cpu[n]);
|
||||
sysbus_connect_irq(busdev, (2 * n) + 0,
|
||||
qdev_get_gpio_in(cpudev, ARM_CPU_IRQ));
|
||||
sysbus_connect_irq(busdev, (2 * n) + 1,
|
||||
qdev_get_gpio_in(cpudev, ARM_CPU_FIQ));
|
||||
}
|
||||
|
||||
for (n = 0; n < 64; n++) {
|
||||
pic[n] = qdev_get_gpio_in(dev, n);
|
||||
@@ -349,7 +362,7 @@ static void zynq_init(MachineState *machine)
|
||||
zynq_binfo.board_setup_addr = BOARD_SETUP_ADDR;
|
||||
zynq_binfo.write_board_setup = zynq_write_board_setup;
|
||||
|
||||
arm_load_kernel(cpu, machine, &zynq_binfo);
|
||||
arm_load_kernel(zynq_machine->cpu[0], machine, &zynq_binfo);
|
||||
}
|
||||
|
||||
static void zynq_machine_class_init(ObjectClass *oc, void *data)
|
||||
@@ -361,7 +374,7 @@ static void zynq_machine_class_init(ObjectClass *oc, void *data)
|
||||
MachineClass *mc = MACHINE_CLASS(oc);
|
||||
mc->desc = "Xilinx Zynq Platform Baseboard for Cortex-A9";
|
||||
mc->init = zynq_init;
|
||||
mc->max_cpus = 1;
|
||||
mc->max_cpus = ZYNQ_MAX_CPUS;
|
||||
mc->no_sdcard = 1;
|
||||
mc->ignore_memory_transaction_failures = true;
|
||||
mc->valid_cpu_types = valid_cpu_types;
|
||||
|
||||
+11
-1
@@ -1308,12 +1308,15 @@ static void gic_dist_writeb(void *opaque, hwaddr offset,
|
||||
|
||||
for (i = 0; i < 8; i++) {
|
||||
if (value & (1 << i)) {
|
||||
int mask = (irq < GIC_INTERNAL) ? (1 << cpu)
|
||||
: GIC_DIST_TARGET(irq + i);
|
||||
|
||||
if (s->security_extn && !attrs.secure &&
|
||||
!GIC_DIST_TEST_GROUP(irq + i, 1 << cpu)) {
|
||||
continue; /* Ignore Non-secure access of Group0 IRQ */
|
||||
}
|
||||
|
||||
GIC_DIST_SET_PENDING(irq + i, GIC_DIST_TARGET(irq + i));
|
||||
GIC_DIST_SET_PENDING(irq + i, mask);
|
||||
}
|
||||
}
|
||||
} else if (offset < 0x300) {
|
||||
@@ -1407,6 +1410,13 @@ static void gic_dist_writeb(void *opaque, hwaddr offset,
|
||||
value = ALL_CPU_MASK;
|
||||
}
|
||||
s->irq_target[irq] = value & ALL_CPU_MASK;
|
||||
if (irq >= GIC_INTERNAL && s->irq_state[irq].pending) {
|
||||
/*
|
||||
* Changing the target of an interrupt that is currently
|
||||
* pending updates the set of CPUs it is pending on.
|
||||
*/
|
||||
s->irq_state[irq].pending = value & ALL_CPU_MASK;
|
||||
}
|
||||
}
|
||||
} else if (offset < 0xf00) {
|
||||
/* Interrupt Configuration. */
|
||||
|
||||
@@ -927,6 +927,11 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
|
||||
case OHCI_TD_DIR_SETUP:
|
||||
str = "setup";
|
||||
pid = USB_TOKEN_SETUP;
|
||||
if (OHCI_BM(ed->flags, ED_EN) > 0) { /* setup only allowed to ep 0 */
|
||||
trace_usb_ohci_td_bad_pid(str, ed->flags, td.flags);
|
||||
ohci_die(ohci);
|
||||
return 1;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
trace_usb_ohci_td_bad_direction(dir);
|
||||
|
||||
@@ -28,6 +28,7 @@ usb_ohci_iso_td_data_overrun(int ret, ssize_t len) "DataOverrun %d > %zu"
|
||||
usb_ohci_iso_td_data_underrun(int ret) "DataUnderrun %d"
|
||||
usb_ohci_iso_td_nak(int ret) "got NAK/STALL %d"
|
||||
usb_ohci_iso_td_bad_response(int ret) "Bad device response %d"
|
||||
usb_ohci_td_bad_pid(const char *s, uint32_t edf, uint32_t tdf) "Bad pid %s: ed.flags 0x%x td.flags 0x%x"
|
||||
usb_ohci_port_attach(int index) "port #%d"
|
||||
usb_ohci_port_detach(int index) "port #%d"
|
||||
usb_ohci_port_wakeup(int index) "port #%d"
|
||||
|
||||
@@ -115,8 +115,19 @@ struct TCGCPUOps {
|
||||
void (*do_interrupt)(CPUState *cpu);
|
||||
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
|
||||
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
|
||||
/** @cpu_exec_halt: Callback for handling halt in cpu_exec */
|
||||
void (*cpu_exec_halt)(CPUState *cpu);
|
||||
/**
|
||||
* @cpu_exec_halt: Callback for handling halt in cpu_exec.
|
||||
*
|
||||
* The target CPU should do any special processing here that it needs
|
||||
* to do when the CPU is in the halted state.
|
||||
*
|
||||
* Return true to indicate that the CPU should now leave halt, false
|
||||
* if it should remain in the halted state.
|
||||
*
|
||||
* If this method is not provided, the default is to do nothing, and
|
||||
* to leave halt if cpu_has_work() returns true.
|
||||
*/
|
||||
bool (*cpu_exec_halt)(CPUState *cpu);
|
||||
/**
|
||||
* @tlb_fill: Handle a softmmu tlb miss
|
||||
*
|
||||
|
||||
@@ -571,6 +571,11 @@ static inline bool isar_feature_aa64_i8mm(const ARMISARegisters *id)
|
||||
return FIELD_EX64(id->id_aa64isar1, ID_AA64ISAR1, I8MM) != 0;
|
||||
}
|
||||
|
||||
static inline bool isar_feature_aa64_wfxt(const ARMISARegisters *id)
|
||||
{
|
||||
return FIELD_EX64(id->id_aa64isar2, ID_AA64ISAR2, WFXT) >= 2;
|
||||
}
|
||||
|
||||
static inline bool isar_feature_aa64_hbc(const ARMISARegisters *id)
|
||||
{
|
||||
return FIELD_EX64(id->id_aa64isar2, ID_AA64ISAR2, BC) != 0;
|
||||
|
||||
@@ -1132,6 +1132,35 @@ static bool arm_cpu_virtio_is_big_endian(CPUState *cs)
|
||||
return arm_cpu_data_is_big_endian(env);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_TCG
|
||||
static bool arm_cpu_exec_halt(CPUState *cs)
|
||||
{
|
||||
bool leave_halt = cpu_has_work(cs);
|
||||
|
||||
if (leave_halt) {
|
||||
/* We're about to come out of WFI/WFE: disable the WFxT timer */
|
||||
ARMCPU *cpu = ARM_CPU(cs);
|
||||
if (cpu->wfxt_timer) {
|
||||
timer_del(cpu->wfxt_timer);
|
||||
}
|
||||
}
|
||||
return leave_halt;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void arm_wfxt_timer_cb(void *opaque)
|
||||
{
|
||||
ARMCPU *cpu = opaque;
|
||||
CPUState *cs = CPU(cpu);
|
||||
|
||||
/*
|
||||
* We expect the CPU to be halted; this will cause arm_cpu_is_work()
|
||||
* to return true (so we will come out of halt even with no other
|
||||
* pending interrupt), and the TCG accelerator's cpu_exec_interrupt()
|
||||
* function auto-clears the CPU_INTERRUPT_EXITTB flag for us.
|
||||
*/
|
||||
cpu_interrupt(cs, CPU_INTERRUPT_EXITTB);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)
|
||||
@@ -1877,6 +1906,9 @@ static void arm_cpu_finalizefn(Object *obj)
|
||||
if (cpu->pmu_timer) {
|
||||
timer_free(cpu->pmu_timer);
|
||||
}
|
||||
if (cpu->wfxt_timer) {
|
||||
timer_free(cpu->wfxt_timer);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -2369,6 +2401,13 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
if (tcg_enabled() && cpu_isar_feature(aa64_wfxt, cpu)) {
|
||||
cpu->wfxt_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL,
|
||||
arm_wfxt_timer_cb, cpu);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (tcg_enabled()) {
|
||||
/*
|
||||
* Don't report some architectural features in the ID registers
|
||||
@@ -2625,6 +2664,7 @@ static const TCGCPUOps arm_tcg_ops = {
|
||||
#else
|
||||
.tlb_fill = arm_cpu_tlb_fill,
|
||||
.cpu_exec_interrupt = arm_cpu_exec_interrupt,
|
||||
.cpu_exec_halt = arm_cpu_exec_halt,
|
||||
.do_interrupt = arm_cpu_do_interrupt,
|
||||
.do_transaction_failed = arm_cpu_do_transaction_failed,
|
||||
.do_unaligned_access = arm_cpu_do_unaligned_access,
|
||||
|
||||
@@ -866,6 +866,9 @@ struct ArchCPU {
|
||||
* pmu_op_finish() - it does not need other handling during migration
|
||||
*/
|
||||
QEMUTimer *pmu_timer;
|
||||
/* Timer used for WFxT timeouts */
|
||||
QEMUTimer *wfxt_timer;
|
||||
|
||||
/* GPIO outputs for generic timer */
|
||||
qemu_irq gt_timer_outputs[NUM_GTIMERS];
|
||||
/* GPIO output for GICv3 maintenance interrupt signal */
|
||||
|
||||
+5
-1
@@ -109,7 +109,11 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
|
||||
* No explicit bits enabled, and no implicit bits from sve-max-vq.
|
||||
*/
|
||||
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
||||
/* SVE is disabled and so are all vector lengths. Good. */
|
||||
/*
|
||||
* SVE is disabled and so are all vector lengths. Good.
|
||||
* Disable all SVE extensions as well.
|
||||
*/
|
||||
cpu->isar.id_aa64zfr0 = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -2665,7 +2665,7 @@ static CPAccessResult gt_stimer_access(CPUARMState *env,
|
||||
}
|
||||
}
|
||||
|
||||
static uint64_t gt_get_countervalue(CPUARMState *env)
|
||||
uint64_t gt_get_countervalue(CPUARMState *env)
|
||||
{
|
||||
ARMCPU *cpu = env_archcpu(env);
|
||||
|
||||
@@ -2800,7 +2800,7 @@ static uint64_t gt_cnt_read(CPUARMState *env, const ARMCPRegInfo *ri)
|
||||
return gt_get_countervalue(env) - gt_phys_cnt_offset(env);
|
||||
}
|
||||
|
||||
static uint64_t gt_virt_cnt_offset(CPUARMState *env)
|
||||
uint64_t gt_virt_cnt_offset(CPUARMState *env)
|
||||
{
|
||||
uint64_t hcr;
|
||||
|
||||
|
||||
+53
-44
@@ -53,6 +53,7 @@ DEF_HELPER_2(exception_pc_alignment, noreturn, env, tl)
|
||||
DEF_HELPER_1(setend, void, env)
|
||||
DEF_HELPER_2(wfi, void, env, i32)
|
||||
DEF_HELPER_1(wfe, void, env)
|
||||
DEF_HELPER_2(wfit, void, env, i64)
|
||||
DEF_HELPER_1(yield, void, env)
|
||||
DEF_HELPER_1(pre_hvc, void, env)
|
||||
DEF_HELPER_2(pre_smc, void, env, i32)
|
||||
@@ -268,50 +269,6 @@ DEF_HELPER_FLAGS_2(fjcvtzs, TCG_CALL_NO_RWG, i64, f64, ptr)
|
||||
DEF_HELPER_FLAGS_3(check_hcr_el2_trap, TCG_CALL_NO_WG, void, env, i32, i32)
|
||||
|
||||
/* neon_helper.c */
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_u8, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_s8, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_u16, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_s16, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_u32, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_qadd_s32, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_uqadd_s8, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_uqadd_s16, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_uqadd_s32, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_uqadd_s64, TCG_CALL_NO_RWG, i64, env, i64, i64)
|
||||
DEF_HELPER_FLAGS_3(neon_sqadd_u8, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_sqadd_u16, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_sqadd_u32, TCG_CALL_NO_RWG, i32, env, i32, i32)
|
||||
DEF_HELPER_FLAGS_3(neon_sqadd_u64, TCG_CALL_NO_RWG, i64, env, i64, i64)
|
||||
DEF_HELPER_3(neon_qsub_u8, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qsub_s8, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qsub_u16, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qsub_s16, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qsub_u32, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qsub_s32, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qadd_u64, i64, env, i64, i64)
|
||||
DEF_HELPER_3(neon_qadd_s64, i64, env, i64, i64)
|
||||
DEF_HELPER_3(neon_qsub_u64, i64, env, i64, i64)
|
||||
DEF_HELPER_3(neon_qsub_s64, i64, env, i64, i64)
|
||||
|
||||
DEF_HELPER_2(neon_hadd_s8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hadd_u8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hadd_s16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hadd_u16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hadd_s32, s32, s32, s32)
|
||||
DEF_HELPER_2(neon_hadd_u32, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_rhadd_s8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_rhadd_u8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_rhadd_s16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_rhadd_u16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_rhadd_s32, s32, s32, s32)
|
||||
DEF_HELPER_2(neon_rhadd_u32, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hsub_s8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hsub_u8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hsub_s16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hsub_u16, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_hsub_s32, s32, s32, s32)
|
||||
DEF_HELPER_2(neon_hsub_u32, i32, i32, i32)
|
||||
|
||||
DEF_HELPER_2(neon_pmin_u8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_pmin_s8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_pmin_u16, i32, i32, i32)
|
||||
@@ -351,6 +308,32 @@ DEF_HELPER_3(neon_qrshl_u32, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qrshl_s32, i32, env, i32, i32)
|
||||
DEF_HELPER_3(neon_qrshl_u64, i64, env, i64, i64)
|
||||
DEF_HELPER_3(neon_qrshl_s64, i64, env, i64, i64)
|
||||
DEF_HELPER_FLAGS_5(neon_sqshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqrshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqrshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqrshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqrshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqrshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqrshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqrshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_uqrshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_4(gvec_srshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_srshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_srshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_srshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_4(gvec_urshl_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_urshl_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_urshl_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(gvec_urshl_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_2(neon_add_u8, i32, i32, i32)
|
||||
DEF_HELPER_2(neon_add_u16, i32, i32, i32)
|
||||
@@ -836,6 +819,22 @@ DEF_HELPER_FLAGS_5(gvec_sqsub_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_sqsub_d, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_usqadd_b, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_usqadd_h, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_usqadd_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_usqadd_d, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_suqadd_b, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_suqadd_h, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_suqadd_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(gvec_suqadd_d, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_5(gvec_fmlal_a32, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
@@ -970,6 +969,16 @@ DEF_HELPER_FLAGS_5(neon_sqrdmulh_h, TCG_CALL_NO_RWG,
|
||||
DEF_HELPER_FLAGS_5(neon_sqrdmulh_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_5(neon_sqdmulh_idx_h, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqdmulh_idx_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_5(neon_sqrdmulh_idx_h, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_5(neon_sqrdmulh_idx_s, TCG_CALL_NO_RWG,
|
||||
void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
DEF_HELPER_FLAGS_4(sve2_sqdmulh_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(sve2_sqdmulh_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
DEF_HELPER_FLAGS_4(sve2_sqdmulh_s, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
|
||||
|
||||
@@ -1770,4 +1770,12 @@ bool check_watchpoint_in_range(int i, target_ulong addr);
|
||||
CPUWatchpoint *find_hw_watchpoint(CPUState *cpu, target_ulong addr);
|
||||
int insert_hw_watchpoint(target_ulong addr, target_ulong len, int type);
|
||||
int delete_hw_watchpoint(target_ulong addr, target_ulong len, int type);
|
||||
|
||||
/* Return the current value of the system counter in ticks */
|
||||
uint64_t gt_get_countervalue(CPUARMState *env);
|
||||
/*
|
||||
* Return the currently applicable offset between the system counter
|
||||
* and CNTVCT_EL0 (this will be either 0 or the value of CNTVOFF_EL2).
|
||||
*/
|
||||
uint64_t gt_virt_cnt_offset(CPUARMState *env);
|
||||
#endif
|
||||
|
||||
@@ -242,6 +242,25 @@ static const VMStateDescription vmstate_irq_line_state = {
|
||||
}
|
||||
};
|
||||
|
||||
static bool wfxt_timer_needed(void *opaque)
|
||||
{
|
||||
ARMCPU *cpu = opaque;
|
||||
|
||||
/* We'll only have the timer object if FEAT_WFxT is implemented */
|
||||
return cpu->wfxt_timer;
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_wfxt_timer = {
|
||||
.name = "cpu/wfxt-timer",
|
||||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.needed = wfxt_timer_needed,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_TIMER_PTR(wfxt_timer, ARMCPU),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static bool m_needed(void *opaque)
|
||||
{
|
||||
ARMCPU *cpu = opaque;
|
||||
@@ -957,6 +976,7 @@ const VMStateDescription vmstate_arm_cpu = {
|
||||
#endif
|
||||
&vmstate_serror,
|
||||
&vmstate_irq_line_state,
|
||||
&vmstate_wfxt_timer,
|
||||
NULL
|
||||
}
|
||||
};
|
||||
|
||||
@@ -32,6 +32,7 @@
|
||||
&rr_e rd rn esz
|
||||
&rrr_e rd rn rm esz
|
||||
&rrx_e rd rn rm idx esz
|
||||
&rrrr_e rd rn rm ra esz
|
||||
&qrr_e q rd rn esz
|
||||
&qrrr_e q rd rn rm esz
|
||||
&qrrx_e q rd rn rm idx esz
|
||||
@@ -42,8 +43,11 @@
|
||||
@rr_sd ........ ... ..... ...... rn:5 rd:5 &rr_e esz=%esz_sd
|
||||
|
||||
@rrr_h ........ ... rm:5 ...... rn:5 rd:5 &rrr_e esz=1
|
||||
@rrr_d ........ ... rm:5 ...... rn:5 rd:5 &rrr_e esz=3
|
||||
@rrr_sd ........ ... rm:5 ...... rn:5 rd:5 &rrr_e esz=%esz_sd
|
||||
@rrr_hsd ........ ... rm:5 ...... rn:5 rd:5 &rrr_e esz=%esz_hsd
|
||||
@rrr_e ........ esz:2 . rm:5 ...... rn:5 rd:5 &rrr_e
|
||||
@r2r_e ........ esz:2 . ..... ...... rm:5 rd:5 &rrr_e rn=%rd
|
||||
|
||||
@rrx_h ........ .. .. rm:4 .... . . rn:5 rd:5 &rrx_e esz=1 idx=%hlm
|
||||
@rrx_s ........ .. . rm:5 .... . . rn:5 rd:5 &rrx_e esz=2 idx=%hl
|
||||
@@ -59,6 +63,7 @@
|
||||
@qrrr_h . q:1 ...... ... rm:5 ...... rn:5 rd:5 &qrrr_e esz=1
|
||||
@qrrr_sd . q:1 ...... ... rm:5 ...... rn:5 rd:5 &qrrr_e esz=%esz_sd
|
||||
@qrrr_e . q:1 ...... esz:2 . rm:5 ...... rn:5 rd:5 &qrrr_e
|
||||
@qr2r_e . q:1 ...... esz:2 . ..... ...... rm:5 rd:5 &qrrr_e rn=%rd
|
||||
|
||||
@qrrx_h . q:1 .. .... .. .. rm:4 .... . . rn:5 rd:5 \
|
||||
&qrrx_e esz=1 idx=%hlm
|
||||
@@ -225,6 +230,10 @@ ERETA 1101011 0100 11111 00001 m:1 11111 11111 &reta # ERETAA, ERETAB
|
||||
NOP 1101 0101 0000 0011 0010 ---- --- 11111
|
||||
}
|
||||
|
||||
# System instructions with register argument
|
||||
WFET 1101 0101 0000 0011 0001 0000 000 rd:5
|
||||
WFIT 1101 0101 0000 0011 0001 0000 001 rd:5
|
||||
|
||||
# Barriers
|
||||
|
||||
CLREX 1101 0101 0000 0011 0011 ---- 010 11111
|
||||
@@ -744,6 +753,35 @@ FRECPS_s 0101 1110 0.1 ..... 11111 1 ..... ..... @rrr_sd
|
||||
FRSQRTS_s 0101 1110 110 ..... 00111 1 ..... ..... @rrr_h
|
||||
FRSQRTS_s 0101 1110 1.1 ..... 11111 1 ..... ..... @rrr_sd
|
||||
|
||||
SQADD_s 0101 1110 ..1 ..... 00001 1 ..... ..... @rrr_e
|
||||
UQADD_s 0111 1110 ..1 ..... 00001 1 ..... ..... @rrr_e
|
||||
SQSUB_s 0101 1110 ..1 ..... 00101 1 ..... ..... @rrr_e
|
||||
UQSUB_s 0111 1110 ..1 ..... 00101 1 ..... ..... @rrr_e
|
||||
|
||||
SUQADD_s 0101 1110 ..1 00000 00111 0 ..... ..... @r2r_e
|
||||
USQADD_s 0111 1110 ..1 00000 00111 0 ..... ..... @r2r_e
|
||||
|
||||
SSHL_s 0101 1110 111 ..... 01000 1 ..... ..... @rrr_d
|
||||
USHL_s 0111 1110 111 ..... 01000 1 ..... ..... @rrr_d
|
||||
SRSHL_s 0101 1110 111 ..... 01010 1 ..... ..... @rrr_d
|
||||
URSHL_s 0111 1110 111 ..... 01010 1 ..... ..... @rrr_d
|
||||
SQSHL_s 0101 1110 ..1 ..... 01001 1 ..... ..... @rrr_e
|
||||
UQSHL_s 0111 1110 ..1 ..... 01001 1 ..... ..... @rrr_e
|
||||
SQRSHL_s 0101 1110 ..1 ..... 01011 1 ..... ..... @rrr_e
|
||||
UQRSHL_s 0111 1110 ..1 ..... 01011 1 ..... ..... @rrr_e
|
||||
|
||||
ADD_s 0101 1110 111 ..... 10000 1 ..... ..... @rrr_d
|
||||
SUB_s 0111 1110 111 ..... 10000 1 ..... ..... @rrr_d
|
||||
CMGT_s 0101 1110 111 ..... 00110 1 ..... ..... @rrr_d
|
||||
CMHI_s 0111 1110 111 ..... 00110 1 ..... ..... @rrr_d
|
||||
CMGE_s 0101 1110 111 ..... 00111 1 ..... ..... @rrr_d
|
||||
CMHS_s 0111 1110 111 ..... 00111 1 ..... ..... @rrr_d
|
||||
CMTST_s 0101 1110 111 ..... 10001 1 ..... ..... @rrr_d
|
||||
CMEQ_s 0111 1110 111 ..... 10001 1 ..... ..... @rrr_d
|
||||
|
||||
SQDMULH_s 0101 1110 ..1 ..... 10110 1 ..... ..... @rrr_e
|
||||
SQRDMULH_s 0111 1110 ..1 ..... 10110 1 ..... ..... @rrr_e
|
||||
|
||||
### Advanced SIMD scalar pairwise
|
||||
|
||||
FADDP_s 0101 1110 0011 0000 1101 10 ..... ..... @rr_h
|
||||
@@ -857,6 +895,53 @@ BSL_v 0.10 1110 011 ..... 00011 1 ..... ..... @qrrr_b
|
||||
BIT_v 0.10 1110 101 ..... 00011 1 ..... ..... @qrrr_b
|
||||
BIF_v 0.10 1110 111 ..... 00011 1 ..... ..... @qrrr_b
|
||||
|
||||
SQADD_v 0.00 1110 ..1 ..... 00001 1 ..... ..... @qrrr_e
|
||||
UQADD_v 0.10 1110 ..1 ..... 00001 1 ..... ..... @qrrr_e
|
||||
SQSUB_v 0.00 1110 ..1 ..... 00101 1 ..... ..... @qrrr_e
|
||||
UQSUB_v 0.10 1110 ..1 ..... 00101 1 ..... ..... @qrrr_e
|
||||
|
||||
SUQADD_v 0.00 1110 ..1 00000 00111 0 ..... ..... @qr2r_e
|
||||
USQADD_v 0.10 1110 ..1 00000 00111 0 ..... ..... @qr2r_e
|
||||
|
||||
SSHL_v 0.00 1110 ..1 ..... 01000 1 ..... ..... @qrrr_e
|
||||
USHL_v 0.10 1110 ..1 ..... 01000 1 ..... ..... @qrrr_e
|
||||
SRSHL_v 0.00 1110 ..1 ..... 01010 1 ..... ..... @qrrr_e
|
||||
URSHL_v 0.10 1110 ..1 ..... 01010 1 ..... ..... @qrrr_e
|
||||
SQSHL_v 0.00 1110 ..1 ..... 01001 1 ..... ..... @qrrr_e
|
||||
UQSHL_v 0.10 1110 ..1 ..... 01001 1 ..... ..... @qrrr_e
|
||||
SQRSHL_v 0.00 1110 ..1 ..... 01011 1 ..... ..... @qrrr_e
|
||||
UQRSHL_v 0.10 1110 ..1 ..... 01011 1 ..... ..... @qrrr_e
|
||||
|
||||
ADD_v 0.00 1110 ..1 ..... 10000 1 ..... ..... @qrrr_e
|
||||
SUB_v 0.10 1110 ..1 ..... 10000 1 ..... ..... @qrrr_e
|
||||
CMGT_v 0.00 1110 ..1 ..... 00110 1 ..... ..... @qrrr_e
|
||||
CMHI_v 0.10 1110 ..1 ..... 00110 1 ..... ..... @qrrr_e
|
||||
CMGE_v 0.00 1110 ..1 ..... 00111 1 ..... ..... @qrrr_e
|
||||
CMHS_v 0.10 1110 ..1 ..... 00111 1 ..... ..... @qrrr_e
|
||||
CMTST_v 0.00 1110 ..1 ..... 10001 1 ..... ..... @qrrr_e
|
||||
CMEQ_v 0.10 1110 ..1 ..... 10001 1 ..... ..... @qrrr_e
|
||||
SHADD_v 0.00 1110 ..1 ..... 00000 1 ..... ..... @qrrr_e
|
||||
UHADD_v 0.10 1110 ..1 ..... 00000 1 ..... ..... @qrrr_e
|
||||
SHSUB_v 0.00 1110 ..1 ..... 00100 1 ..... ..... @qrrr_e
|
||||
UHSUB_v 0.10 1110 ..1 ..... 00100 1 ..... ..... @qrrr_e
|
||||
SRHADD_v 0.00 1110 ..1 ..... 00010 1 ..... ..... @qrrr_e
|
||||
URHADD_v 0.10 1110 ..1 ..... 00010 1 ..... ..... @qrrr_e
|
||||
SMAX_v 0.00 1110 ..1 ..... 01100 1 ..... ..... @qrrr_e
|
||||
UMAX_v 0.10 1110 ..1 ..... 01100 1 ..... ..... @qrrr_e
|
||||
SMIN_v 0.00 1110 ..1 ..... 01101 1 ..... ..... @qrrr_e
|
||||
UMIN_v 0.10 1110 ..1 ..... 01101 1 ..... ..... @qrrr_e
|
||||
SABD_v 0.00 1110 ..1 ..... 01110 1 ..... ..... @qrrr_e
|
||||
UABD_v 0.10 1110 ..1 ..... 01110 1 ..... ..... @qrrr_e
|
||||
SABA_v 0.00 1110 ..1 ..... 01111 1 ..... ..... @qrrr_e
|
||||
UABA_v 0.10 1110 ..1 ..... 01111 1 ..... ..... @qrrr_e
|
||||
MUL_v 0.00 1110 ..1 ..... 10011 1 ..... ..... @qrrr_e
|
||||
PMUL_v 0.10 1110 001 ..... 10011 1 ..... ..... @qrrr_b
|
||||
MLA_v 0.00 1110 ..1 ..... 10010 1 ..... ..... @qrrr_e
|
||||
MLS_v 0.10 1110 ..1 ..... 10010 1 ..... ..... @qrrr_e
|
||||
|
||||
SQDMULH_v 0.00 1110 ..1 ..... 10110 1 ..... ..... @qrrr_e
|
||||
SQRDMULH_v 0.10 1110 ..1 ..... 10110 1 ..... ..... @qrrr_e
|
||||
|
||||
### Advanced SIMD scalar x indexed element
|
||||
|
||||
FMUL_si 0101 1111 00 .. .... 1001 . 0 ..... ..... @rrx_h
|
||||
@@ -875,6 +960,12 @@ FMULX_si 0111 1111 00 .. .... 1001 . 0 ..... ..... @rrx_h
|
||||
FMULX_si 0111 1111 10 . ..... 1001 . 0 ..... ..... @rrx_s
|
||||
FMULX_si 0111 1111 11 0 ..... 1001 . 0 ..... ..... @rrx_d
|
||||
|
||||
SQDMULH_si 0101 1111 01 .. .... 1100 . 0 ..... ..... @rrx_h
|
||||
SQDMULH_si 0101 1111 10 .. .... 1100 . 0 ..... ..... @rrx_s
|
||||
|
||||
SQRDMULH_si 0101 1111 01 .. .... 1101 . 0 ..... ..... @rrx_h
|
||||
SQRDMULH_si 0101 1111 10 . ..... 1101 . 0 ..... ..... @rrx_s
|
||||
|
||||
### Advanced SIMD vector x indexed element
|
||||
|
||||
FMUL_vi 0.00 1111 00 .. .... 1001 . 0 ..... ..... @qrrx_h
|
||||
@@ -897,3 +988,31 @@ FMLAL_vi 0.00 1111 10 .. .... 0000 . 0 ..... ..... @qrrx_h
|
||||
FMLSL_vi 0.00 1111 10 .. .... 0100 . 0 ..... ..... @qrrx_h
|
||||
FMLAL2_vi 0.10 1111 10 .. .... 1000 . 0 ..... ..... @qrrx_h
|
||||
FMLSL2_vi 0.10 1111 10 .. .... 1100 . 0 ..... ..... @qrrx_h
|
||||
|
||||
MUL_vi 0.00 1111 01 .. .... 1000 . 0 ..... ..... @qrrx_h
|
||||
MUL_vi 0.00 1111 10 . ..... 1000 . 0 ..... ..... @qrrx_s
|
||||
|
||||
MLA_vi 0.10 1111 01 .. .... 0000 . 0 ..... ..... @qrrx_h
|
||||
MLA_vi 0.10 1111 10 . ..... 0000 . 0 ..... ..... @qrrx_s
|
||||
|
||||
MLS_vi 0.10 1111 01 .. .... 0100 . 0 ..... ..... @qrrx_h
|
||||
MLS_vi 0.10 1111 10 . ..... 0100 . 0 ..... ..... @qrrx_s
|
||||
|
||||
SQDMULH_vi 0.00 1111 01 .. .... 1100 . 0 ..... ..... @qrrx_h
|
||||
SQDMULH_vi 0.00 1111 10 . ..... 1100 . 0 ..... ..... @qrrx_s
|
||||
|
||||
SQRDMULH_vi 0.00 1111 01 .. .... 1101 . 0 ..... ..... @qrrx_h
|
||||
SQRDMULH_vi 0.00 1111 10 . ..... 1101 . 0 ..... ..... @qrrx_s
|
||||
|
||||
# Floating-point conditional select
|
||||
|
||||
FCSEL 0001 1110 .. 1 rm:5 cond:4 11 rn:5 rd:5 esz=%esz_hsd
|
||||
|
||||
# Floating-point data-processing (3 source)
|
||||
|
||||
@rrrr_hsd .... .... .. . rm:5 . ra:5 rn:5 rd:5 &rrrr_e esz=%esz_hsd
|
||||
|
||||
FMADD 0001 1111 .. 0 ..... 0 ..... ..... ..... @rrrr_hsd
|
||||
FMSUB 0001 1111 .. 0 ..... 1 ..... ..... ..... @rrrr_hsd
|
||||
FNMADD 0001 1111 .. 1 ..... 0 ..... ..... ..... @rrrr_hsd
|
||||
FNMSUB 0001 1111 .. 1 ..... 1 ..... ..... ..... @rrrr_hsd
|
||||
|
||||
@@ -1168,6 +1168,7 @@ void aarch64_max_tcg_initfn(Object *obj)
|
||||
t = cpu->isar.id_aa64isar2;
|
||||
t = FIELD_DP64(t, ID_AA64ISAR2, MOPS, 1); /* FEAT_MOPS */
|
||||
t = FIELD_DP64(t, ID_AA64ISAR2, BC, 1); /* FEAT_HBC */
|
||||
t = FIELD_DP64(t, ID_AA64ISAR2, WFXT, 2); /* FEAT_WFxT */
|
||||
cpu->isar.id_aa64isar2 = t;
|
||||
|
||||
t = cpu->isar.id_aa64pfr0;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user