From patchwork Wed Feb 14 22:12:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Hawkins X-Patchwork-Id: 201146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp15127dyb; Wed, 14 Feb 2024 14:13:14 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWHspwnYJVDbQtgII7muBR170M6HVeXfjZdbo+bPvkP3rH6NGd4W9RhyjPAHdzpO6SX6ZnTUoiJKpq0fvyBKhmDcj9Htw== X-Google-Smtp-Source: AGHT+IEeQXxDsh/St3S1351kC+srubk1TItdXJsHcjZcbvZExTbhXobf/wDQYD6fQmjjkfjAaIGT X-Received: by 2002:a05:6808:d47:b0:3c0:4730:b595 with SMTP id w7-20020a0568080d4700b003c04730b595mr130741oik.27.1707948794030; Wed, 14 Feb 2024 14:13:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707948794; cv=pass; d=google.com; s=arc-20160816; b=oeS4uL5BCmZftvYaZWoKOqsEagtcwt1L1FkDcnYcfHnCXoz/vL4NywYYtsS6ske8C/ 3jAd81mGP3vp/gZdRX5eo7YJMoSVesFFLG1Zvr1Pciqu2vOtcZ7GBm+KzfiDGWqLk5fP xDTQOFtCUHAGZ+byRcVs6a6RQeo05wq6Cke0+Felj+rZFgsRwB877lPx3s6ewnZ6ucv+ W8199tTprRm7HUECKS2L91fhLojinhkjT+XNaz/0WjeFsOnHYEZMz5SbgCiA+vR47SZD GH0iOv4tTmCximXUZzpPTQiS+agXS9IzAm73EkMnZ9ntWpExrAItTYlXpAxoI0sw3qGf e5Pg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=Rnc2aDwk/iGaYFYnXGLJoYYhcox/I14mWLkXAd/JUBM=; fh=+vJO8Hfkcj3EJXYI5vBVcrPtvJP9nsXKmo/6a1ScSZM=; b=W0uRZ36i2cFtSaf4NjbTPqWbQOyvAQ2RAcSznqMiHHPXcASB9Puq2lWSxQ/5j9APBe kmymxOM1PqIxidQvjk/sKcvPbB1tKpm4lEIkE9Cnaccrr1/HC/0kyMTkiOQ1d/gLpfn/ 7o2PHL4USbq1bPIfJ8Vz2sY8edSF/HV3WmLh57H8p6pfyq+lT9UwrQ/8gcXN5EI4JI/k VpMXFWnsZncUP5RtVe03arNtZCupG9WG/TjjuoYUItHu5uMe7hqqYSKV+W6ByRWOFRiW uUKBKFTNawGxbiQ1TeEpQJYVO3Ur3X+6rE8J3XEHSnoyiQJH24qGS/Jb5e9hMyYPINWI r88A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@obs-cr.20230601.gappssmtp.com header.s=20230601 header.b=D3meU8P7; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" X-Forwarded-Encrypted: i=2; AJvYcCVjT2Q59bNp2Y9oylvxdk+nJNfKdWWrX/D5zybkv9jZVZHJoAmhTN2NnQH6s7+bdw3qHJ3eEiF5p22qcSJ544+zKLhe0g== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id s19-20020ac85cd3000000b0042c5c996dd1si6951450qta.139.2024.02.14.14.13.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 14:13:13 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@obs-cr.20230601.gappssmtp.com header.s=20230601 header.b=D3meU8P7; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AB9333861805 for ; Wed, 14 Feb 2024 22:13:13 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-oo1-xc34.google.com (mail-oo1-xc34.google.com [IPv6:2607:f8b0:4864:20::c34]) by sourceware.org (Postfix) with ESMTPS id 98CE23857716 for ; Wed, 14 Feb 2024 22:13:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 98CE23857716 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=obs.cr Authentication-Results: sourceware.org; spf=none smtp.mailfrom=obs.cr ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 98CE23857716 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707948785; cv=none; b=uo4hanDOlXcwf7uDgS69uLyEVFSnkGsIdvOx2mqn4QSn/qUMgLTXywGxfvyaPhsTstzfsbVJUrrtAOSSQo/JgO+h/nAnEY2z+3QXTNaz73dHdzmmHx/wMbwpTUvQe78B1xvftw5wvjtNa2ndQwT+jgPF0S0mE8Udge50PnnZ5Yg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707948785; c=relaxed/simple; bh=j02uXlsGnin4CDHZM7+VOXy4CsLMx65qku8JA/8YLS4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=sI3wrF4bD1PEHIhnjjpgosce+7r5ZH2NDVzDIQMYniUy7M6eMSLUw+KUbeqYJqqMsy1En50c2ziIXy84lwU4JxGGukdqc6aFDB0JKHAVuGZ/9kudt7zsr+8x4WqhjexjRYPS6kNG/of64FIxzMlfNtdeu23Y7xfpFw1CUTDeHtM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc34.google.com with SMTP id 006d021491bc7-599f5e71d85so138213eaf.3 for ; Wed, 14 Feb 2024 14:13:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obs-cr.20230601.gappssmtp.com; s=20230601; t=1707948782; x=1708553582; darn=sourceware.org; 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=Rnc2aDwk/iGaYFYnXGLJoYYhcox/I14mWLkXAd/JUBM=; b=D3meU8P7kuk/MKHzJd6eeDHiYfGYdTW6hhzOIdhRmev7Q1qcRjuTRgZZtCV7Y4vvWs QiTF80v47BvpZKM3Z8/JJMIqVoc0EsfEfU7FB3XZDgzNjJ3dtjE6VuecKLnjfg40pKlT 5O6HiKLuUAz6uSHSuPgAeqaFzAzPcnyN8q+5JPeRpzGL138N1oNDmvagvBiq7BZKmcro vDQPYTCkPb4Dse/tD6Gl91jhphvnxrmxEtv1YLmzb/62l6d36h21knfFMwf1kesCz0gs H7z5zVtQUfudNMIMRlSVIB0KA5wZWkg7QF7EwANddPobM+oQIhnE14PfcrvwGFOBOPTH u93A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707948782; x=1708553582; 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=Rnc2aDwk/iGaYFYnXGLJoYYhcox/I14mWLkXAd/JUBM=; b=qhMWRmxdbZFwqEWJxxqAzzLxwRMF9I7x9h2a94Vuk2YS+1HEkc/+yfpVkzsEXmToEC X6SZ5dbxEff7mR82r5Ut0AhrhNo/T1wObaXv2Dp42n8R+TWB/G8srBD/KPxXEMx1AKfK jXpXs1harcudR7Mr35oVz+g9ywFYj6l8HuN2bicrNMZD9v5TGNvz16blvDwQZ1yU+Rgk tiVCXbuTKQ2hCLJXUWlKJnrFyeK12aw45fkBZnxTSM7x4UzIaI85fQPezIZz5p5I3OHC LzF45OJHuFhj87c8V18laqj7F+cw1FS9v8S0GfCTfZ4O4fO+m6c54pU4iePTcfSwFlpA 8vow== X-Gm-Message-State: AOJu0YzNA5v9nDbLMhLzrtSSiM0e7e9Kux+mMwZZxzw1maHnxWJQO3av NHjg8QXRhSArRkoKG7CnDVJfHcfEbHEbIYwQ4gRaqkOBr6MwikijssRrutUIf01wrEwpNjJw8mr x X-Received: by 2002:a4a:610a:0:b0:59d:d34a:3cff with SMTP id n10-20020a4a610a000000b0059dd34a3cffmr75685ooc.0.1707948782379; Wed, 14 Feb 2024 14:13:02 -0800 (PST) Received: from borderland.rhod.uc.edu ([129.137.96.2]) by smtp.gmail.com with ESMTPSA id og8-20020a056214428800b0068c4b445991sm62qvb.67.2024.02.14.14.13.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 14:13:02 -0800 (PST) From: Will Hawkins To: binutils@sourceware.org Cc: Will Hawkins Subject: [PATCH v4 1/1] objdump, as: Add callx support for BPF CPU v1 Date: Wed, 14 Feb 2024 17:12:53 -0500 Message-ID: <20240214221257.908126-2-hawkinsw@obs.cr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240214221257.908126-1-hawkinsw@obs.cr> References: <20240214221257.908126-1-hawkinsw@obs.cr> MIME-Version: 1.0 X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790914114856071954 X-GMAIL-MSGID: 1790914114856071954 Add support for (dis)assembling the callx instruction back to CPU v1. gas/ChangeLog: * testsuite/gas/bpf/indcall-1-pseudoc.d: Remove xbpf CPU variant ... * testsuite/gas/bpf/indcall-1.d: ... specification from callx tests. opcodes/ChangeLog: * bpf-opc.c: Move callx into the v1 BPF CPU variant. Signed-off-by: Will Hawkins --- gas/testsuite/gas/bpf/indcall-1-pseudoc.d | 4 ++-- gas/testsuite/gas/bpf/indcall-1.d | 4 ++-- opcodes/bpf-opc.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d index 7a95bad8e65..ae49cd1c446 100644 --- a/gas/testsuite/gas/bpf/indcall-1-pseudoc.d +++ b/gas/testsuite/gas/bpf/indcall-1-pseudoc.d @@ -1,5 +1,5 @@ -#as: -EL -mdialect=pseudoc -misa-spec=xbpf -#objdump: -M xbpf,pseudoc,dec -dr +#as: -EL -mdialect=pseudoc +#objdump: -M pseudoc,dec -dr #source: indcall-1-pseudoc.s #name: BPF indirect call 1, pseudoc syntax diff --git a/gas/testsuite/gas/bpf/indcall-1.d b/gas/testsuite/gas/bpf/indcall-1.d index 51103bba2a1..48e351fdaae 100644 --- a/gas/testsuite/gas/bpf/indcall-1.d +++ b/gas/testsuite/gas/bpf/indcall-1.d @@ -1,5 +1,5 @@ -#as: -EL -misa-spec=xbpf -#objdump: -dr -M xbpf,dec +#as: -EL +#objdump: -dr -M dec #source: indcall-1.s #name: BPF indirect call 1, normal syntax diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index 19e096501a2..0524f4c7e1c 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -273,7 +273,7 @@ const struct bpf_opcode bpf_opcodes[] = {BPF_INSN_JNER, "jne%W%dr , %sr , %d16", "if%w%dr != %sr%wgoto%w%d16", BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_JNE|BPF_SRC_X}, {BPF_INSN_CALLR, "call%W%dr", "callx%w%dr", - BPF_XBPF, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, + BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_X}, {BPF_INSN_CALL, "call%W%d32", "call%w%d32", BPF_V1, BPF_CODE, BPF_CLASS_JMP|BPF_CODE_CALL|BPF_SRC_K}, {BPF_INSN_EXIT, "exit", "exit",