diff options
| author | David Hildenbrand | 2017-08-18 13:43:48 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-08-30 18:23:25 +0200 |
| commit | d9b8daf9963821ab9a5c812f989f27344ddc10fa (patch) | |
| tree | 78b01ad942c477f9e7bf8b8fd306249b84cca57a | |
| parent | target/s390x: move s390_do_cpu_reset() to diag.c (diff) | |
| download | qemu-d9b8daf9963821ab9a5c812f989f27344ddc10fa.tar.gz qemu-d9b8daf9963821ab9a5c812f989f27344ddc10fa.tar.xz qemu-d9b8daf9963821ab9a5c812f989f27344ddc10fa.zip | |
target/s390x: move get_per_in_range() to misc_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-14-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | target/s390x/cpu.h | 11 | ||||
| -rw-r--r-- | target/s390x/misc_helper.c | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 9cdce6c6bd..55aab52f84 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -438,17 +438,6 @@ static inline uint8_t get_per_atmid(CPUS390XState *env) ((env->psw.mask & PSW_ASC_ACCREG)? (1 << 2) : 0); } -/* Check if an address is within the PER starting address and the PER - ending address. The address range might loop. */ -static inline bool get_per_in_range(CPUS390XState *env, uint64_t addr) -{ - if (env->cregs[10] <= env->cregs[11]) { - return env->cregs[10] <= addr && addr <= env->cregs[11]; - } else { - return env->cregs[10] <= addr || addr <= env->cregs[11]; - } -} - S390CPU *cpu_s390x_init(const char *cpu_model); S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp); S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp); diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 34d730ba73..d5497cbcba 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -455,6 +455,17 @@ void HELPER(per_check_exception)(CPUS390XState *env) } } +/* Check if an address is within the PER starting address and the PER + ending address. The address range might loop. */ +static inline bool get_per_in_range(CPUS390XState *env, uint64_t addr) +{ + if (env->cregs[10] <= env->cregs[11]) { + return env->cregs[10] <= addr && addr <= env->cregs[11]; + } else { + return env->cregs[10] <= addr || addr <= env->cregs[11]; + } +} + void HELPER(per_branch)(CPUS390XState *env, uint64_t from, uint64_t to) { if ((env->cregs[9] & PER_CR9_EVENT_BRANCH)) { |