7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- hw/net/can/sja1000: fix bug for single acceptance filter and standard frame
- tests/avocado: fix typo in replay_linux
- util/userfaultfd: Remove unused uffd_poll_events
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
62 lines
2.2 KiB
Diff
62 lines
2.2 KiB
Diff
From 0338db7f0f42f68b709ad6bbd79e471292b32baf Mon Sep 17 00:00:00 2001
|
|
From: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 21 Oct 2024 19:32:15 +0800
|
|
Subject: [PATCH] target/m68k: always call gen_exit_tb() after writes to SR
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Any write to SR can change the security state so always call gen_exit_tb() when
|
|
this occurs. In particular MacOS makes use of andiw/oriw in a few places to
|
|
handle the switch between user and supervisor mode.
|
|
|
|
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
|
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-Id: <20220917112515.83905-5-mark.cave-ayland@ilande.co.uk>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
Signed-off-by: Liu Jing <liujing_yewu@cmss.chinamobile.com>
|
|
---
|
|
target/m68k/translate.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
|
|
index 6cc4321921..9e465272ea 100644
|
|
--- a/target/m68k/translate.c
|
|
+++ b/target/m68k/translate.c
|
|
@@ -2359,6 +2359,7 @@ DISAS_INSN(arith_im)
|
|
tcg_gen_or_i32(dest, src1, im);
|
|
if (with_SR) {
|
|
gen_set_sr(s, dest, opsize == OS_BYTE);
|
|
+ gen_exit_tb(s);
|
|
} else {
|
|
DEST_EA(env, insn, opsize, dest, &addr);
|
|
gen_logic_cc(s, dest, opsize);
|
|
@@ -2368,6 +2369,7 @@ DISAS_INSN(arith_im)
|
|
tcg_gen_and_i32(dest, src1, im);
|
|
if (with_SR) {
|
|
gen_set_sr(s, dest, opsize == OS_BYTE);
|
|
+ gen_exit_tb(s);
|
|
} else {
|
|
DEST_EA(env, insn, opsize, dest, &addr);
|
|
gen_logic_cc(s, dest, opsize);
|
|
@@ -2391,6 +2393,7 @@ DISAS_INSN(arith_im)
|
|
tcg_gen_xor_i32(dest, src1, im);
|
|
if (with_SR) {
|
|
gen_set_sr(s, dest, opsize == OS_BYTE);
|
|
+ gen_exit_tb(s);
|
|
} else {
|
|
DEST_EA(env, insn, opsize, dest, &addr);
|
|
gen_logic_cc(s, dest, opsize);
|
|
@@ -4594,6 +4597,7 @@ DISAS_INSN(strldsr)
|
|
}
|
|
gen_push(s, gen_get_sr(s));
|
|
gen_set_sr_im(s, ext, 0);
|
|
+ gen_exit_tb(s);
|
|
}
|
|
|
|
DISAS_INSN(move_from_sr)
|
|
--
|
|
2.41.0.windows.1
|
|
|