Message ID | 20190118145805.6852-29-peter.maydell@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="J7b+m9xI"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43h4hJ3fnJz9sCs for <incoming@patchwork.ozlabs.org>; Sat, 19 Jan 2019 02:32:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:41522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1gkW8U-0006Cx-8u for incoming@patchwork.ozlabs.org; Fri, 18 Jan 2019 10:32:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbY-0002od-Cq for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbV-0007RT-26 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:44 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38103) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1gkVbU-0007QK-Q3 for qemu-devel@nongnu.org; Fri, 18 Jan 2019 09:58:40 -0500 Received: by mail-wm1-x332.google.com with SMTP id m22so4809925wml.3 for <qemu-devel@nongnu.org>; Fri, 18 Jan 2019 06:58:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rgYl7iFi/SFzVLdAXpYU+mmUKKF5k+cFQF/xUVCDN+Q=; b=J7b+m9xIUrf596Q3bBT/kDNSi8TIyShjxlChczCby5ve/Ne/XFdt4iOlqpXbwU0jti 9n2evxeaUYb/NSROYckkz9vuLZtCpU9pO25yJ2V/oCx9FAwl0/UeneBGrsVVPGxfDL2W jwX29LQUvztB5VLIlRnNVADZGag94+mSjkWz8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rgYl7iFi/SFzVLdAXpYU+mmUKKF5k+cFQF/xUVCDN+Q=; b=gXkvFf8+lV6RmwS8BxDjphtGa+AgexISTpObjs+cuTzoCnanlk+4BCv0QAvPzIfM3m pQqMHJ9YC4FA2Y8E9X46IQzA/8QNltd1RbE6PjmmA82j7i6bInFB2d0c1AsbDAYilFen wnpVQPAq0ou9YutI+32mqSnCFJzFoJ8AJtEWNwnCSpWLW1G4ABDFTBIQZQOlWKYau25Q YVUHjnTkBbEgF2Gm9FbNhGKNCA9aDiYcgN9yMxcP+fCmIt4EoiTSOSUKjH5mD0BouKnZ lBhZb3s324695T4wbHLEDX069nhLPvPam8C0SsVn4gtxD2MikmhDk/wcZcK/8vWJQOdb CcjQ== X-Gm-Message-State: AJcUukd16+FPajGPjRoM4S4aHoG+yUSuezP5fQHqeFZKhwiZGONNU1vS MeMm1VwElIOyMcf/f6oKMAgVl888kujgYw== X-Google-Smtp-Source: ALg8bN4fZpsRDidHI574SIDax5rDT2bKfAF+qGemmtk7Rld3wVMhSlcur4HjRgwpfmhiUKLyrdig+g== X-Received: by 2002:a1c:e913:: with SMTP id q19mr16353197wmc.55.1547823519319; Fri, 18 Jan 2019 06:58:39 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e27sm92094561wra.67.2019.01.18.06.58.38 for <qemu-devel@nongnu.org> (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Jan 2019 06:58:38 -0800 (PST) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 18 Jan 2019 14:57:44 +0000 Message-Id: <20190118145805.6852-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190118145805.6852-1-peter.maydell@linaro.org> References: <20190118145805.6852-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::332 Subject: [Qemu-devel] [PULL 28/49] target/arm: Implement pauth_strip X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,01/49] hw/char/stm32f2xx_usart: Do not update data register when device is disabled
|
expand
|
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index 902f68a24cc..e02376a2d02 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -38,6 +38,15 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_t ptr, uint64_t modifier, g_assert_not_reached(); /* FIXME */ } +static uint64_t pauth_original_ptr(uint64_t ptr, ARMVAParameters param) +{ + uint64_t extfield = -param.select; + int bot_pac_bit = 64 - param.tsz; + int top_pac_bit = 64 - 8 * param.tbi; + + return deposit64(ptr, bot_pac_bit, top_pac_bit - bot_pac_bit, extfield); +} + static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier, ARMPACKey *key, bool data, int keynumber) { @@ -46,7 +55,10 @@ static uint64_t pauth_auth(CPUARMState *env, uint64_t ptr, uint64_t modifier, static uint64_t pauth_strip(CPUARMState *env, uint64_t ptr, bool data) { - g_assert_not_reached(); /* FIXME */ + ARMMMUIdx mmu_idx = arm_stage1_mmu_idx(env); + ARMVAParameters param = aa64_va_parameters(env, ptr, mmu_idx, data); + + return pauth_original_ptr(ptr, param); } static void QEMU_NORETURN pauth_trap(CPUARMState *env, int target_el,