motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/s390x: Pass S390Access pointer into access_prepare

Browse source 
Passing a pointer from the caller down to access_prepare_nf
eliminates a structure copy.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20230109201856.3916639-3-richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Richard Henderson 2023-01-09 12:18:51 -08:00 • committed by Thomas Huth
parent 4049431478
commit 7ba5da818a
1 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

100
target/s390x/tcg/mem_helper.c
View file

@ -212,15 +212,14 @@ static int access_prepare_nf(S390Access *access, CPUS390XState *env,
return 0; return 0;
} }
static S390Access access_prepare(CPUS390XState *env, vaddr vaddr, int size, static inline void access_prepare(S390Access *ret, CPUS390XState *env,
MMUAccessType access_type, int mmu_idx, vaddr vaddr, int size,
uintptr_t ra) MMUAccessType access_type, int mmu_idx,
uintptr_t ra)
{ {
S390Access ret; int exc = access_prepare_nf(ret, env, false, vaddr, size,
int exc = access_prepare_nf(&ret, env, false, vaddr, size,
access_type, mmu_idx, ra); access_type, mmu_idx, ra);
assert(!exc); assert(!exc);
return ret;
} }
/* Helper to handle memset on a single page. */ /* Helper to handle memset on a single page. */
@ -412,9 +411,9 @@ static uint32_t do_helper_nc(CPUS390XState *env, uint32_t l, uint64_t dest,
/* NC always processes one more byte than specified - maximum is 256 */ /* NC always processes one more byte than specified - maximum is 256 */
l++; l++;
srca1 = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca1, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
srca2 = access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca2, env, dest, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
const uint8_t x = access_get_byte(env, &srca1, i, ra) & const uint8_t x = access_get_byte(env, &srca1, i, ra) &
access_get_byte(env, &srca2, i, ra); access_get_byte(env, &srca2, i, ra);
@ -446,9 +445,9 @@ static uint32_t do_helper_xc(CPUS390XState *env, uint32_t l, uint64_t dest,
/* XC always processes one more byte than specified - maximum is 256 */ /* XC always processes one more byte than specified - maximum is 256 */
l++; l++;
srca1 = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca1, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
srca2 = access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca2, env, dest, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
/* xor with itself is the same as memset(0) */ /* xor with itself is the same as memset(0) */
if (src == dest) { if (src == dest) {
@ -487,9 +486,9 @@ static uint32_t do_helper_oc(CPUS390XState *env, uint32_t l, uint64_t dest,
/* OC always processes one more byte than specified - maximum is 256 */ /* OC always processes one more byte than specified - maximum is 256 */
l++; l++;
srca1 = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca1, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
srca2 = access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca2, env, dest, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
const uint8_t x = access_get_byte(env, &srca1, i, ra) | const uint8_t x = access_get_byte(env, &srca1, i, ra) |
access_get_byte(env, &srca2, i, ra); access_get_byte(env, &srca2, i, ra);
@ -520,8 +519,8 @@ static uint32_t do_helper_mvc(CPUS390XState *env, uint32_t l, uint64_t dest,
/* MVC always copies one more byte than specified - maximum is 256 */ /* MVC always copies one more byte than specified - maximum is 256 */
l++; l++;
srca = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
/* /*
* "When the operands overlap, the result is obtained as if the operands * "When the operands overlap, the result is obtained as if the operands
@ -559,8 +558,8 @@ void HELPER(mvcrl)(CPUS390XState *env, uint64_t l, uint64_t dest, uint64_t src)
/* MVCRL always copies one more byte than specified - maximum is 256 */ /* MVCRL always copies one more byte than specified - maximum is 256 */
l++; l++;
srca = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = l - 1; i >= 0; i--) { for (i = l - 1; i >= 0; i--) {
uint8_t byte = access_get_byte(env, &srca, i, ra); uint8_t byte = access_get_byte(env, &srca, i, ra);
@ -580,8 +579,8 @@ void HELPER(mvcin)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
l++; l++;
src = wrap_address(env, src - l + 1); src = wrap_address(env, src - l + 1);
srca = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
const uint8_t x = access_get_byte(env, &srca, l - i - 1, ra); const uint8_t x = access_get_byte(env, &srca, l - i - 1, ra);
@ -600,9 +599,9 @@ void HELPER(mvn)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
/* MVN always copies one more byte than specified - maximum is 256 */ /* MVN always copies one more byte than specified - maximum is 256 */
l++; l++;
srca1 = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca1, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
srca2 = access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca2, env, dest, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
const uint8_t x = (access_get_byte(env, &srca1, i, ra) & 0x0f) | const uint8_t x = (access_get_byte(env, &srca1, i, ra) & 0x0f) |
(access_get_byte(env, &srca2, i, ra) & 0xf0); (access_get_byte(env, &srca2, i, ra) & 0xf0);
@ -623,8 +622,8 @@ void HELPER(mvo)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
S390Access srca, desta; S390Access srca, desta;
int i, j; int i, j;
srca = access_prepare(env, src, len_src, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, src, len_src, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, len_dest, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, len_dest, MMU_DATA_STORE, mmu_idx, ra);
/* Handle rightmost byte */ /* Handle rightmost byte */
byte_dest = cpu_ldub_data_ra(env, dest + len_dest - 1, ra); byte_dest = cpu_ldub_data_ra(env, dest + len_dest - 1, ra);
@ -656,9 +655,9 @@ void HELPER(mvz)(CPUS390XState *env, uint32_t l, uint64_t dest, uint64_t src)
/* MVZ always copies one more byte than specified - maximum is 256 */ /* MVZ always copies one more byte than specified - maximum is 256 */
l++; l++;
srca1 = access_prepare(env, src, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca1, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
srca2 = access_prepare(env, dest, l, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca2, env, dest, l, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, l, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, dest, l, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < l; i++) { for (i = 0; i < l; i++) {
const uint8_t x = (access_get_byte(env, &srca1, i, ra) & 0xf0) | const uint8_t x = (access_get_byte(env, &srca1, i, ra) & 0xf0) |
(access_get_byte(env, &srca2, i, ra) & 0x0f); (access_get_byte(env, &srca2, i, ra) & 0x0f);
@ -1002,8 +1001,8 @@ uint32_t HELPER(mvst)(CPUS390XState *env, uint32_t r1, uint32_t r2)
* this point). We might over-indicate watchpoints within the pages * this point). We might over-indicate watchpoints within the pages
* (if we ever care, we have to limit processing to a single byte). * (if we ever care, we have to limit processing to a single byte).
*/ */
srca = access_prepare(env, s, len, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, s, len, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, d, len, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, d, len, MMU_DATA_STORE, mmu_idx, ra);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
const uint8_t v = access_get_byte(env, &srca, i, ra); const uint8_t v = access_get_byte(env, &srca, i, ra);
@ -1090,19 +1089,19 @@ static inline uint32_t do_mvcl(CPUS390XState *env,
len = MIN(MIN(*srclen, -(*src | TARGET_PAGE_MASK)), len); len = MIN(MIN(*srclen, -(*src | TARGET_PAGE_MASK)), len);
*destlen -= len; *destlen -= len;
*srclen -= len; *srclen -= len;
srca = access_prepare(env, *src, len, MMU_DATA_LOAD, mmu_idx, ra); access_prepare(&srca, env, *src, len, MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, *dest, len, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, *dest, len, MMU_DATA_STORE, mmu_idx, ra);
access_memmove(env, &desta, &srca, ra); access_memmove(env, &desta, &srca, ra);
*src = wrap_address(env, *src + len); *src = wrap_address(env, *src + len);
*dest = wrap_address(env, *dest + len); *dest = wrap_address(env, *dest + len);
} else if (wordsize == 1) { } else if (wordsize == 1) {
/* Pad the remaining area */ /* Pad the remaining area */
*destlen -= len; *destlen -= len;
desta = access_prepare(env, *dest, len, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, *dest, len, MMU_DATA_STORE, mmu_idx, ra);
access_memset(env, &desta, pad, ra); access_memset(env, &desta, pad, ra);
*dest = wrap_address(env, *dest + len); *dest = wrap_address(env, *dest + len);
} else { } else {
desta = access_prepare(env, *dest, len, MMU_DATA_STORE, mmu_idx, ra); access_prepare(&desta, env, *dest, len, MMU_DATA_STORE, mmu_idx, ra);
/* The remaining length selects the padding byte. */ /* The remaining length selects the padding byte. */
for (i = 0; i < len; (*destlen)--, i++) { for (i = 0; i < len; (*destlen)--, i++) {
@ -1158,16 +1157,16 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2)
while (destlen) { while (destlen) {
cur_len = MIN(destlen, -(dest | TARGET_PAGE_MASK)); cur_len = MIN(destlen, -(dest | TARGET_PAGE_MASK));
if (!srclen) { if (!srclen) {
desta = access_prepare(env, dest, cur_len, MMU_DATA_STORE, mmu_idx, access_prepare(&desta, env, dest, cur_len,
ra); MMU_DATA_STORE, mmu_idx, ra);
access_memset(env, &desta, pad, ra); access_memset(env, &desta, pad, ra);
} else { } else {
cur_len = MIN(MIN(srclen, -(src | TARGET_PAGE_MASK)), cur_len); cur_len = MIN(MIN(srclen, -(src | TARGET_PAGE_MASK)), cur_len);
srca = access_prepare(env, src, cur_len, MMU_DATA_LOAD, mmu_idx, access_prepare(&srca, env, src, cur_len,
ra); MMU_DATA_LOAD, mmu_idx, ra);
desta = access_prepare(env, dest, cur_len, MMU_DATA_STORE, mmu_idx, access_prepare(&desta, env, dest, cur_len,
ra); MMU_DATA_STORE, mmu_idx, ra);
access_memmove(env, &desta, &srca, ra); access_memmove(env, &desta, &srca, ra);
src = wrap_address(env, src + cur_len); src = wrap_address(env, src + cur_len);
srclen -= cur_len; srclen -= cur_len;
@ -2272,8 +2271,8 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2,
return cc; return cc;
} }
srca = access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_PRIMARY_IDX, ra); access_prepare(&srca, env, a2, l, MMU_DATA_LOAD, MMU_PRIMARY_IDX, ra);
desta = access_prepare(env, a1, l, MMU_DATA_STORE, MMU_SECONDARY_IDX, ra); access_prepare(&desta, env, a1, l, MMU_DATA_STORE, MMU_SECONDARY_IDX, ra);
access_memmove(env, &desta, &srca, ra); access_memmove(env, &desta, &srca, ra);
return cc; return cc;
} }
@ -2306,9 +2305,8 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2,
} else if (!l) { } else if (!l) {
return cc; return cc;
} }
access_prepare(&srca, env, a2, l, MMU_DATA_LOAD, MMU_SECONDARY_IDX, ra);
srca = access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_SECONDARY_IDX, ra); access_prepare(&desta, env, a1, l, MMU_DATA_STORE, MMU_PRIMARY_IDX, ra);
desta = access_prepare(env, a1, l, MMU_DATA_STORE, MMU_PRIMARY_IDX, ra);
access_memmove(env, &desta, &srca, ra); access_memmove(env, &desta, &srca, ra);
return cc; return cc;
} }
@ -2649,10 +2647,12 @@ uint32_t HELPER(mvcos)(CPUS390XState *env, uint64_t dest, uint64_t src,
/* FIXME: Access using correct keys and AR-mode */ /* FIXME: Access using correct keys and AR-mode */
if (len) { if (len) {
S390Access srca = access_prepare(env, src, len, MMU_DATA_LOAD, S390Access srca, desta;
mmu_idx_from_as(src_as), ra);
S390Access desta = access_prepare(env, dest, len, MMU_DATA_STORE, access_prepare(&srca, env, src, len, MMU_DATA_LOAD,
mmu_idx_from_as(dest_as), ra); mmu_idx_from_as(src_as), ra);
access_prepare(&desta, env, dest, len, MMU_DATA_STORE,
mmu_idx_from_as(dest_as), ra);
access_memmove(env, &desta, &srca, ra); access_memmove(env, &desta, &srca, ra);
} }