diff options
| author | David Hildenbrand | 2017-08-18 13:43:45 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-08-30 18:23:25 +0200 |
| commit | 12e1e8f1aa3e79f408adadaaaff2148e56ba5068 (patch) | |
| tree | 99fbb82229fa4a2a67df1b2976f80737c30bb759 | |
| parent | target/s390x: move cc_name() to helper.c (diff) | |
| download | qemu-12e1e8f1aa3e79f408adadaaaff2148e56ba5068.tar.gz qemu-12e1e8f1aa3e79f408adadaaaff2148e56ba5068.tar.xz qemu-12e1e8f1aa3e79f408adadaaaff2148e56ba5068.zip | |
target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c
Only used in that file.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-11-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | target/s390x/cpu.h | 14 | ||||
| -rw-r--r-- | target/s390x/excp_helper.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 10208ecbbb..c71a4bf0c4 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -393,20 +393,6 @@ static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch) } } -static inline uint64_t cpu_mmu_idx_to_asc(int mmu_idx) -{ - switch (mmu_idx) { - case MMU_PRIMARY_IDX: - return PSW_ASC_PRIMARY; - case MMU_SECONDARY_IDX: - return PSW_ASC_SECONDARY; - case MMU_HOME_IDX: - return PSW_ASC_HOME; - default: - abort(); - } -} - static inline void cpu_get_tb_cpu_state(CPUS390XState* env, target_ulong *pc, target_ulong *cs_base, uint32_t *flags) { diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index d1833772d5..db86259188 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -68,6 +68,20 @@ int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr address, #else /* !CONFIG_USER_ONLY */ +static inline uint64_t cpu_mmu_idx_to_asc(int mmu_idx) +{ + switch (mmu_idx) { + case MMU_PRIMARY_IDX: + return PSW_ASC_PRIMARY; + case MMU_SECONDARY_IDX: + return PSW_ASC_SECONDARY; + case MMU_HOME_IDX: + return PSW_ASC_HOME; + default: + abort(); + } +} + int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, int rw, int mmu_idx) { |