From patchwork Fri Jul 30 18:28:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12411743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C800C4338F for ; Fri, 30 Jul 2021 18:29:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E063560F4B for ; Fri, 30 Jul 2021 18:29:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E063560F4B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9XGQ-0005fQ-Vi for qemu-devel@archiver.kernel.org; Fri, 30 Jul 2021 14:29:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9XFD-0003dD-F9 for qemu-devel@nongnu.org; Fri, 30 Jul 2021 14:28:27 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:46785) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9XFC-0002GP-0d for qemu-devel@nongnu.org; Fri, 30 Jul 2021 14:28:27 -0400 Received: by mail-pj1-x1033.google.com with SMTP id g23-20020a17090a5797b02901765d605e14so15570650pji.5 for ; Fri, 30 Jul 2021 11:28:25 -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 :mime-version:content-transfer-encoding; bh=w06bUv5LRjs6n6zmJVqpQJN5oZD2CyZbJSw31pPYfbA=; b=bhyVNQ7qOH5DeI9nAKMQzZANzYheKf/D1JMww4Wpl4Wmx9P7jNO72EfX4uyuaTUg7Z RGUKsPqREx/ztKDQxeA/shxEgZLfj7SqD7bK3dxjLcahwpJP+0Gx2TwDgwx7Z0tO1AO1 P8b66FUKtta0moubjKhC2xCa4i2UIIL3iPlZ4Lk9ziDUnksYFqb6yICTsfxFf/pvW8P9 i37F8362eVUBqvDEHiCnTaf19WU4HDHayEC4VoLnQvyYBKF5vdTfqdYmQ0F/RXuLKZ73 JoEv6hDiIUKEeoMFeRNSgFB+30m0l9EiEZL+mAKRiwfUPRWffPyHmQj/Aep+BbRqWAiV dd9A== 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:mime-version:content-transfer-encoding; bh=w06bUv5LRjs6n6zmJVqpQJN5oZD2CyZbJSw31pPYfbA=; b=TVZ3NJ9C2BYnJEtUQXTKrNRPOLCKONlpYccj3AiTppRkfiu71O0+peCNQDfbnTRgqY xeCjPeq9NOjyDeXd2Ol2pxxLzRoAo+8rD/JZSGvSucuyHoLT+YQdOV7KUXEflST+sa6Z vdf32cjKQYbNTm8EfCvMODMI3k9LF1yMoF0o1HUKqS+PJnfywomCpr3VcKiH1Bf8EBra w+3B25OoZDcEfgi+o+lnORJnlicPX9x4g80vAhc+aE62TJGqK3vpdQxSJQTjF64gnix3 GHsHamdLCJvxO7AFEKiahi7gnG1bKl3r/Wf8M0Lwqb1Ph43vyAixtkQX5jo4qTIBZ5Kf n7/w== X-Gm-Message-State: AOAM53134H7zZNQf2gYpz/WKBy9s/4UVkHXFEvJxpdNZGZm5LGHw5ytR Q+GYHxmMgJSIbf/kVC/5Y5J2oCwHQ/Dazg== X-Google-Smtp-Source: ABdhPJwnyFn9iAt/FKosel0Jh+3B4/0gopvGZzbcpdy85OCGzw5AzhdcVXvT4Td32mRa0yvJzuNMOw== X-Received: by 2002:a62:dd83:0:b029:30f:d69:895f with SMTP id w125-20020a62dd830000b029030f0d69895fmr3869627pff.17.1627669704623; Fri, 30 Jul 2021 11:28:24 -0700 (PDT) Received: from cloudburst.home (2603-800c-3202-ffa7-c4c7-6719-c57e-8ffe.res6.spectrum.com. [2603:800c:3202:ffa7:c4c7:6719:c57e:8ffe]) by smtp.gmail.com with ESMTPSA id k16sm3004185pfu.83.2021.07.30.11.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 11:28:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 1/2] accel/tcg: Remove double bswap for helper_atomic_sto_*_mmu Date: Fri, 30 Jul 2021 08:28:19 -1000 Message-Id: <20210730182820.451248-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210730182820.451248-1-richard.henderson@linaro.org> References: <20210730182820.451248-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This crept in as either a cut-and-paste error, or rebase error. Fixes: cfec388518d ("atomic_template: add inline trace/plugin helpers") Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210729004647.282017-24-richard.henderson@linaro.org> Signed-off-by: Richard Henderson --- accel/tcg/atomic_template.h | 1 - 1 file changed, 1 deletion(-) diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h index d89af4cc1e..8098a1be31 100644 --- a/accel/tcg/atomic_template.h +++ b/accel/tcg/atomic_template.h @@ -251,7 +251,6 @@ void ATOMIC_NAME(st)(CPUArchState *env, target_ulong addr, ABI_TYPE val, PAGE_WRITE, retaddr); uint16_t info = atomic_trace_st_pre(env, addr, oi); - val = BSWAP(val); val = BSWAP(val); atomic16_set(haddr, val); ATOMIC_MMU_CLEANUP; From patchwork Fri Jul 30 18:28:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12411745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C50D2C432BE for ; Fri, 30 Jul 2021 18:29:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F88360F4B for ; Fri, 30 Jul 2021 18:29:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5F88360F4B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:53752 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9XGS-0005kE-Gp for qemu-devel@archiver.kernel.org; Fri, 30 Jul 2021 14:29:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9XFF-0003fW-0l for qemu-devel@nongnu.org; Fri, 30 Jul 2021 14:28:29 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:53189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9XFD-0002HM-1N for qemu-devel@nongnu.org; Fri, 30 Jul 2021 14:28:28 -0400 Received: by mail-pj1-x1033.google.com with SMTP id nh14so4709587pjb.2 for ; Fri, 30 Jul 2021 11:28:26 -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 :mime-version:content-transfer-encoding; bh=wkE3dQf5TIvMZgo2onGkpvFXTYfGsfBXurvbs76LBNQ=; b=sRtOpnbELr4HJZfY24dYbi/AT1N4D/foyRDx5VytkvTt8pzAiIZDFRus00HW0Vo7+/ 3Q36CVcLeCJMU5v4GoZIH4YX5qphn2y5KZsspRuqZ3ARwAQIHff5M8a+H5gtPE8luN2/ yOt3r7gHmv9R2GyDpEtxagNhqhjkKBeyNDnfx7+TEHBynUDnn1hZtff7i0DuYufSI95z D9s9zCeRu3oQme9MGF4HEIaAjMcXEdnM0LMAEEHrge6ZAjwdMG2Q+uKAOs6C7nUVjF94 3p6HPkKbYqZhn9rMASMNsyvzUGF2R7swtpkgi0nHf66XiUpN09PBdNDKS/kwSNmaKeu5 +cEA== 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:mime-version:content-transfer-encoding; bh=wkE3dQf5TIvMZgo2onGkpvFXTYfGsfBXurvbs76LBNQ=; b=dctEnFCAY2Ik19LHF97kt7m/WPWhOQk/z7lHc3fKcAFWbfxvi4e2Ed6EqByKcvkK0K i7EYWVQwiPdMcmqgYUYT0U1AXgc0ZzqIetzsfGLpLdXnO0mdkEqmzpqQdCpfWNEFQtol rmcoOBjP49z9Nb3b2XzCvpoRh34AtzLfsftP2G1pV6zGajLT0tYIfXuDg29YhxZ0Fb8V RAt+/PHJFPBOInLFPFk4k0AdOokRXbwhQYa9xOhGX9fb6is11g9v1xMfX/UVLCn50CxE VtmNhZQFuGmjzqVvz7MTk30KhosVjeLcdKOQpTNAcKDu7ZeJOQYrnbHint6cyoZHMlY8 Xc7w== X-Gm-Message-State: AOAM533IFm4cq0rZHsh0yBj1BJeAPE0ETuBsKDIbZMiEoDhdsBW76x8x u79J0eTdaNBDNvO7Oo1Ov+1KuwuOoISrAQ== X-Google-Smtp-Source: ABdhPJw3Nhql5xpPpl7CNFSBvZxRW1MCSY4x6XgZ4uWFn83zvZ2iEXuThRE3Iunm3np/KG56Ro7tag== X-Received: by 2002:a62:5a46:0:b029:3ab:9434:4eca with SMTP id o67-20020a625a460000b02903ab94344ecamr4214005pfb.39.1627669705882; Fri, 30 Jul 2021 11:28:25 -0700 (PDT) Received: from cloudburst.home (2603-800c-3202-ffa7-c4c7-6719-c57e-8ffe.res6.spectrum.com. [2603:800c:3202:ffa7:c4c7:6719:c57e:8ffe]) by smtp.gmail.com with ESMTPSA id k16sm3004185pfu.83.2021.07.30.11.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 11:28:25 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/2] target/nios2: Mark raise_exception() as noreturn Date: Fri, 30 Jul 2021 08:28:20 -1000 Message-Id: <20210730182820.451248-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210730182820.451248-1-richard.henderson@linaro.org> References: <20210730182820.451248-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Raised exceptions don't return, so mark the helper with noreturn. Fixes: 032c76bc6f9 ("nios2: Add architecture emulation support") Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210729101315.2318714-1-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/nios2/helper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/nios2/helper.h b/target/nios2/helper.h index b0cb9146a5..6c8f0b5b35 100644 --- a/target/nios2/helper.h +++ b/target/nios2/helper.h @@ -18,7 +18,7 @@ * */ -DEF_HELPER_2(raise_exception, void, env, i32) +DEF_HELPER_FLAGS_2(raise_exception, TCG_CALL_NO_WG, noreturn, env, i32) #if !defined(CONFIG_USER_ONLY) DEF_HELPER_2(mmu_read_debug, void, env, i32)