From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47625) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diH0l-0006Zb-5U for qemu-devel@nongnu.org; Thu, 17 Aug 2017 05:22:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diH0k-0000J9-8L for qemu-devel@nongnu.org; Thu, 17 Aug 2017 05:22:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44800) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diH0k-0000IU-1V for qemu-devel@nongnu.org; Thu, 17 Aug 2017 05:22:42 -0400 From: David Hildenbrand Date: Thu, 17 Aug 2017 11:22:20 +0200 Message-Id: <20170817092225.4264-6-david@redhat.com> In-Reply-To: <20170817092225.4264-1-david@redhat.com> References: <20170817092225.4264-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v1 for-2.11 05/10] target/s390x: move get_per_in_range() to misc_helper.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rth@twiddle.net, Aurelien Jarno , thuth@redhat.com, cohuck@redhat.com, david@redhat.com, borntraeger@de.ibm.com Only used in that file. Signed-off-by: David Hildenbrand --- target/s390x/cpu.h | 11 ----------- 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 d8bc134..ca10f0a 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 d23ffcd..ab0c53d 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -451,6 +451,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)) { -- 2.9.4