From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 1/9] target/alpha: Use cpu_env in preference to ALPHA_CPU
Date: Sat, 4 May 2024 08:39:18 -0700 [thread overview]
Message-ID: <20240504153926.357845-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240504153926.357845-1-richard.henderson@linaro.org>
ALPHA_CPU has a dynamic object type assert, which is
unnecessary considering that these are all class hooks.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240503072014.24751-2-philmd@linaro.org>
---
target/alpha/cpu.c | 15 ++++++---------
target/alpha/helper.c | 8 ++++----
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c
index 05f9ee41e9..f98d022671 100644
--- a/target/alpha/cpu.c
+++ b/target/alpha/cpu.c
@@ -28,25 +28,22 @@
static void alpha_cpu_set_pc(CPUState *cs, vaddr value)
{
- AlphaCPU *cpu = ALPHA_CPU(cs);
-
- cpu->env.pc = value;
+ CPUAlphaState *env = cpu_env(cs);
+ env->pc = value;
}
static vaddr alpha_cpu_get_pc(CPUState *cs)
{
- AlphaCPU *cpu = ALPHA_CPU(cs);
-
- return cpu->env.pc;
+ CPUAlphaState *env = cpu_env(cs);
+ return env->pc;
}
static void alpha_restore_state_to_opc(CPUState *cs,
const TranslationBlock *tb,
const uint64_t *data)
{
- AlphaCPU *cpu = ALPHA_CPU(cs);
-
- cpu->env.pc = data[0];
+ CPUAlphaState *env = cpu_env(cs);
+ env->pc = data[0];
}
static bool alpha_cpu_has_work(CPUState *cs)
diff --git a/target/alpha/helper.c b/target/alpha/helper.c
index d6d4353edd..c5e4958f8b 100644
--- a/target/alpha/helper.c
+++ b/target/alpha/helper.c
@@ -124,7 +124,7 @@ void alpha_cpu_record_sigsegv(CPUState *cs, vaddr address,
MMUAccessType access_type,
bool maperr, uintptr_t retaddr)
{
- AlphaCPU *cpu = ALPHA_CPU(cs);
+ CPUAlphaState *env = cpu_env(cs);
target_ulong mmcsr, cause;
/* Assuming !maperr, infer the missing protection. */
@@ -155,9 +155,9 @@ void alpha_cpu_record_sigsegv(CPUState *cs, vaddr address,
}
/* Record the arguments that PALcode would give to the kernel. */
- cpu->env.trap_arg0 = address;
- cpu->env.trap_arg1 = mmcsr;
- cpu->env.trap_arg2 = cause;
+ env->trap_arg0 = address;
+ env->trap_arg1 = mmcsr;
+ env->trap_arg2 = cause;
}
#else
/* Returns the OSF/1 entMM failure indication, or -1 on success. */
--
2.34.1
next prev parent reply other threads:[~2024-05-04 15:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-04 15:39 [PULL 0/9] target/alpha: Implement CF_PCREL Richard Henderson
2024-05-04 15:39 ` Richard Henderson [this message]
2024-05-04 15:39 ` [PULL 2/9] target/alpha: Hoist branch shift to initial decode Richard Henderson
2024-05-04 15:39 ` [PULL 3/9] target/alpha: Use DISAS_NEXT definition instead of magic '0' value Richard Henderson
2024-05-04 15:39 ` [PULL 4/9] target/alpha: Inline DISAS_PC_UPDATED and return DISAS_NORETURN Richard Henderson
2024-05-04 15:39 ` [PULL 5/9] target/alpha: Return DISAS_NORETURN once Richard Henderson
2024-05-04 15:39 ` [PULL 6/9] target/alpha: Simplify gen_bcond_internal() Richard Henderson
2024-05-04 15:39 ` [PULL 7/9] target/alpha: Split out gen_goto_tb Richard Henderson
2024-05-04 15:39 ` [PULL 8/9] target/alpha: Split out gen_pc_disp Richard Henderson
2024-05-04 15:39 ` [PULL 9/9] target/alpha: Implement CF_PCREL Richard Henderson
2024-05-05 0:39 ` [PULL 0/9] " Richard Henderson
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=20240504153926.357845-2-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).