OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

s390x: Rename and use constants for short PSW address and mask

Browse Source 
Let's rename PSW_MASK_ESA_ADDR to PSW_MASK_SHORT_ADDR because we're
not working with a ESA PSW which would not support the extended
addressing bit. Also let's actually use it.

Additionally we introduce PSW_MASK_SHORT_CTRL and use it throughout
the codebase.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200227092341.38558-1-frankja@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Janosch Frank 2020-02-27 04:23:41 -05:00 committed by Cornelia Huck
parent 8f4335242a
commit b6c2dbd721
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/ipl.c
View File

@ -179,7 +179,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp)
/* if not Linux load the address of the (short) IPL PSW */ /* if not Linux load the address of the (short) IPL PSW */
ipl_psw = rom_ptr(4, 4); ipl_psw = rom_ptr(4, 4);
if (ipl_psw) { if (ipl_psw) {
pentry = be32_to_cpu(*ipl_psw) & 0x7fffffffUL; pentry = be32_to_cpu(*ipl_psw) & PSW_MASK_SHORT_ADDR;
} else { } else {
error_setg(&err, "Could not get IPL PSW"); error_setg(&err, "Could not get IPL PSW");
goto error; goto error;

4
target/s390x/cpu.c
View File

@ -78,13 +78,13 @@ static void s390_cpu_load_normal(CPUState *s)
S390CPU *cpu = S390_CPU(s); S390CPU *cpu = S390_CPU(s);
uint64_t spsw = ldq_phys(s->as, 0); uint64_t spsw = ldq_phys(s->as, 0);
cpu->env.psw.mask = spsw & 0xffffffff80000000ULL; cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
/* /*
* Invert short psw indication, so SIE will report a specification * Invert short psw indication, so SIE will report a specification
* exception if it was not set. * exception if it was not set.
*/ */
cpu->env.psw.mask ^= PSW_MASK_SHORTPSW; cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
cpu->env.psw.addr = spsw & 0x7fffffffULL; cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu); s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
} }

3
target/s390x/cpu.h
View File

@ -276,7 +276,8 @@ extern const VMStateDescription vmstate_s390_cpu;
#define PSW_MASK_RI 0x0000008000000000ULL #define PSW_MASK_RI 0x0000008000000000ULL
#define PSW_MASK_64 0x0000000100000000ULL #define PSW_MASK_64 0x0000000100000000ULL
#define PSW_MASK_32 0x0000000080000000ULL #define PSW_MASK_32 0x0000000080000000ULL
#define PSW_MASK_ESA_ADDR 0x000000007fffffffULL #define PSW_MASK_SHORT_ADDR 0x000000007fffffffULL
#define PSW_MASK_SHORT_CTRL 0xffffffff80000000ULL
#undef PSW_ASC_PRIMARY #undef PSW_ASC_PRIMARY
#undef PSW_ASC_ACCREG #undef PSW_ASC_ACCREG