From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, daniel@0x0f.com
Subject: [PATCH v3 15/26] target/m68k: Remove env argument to gen_lea_mode
Date: Mon, 9 Sep 2024 10:28:12 -0700 [thread overview]
Message-ID: <20240909172823.649837-16-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240909172823.649837-1-richard.henderson@linaro.org>
Use the env pointer in DisasContext.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/translate.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 78a9358416..938c650c78 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -693,8 +693,7 @@ static int addr_inc_size(DisasContext *s, int reg0, int opsize)
/*
* Generate code for an "effective address".
*/
-static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
- int mode, int reg0, int opsize)
+static TCGv gen_lea_mode(DisasContext *s, int mode, int reg0, int opsize)
{
TCGv reg, addr, tmp;
uint16_t ext;
@@ -732,7 +731,7 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
case 5: /* Indirect displacement. */
reg = get_areg(s, reg0);
addr = tcg_temp_new();
- ext = read_im16(env, s);
+ ext = read_im16(s->env, s);
tcg_gen_addi_i32(addr, reg, (int16_t)ext);
return addr;
case 6: /* Indirect index + displacement. */
@@ -741,14 +740,14 @@ static TCGv gen_lea_mode(CPUM68KState *env, DisasContext *s,
case 7: /* Other */
switch (reg0) {
case 0: /* Absolute short. */
- offset = (int16_t)read_im16(env, s);
+ offset = (int16_t)read_im16(s->env, s);
break;
case 1: /* Absolute long. */
- offset = read_im32(env, s);
+ offset = read_im32(s->env, s);
break;
case 2: /* pc displacement */
offset = s->pc;
- offset += (int16_t)read_im16(env, s);
+ offset += (int16_t)read_im16(s->env, s);
break;
case 3: /* pc index+displacement. */
return gen_lea_indexed(s, NULL_QREG);
@@ -768,7 +767,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn,
{
int mode = extract32(insn, 3, 3);
int reg0 = REG(insn, 0);
- return gen_lea_mode(env, s, mode, reg0, opsize);
+ return gen_lea_mode(s, mode, reg0, opsize);
}
/*
@@ -826,7 +825,7 @@ static TCGv gen_load_mode(CPUM68KState *env, DisasContext *s,
case 4: /* Indirect predecrememnt. */
case 5: /* Indirect displacement. */
case 6: /* Indirect index + displacement. */
- addr = gen_lea_mode(env, s, mode, reg0, opsize);
+ addr = gen_lea_mode(s, mode, reg0, opsize);
if (IS_NULL_QREG(addr)) {
ret = addr;
addr = NULL;
@@ -869,7 +868,7 @@ static bool gen_store_mode(CPUM68KState *env, DisasContext *s,
case 6: /* Indirect index + displacement. */
case 7: /* Other */
if (!addr) {
- addr = gen_lea_mode(env, s, mode, reg0, opsize);
+ addr = gen_lea_mode(s, mode, reg0, opsize);
if (IS_NULL_QREG(addr)) {
return false;
}
@@ -1109,7 +1108,7 @@ static int gen_ea_mode_fp(CPUM68KState *env, DisasContext *s, int mode,
case 4: /* Indirect predecrememnt. */
case 5: /* Indirect displacement. */
case 6: /* Indirect index + displacement. */
- addr = gen_lea_mode(env, s, mode, reg0, opsize);
+ addr = gen_lea_mode(s, mode, reg0, opsize);
if (IS_NULL_QREG(addr)) {
return -1;
}
@@ -1930,7 +1929,7 @@ DISAS_INSN(movem)
break;
default:
- tmp = gen_lea_mode(env, s, mode, reg0, opsize);
+ tmp = gen_lea_mode(s, mode, reg0, opsize);
if (IS_NULL_QREG(tmp)) {
goto do_addr_fault;
}
@@ -2672,7 +2671,7 @@ DISAS_INSN(tas)
} else {
TCGv src1, addr;
- addr = gen_lea_mode(env, s, mode, reg0, OS_BYTE);
+ addr = gen_lea_mode(s, mode, reg0, OS_BYTE);
if (IS_NULL_QREG(addr)) {
gen_addr_fault(s);
return;
--
2.43.0
next prev parent reply other threads:[~2024-09-09 17:30 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-09 17:27 [PATCH v3 00/26] target/m68k: fpu improvements Richard Henderson
2024-09-09 17:27 ` [PATCH v3 01/26] target/m68k: Always return a temporary from gen_lea_mode Richard Henderson
2024-09-09 17:27 ` [PATCH v3 02/26] target/m68k: Add FPSR exception bit defines Richard Henderson
2024-09-09 17:28 ` [PATCH v3 03/26] target/m68k: Restore fp rounding mode on vm load Richard Henderson
2024-09-09 21:59 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 04/26] target/m68k: Keep FPSR up-to-date Richard Henderson
2024-09-09 17:28 ` [PATCH v3 05/26] target/m68k: Update FPSR.EXC Richard Henderson
2024-09-09 17:28 ` [PATCH v3 06/26] softfloat: Set QEMU_NO_HARDFLOAT for m68k Richard Henderson
2024-09-09 17:28 ` [PATCH v3 07/26] target/m68k: Invoke update_fpsr for FMOVECR Richard Henderson
2024-09-09 17:28 ` [PATCH v3 08/26] target/m68k: Introduce M68K_FEATURE_FPU_PACKED_DECIMAL Richard Henderson
2024-09-09 17:28 ` [PATCH v3 09/26] target/m68k: Merge gen_ea into SRC_EA and DEST_EA Richard Henderson
2024-09-09 22:02 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 10/26] target/m68k: Use g_assert_not_reached in gen_lea_mode and gen_ea_mode Richard Henderson
2024-09-09 22:03 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 11/26] target/m68k: Use OS_UNSIZED in LEA, PEA, JMP Richard Henderson
2024-09-09 17:28 ` [PATCH v3 12/26] target/m68k: Move pre-dec/post-inc to gen_lea_mode Richard Henderson
2024-09-09 17:28 ` [PATCH v3 13/26] target/m68k: Split gen_ea_mode for load/store Richard Henderson
2024-09-09 17:28 ` [PATCH v3 14/26] target/m68k: Remove env argument to gen_lea_indexed Richard Henderson
2024-09-09 22:05 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` Richard Henderson [this message]
2024-09-09 22:06 ` [PATCH v3 15/26] target/m68k: Remove env argument to gen_lea_mode Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 16/26] target/m68k: Remove env argument to gen_load_mode Richard Henderson
2024-09-09 22:06 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 17/26] target/m68k: Remove env argument to gen_store_mode Richard Henderson
2024-09-09 22:06 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 18/26] target/m68k: Remove env argument to gen_ea_mode_fp Richard Henderson
2024-09-09 22:06 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 19/26] target/m68k: Split gen_ea_mode_fp for load/store Richard Henderson
2024-09-09 22:13 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 20/26] target/m68k: Move gen_addr_fault into gen_{load, store}_mode_fp Richard Henderson
2024-09-09 22:14 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 21/26] target/m68k: Merge gen_load_fp, gen_load_mode_fp Richard Henderson
2024-09-09 22:16 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 22/26] target/m68k: Merge gen_store_fp, gen_store_mode_fp Richard Henderson
2024-09-09 22:16 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 23/26] target/m68k: Implement packed decimal real loads and stores Richard Henderson
2024-09-09 17:28 ` [PATCH v3 24/26] tests/tcg/m68k: Add packed decimal tests Richard Henderson
2024-09-09 17:28 ` [PATCH v3 25/26] target/m68k: Make vmstate variables static Richard Henderson
2024-09-09 22:17 ` Philippe Mathieu-Daudé
2024-09-09 17:28 ` [PATCH v3 26/26] target/m68k: Implement FPIAR 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=20240909172823.649837-16-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=daniel@0x0f.com \
--cc=laurent@vivier.eu \
--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).