starred/qemu-qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-09 01:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/s390x: Inline cpu_ld{uw, l}_code() calls in EX opcode helper

Browse Source 
In preparation of removing the cpu_lduw_code() and cpu_ldl_code()
wrappers, inline them.

Since S390x instructions are always stored in big-endian order,
replace MO_TE -> MO_BE.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20251224162036.90404-6-philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé
2025-12-24 17:20:32 +01:00
committed by Thomas Huth
parent 69da23130f
commit 381a1fda5b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
target/s390x/tcg/mem_helper.c
View File

@@ -2430,15 +2430,18 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t r1, uint64_t addr)
*/
void HELPER(ex)(CPUS390XState *env, uint32_t ilen, uint64_t r1, uint64_t addr)
{
CPUState *cs = env_cpu(env);
uint64_t insn;
uint8_t opc;
MemOpIdx oi;
/* EXECUTE targets must be at even addresses. */
if (addr & 1) {
tcg_s390_program_interrupt(env, PGM_SPECIFICATION, GETPC());
}
insn = cpu_lduw_code(env, addr);
oi = make_memop_idx(MO_BEUW, cpu_mmu_index(cs, true));
insn = cpu_ldw_code_mmu(env, addr, oi, 0);
opc = insn >> 8;
/* Or in the contents of R1[56:63]. */
@@ -2450,10 +2453,11 @@ void HELPER(ex)(CPUS390XState *env, uint32_t ilen, uint64_t r1, uint64_t addr)
case 2:
break;
case 4:
insn |= (uint64_t)cpu_lduw_code(env, addr + 2) << 32;
insn |= (uint64_t)cpu_ldw_code_mmu(env, addr + 2, oi, 0) << 32;
break;
case 6:
insn |= (uint64_t)(uint32_t)cpu_ldl_code(env, addr + 2) << 16;
oi = make_memop_idx(MO_BEUL, cpu_mmu_index(cs, true));
insn |= (uint64_t)(uint32_t)cpu_ldl_code_mmu(env, addr + 2, oi, 0) << 16;
break;
default:
g_assert_not_reached();