From nobody Sun May 19 23:21:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678393176; cv=none; d=zohomail.com; s=zohoarc; b=SrxOZrx0uddSW91EGAlq0LVgGZJFcgDc48fNVdIRNAg8e8S6e//e9TX2Rw1Ukd9V+Yl3rwAQkVPpQ0fXSUOUYNDoDF+Db2earymsDyJMYA17ratuIVIK2XSYYH6VAlLvfJaX0LYjXb7CAuPyFeteeTyH6QhESC5PNWq4SZUr8nc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678393176; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XqkTjaGJM8DnE14G+6CyxH6VE5+2RWIp+jWXl8vO804=; b=MfvC/pNIf8c5Mh9meyYlhs8t1Zc8ufmo7e551cXyOnxWBTEGqVTIuaPTtBtigETKFVNmm5ttsK3pDmy3JfLqDOR4VuFnb7eHGk6v8oRVB0VMEf/0JH25P5Lhm1qgWCL0UPYXQ13E2rYjx0G8i5X69emO0rcKITez17n79RVqBcs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678393176351744.5140599697532; Thu, 9 Mar 2023 12:19:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paMgU-0007BL-Vv; Thu, 09 Mar 2023 15:16:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paMgM-0006NY-C2 for qemu-devel@nongnu.org; Thu, 09 Mar 2023 15:16:10 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paMgK-0002s2-LJ for qemu-devel@nongnu.org; Thu, 09 Mar 2023 15:16:10 -0500 Received: by mail-pl1-x62f.google.com with SMTP id a9so3211672plh.11 for ; Thu, 09 Mar 2023 12:16:07 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:bf7f:79a0:a976:bdaf]) by smtp.gmail.com with ESMTPSA id w4-20020a17090a1b8400b0023377b98c7csm304094pjc.38.2023.03.09.12.16.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 12:16:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678392966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=XqkTjaGJM8DnE14G+6CyxH6VE5+2RWIp+jWXl8vO804=; b=FXbZtCukePVi1EMXlwW5cuzVyT7KfLOT80SqSeSf/kBf+w6zgEf1W/VTAdslOJsQMK yrYQEg49OGtHT6qBkQor6+McahtEof5KeU2a4x3um0i15UCNmOW5vMlFrE4beTO//NLR oYzF9NOSPBVEzUo0xMljGZcmMXJ/xZiIAKzlZylRA5l2w18ZHXbbVHQBd8GdOQwN0L29 dvQcitS3/xRRYmL0qy7j6Zq2N7jIEY5KxUjSarJtu9kJBMzsDdtznqXJ5m00diamfOBa encI4AJomFrl8QdIoiPKCSgSM8uKmH576wFVmcloKDc8DlTEY1O/CEeg+c8z+EUZdKjW p1nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678392966; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XqkTjaGJM8DnE14G+6CyxH6VE5+2RWIp+jWXl8vO804=; b=QwFtG9DxDM4fwGboucf5mFYqBoUgtm/bzUevYMkArmYp/5JQDYxb0BrQCWA4RF1p1X iA0gfki+zlTSsAfycyqu7uSc5rV9fCZq17eT/vhxeLQhDqEiDAcWf933dFT+VmmMVx6L lHyBybyaDCzffT0LZFfO3G5q5YrkLDKcn6KLK3O2LZmTLres33U1R7rQZT062bdkAumI Vj2eJ6XVejURPJNsq+YR5BMEO8IrB+t2TQfuuT0kWGHAZ1/natb98JepFT1n9b94HBKV MsJx2OpEhpcOYCzP2P1Ue4l9lJOcpXvVg1RSyQe2qMVh1bGZDxCcb7nOU1U/sBSoWyMd BKvw== X-Gm-Message-State: AO0yUKUVQ3vAXWjXsw3YJOjgh++I1w8q0ZP/lEtwABYhFFlxKhxXVx2P fPraHB0Uykw1MHDXeHOI4M5eWzYpuAbdxt6QFUs= X-Google-Smtp-Source: AK7set/CjWGEluCFCHYQ4p+99Nb4XUkkzFJdJJXINe7dTI4qpPBLssMB5ttK58Tm9A3vFdPhBQ2NHQ== X-Received: by 2002:a17:90a:1a53:b0:234:b4a7:2abd with SMTP id 19-20020a17090a1a5300b00234b4a72abdmr24525040pjl.12.1678392966504; Thu, 09 Mar 2023 12:16:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v2 1/2] target/m68k: Reject immediate as destination in gen_ea_mode Date: Thu, 9 Mar 2023 12:16:03 -0800 Message-Id: <20230309201604.3885359-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230309201604.3885359-1-richard.henderson@linaro.org> References: <20230309201604.3885359-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678393176995100001 Content-Type: text/plain; charset="utf-8" In theory this should never happen, as all such instructions are illegal. This is checked in e.g. gen_lea_mode and gen_ea_mode_fp but not here. In case something higher up isn't checking modes properly, return NULL_QREG. This will result in an illegal instruction exception being raised. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- target/m68k/translate.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 422f4652f1..e16c608ef8 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -894,6 +894,10 @@ static TCGv gen_ea_mode(CPUM68KState *env, DisasContex= t *s, int mode, int reg0, case 3: /* pc index+displacement. */ goto do_indirect; case 4: /* Immediate. */ + /* Should never be used for an output or RMW input. */ + if (what =3D=3D EA_STORE || addrp) { + return NULL_QREG; + } /* Sign extend values for consistency. */ switch (opsize) { case OS_BYTE: --=20 2.34.1 From nobody Sun May 19 23:21:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1678393547; cv=none; d=zohomail.com; s=zohoarc; b=F6pPHaK4EVLBu/UcjerVslIWSBYNTrN98VQQYMlE6cbHnr/ysW+E5jeL6gnnsyaor2QeQ12KySWAeoip6SsOvlPcbILYoNYL+DTemppV2HbxrwjN1wX+FxxVx+zBngC6Jtlt8j1QEvCmZT409MLgVXoPFlFtv5TprLWmBqIuCUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678393547; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dMeG1HwbQDXPwGHTmyb1B+zs2kscYWiAZRcxkV3XrFk=; b=ZMbkCiV+9xXJpYZlS1HXaFE30F7aD/rDeX3twZMepzoJPgye4EYsn4q4EuT05doLyOB9hN7r+27geMgayo46++gJ+2tQKUfu5oTELfHISsoUB2p+KxaYgTPw/ZAm2wIy713WcNV6Xu/Uv0G8zR1ZNgmTBVI1aGfkzveG/uqPkb8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1678393547969429.19563112995354; Thu, 9 Mar 2023 12:25:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paMgV-0007DQ-63; Thu, 09 Mar 2023 15:16:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paMgN-0006QT-EZ for qemu-devel@nongnu.org; Thu, 09 Mar 2023 15:16:11 -0500 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paMgL-0002s7-4F for qemu-devel@nongnu.org; Thu, 09 Mar 2023 15:16:11 -0500 Received: by mail-pj1-x102f.google.com with SMTP id nn12so3160909pjb.5 for ; Thu, 09 Mar 2023 12:16:08 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:bf7f:79a0:a976:bdaf]) by smtp.gmail.com with ESMTPSA id w4-20020a17090a1b8400b0023377b98c7csm304094pjc.38.2023.03.09.12.16.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 12:16:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678392967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dMeG1HwbQDXPwGHTmyb1B+zs2kscYWiAZRcxkV3XrFk=; b=bVJ+aaPAh0RouOjtJTNFrr/yOv+/aYxxMYjxuwDhsU71tKfMCz+a+EkUKWKSuMZ1OA GAHoCjOQrer2jWvByBJPFf2tXAr4jxixT+QgcC1BbHmdof6YdUbLrPU/zZ0Tely4aV52 aLFyHXWMBCiNWLDhjWnEIv3ah9KNL+xRS3Pn4eT7POpn7aCQXGZ0Z42xRPJmwGKVF4n5 2P6iVrJMamynCxgIi9z/U8EfpZtjNlMaVAqZ5p8CNCraRSYb74rL1yWlEvJ+vco3xSYB VbrYI9LZMpk4O7CPzRBOY/v+x0b9hyosjaBcUWBum/uVjuziwDjnV53wA1E5HzMpQjlI ryPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678392967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dMeG1HwbQDXPwGHTmyb1B+zs2kscYWiAZRcxkV3XrFk=; b=3crPar8V7EfZb5TpeNqkuyw10YIhPpboUclU26rKfyk58k0sKkkLj9CFb6rFQoM8RQ lxCIzS+wO4dpXpHffT/BIPZzQcsGhEMQSTLYT1lmTthHHXW0SkFvd7jUZB8L36vSd16z Ai/Jot92AP3AzDjW/U5HDkCqo4cuYdfXUsr+QTCUSPhURq2jagYtIhCHb3NhOYtXV5Tk ndx7jjN6kkIZkkwkBMX6D5gm6SP1M9C17UUHYpjsIqOXQVK/yMO883AocHJqceJfNKWm tesN4weEK7XMR1xIISfhlr0XcVvmWFUTSNyiPxWNoEC6CGf5KtWooF5/UjwECJ1VO/eW 6Upw== X-Gm-Message-State: AO0yUKViX9qlva7aEL7yeJ0qpqdnzv6by1EJXnxpItO0E4KPbB3NfVdw GuCA0ukUPT9MmRpoXtCcx7342HGFKzzseV577uI= X-Google-Smtp-Source: AK7set9sQoJd8/rLMyz01IkgjsDrpGr9fZchI9oqDmW9g4tJjzw9/Ula6i1pBqqDv2FF5IY3RRj/ww== X-Received: by 2002:a17:90b:38c7:b0:234:b03:5a70 with SMTP id nn7-20020a17090b38c700b002340b035a70mr23946139pjb.35.1678392967338; Thu, 09 Mar 2023 12:16:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH v2 2/2] linux-user/m68k: Handle EXCP_ADDRESS in cpu_loop Date: Thu, 9 Mar 2023 12:16:04 -0800 Message-Id: <20230309201604.3885359-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230309201604.3885359-1-richard.henderson@linaro.org> References: <20230309201604.3885359-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1678393549919100003 Content-Type: text/plain; charset="utf-8" This exception can be raised by illegal instructions. Signed-off-by: Richard Henderson Reviewed-by: Laurent Vivier --- linux-user/m68k/cpu_loop.c | 5 ++++- tests/tcg/m68k/excp-address.c | 32 ++++++++++++++++++++++++++++++++ tests/tcg/m68k/Makefile.target | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/m68k/excp-address.c diff --git a/linux-user/m68k/cpu_loop.c b/linux-user/m68k/cpu_loop.c index caead1cb74..84b5d290c0 100644 --- a/linux-user/m68k/cpu_loop.c +++ b/linux-user/m68k/cpu_loop.c @@ -35,7 +35,10 @@ void cpu_loop(CPUM68KState *env) cpu_exec_end(cs); process_queued_cpu_work(cs); =20 - switch(trapnr) { + switch (trapnr) { + case EXCP_ADDRESS: + force_sig_fault(TARGET_SIGBUS, TARGET_BUS_ADRALN, env->pc); + break; case EXCP_ILLEGAL: case EXCP_LINEA: case EXCP_LINEF: diff --git a/tests/tcg/m68k/excp-address.c b/tests/tcg/m68k/excp-address.c new file mode 100644 index 0000000000..1dbdddef58 --- /dev/null +++ b/tests/tcg/m68k/excp-address.c @@ -0,0 +1,32 @@ +/* + * Test m68k address exception + */ + +#define _GNU_SOURCE 1 +#include +#include + +static void sig_handler(int sig, siginfo_t *si, void *puc) +{ + exit(0); +} + +int main(int argc, char **argv) +{ + struct sigaction act =3D { + .sa_sigaction =3D sig_handler, + .sa_flags =3D SA_SIGINFO + }; + + sigaction(SIGBUS, &act, NULL); + + /* + * addl %d0,#0 -- with immediate as destination is illegal. + * Buggy qemu interpreted the insn as 5 words: 2 for immediate source + * and another 2 for immediate destination. Provide all that padding + * so that abort gets called. + */ + asm volatile(".word 0xd1bc,0,0,0,0"); + + abort(); +} diff --git a/tests/tcg/m68k/Makefile.target b/tests/tcg/m68k/Makefile.target index 1163c7ef03..d3b0bc48a3 100644 --- a/tests/tcg/m68k/Makefile.target +++ b/tests/tcg/m68k/Makefile.target @@ -4,6 +4,7 @@ # =20 VPATH +=3D $(SRC_PATH)/tests/tcg/m68k +TESTS +=3D excp-address TESTS +=3D trap =20 # On m68k Linux supports 4k and 8k pages (but 8k is currently broken) --=20 2.34.1