[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to mem_help
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to mem_helper.c |
Date: |
Wed, 30 Aug 2017 18:52:41 +0200 |
From: David Hildenbrand <address@hidden>
Only used in that file.
Reviewed-by: Thomas Huth <address@hidden>
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/cpu.h | 11 -----------
target/s390x/mem_helper.c | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index c71a4bf0c4..8300cb219d 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -366,17 +366,6 @@ void s390x_cpu_debug_excp_handler(CPUState *cs);
#define MMU_SECONDARY_IDX 1
#define MMU_HOME_IDX 2
-static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)
-{
- uint16_t pkm = env->cregs[3] >> 16;
-
- if (env->psw.mask & PSW_MASK_PSTATE) {
- /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */
- return pkm & (0x80 >> psw_key);
- }
- return true;
-}
-
static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)
{
switch (env->psw.mask & PSW_MASK_ASC) {
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index c71dce4b1e..b91c7402c4 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -56,6 +56,17 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType
access_type,
#define HELPER_LOG(x...)
#endif
+static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)
+{
+ uint16_t pkm = env->cregs[3] >> 16;
+
+ if (env->psw.mask & PSW_MASK_PSTATE) {
+ /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */
+ return pkm & (0x80 >> psw_key);
+ }
+ return true;
+}
+
/* Reduce the length so that addr + len doesn't cross a page boundary. */
static inline uint32_t adj_len_to_page(uint32_t len, uint64_t addr)
{
--
2.13.5
- [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(), (continued)
- [Qemu-devel] [PULL 23/44] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 24/44] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 25/44] target/s390x: simplify ri_allowed(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 26/44] target/s390x: simplify gs_allowed(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 28/44] s390x/cpumodel: factor out determination of default model name, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 29/44] s390x: drop inclusion of sysemu/kvm.h from some files, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 30/44] target/s390x: move gtod_*() declarations to s390-virtio.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 32/44] target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 31/44] target/s390x: move cc_name() to helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to mem_helper.c,
Cornelia Huck <=
- [Qemu-devel] [PULL 34/44] target/s390x: move s390_do_cpu_reset() to diag.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 35/44] target/s390x: move get_per_in_range() to misc_helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 36/44] target/s390x: introduce internal.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions outside of target/s390x/, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 37/44] target/s390x: move a couple of functions to cpu.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 39/44] s390x/kvm: move KVM declarations and stubs to separate files, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 41/44] s390x/s390-stattrib: Mark the storage attribute as not user_creatable, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 42/44] s390-ccw: Fix alignment for CCW1, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 40/44] target/s390x: cleanup cpu.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 44/44] s390x/pci: fixup trap_msix(), Cornelia Huck, 2017/08/30