From patchwork Mon Mar 26 16:50:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 132422 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp4064468ljb; Mon, 26 Mar 2018 09:53:31 -0700 (PDT) X-Google-Smtp-Source: AG47ELuX5WBx0SZhg8RMQtUF/iwjqeTrcxL/oDzsynsUg9n1eBl9Mv4JTmdGjOH7Dm48fdX1S9BJ X-Received: by 10.200.3.158 with SMTP id t30mr60155629qtg.259.1522083211407; Mon, 26 Mar 2018 09:53:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522083211; cv=none; d=google.com; s=arc-20160816; b=rLgt4Vo+G6Rn4Vuxv8X9PlfoQdlsPMDl84iUt0i+5Xo+Ljpr4FmhZBDzpRwQkykZlZ X6/W+Re1H34vp+HaPELTsQeMILztcV8SLDk4r/RPDqIhAAxc2YaXdKaNtZTKJuMk9CJT VcA4rIKJhGm2GxrgP3Jgizlxz81rZduQTsupsLPsI5502+WPLHbhmu5n515V/IKyLMo2 TmOn1BeyaaXQRiK2W0nwVJ5hlBvFdWt2Im4mTcHmY4M3QQhgsgqgT1R15aka3y3vm3n+ qn96hPe5HsTYoasrVmdu3fkb4oyETTEBOJF70ikmMdPvKFMsZjnYWYvWu+xklRYJkqFJ 4BRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=1o975ZELE85LvZ1J3dMSo3WrhC2pJGMyzhV+sPSgfS8=; b=mDlrEn40zguwZyQJi85TYRH4ikLeBA4C4pZoyhaIOjEOtvHSWeHh1SqMkoxYC5M2x5 nSO3G8XVhhx5icCuvW3isBxFW3FBURobuwHKZT++oQSdjqjSr4//JaFgZr6RkHFX8o+p j9OuKmkwQJQDTOJJ2UOF4yKExRJRhFA54oDgWbU3pIsZMvVIo4HfnviheLGrvwxnTxrv Jz6q2UzgricBS9UeguXx6xXFZ6A96kg5SySXIs0tex5kkrhu8SCVjcTg3FRHkrC19gYU 4znyHUk6va4hF58elJDQ4cbQI0sWk2xTSfhZTZdHDHrXttpQF/EcopqdBG22Vtq9yWb1 hfFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QjhMy8kz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x83si12601688qka.472.2018.03.26.09.53.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 26 Mar 2018 09:53:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QjhMy8kz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0VNC-0001qo-Ta for patch@linaro.org; Mon, 26 Mar 2018 12:53:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0VKd-0000p4-9x for qemu-devel@nongnu.org; Mon, 26 Mar 2018 12:50:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0VKc-0002E6-AL for qemu-devel@nongnu.org; Mon, 26 Mar 2018 12:50:51 -0400 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:43387) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0VKc-0002Dn-3Q for qemu-devel@nongnu.org; Mon, 26 Mar 2018 12:50:50 -0400 Received: by mail-pf0-x243.google.com with SMTP id j2so7738147pff.10 for ; Mon, 26 Mar 2018 09:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1o975ZELE85LvZ1J3dMSo3WrhC2pJGMyzhV+sPSgfS8=; b=QjhMy8kzqdVJ57egAI8cy2IGG6z80NxwDm3TAt9WITBsJkqQlfY7CImxh5T3wLjmoV SoXRWVR420itJawJmDC0YF24KGNnesRMACUQ4BX7AY//2KUuw6Dw5GrKMBEANOAjnS8L UGfe2H1eoFiqxgmkAaXv+2vOYahsQXWCtz2MY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1o975ZELE85LvZ1J3dMSo3WrhC2pJGMyzhV+sPSgfS8=; b=hLRg6AuOZOZsQda7viGqn6lBAUodK2MEzkBKhV3YBxfDtWdm3OutzDvBJ3SGuPWWHm Ihph5QRrEiYug4Qa1iZrBoAxIYddQEJtEYYzFn3rxAXUV+qfdCG2SHSgKSY1hNzQiERZ pfv5gGr9ZFvbL4PFugoVjEUHbs2AY01PoSj6Eyt3KSriNJ6S5fYZBg6znVWw6xOzbswa X/27mo5B5AqP2tq/dcv8sFIG6RaeMLEJdMnwXq9DOY+pOfOAnc6MQ1IWykBgqLQz/vH7 c5cTcYmw4WwBrm+os+tk6YCGqID8cNQ2n67t2mLl8Yxm26KVBh/FVsXA9KRseBBs7y4r znvw== X-Gm-Message-State: AElRT7FG/SUu2pup/R8ntlKtyH7r2qSqR3He7zgJfRjebKs4HO5BodD1 93ZK2X6oEK8gd+tRvhoI3lqCQRXS1VE= X-Received: by 10.99.100.68 with SMTP id y65mr29438517pgb.257.1522083048465; Mon, 26 Mar 2018 09:50:48 -0700 (PDT) Received: from cloudburst.twiddle.net ([120.145.12.109]) by smtp.gmail.com with ESMTPSA id e3sm31691803pfe.125.2018.03.26.09.50.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Mar 2018 09:50:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 27 Mar 2018 00:50:30 +0800 Message-Id: <20180326165030.875-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180326165030.875-1-richard.henderson@linaro.org> References: <20180326165030.875-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL 1/1] target/hppa: Include priv level in user-only iaoq X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" A recent glibc change relies on the fact that the iaoq must be 3, and computes an address based on that. QEMU had been ignoring the priv level for user-only, which produced an incorrect address. Reported-by: John David Anglin Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 4 ++-- target/hppa/translate.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 19dd12a93e..861bbb1f16 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -305,8 +305,8 @@ static inline void cpu_get_tb_cpu_state(CPUHPPAState *env, target_ulong *pc, incomplete virtual address. This also means that we must separate out current cpu priviledge from the low bits of IAOQ_F. */ #ifdef CONFIG_USER_ONLY - *pc = env->iaoq_f; - *cs_base = env->iaoq_b; + *pc = env->iaoq_f & -4; + *cs_base = env->iaoq_b & -4; #else /* ??? E, T, H, L, B, P bits need to be here, when implemented. */ flags |= env->psw & (PSW_W | PSW_C | PSW_D); diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 6499b392f9..c532889b1f 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -1909,9 +1909,6 @@ static DisasJumpType do_ibranch(DisasContext *ctx, TCGv_reg dest, */ static TCGv_reg do_ibranch_priv(DisasContext *ctx, TCGv_reg offset) { -#ifdef CONFIG_USER_ONLY - return offset; -#else TCGv_reg dest; switch (ctx->privilege) { case 0: @@ -1931,7 +1928,6 @@ static TCGv_reg do_ibranch_priv(DisasContext *ctx, TCGv_reg offset) break; } return dest; -#endif } #ifdef CONFIG_USER_ONLY @@ -1967,7 +1963,7 @@ static DisasJumpType do_page_zero(DisasContext *ctx) goto do_sigill; } - switch (ctx->iaoq_f) { + switch (ctx->iaoq_f & -4) { case 0x00: /* Null pointer call */ gen_excp_1(EXCP_IMP); return DISAS_NORETURN; @@ -1978,7 +1974,7 @@ static DisasJumpType do_page_zero(DisasContext *ctx) case 0xe0: /* SET_THREAD_POINTER */ tcg_gen_st_reg(cpu_gr[26], cpu_env, offsetof(CPUHPPAState, cr[27])); - tcg_gen_mov_reg(cpu_iaoq_f, cpu_gr[31]); + tcg_gen_ori_reg(cpu_iaoq_f, cpu_gr[31], 3); tcg_gen_addi_reg(cpu_iaoq_b, cpu_iaoq_f, 4); return DISAS_IAQ_N_UPDATED; @@ -4697,8 +4693,8 @@ static int hppa_tr_init_disas_context(DisasContextBase *dcbase, #ifdef CONFIG_USER_ONLY ctx->privilege = MMU_USER_IDX; ctx->mmu_idx = MMU_USER_IDX; - ctx->iaoq_f = ctx->base.pc_first; - ctx->iaoq_b = ctx->base.tb->cs_base; + ctx->iaoq_f = ctx->base.pc_first | MMU_USER_IDX; + ctx->iaoq_b = ctx->base.tb->cs_base | MMU_USER_IDX; #else ctx->privilege = (ctx->tb_flags >> TB_FLAG_PRIV_SHIFT) & 3; ctx->mmu_idx = (ctx->tb_flags & PSW_D ? ctx->privilege : MMU_PHYS_IDX);