From patchwork Mon Apr 15 08:36:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 88478 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E27023858410 for ; Mon, 15 Apr 2024 08:35:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2067.outbound.protection.outlook.com [40.92.90.67]) by sourceware.org (Postfix) with ESMTPS id E8BA43858D34 for ; Mon, 15 Apr 2024 08:35:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E8BA43858D34 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=hotmail.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=hotmail.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E8BA43858D34 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.92.90.67 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713170107; cv=pass; b=v9meFXAD5iCiLscPrV6lxDBpB6rRtF+FHAAU24jlFOGRblIn73TFvXwkSXUB57Qat/PoQEVmGvVMP8O9cYDtFRkNQJbWJJtv1RU6dJPtzTHtdaKqJzu2BA60EsDF/wzxFgoo7P6SQnLUM6ZvhD+hgo8i6GwDR2LFgbFXdohhn2k= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713170107; c=relaxed/simple; bh=tsEq2eDxrfV2ohHpMcRPBcyAsOt8kdr77zHy/Qc/lY4=; h=DKIM-Signature:Message-ID:Date:To:From:Subject:MIME-Version; b=Q+Mdh6tMtTvzb0u/eBarvkQISLb6onyI8ObiBntXMCZMrJiHtEKwMCeUcd7Wuc8MYil/A1vsNA5OWmESApN+DAqjQ7WRJDSLIQDdNm8h2UnimAXWGE68DxTykgKTzbGYabpCiLB5+b9hM8AK7hPEuIMquLAzbpT8zoJFoPC2akY= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sv7CCv5l3CbWBoXjJVKGARLWh4vc1+e5XqbiAU+JiW55Wu92iItnKgRm38YkAHCC8tmeLNgXhZDnupYNOMNidul76Pm4QHfz5Bpwl9JgScNzuexY0glFoIkWzK7QMDFvX5I6H4IJo6QCSzF0fLBNnVJAFlgTDUd4Wml8b77EB+frNxqJfXQ3YdP/mtF0Z+wDA+6aJUjNvBhivKWZIjgU2ZsUyniioghsr+afDtn3Ci2mLdWiSeUAVEWWFa0mqMA+xIYK/m5HWruGhKmGQqEQPBnfp6sxLY0r3/WkhoQmGXg+YGAMDmj+pg1fis4QzQMm7eHQN7ZaPHYuE9OBJQSyyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MsnIk1+rYHz909T3aQGsl+68gpvYOzyFYnj7hJNxlIQ=; b=bTlxUz3gFJzc6jzt+1n/oc5C6010KxjmZDbWsspEfucyVw5r3FqVnkG7mkEtaLLxVRIKi8/MT33DCjRDxapv5qHv30KLLD/5XWztjatryXo1VIDz75PD/U5YuYPhzzh/AqzPfOMP17WyR3NTtk68ygsPPyTqxBWB8k8qrVKI1g9tWR5maBa6zAsWjym0GHqzb52AjyoFH3NcGbI74I97jeoTx/KldbghtCn/QVcCQ3MXm+qKZ3yKDneiMkLlBCwJ0siw+uPnGVruSEhcgdWAPLA19mGIO1SnKwNED4yzQ8T4yGra6iUt9b/dxYdLUP9LMnyVs9IxfZTzuiGa473dow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=HOTMAIL.DE; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MsnIk1+rYHz909T3aQGsl+68gpvYOzyFYnj7hJNxlIQ=; b=uWjdgCTEIOJj5wKvlF+r4qtea1yQG8j769w/dm44qamrBZieVTKN7WFQMYR8mLuW+1Zttqv3piv7D/r6Mj+3d9KKSuFiXQHQpzsUD88Pp2bJkuxqm53ck8LK8UcYbYElFNsf3iybrpRHk+QgafqpNd8aUSG5CsW0WqG/hD5lj/RHKrhGVLnTnAn8XJ1vsUG64EIfgO8w2L4DsMNJUUJbrDJ3WFm/MU+fvk5AQoBKUXvcBZsBhyvHamp8MVghVLv1duaMhdZllyJJM0P3glift8bMHt6Rx8hBkLoYvXbEysDGYB60V4bRWF9ChoSiDGd3kGJW5+Df9KC2e1j+s/fUcQ== Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) by DU2P193MB2258.EURP193.PROD.OUTLOOK.COM (2603:10a6:10:2fd::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.50; Mon, 15 Apr 2024 08:35:01 +0000 Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::5403:f1ad:efaf:1f71]) by AS8P193MB1285.EURP193.PROD.OUTLOOK.COM ([fe80::5403:f1ad:efaf:1f71%4]) with mapi id 15.20.7452.049; Mon, 15 Apr 2024 08:35:01 +0000 Message-ID: Date: Mon, 15 Apr 2024 10:36:53 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "gdb-patches@sourceware.org" , Andrew Burgess From: Bernd Edlinger Subject: [PATCH] sim: riscv: Fix confusion with c.jal vs. c.addiw X-TMN: [5adYf1RevPDYXn5NbloZ30k4M8u2cfnL5qdV/DvsLgg9Vd+qv95/uIoJ+CXVbMo1] X-ClientProxiedBy: FR0P281CA0206.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::15) To AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) X-Microsoft-Original-Message-ID: <3146e1fb-ea4b-4dc6-a471-3d51227eb296@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P193MB1285:EE_|DU2P193MB2258:EE_ X-MS-Office365-Filtering-Correlation-Id: 4de08d27-a8a1-4b69-2773-08dc5d26f103 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9vzT+GSTC94W5Xjx+fREf7j/G1+Tn8FB6ku8yUgBp8qGz63aTgOEkuI6RrnZGh9hi6AhZWfsafCa1c0a6UvsgYkZpjcgC555SX1eh8ydc8qyOPWZd7WsDHpOw50xOR1NnEZ5XaFzuGXineccsBnUaahV2gnjo6g0cAzAyMjDQYUQoBYHTSie4KFzbpfweoZ0jtLhbCoWryiQJ7/5GzaSxe5g/SURJfDe18xNFeGkJYIn3ASM/QpKFL5UhsUcuqNisnqcYNEn1OPffy7jkN+7Fok+qpmyg99BsTudQbeXN3c6aAPOqozzRbkiIvA7jWF6TVDdF+fOupSlIAxLZrZTUljxAScj9gHRKAPSGb+BjtKtYbHgLCTcym1YeAKxu6n83lfoCEdXtDdYE0IsSyZqcR+FMH3dcyFGoeAIpnFaWCGxlZxJJ+H5En35urJlnURVaAC2qlo5iP1x1uf+k1fPpSVnz1aEYBCLdibAc5sJMCCXnKbKC4jR1vtc2V/9TukaeBLNraUaG5GE3unqBR3PQxahkqJ+UKQ+G8TPgkTSGQWQ3vXRiDWejrcaQQJVKfcL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?TRiHtb6nms/qUu7Qw5BNQEMDyNfu?= =?utf-8?q?Yiyv3ukMCaJKRe+l5YoNJrdP7PEKi5cZONffg2QjeOvI69J0nN/IlLd+uCpw8UIs/?= =?utf-8?q?aEEG/pqqgQX+I1WXBpf316FSitm0zp8ONubsmkN5RKEllkLV07ox5e0EIHvscTfNg?= =?utf-8?q?Q+z5Mzc6puF4FF4wbDR3GAo/TpCla3Frg64Lb6LTYgAylGtrzqAORqP4XgG9GKMQ8?= =?utf-8?q?H+MvYT35T8qy6Yo/+qyjxQR1PeFRUKU/uG9Y0UvPd8T377V35U3jikxxaGLNaXVOA?= =?utf-8?q?R/uwx1LjqLZVBWPfxra1GSkxPFAYLfDMJ06LH4GQZt2TYF/hLoxtMO8RNgZKqSkXE?= =?utf-8?q?WBfWHZcvHPw7xaT3Gf5E7kjUAcfYyOHFYhB/CooMpurptNN1FT50fQsxc5bvWihX9?= =?utf-8?q?CWjP4iK+6AX9fw4MT8VhI+ATfXIp0hxwMxFK9BtJvlnDO42ZegL7VFkwpIXY61as6?= =?utf-8?q?gE1c1ZnhtB0XsNzQopqkC7UqI9XpCGstf3zSh4NyA32TOnjF3sOhhuvpsH+4KoPl9?= =?utf-8?q?suumfBaCCDSmSeyS097wEk1MjillgK7JuXNR1qH+vUUbps/xhG2ofZgnImCMNQsF2?= =?utf-8?q?7ms+dk9sXepKq3+DRn32+/IlBsB/KJnpahqfjEdlNmokBiKfW5m8pKBG97gSk4+6U?= =?utf-8?q?8/pqI247SZmTZlhoLJL+4bVr1MpVVNrKjZj4XOZHT7VMMJ1lhlwTSBe9Hxf0vdCsQ?= =?utf-8?q?umWYWdLzqOt/zhUmBEO96e535/kd/5m8Po2bWyQk5x9f5AGnUL22oA1URe6wxsDzU?= =?utf-8?q?qTX0hk0LbLD7Y5JhT2ZA/7QHUwUs6lkhJPVweHwvX8qzjTZuAzqli3UVnRyyq5qdz?= =?utf-8?q?6FpUaMWKWqM+IFpDmcc8MbyGsHvfIwEboOp5tURik9HxWEabl5q+GwqlPdUKGAQ3+?= =?utf-8?q?MDAdACwZoRmD1ez/GRB/Y21Y0rOwzS6BYiRKnAqOI++9ZkGfp6ryuFtlO12OCCm2D?= =?utf-8?q?Ge5C11OqpnkHNHdBum7GaJyguEGkTeRW+yNzfQI/YlcGm4+q5NpBxTXw0hf9p1oDO?= =?utf-8?q?2hBoNCwa2wLAW3PcjLNpq3pV/RwuX3Yk/ZpXqae16xpX/RxWbUjQjIVu7Qhuc7hJG?= =?utf-8?q?NoNZhmPKlLdspaeerQIJBuyhSzQjY1PWiOPHwifQQZNWXd9qMaiXSbi1lIzTKBPS/?= =?utf-8?q?itJwRZcryr3iYhhjkivYGwh2dg97coof7iBEzafsDT0f+RTESSWnPPOsStquY0cfJ?= =?utf-8?q?vSACTp9qQL+mA4SvSlOFmn1nucO95ka5VrJYextjlAb53hXE69eqag+FALbYZ0qVn?= =?utf-8?q?YXTjBgGQJhECYVkR?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-80ceb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 4de08d27-a8a1-4b69-2773-08dc5d26f103 X-MS-Exchange-CrossTenant-AuthSource: AS8P193MB1285.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2024 08:35:01.7075 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P193MB2258 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org There was apparently a confusion which cpu model uses compressed JAL and which ADDIW. Fixed that in execute_c, case MATCH_C_JAL | MATCH_C_ADDIW. Fixes 3224e32fb84f ("sim: riscv: Add support for compressed integer instructions") --- sim/riscv/sim-main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index adff99921c6..9fd2cc70657 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -1016,9 +1016,9 @@ execute_c (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) TRACE_BRANCH (cpu, "to %#" PRIxTW, pc); break; case MATCH_C_JAL | MATCH_C_ADDIW: - /* JAL and ADDIW have the same mask but are only available on RV64 or - RV32 respectively. */ - if (RISCV_XLEN (cpu) == 64) + /* JAL and ADDIW have the same mask but are only available on RV32 or + RV64 respectively. */ + if (RISCV_XLEN (cpu) == 32) { imm = EXTRACT_CJTYPE_IMM (iw); TRACE_INSN (cpu, "c.jal %" PRIxTW, @@ -1027,7 +1027,7 @@ execute_c (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) pc = riscv_cpu->pc + imm; TRACE_BRANCH (cpu, "to %#" PRIxTW, pc); } - else if (RISCV_XLEN (cpu) == 32) + else if (RISCV_XLEN (cpu) == 64) { imm = EXTRACT_CITYPE_IMM (iw); TRACE_INSN (cpu, "c.addiw %s, %s, %#" PRIxTW "; // %s += %#" PRIxTW,