ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x/ioinst: Throw addressing exception when memory_map failed 

So far, the IO instructions were throwing specification exceptions when
there was a problem with accessing the memory. However, the better way
is to throw an addressing exception instead.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Thomas Huth 2013-06-21 13:12:45 +02:00 committed by Christian Borntraeger
parent 61bf0dcb2e
commit 0056fc9e44
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target-s390x/ioinst.c
View File

@ -163,7 +163,7 @@ int ioinst_handle_msch(CPUS390XState *env, uint64_t reg1, uint32_t ipb)
} }
schib = s390_cpu_physical_memory_map(env, addr, &len, 0); schib = s390_cpu_physical_memory_map(env, addr, &len, 0);
if (!schib || len != sizeof(*schib)) { if (!schib || len != sizeof(*schib)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
cc = -EIO; cc = -EIO;
goto out; goto out;
} }
@ -238,7 +238,7 @@ int ioinst_handle_ssch(CPUS390XState *env, uint64_t reg1, uint32_t ipb)
} }
orig_orb = s390_cpu_physical_memory_map(env, addr, &len, 0); orig_orb = s390_cpu_physical_memory_map(env, addr, &len, 0);
if (!orig_orb || len != sizeof(*orig_orb)) { if (!orig_orb || len != sizeof(*orig_orb)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
cc = -EIO; cc = -EIO;
goto out; goto out;
} }
@ -286,7 +286,7 @@ int ioinst_handle_stcrw(CPUS390XState *env, uint32_t ipb)
} }
crw = s390_cpu_physical_memory_map(env, addr, &len, 1); crw = s390_cpu_physical_memory_map(env, addr, &len, 1);
if (!crw || len != sizeof(*crw)) { if (!crw || len != sizeof(*crw)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
cc = -EIO; cc = -EIO;
goto out; goto out;
} }
@ -318,7 +318,7 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb)
} }
schib = s390_cpu_physical_memory_map(env, addr, &len, 1); schib = s390_cpu_physical_memory_map(env, addr, &len, 1);
if (!schib || len != sizeof(*schib)) { if (!schib || len != sizeof(*schib)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
cc = -EIO; cc = -EIO;
goto out; goto out;
} }
@ -367,7 +367,7 @@ int ioinst_handle_tsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb)
} }
irb = s390_cpu_physical_memory_map(env, addr, &len, 1); irb = s390_cpu_physical_memory_map(env, addr, &len, 1);
if (!irb || len != sizeof(*irb)) { if (!irb || len != sizeof(*irb)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
cc = -EIO; cc = -EIO;
goto out; goto out;
} }
@ -600,7 +600,7 @@ int ioinst_handle_chsc(CPUS390XState *env, uint32_t ipb)
} }
req = s390_cpu_physical_memory_map(env, addr, &map_size, 1); req = s390_cpu_physical_memory_map(env, addr, &map_size, 1);
if (!req || map_size != TARGET_PAGE_SIZE) { if (!req || map_size != TARGET_PAGE_SIZE) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }
@ -655,7 +655,7 @@ int ioinst_handle_tpi(CPUS390XState *env, uint32_t ipb)
orig_len = len; orig_len = len;
int_code = s390_cpu_physical_memory_map(env, addr, &len, 1); int_code = s390_cpu_physical_memory_map(env, addr, &len, 1);
if (!int_code || (len != orig_len)) { if (!int_code || (len != orig_len)) {
program_interrupt(env, PGM_SPECIFICATION, 2); program_interrupt(env, PGM_ADDRESSING, 2);
ret = -EIO; ret = -EIO;
goto out; goto out;
} }