From patchwork Mon Apr 15 14:46:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 88496 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 6975D3858C41 for ; Mon, 15 Apr 2024 14:45:33 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2033.outbound.protection.outlook.com [40.92.89.33]) by sourceware.org (Postfix) with ESMTPS id E71673858410 for ; Mon, 15 Apr 2024 14:45:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E71673858410 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 E71673858410 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.92.89.33 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713192310; cv=pass; b=W1zsIpvpK9C1oCnP6ingFTO2HAlFR8P/E/B8K38+TaKjEQCsJwxKKgLWvmvK4WVQhPXbIPoBKgIIAiHr5isMQs8X78EPUQtf415es2OEi38SHaWOt6voqcbGwfa892Td4E5kip1jw2jk/aAhkCeVAUgCNOejPWDkxUfSy610Ug0= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1713192310; c=relaxed/simple; bh=cvNvJAcHgoCSQ60uCdhtvwGoDM6MXgQAZQhBEvjLxeE=; h=DKIM-Signature:Message-ID:Date:To:From:Subject:MIME-Version; b=v7qEkb8EI8A1b1P4RQVg3d7SWeQus3bW3REvFseFdo77wgs9ylo7H077dqnYWxf7l9Q1HyxiIDE3T+QWpXcjjavhBSvL2zfOJjkjxeIFBg363vbtcz8t8Vb1a7Z4oXwE4v6PD35Bw5dSUXNA7DjJq7vWwzo+47ZkywfGV3Dpawg= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWmy+PVExFItopImE/GUkYIv6aahANZpC2xJbWYs7mBtlcSLqUTGK4bw0Nc+7B6uMJwHlMjKqiky+SJsth/G08JVPUxHQ4fvw68WeE7vz0oChWgy80RQC98P1vb0RIXyrl/iEcpq+tm8hH6RVfZSKVo9JJPcEVgEQvJ/DChae/XSFHoFV5VMi7RhSSCe6GuW5Tg6pTZ/F92fh596bfBpeKPDHzSVfKZkIEp06/vV3/fCsU3WRQ04EXwKMRxfXEsNx5Y12cL1p1O808d5BPutU3Vqu6Hx/2ACw1opbOlaSjQfdK2gOg4ERQu9/jNKwTuQZSENS5fohbTNKN13StsrJA== 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=75RC77NTNi8auEdvNDWzHKaowRIEOa+EnOtAtqk5W1E=; b=Vm5rCy/yEh4tDQgC9iXKlMjeTpyw2OOMfqUJ084O+gM7k6g0G0ckd5bqh+Cz5cKQ6GY6X20wEj/6IkK7QiEv6EW3yc2hsi9AOgRrUUOTqod+We30/VJqNAWLJjgOkBFACcxAkkIjxjTK63cbhvvI1CBPEMjiFYhlZThANbgDIU7V8arUvFDevsClhKW3pclHURifG0ezRv4cNCkzAL8/ua8NYJ3aBSpusK/UP6CWH/HNUuDyRgsXSJvVLqNrX/cVrB1fu7uwj7uJHlQ2MwmJdJyLSX0jjhQ43MAH0sHfNMJbmXN2Bn/1XPhpw+/8rx8uxBE654oZ7w1oKVXVH7/Ocw== 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=75RC77NTNi8auEdvNDWzHKaowRIEOa+EnOtAtqk5W1E=; b=fLxuYfueFPEzbTkWbIHs4beWV6wBlivCPsH/J6Mvvcxrf0DhwSWXxJMwJK7EWPeeXP2XrH3H2w+AgfiU1Ew/7+uacrIEYY7dLoqZDTS0T113GYQ/jSCdF9EXYvIluiWOJlREA97CWneryPClOpvFAI6svg0RS5EEZlzj6PZMEKu2JpZ/Di+t7LHXNCPV6Z1TMFH53uZVkUEyEA+UYK4UZmHHCIg46Xju74JPqsIZVmTFybR149l0DO1Nsv+zcSxRpBffs45jpywNotXLQ3qFQo9Dj1ErbraeEQOrvl+CDXFH2iDY3/97DevzFlF/P9htIL+CyR5uE0cUHWRlkljTqA== Received: from AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) by AS8P193MB1205.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:33d::15) 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 14:45:07 +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 14:45:07 +0000 Message-ID: Date: Mon, 15 Apr 2024 16:46:59 +0200 User-Agent: Mozilla Thunderbird Content-Language: en-US To: "gdb-patches@sourceware.org" From: Bernd Edlinger Subject: [PATCH 2/2] sim: riscv: Simplify the signed div by -1 code X-TMN: [jR/f6XiN5A2g0lM7wO1Pr2y6ahWCjNx2EImrkT99GXdn9h/hR9r856+WXg/fdXTG] X-ClientProxiedBy: FR3P281CA0196.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::14) To AS8P193MB1285.EURP193.PROD.OUTLOOK.COM (2603:10a6:20b:333::21) X-Microsoft-Original-Message-ID: <94d69565-f907-426d-9af5-f2a47736b1dd@hotmail.de> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P193MB1285:EE_|AS8P193MB1205:EE_ X-MS-Office365-Filtering-Correlation-Id: 06f8f675-b4d5-42eb-d888-08dc5d5aa485 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E0ZX+6h7Xo3T2EZGB0jjRK5ypZFDYQx7Qc6AjewlvHYS/R2eVStWWeUYoqmUfLYFKjCGvVWouV4c/m0ZAhuRi57RNLvzhRjcj5NcjE8b2vTFGR/28TZSOdZC8rNuN4aRoiaasV9HXuydqpLek5AagHkwB3J/Cns/T0zw/naCxfUXSD5BDoJoewDggi643eE2U+qA/n7bd/kls0JwQy2pISWk3vc687+foW6iRP4Cmr46lDlaNXWoIRxJz8vY8QtSmNRmfflgPSBTCz0h6v/Z6Ds/J7Gp+j8m5c8M5kdNduviXJz0R6Pzz1sQj13tuQBBORAQUeehXpcWFWSerViJL5eTcX47cVq3VALc578epFjkw2JzJ9zND5Hsr2uXfqueyQ/vUKE+lQxrPN5Mq6gkE5amGC+MGATjNM3JpMzsUlV6Qny3+xfRMDQCOdycYp8l/nDvTMt86T6rUTNKW5+c2s00B1jjw1VpU1p+omhl12ROBEXjFZRml/Mz81gcwSKGGN3MJgy5ulpnhDRFRVP2frDOn6ADGiE+FmiYScn4sALOl57kE2aXruCMAHi4q3kf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?BwX41HujjjLpN183c0CmTsVkE/Op?= =?utf-8?q?db63tM7V6n0CQzJ5ME8Rw7bn2VmyrQgQtx7dFT/OmfyiaPYKo/iP3C347tZWqcUiy?= =?utf-8?q?JS27HuM+4z9o4k1RtmoQJ5IwtF1Ft8H6KHB7rznZzosi1Oa9ieamPbDiCEJjVzar4?= =?utf-8?q?VQ0PvcB64fE3rcLe6EXfJJIwjig/6EQNSD5gfxERbDezRhSy3NBfgVCcDHIp+wavk?= =?utf-8?q?mS7Lc3guAmE15lzMSXO7xlNobFFNhYh+YY0I64+v56NH8xwH0s1tmchCNJPUnaLPa?= =?utf-8?q?Fq+TvS0EFdzq84UepooV3LPwt1x70ivKIsAsQgFs4KX4OYrBzZM06XhUBPjJV4owt?= =?utf-8?q?KlgZbzCrwIRory9yRiQ+7dmgDL0186OIpURFaBrJrBFGVmphatcGS1fFZOkoAx7tu?= =?utf-8?q?fESr2fEL299TGBJF5FlTzLq5UaDbjVBmnRh4fLzPxZUufC/p6oPZS65a+Ww/eFsGc?= =?utf-8?q?kcgSAFZ0QbEOADq3dmV7X/F8/T7XlAS2gB2cLoSJ34NRJZM4RagFoCW1RSXiTMojL?= =?utf-8?q?O13KkzauUS3T2+mc5JWHKvjWMRn1QIVoSc4mhEFBlDCb6utoUkteTiK6i2RfywGxf?= =?utf-8?q?9okOnGVHrVH68xtlsCx/MoljfPX6wcNePmHUxN/otkMyvSzS4BokXK3tSeSwusNXF?= =?utf-8?q?QEYweu4g9T2oJDqsZuUO4mtKOrWnCjgJNx9Ym3jwZipu9im5j2iPQMk1K4g9blAPL?= =?utf-8?q?KWMkVgrogC6s0nbQQU4mGnqZXOWY/LYhPo7SZYwYjhaSjnuf1GcF3O4zjCih3vMF/?= =?utf-8?q?lvLPCqQHrQZZKguATCkj4njFhb5F1eNCnbmyAgWUiL8q1ksfSATTmB7bRGegYKJg1?= =?utf-8?q?GLQYVgIAbzPyyErycCyokdb+sMpCQ9ivuI8ZUsUDlkgI3j7rE/sRIVogDwrZ/0301?= =?utf-8?q?eVRaOvHMuPQaHsJvQrb1OVlOo65xDZAQbzhYrC1EvIbGqnqq47yqyZCqAb6mV4+Oo?= =?utf-8?q?Mu3t6PDgpLcZ5/KVVs1GjTogLlbga31eFr4aIFASZyfQWFCca4n02+OL0oXDSqRVY?= =?utf-8?q?mTZCvb7TwG2Nti9b+UgNorIWdLZ+LuZAl4xXhlUKe7uSZuHRjDgumd8fXR7BGm0pB?= =?utf-8?q?VC7CP/tUkX5jqXOmxdBN8mn1UCIqV1XiMqB3vxJV8B5xnPDzJauqswhznvqqDJIRj?= =?utf-8?q?86QVqOrnSKy4HebL7DrWTpFiOkydhrgGHVMfc2C8jBl3+SK+MIWp9QwpT4xUbgOpP?= =?utf-8?q?N1ShPrpIKXYlW/JkHTQZOcw2R2FqZy+fSBY295H8S2e/nM5kRzKPoC61OCiVvoPLk?= =?utf-8?q?V9by2vnVopT/n4+4?= X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-80ceb.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 06f8f675-b4d5-42eb-d888-08dc5d5aa485 X-MS-Exchange-CrossTenant-AuthSource: AS8P193MB1285.EURP193.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2024 14:45:07.0620 (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: AS8P193MB1205 X-Spam-Status: No, score=-13.5 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 This uses the idea from the previous patch to simplify the code for non-overflowing signed divisions by -1. This is no bug-fix but it simplifies the code and avoids some unnecessary branches. --- sim/riscv/sim-main.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sim/riscv/sim-main.c b/sim/riscv/sim-main.c index 515ff835223..e4b15b533ba 100644 --- a/sim/riscv/sim-main.c +++ b/sim/riscv/sim-main.c @@ -700,18 +700,16 @@ execute_m (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) const char *rd_name = riscv_gpr_names_abi[rd]; const char *rs1_name = riscv_gpr_names_abi[rs1]; const char *rs2_name = riscv_gpr_names_abi[rs2]; - unsigned_word tmp, dividend_max; + unsigned_word tmp; sim_cia pc = riscv_cpu->pc + 4; - dividend_max = -((unsigned_word) 1 << (WITH_TARGET_WORD_BITSIZE - 1)); - switch (op->match) { case MATCH_DIV: TRACE_INSN (cpu, "div %s, %s, %s; // %s = %s / %s", rd_name, rs1_name, rs2_name, rd_name, rs1_name, rs2_name); - if (riscv_cpu->regs[rs1] == dividend_max && riscv_cpu->regs[rs2] == -1) - tmp = dividend_max; + if (riscv_cpu->regs[rs2] == -1) + tmp = -riscv_cpu->regs[rs1]; else if (riscv_cpu->regs[rs2]) tmp = (signed_word) riscv_cpu->regs[rs1] / (signed_word) riscv_cpu->regs[rs2]; @@ -793,7 +791,7 @@ execute_m (SIM_CPU *cpu, unsigned_word iw, const struct riscv_opcode *op) case MATCH_REM: TRACE_INSN (cpu, "rem %s, %s, %s; // %s = %s %% %s", rd_name, rs1_name, rs2_name, rd_name, rs1_name, rs2_name); - if (riscv_cpu->regs[rs1] == dividend_max && riscv_cpu->regs[rs2] == -1) + if (riscv_cpu->regs[rs2] == -1) tmp = 0; else if (riscv_cpu->regs[rs2]) tmp = (signed_word) riscv_cpu->regs[rs1]