From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 14/19] target/i386/seg_helper: introduce tss_set_busy
Date: Tue, 26 Sep 2023 18:59:10 +0200 [thread overview]
Message-ID: <20230926165915.738719-15-pbonzini@redhat.com> (raw)
In-Reply-To: <20230926165915.738719-1-pbonzini@redhat.com>
Eliminate a shadowed local variable in the process.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/tcg/seg_helper.c | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c
index e8d19c65fdc..b5198db82bc 100644
--- a/target/i386/tcg/seg_helper.c
+++ b/target/i386/tcg/seg_helper.c
@@ -226,6 +226,21 @@ static void tss_load_seg(CPUX86State *env, X86Seg seg_reg, int selector,
}
}
+static void tss_set_busy(CPUX86State *env, int tss_selector, bool value,
+ uintptr_t retaddr)
+{
+ target_ulong ptr = env->gdt.base + (env->tr.selector & ~7);
+ uint32_t e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr);
+
+ if (value) {
+ e2 |= DESC_TSS_BUSY_MASK;
+ } else {
+ e2 &= ~DESC_TSS_BUSY_MASK;
+ }
+
+ cpu_stl_kernel_ra(env, ptr + 4, e2, retaddr);
+}
+
#define SWITCH_TSS_JMP 0
#define SWITCH_TSS_IRET 1
#define SWITCH_TSS_CALL 2
@@ -341,13 +356,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_selector,
/* clear busy bit (it is restartable) */
if (source == SWITCH_TSS_JMP || source == SWITCH_TSS_IRET) {
- target_ulong ptr;
- uint32_t e2;
-
- ptr = env->gdt.base + (env->tr.selector & ~7);
- e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr);
- e2 &= ~DESC_TSS_BUSY_MASK;
- cpu_stl_kernel_ra(env, ptr + 4, e2, retaddr);
+ tss_set_busy(env, env->tr.selector, 0, retaddr);
}
old_eflags = cpu_compute_eflags(env);
if (source == SWITCH_TSS_IRET) {
@@ -399,13 +408,7 @@ static void switch_tss_ra(CPUX86State *env, int tss_selector,
/* set busy bit */
if (source == SWITCH_TSS_JMP || source == SWITCH_TSS_CALL) {
- target_ulong ptr;
- uint32_t e2;
-
- ptr = env->gdt.base + (tss_selector & ~7);
- e2 = cpu_ldl_kernel_ra(env, ptr + 4, retaddr);
- e2 |= DESC_TSS_BUSY_MASK;
- cpu_stl_kernel_ra(env, ptr + 4, e2, retaddr);
+ tss_set_busy(env, tss_selector, 1, retaddr);
}
/* set the new CPU state */
--
2.41.0
next prev parent reply other threads:[~2023-09-26 17:00 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 16:58 [PULL 00/19] Misc patches for 2023-09-26 Paolo Bonzini
2023-09-26 16:58 ` [PULL 01/19] pc_piix: remove pc-i440fx-1.4 up to pc-i440fx-1.7 Paolo Bonzini
2023-09-26 16:58 ` [PULL 02/19] seabios: remove PCI drivers from bios.bin Paolo Bonzini
2023-09-26 16:58 ` [PULL 03/19] user-exec-stub: remove unused variable Paolo Bonzini
2023-09-26 16:59 ` [PULL 04/19] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 [CVE-2023-42467] Paolo Bonzini
2023-09-26 16:59 ` [PULL 05/19] vl: remove shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 06/19] ui/vnc: fix debug output for invalid audio message Paolo Bonzini
2023-09-26 16:59 ` [PULL 07/19] ui/vnc: fix handling of VNC_FEATURE_XVP Paolo Bonzini
2023-09-26 16:59 ` [PULL 08/19] mptsas: avoid shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 09/19] pm_smbus: rename variable to avoid shadowing Paolo Bonzini
2023-09-26 16:59 ` [PULL 10/19] m48t59-test: avoid possible overflow on ABS Paolo Bonzini
2023-09-26 16:59 ` [PULL 11/19] target/i386/kvm: eliminate shadowed local variables Paolo Bonzini
2023-09-26 16:59 ` [PULL 12/19] target/i386/cpu: avoid " Paolo Bonzini
2023-09-26 16:59 ` [PULL 13/19] target/i386/translate: " Paolo Bonzini
2023-09-26 16:59 ` Paolo Bonzini [this message]
2023-09-26 16:59 ` [PULL 15/19] target/i386/seg_helper: remove shadowed variable Paolo Bonzini
2023-09-26 16:59 ` [PULL 16/19] target/i386/svm_helper: eliminate duplicate local variable Paolo Bonzini
2023-09-26 16:59 ` [PULL 17/19] block: mark mixed functions that can suspend Paolo Bonzini
2023-09-26 16:59 ` [PULL 18/19] compiler: introduce QEMU_ANNOTATE Paolo Bonzini
2023-09-26 16:59 ` [PULL 19/19] audio: remove shadowed locals Paolo Bonzini
2023-09-27 20:13 ` [PULL 00/19] Misc patches for 2023-09-26 Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230926165915.738719-15-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).