From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQJRd-00022D-U7 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 12:34:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQJRZ-0002Yb-BO for qemu-devel@nongnu.org; Wed, 19 Mar 2014 12:34:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQJRZ-0002YW-24 for qemu-devel@nongnu.org; Wed, 19 Mar 2014 12:34:17 -0400 Message-ID: <5329C6EF.5060503@redhat.com> Date: Wed, 19 Mar 2014 17:33:51 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1394801281-18997-1-git-send-email-james.hogan@imgtec.com> <1394801281-18997-4-git-send-email-james.hogan@imgtec.com> In-Reply-To: <1394801281-18997-4-git-send-email-james.hogan@imgtec.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 03/10] target-mips: get_physical_address: Add defines for segment bases List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: James Hogan , qemu-devel@nongnu.org Cc: Sanjay Lal , Gleb Natapov , Aurelien Jarno , kvm@vger.kernel.org Il 14/03/2014 13:47, James Hogan ha scritto: > Add preprocessor definitions for 32bit segment bases for use in > get_physical_address(). These will also be taken advantage of in the > next patch which adds KVM awareness. > > Signed-off-by: James Hogan > Reviewed-by: Aurelien Jarno > --- > target-mips/helper.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/target-mips/helper.c b/target-mips/helper.c > index b28ae9b..2b30fc2 100644 > --- a/target-mips/helper.c > +++ b/target-mips/helper.c > @@ -118,7 +118,13 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical, > qemu_log("user mode %d h %08x\n", user_mode, env->hflags); > #endif > > - if (address <= (int32_t)0x7FFFFFFFUL) { > +#define USEG_LIMIT 0x7FFFFFFFUL > +#define KSEG0_BASE 0x80000000UL > +#define KSEG1_BASE 0xA0000000UL > +#define KSEG2_BASE 0xC0000000UL > +#define KSEG3_BASE 0xE0000000UL > + Please put these outside the function. (Same for those in patch 4). > + if (address <= USEG_LIMIT) { > /* useg */ > if (env->CP0_Status & (1 << CP0St_ERL)) { > *physical = address & 0xFFFFFFFF; > @@ -160,23 +166,23 @@ static int get_physical_address (CPUMIPSState *env, hwaddr *physical, > ret = TLBRET_BADADDR; > } > #endif > - } else if (address < (int32_t)0xA0000000UL) { > + } else if (address < (int32_t)KSEG1_BASE) { > /* kseg0 */ > if (kernel_mode) { > - *physical = address - (int32_t)0x80000000UL; > + *physical = address - (int32_t)KSEG0_BASE; > *prot = PAGE_READ | PAGE_WRITE; > } else { > ret = TLBRET_BADADDR; > } > - } else if (address < (int32_t)0xC0000000UL) { > + } else if (address < (int32_t)KSEG2_BASE) { > /* kseg1 */ > if (kernel_mode) { > - *physical = address - (int32_t)0xA0000000UL; > + *physical = address - (int32_t)KSEG1_BASE; > *prot = PAGE_READ | PAGE_WRITE; > } else { > ret = TLBRET_BADADDR; > } > - } else if (address < (int32_t)0xE0000000UL) { > + } else if (address < (int32_t)KSEG3_BASE) { > /* sseg (kseg2) */ > if (supervisor_mode || kernel_mode) { > ret = env->tlb->map_address(env, physical, prot, address, rw, access_type); >