[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/33] s390x/tcg: move wrap_address() to internal.h
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 02/33] s390x/tcg: move wrap_address() to internal.h |
Date: |
Fri, 6 Oct 2017 11:59:25 +0200 |
From: David Hildenbrand <address@hidden>
We want to use it in another file.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target/s390x/internal.h | 14 ++++++++++++++
target/s390x/mem_helper.c | 14 --------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/target/s390x/internal.h b/target/s390x/internal.h
index bc8f83129a..70d2b87e55 100644
--- a/target/s390x/internal.h
+++ b/target/s390x/internal.h
@@ -162,6 +162,20 @@ static inline uint8_t get_per_atmid(CPUS390XState *env)
((env->psw.mask & PSW_ASC_ACCREG) ? (1 << 2) : 0);
}
+static inline uint64_t wrap_address(CPUS390XState *env, uint64_t a)
+{
+ if (!(env->psw.mask & PSW_MASK_64)) {
+ if (!(env->psw.mask & PSW_MASK_32)) {
+ /* 24-Bit mode */
+ a &= 0x00ffffff;
+ } else {
+ /* 31-Bit mode */
+ a &= 0x7fffffff;
+ }
+ }
+ return a;
+}
+
/* CC optimization */
/* Instead of computing the condition codes after each x86 instruction,
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index ec4760e390..a254613dc2 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -122,20 +122,6 @@ static inline void cpu_stsize_data_ra(CPUS390XState *env,
uint64_t addr,
}
}
-static inline uint64_t wrap_address(CPUS390XState *env, uint64_t a)
-{
- if (!(env->psw.mask & PSW_MASK_64)) {
- if (!(env->psw.mask & PSW_MASK_32)) {
- /* 24-Bit mode */
- a &= 0x00ffffff;
- } else {
- /* 31-Bit mode */
- a &= 0x7fffffff;
- }
- }
- return a;
-}
-
static void fast_memset(CPUS390XState *env, uint64_t dest, uint8_t byte,
uint32_t l, uintptr_t ra)
{
--
2.13.6
- [Qemu-devel] [PULL 00/33] next batch of s390x patches, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 02/33] s390x/tcg: move wrap_address() to internal.h,
Cornelia Huck <=
- [Qemu-devel] [PULL 01/33] s390x/tcg: implement spm (SET PROGRAM MASK), Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 03/33] s390x/tcg: add basic MSA features, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 06/33] s390x/css: introduce css data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 04/33] s390x: use generic cpu_model parsing, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 05/33] s390x/kvm: fix and cleanup storing CPU status, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 07/33] s390x/css: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 08/33] virtio-ccw: use ccw data stream, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 09/33] 390x/css: introduce maximum data address checking, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 11/33] s390x/tcg: fix checking for invalid memory check, Cornelia Huck, 2017/10/06
- [Qemu-devel] [PULL 10/33] s390x/css: support ccw IDA, Cornelia Huck, 2017/10/06