david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390x/tcg: MVCOS: Lengths are 32 bit in 24/31-bit mode

Browse Source 
Triggered by a review comment from Richard, also MVCOS has a 32-bit
length in 24/31-bit addressing mode. Add a new helper.

Rename wrap_length() to wrap_length31().

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
David Hildenbrand 2019-09-13 12:27:21 +02:00
parent 43df3e71e3
commit a7627565ae
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/s390x/mem_helper.c
View File

@ -528,7 +528,15 @@ static inline void set_address(CPUS390XState *env, int reg, uint64_t address)
} }
} }
static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length) static inline uint64_t wrap_length32(CPUS390XState *env, uint64_t length)
{
if (!(env->psw.mask & PSW_MASK_64)) {
return (uint32_t)length;
}
return length;
}
static inline uint64_t wrap_length31(CPUS390XState *env, uint64_t length)
{ {
if (!(env->psw.mask & PSW_MASK_64)) { if (!(env->psw.mask & PSW_MASK_64)) {
/* 24-Bit and 31-Bit mode */ /* 24-Bit and 31-Bit mode */
@ -539,7 +547,7 @@ static inline uint64_t wrap_length(CPUS390XState *env, uint64_t length)
static inline uint64_t get_length(CPUS390XState *env, int reg) static inline uint64_t get_length(CPUS390XState *env, int reg)
{ {
return wrap_length(env, env->regs[reg]); return wrap_length31(env, env->regs[reg]);
} }
static inline void set_length(CPUS390XState *env, int reg, uint64_t length) static inline void set_length(CPUS390XState *env, int reg, uint64_t length)
@ -2378,7 +2386,7 @@ uint32_t HELPER(mvcos)(CPUS390XState *env, uint64_t dest, uint64_t src,
s390_program_interrupt(env, PGM_PRIVILEGED, 6, ra); s390_program_interrupt(env, PGM_PRIVILEGED, 6, ra);
} }
len = wrap_length(env, len); len = wrap_length32(env, len);
if (len > 4096) { if (len > 4096) {
cc = 3; cc = 3;
len = 4096; len = 4096;