From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id A694E3858C53 for ; Wed, 26 Jul 2023 09:46:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A694E3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36Q8dXRW020105 for ; Wed, 26 Jul 2023 09:46:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=wqaBiZyKgKKDDuom2rhzT+OKj4Nw4uyNsPWYig1+apA=; b=j5wMwqBLYgEKQhljliTpGDvP19xxukOYXpZRs5LKI6pN94U8iOIjdCvzDcwbsqcVY64R ET42NQx790ADusLTVeye9mmKJU2sgLIUGEDYPuMjEAkQQQnZYI79tM4+y27g1DWlc5+8 ESHkJp0QFifmJd4bhcWWv4YzkWxv3CSarkTJlq6qXwFRN2sS/B2ZOfkmkAn4h+gTZf8r JlC6F6kxy78XaSmRc9VTek1jmB3y1IklZlO2KCuGNsB8VYr+jrbnqhFf9Blom7SB0RZQ ybtopJ1zpcUAeJ1l0WoxeG4xReUa6FEGX5+vWu8gIRbscczplVSJGCdMB0XcRuEbY687 GA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3s05hdy2hm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 26 Jul 2023 09:46:39 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 36Q8UtkO011938 for ; Wed, 26 Jul 2023 09:46:39 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2047.outbound.protection.outlook.com [104.47.73.47]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3s05j67s8h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 26 Jul 2023 09:46:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kCA2818Sr42b+gcJgC7sUFHUwVzhZ704YPUE6iEogbNlQfyP1bWl+8wORzT8v8NvSzl5UcxHALl3t9d171h65WCV5dewU41x5RX+8gFjAUYKQ1NK5mbwSy1Ng2oR8WiTF5uB/GI/TNJZoHUwNRek1Uc3IurGm85loKZVon4nGk13kFrfmR0bsTX9ibdGBTmQeLvUb1WQPzyJo0cVQKT/NI/DQ8Sk0MBLTzwEvpNcIlXPBDL39QLnV86LYQnkyDUnR2OhRQ+eNeaGrytXmrd62mC4Iu3iBqkjYOZBxXopvivb9QoIly0p7V2Gwqkohlq4zfSqbZRbbjRJzlIunIgVlg== 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=wqaBiZyKgKKDDuom2rhzT+OKj4Nw4uyNsPWYig1+apA=; b=FixJGsPgGf2KGFnxIavjPTHvc1IhsuFn6ykk2L6ouFPo+IEeY5xnlrYfFVeNNr2dBoyEdK5HqAg36xLrVmbG5wIfDgcsT2o311WjzlHIBnvjXz8WX2TnV7N1dXXq7r3K1RQwQX8rIR9/RR2ZCEdj8ossoUwr0Fw+7v7hdak2ulRxGXrF+PlhsjGzYh2wPKINr0AnFn7xKgBXW80KCLbROH3XBA/+GLDPzlsH0/zYtHSIpjVbsqLwZACuh8xeBfeJtD0JAK0spdmHSHBeHg1nBxOvJhJSLJmYyWEYl29Bqs1OCoApQTW8YmcpGaV71LCPeXLd7I39GRCVvYVo/qYqjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wqaBiZyKgKKDDuom2rhzT+OKj4Nw4uyNsPWYig1+apA=; b=QGQR3U3FK8Yhb5aEArTOnmDGlH2858+4CJSHnOJ5scFl1qlTVt426gcMlC/QAXMkgA2PGSQFAm38ckFtLgDDp1c6kMe1Foolzs7STvBQHGx/IqXL2GCwlEdbWmWDa8gSl2sgDOavRKO3/zy6rGfQndj59kV21OGyINhd+xxHRWg= Received: from BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) by CH0PR10MB5355.namprd10.prod.outlook.com (2603:10b6:610:c8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.29; Wed, 26 Jul 2023 09:46:37 +0000 Received: from BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::d5ed:aedb:b99f:6f19]) by BYAPR10MB2888.namprd10.prod.outlook.com ([fe80::d5ed:aedb:b99f:6f19%3]) with mapi id 15.20.6609.032; Wed, 26 Jul 2023 09:46:37 +0000 From: "Jose E. Marchesi" To: gdb-patches@sourceware.org Subject: [COMMITTED] bpf: fix neg and neg32 BPF instructions in simulator Date: Wed, 26 Jul 2023 11:46:31 +0200 Message-Id: <20230726094631.32356-1-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: LO4P123CA0032.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:151::19) To BYAPR10MB2888.namprd10.prod.outlook.com (2603:10b6:a03:88::32) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR10MB2888:EE_|CH0PR10MB5355:EE_ X-MS-Office365-Filtering-Correlation-Id: ba88ec18-c00d-4191-97ed-08db8dbd3447 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I1VgdLhCeEPeyM0i87svIcFHn/RcXT/GInl3jTMHsz5ALh52hV5+8S2BuW5uDp/PYxKCmmvI44GlgO3b7bb0ixzrlH0pI3wFLEHUOWRhS0UuVaJvbbqQsQn7t7ARxyrtqBZDUMAdSX/NvsCggLyuKXqXcO71UVDAspQP4evR6cKAMUDza93gq187qgF8tDtDebP2edC2aOT3V9Hn0i8W9pcxjNqv/BQJNm5KvGpIPKU5/6SmbVwgwUyty1kAAZSAcngy1xwfrERv/bgn8S2TKO9iEs37WG2pgxs+57dlAwmvaPfoI2HOwCtlCqqbcckT574XbWbg0gvMlIrs6H7zmqhff8sS59Fn5XC7TzlV+afRzTYWPZ15rlpmmeZ0vXeYZLQDqMWWc4Uudd+xWdfsrybqFID3dWIQvnpCTL/YibZIjPZzF/c7GiGM5PknTjahTYWOh2n/I3+tiEh7BUdbMaW2hXuJh3hpRzVY8fPBws0k+rNmx+EToaMEK82ssogNez9rAb8kv4g8tQE2jpfhDxdNAjrSxpMwo0KJZ/JYfWVVWAORbWxVm68dig7mIEOz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR10MB2888.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(396003)(39860400002)(376002)(366004)(346002)(451199021)(6512007)(6486002)(478600001)(6666004)(83380400001)(36756003)(86362001)(2906002)(66556008)(2616005)(66476007)(186003)(1076003)(6506007)(26005)(38100700002)(66946007)(6916009)(316002)(41300700001)(8936002)(8676002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?axdmSSdPMsi4n+UWFGLvRO2xRmZI0NylHnj0GYJUPGZWVSZAVTN5zdfaHoyj?= =?us-ascii?Q?11f7Fj15bR1qPhj8NCmYFWX5GHqWVsQ+YCeS91tcTASFTvHfopkDDofTH+pZ?= =?us-ascii?Q?EyR13Z1mr6ihTfRIiMuPV6aVxbTREKZLJP6ibKdIqIgpghQMEpBuVO/t1MkY?= =?us-ascii?Q?PZuvqKgMnqrYux/DIVW7hRd3pzd9meFnZs7doAjz4HObQjTtSnvTH3CNofhn?= =?us-ascii?Q?lfNmFLDc7rLVr9ueIibhyuFUNkON/2X8XWovj2OuQjXKhjnf5k3D0+CIMXGs?= =?us-ascii?Q?I9sP51HH9EQZfmNJ1BQFp0Z00V06SlHr2fYBMx+pzOEmANqWXNGsuBeisvtc?= =?us-ascii?Q?35D8AYOMIEt3u+LuTI6Rm5G4JeXkOdkAud0EUzn/Jrem+kPFhlxsvr+8KAND?= =?us-ascii?Q?Vz3cZ0kLQ+4WC/MBOC61ezP7BKDDXRu1ia+KciOcwZTeqFqJNUhhXrGBFZ3l?= =?us-ascii?Q?R5zjs03+cqFKiCvRBRu7gmShT8tv38MEwApr0DatYSmoHw+6K1ARsnDg9C7j?= =?us-ascii?Q?quFqiv2cIDubSnDNN7yVdJjaYEn1P/eps7rA+p3ZsFV2rk/PZUi700RqXxCv?= =?us-ascii?Q?ZTtKNZTczVEuBkZsMthqKVxOa59YNodp6CV5ehypl7/byXP+pQHqTYjUCFGx?= =?us-ascii?Q?WHOXGDiDpHDWWFuD8RfWkIKp8oRX8T2Y7XpPc8U/bat8lQWcqx0L1ZxmOIF9?= =?us-ascii?Q?otzeTaT7JrRxPTey95e3D/Isc0qGrCwMOKK7uWksU1MPzgs/Z+EBDuWmcHlX?= =?us-ascii?Q?ED1wQLmTN/+HFcmAubTmhVUPOCuqfiom40yKAUVjGxGh2hISwTECjXRHZYNQ?= =?us-ascii?Q?o8edlBtRjrTOYnB2WNsYScvEKnoYoMGg531h3Vg3LSZz0lkU/2rZl6dEpmsM?= =?us-ascii?Q?AACudekiKj/QkoZ9aT1QYYHyZup/dmdqBly3NfQk72huRErXRji1KtJq4tDN?= =?us-ascii?Q?ygyVkkmjoqIzSMCjGBVmI5wNtryuQkIyPs2csbpzuEUCHniG6kCGkKJPCVKX?= =?us-ascii?Q?ZPp6eCW2J5v8i2topbKWFKwmTxWzb78S5VdqNxitQFuDruIsrqHTFmBQzEjw?= =?us-ascii?Q?MH5l0oDAQvoZ+3s35SJ2xMRcWD+ghfPiIofn1HaFVUvlmJwaLkZJoh7CdODS?= =?us-ascii?Q?rD8cp7yojh9KNfGuq1PnmBxttQwXz4Z5LxZdKcbKb5eBmwkbzuCtnmTz6Iah?= =?us-ascii?Q?wtOvY2tihu8slyD/Fpo12MZY4u6PDw1oR2Lj8DsoFLxLNXu+Ss2M/oqFRV4h?= =?us-ascii?Q?L2/wGeWBbOYzoYhoTgc0vuGgJ8BcI1rDeBExEUqBO7jOHUGkPcfXyDogy1l+?= =?us-ascii?Q?7vqXPJcNu8+sGVWIdwZovjPJWwqPYmmCFoA8FBjBYfSqF+tsW2VyFlTF2UnD?= =?us-ascii?Q?4N+2gRfIdYh6DNEKztGvaWlM70XQlPr7f0/XILzxHsmFwrCF3dfGxgx821NB?= =?us-ascii?Q?dGEtjAC1P/DyAXaGUUnS25x2UsGl2GCzVdlRVHBb5bTrEYyeDeowrm3fRoY9?= =?us-ascii?Q?Rb4DBRPOCvyeuKk3vh3mNqNB/hqeQr+fP88RVWfc8Dw3v4/6mbLolAU2rUfd?= =?us-ascii?Q?aSy/UrIIPE6ruXxliCBZ53sOc5v/AEbfdma5ccQGrYwT7LwOeFjdJw+wvozW?= =?us-ascii?Q?Ow=3D=3D?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 3ipgyFo9Q4Crv3p2+1cdt7iDaL3eFPOqkbXrsoeJQ9yusv4MkfCVm5hsJGug7U21bpj6edOvI/gAm9520OUAJecPSxS0OtrmOVacpFoXNaz8sE5ErYV/g8zLJ+kz9kQwZ8mJO6xoVjlnChcKRTExe/AbNWCskFWsjpqRwbTL5UKk8PbGweN14Z2j/pyJ3qMec5txig5Zh2JvUif3BsLsdz88L7Vjl6NZaNOBCYjPwhI9Yn/AH63eFaqANhuEBoyPCBXhQ6LVZeVgEJA7XJlyErRXsSeqQzfbfNkwGvlBbaZ4FUNgaYpvm7yar6t6R5zCG6XJHQxpXBkLQUBsIv6tM9QDODk889GJuG5xPkcIzlkHdhCaCgFb0EpLaMmXPTERjxAyRbrO6Mau8QsTR2FkkLB/x6Urjn1fV3oYOz1ynp6yTbR41OnthJBTtoGL+nReunmTui8MHHaRXhLimk5oDKvNzedDerBW60pXR6Jyuo0Dpx+SMebKOpk1GPol4EB4WZ1NuIYmaA7aoIbfwupGeftcnwHti7K7du9NQTf4TfoigSI9zrjKXty2/bxcyRdWTQXUAptbrAOUH9oM7lhxLGmjjoy2do9zhBWB4tmHBWboIujmrY8xabrFb5IYVYpWsIfCGIj3QZeSu+YMOby4c1FHFxVk43jtOCnqA/PCLb0F590H1NGLOfiBPpoqUpPJK+7DINzApkOwva5mpEkk7j4Q7j+isDOIcu04o2INBGcZReXk3fSrOksEgu+mtDdN X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba88ec18-c00d-4191-97ed-08db8dbd3447 X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB2888.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 09:46:37.0992 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +QwTlt3dMgHsXVaju2J3NtjwpDci+4XDLS9GsnFxdM5e+UAonaVMooJMV2nFh6cAnjwBmKG8+G8BIxFhOLzqFovjeY5p/dSdF76POBQtzb8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5355 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-26_04,2023-07-25_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 bulkscore=0 malwarescore=0 mlxscore=0 spamscore=0 mlxlogscore=463 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2307260086 X-Proofpoint-ORIG-GUID: NadJVtKF-95WSX30EWm7nXzswoTmibpi X-Proofpoint-GUID: NadJVtKF-95WSX30EWm7nXzswoTmibpi X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This patch fixes the semantics of the neg and neg32 BPF instructions in the simulator, and also updates the corresponding tests accordingly. Tested in target bpf-unknown-none. --- sim/bpf/bpf-sim.c | 4 ++-- sim/testsuite/bpf/alu.s | 4 ++-- sim/testsuite/bpf/alu32.s | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sim/bpf/bpf-sim.c b/sim/bpf/bpf-sim.c index 8d3a28e1940..5e01ddeca9f 100644 --- a/sim/bpf/bpf-sim.c +++ b/sim/bpf/bpf-sim.c @@ -728,7 +728,7 @@ execute (SIM_CPU *cpu, struct bpf_insn *insn) break; case BPF_INSN_NEGR: BPF_TRACE ("BPF_INSN_NEGR\n"); - bpf_regs[insn->dst] = - (int64_t) bpf_regs[insn->src]; + bpf_regs[insn->dst] = - (int64_t) bpf_regs[insn->dst]; break; case BPF_INSN_NEGI: BPF_TRACE ("BPF_INSN_NEGI\n"); @@ -865,7 +865,7 @@ execute (SIM_CPU *cpu, struct bpf_insn *insn) break; case BPF_INSN_NEG32R: BPF_TRACE ("BPF_INSN_NEG32R\n"); - bpf_regs[insn->dst] = (uint32_t) (- (int32_t) bpf_regs[insn->src]); + bpf_regs[insn->dst] = (uint32_t) (- (int32_t) bpf_regs[insn->dst]); break; case BPF_INSN_NEG32I: BPF_TRACE ("BPF_INSN_NEG32I\n"); diff --git a/sim/testsuite/bpf/alu.s b/sim/testsuite/bpf/alu.s index c073f67f819..4dc37b1f01a 100644 --- a/sim/testsuite/bpf/alu.s +++ b/sim/testsuite/bpf/alu.s @@ -112,10 +112,10 @@ main: fail_ne %r1, 0 ;; neg - neg %r2, %r2 + neg %r2 fail_ne %r2, -5 mov %r1, -1025 - neg %r1, %r1 + neg %r1 fail_ne %r1, 1025 pass diff --git a/sim/testsuite/bpf/alu32.s b/sim/testsuite/bpf/alu32.s index d797122daf1..e8d5062476c 100644 --- a/sim/testsuite/bpf/alu32.s +++ b/sim/testsuite/bpf/alu32.s @@ -100,11 +100,11 @@ main: ;; neg mov32 %r1, -1 mov32 %r2, 0x7fffffff - neg32 %r1, %r1 - neg32 %r2, %r2 + neg32 %r1 + neg32 %r2 fail_ne32 %r1, 1 fail_ne %r2, 0x80000001 ; Note: check for (bad) sign-extend - neg32 %r2, %r2 + neg32 %r2 fail_ne32 %r2, 0x7fffffff pass -- 2.30.2