From patchwork Fri Feb 9 18:07:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Hawkins X-Patchwork-Id: 199037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1033892dyd; Fri, 9 Feb 2024 10:08:32 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVulPh1+dY969wCsaVa2WNjRDPL+mmz+nbl5BeLO6bsvAWbUgc5aQkLJpNGr8lBu3QxIHQBTpB0/wkXZwISZ/aiQHgxVA== X-Google-Smtp-Source: AGHT+IGCNieeQWqdIi/H+dX/LCHH3EtPkzbFUz/7DL2f+3lsuCs75UNMI1KhZnH0HbYirv+c+jiX X-Received: by 2002:a05:6870:2045:b0:219:a6d7:d01e with SMTP id l5-20020a056870204500b00219a6d7d01emr2526499oad.56.1707502112395; Fri, 09 Feb 2024 10:08:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707502112; cv=pass; d=google.com; s=arc-20160816; b=V456vAzZ3fTvP+gabxkpHZB+O+U9anfsQsmZlyBD8O1g2YefG+Ashu8xgPlT6EHT7x 4wuBYNKeZ3ZTPRFWOtJGDxv1UOdEElaw49Zxi97ok0EGKTCVkRJA/SHn+QoxnRJO/tz/ En/cZv7ZaFKRn+A7BEDqCcCleeWutjsocgbeUibuU7pOqWcjADQNdQ5KQXW72JCIf1Ax YFyMLPW67x3HNuAptvS+GLtg1jkaEbXTNXhwzKyBVGKmlP/Um14HiWUzE2gKSMKOZB5Y bcWiLolvjWOcYtLTycCPdg4LcsK7FzzAiTB4H+aIDMYdbTRsqvKsLXQu0XR7sk8IV+n0 DJhQ== 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=WTZ24tZMKofZgiilPrVbaajDkj216pKbTpOw76PPI+A=; fh=cRYRVMKEWmnR7Y5w8Pj0buUvUy95NpuQgmLXMS/llPI=; b=H9F9zPSSLY+uy5NkQNcvNXHMSNGoSRK1YSQeipsHRro2oXoOjGPqcoVaGvqVZ/yuI/ fWvBpQM6h8+cN0eruUNyMqr+0TBEZzJtBwFcUh3WgC1LZTQcW/MFcM3JwAAz41thKq2R ljLdHZXQuyygzT+n5GKoKuz3KZ7StdOLxPASZp2jSKNhXYsgKSHBwEHghaz5Yp2WyVKw 8j68np3V9D7Sd/h9VvC7zdUZmep2RbELjtcqPj0D6W6s5PLqsawkcgGCv2+fFP/3+Hua z6TI/wvln8N7G9Ffh0kEAjguDzeWx0MzLz09am5y29fP/UzkbOdgJpk0wqn0RUxIYr9B ANng==; 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=kn6En+bK; 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; AJvYcCU5t7ano37lND0h/TBJiAW7IO7eTCmL3S3VsNVezJ6NoQyriEogOi3bx6ANwuEESCqTzksWxmlIv6MUj4/Env8F75SiDA== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id y6-20020ac85f46000000b0042c4e2268easi2330144qta.714.2024.02.09.10.08.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 10:08:32 -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=kn6En+bK; 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 1057738582B1 for ; Fri, 9 Feb 2024 18:08:32 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) by sourceware.org (Postfix) with ESMTPS id 0B0BF385841D for ; Fri, 9 Feb 2024 18:08:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0B0BF385841D 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 0B0BF385841D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::736 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707502101; cv=none; b=OB0VzaX01hDieoTYpZUCCoLjnfYKTbumnifTkKVFWBg6kjE2rmJfNsJzOFpadACZlID8pf7pmpjc+vpCUMuPG1k7ZOi7cT5Ovs+PQyda+ETks/6VCEc0jg03e7K2ktioWg0pHvVs7FMpOzGE00Mx/F2R1cDiSQrdGoKsEh05XS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707502101; c=relaxed/simple; bh=hIfOXkxNnqvl6Xt9ITP+lZtyj8ol27Jc1zb1vBquQaw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=yFmkyx0vkZucZDjjEUja/RgbJ+qtzuW/U0YPnb9pnxuEGqdGIRu0uK0K2MoF3ykaL3J/cyKKK1t2VYJtwE1q0q5iNMbCd//cThjRdkyHSVAehBKfSgUPALmjIC6AGiceSaA/9YpuUCvtLCT8+5VWlXNFKFNSopz/Vm1wa9/5N/s= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-783d8dff637so73165285a.3 for ; Fri, 09 Feb 2024 10:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=obs-cr.20230601.gappssmtp.com; s=20230601; t=1707502098; x=1708106898; 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=WTZ24tZMKofZgiilPrVbaajDkj216pKbTpOw76PPI+A=; b=kn6En+bKJm7DDgmf6syhBll7haYGc7UzfScIr2T3rOUwjpFelLpQYan76mtCxBAlpB Y/26/6htAcKK5DJWGwmu1K18dUpEvNJZPcsKtmjC+ObSW8EZTc6lQDlgVuQSZumEv1Zk 7MZBN+TN/ahy8X012dqfTwAHYZnelkK57XQ2XXe40mQ3UTDl/2Y7h9DGSoKu9HYWtSma UW7mfso5jEHxJlWkduW3w0lIFB5tTc+uIs+LtTRAqcJwT3PpzTmAIqQYxmi53ItuPmsv 2UumXiqSeRE9viOIeN9LyaYhYIG5NAdiKk9YkIGzCeuolA9wGv4mwQVpWWSgqGw/JKfr FM1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707502098; x=1708106898; 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=WTZ24tZMKofZgiilPrVbaajDkj216pKbTpOw76PPI+A=; b=f57frQP87oDqmIEcd1GG+OY7B7DI6eyCn2ORIH0SONfhH+xXP0Zm+wsZRA4Ef2gnjL Hnf9rRROKxiKlnVMdyIGXfleEkM/SvOG92psW/WnLMFsXl8Xng9JCOYD1nEEazOCXXPv tsxhcszWBk+DBfPCbmovG4NUrjQQmqhlRQ7wrwvmyz8zrZDgpz6sEY4MH0ep7pgFI6fu 5XzsOL4GDMaqtOL5YPpHGLJhCrjr1RSY+72duc0g5P1Ii2AFNTsdXsYeU3TS5uNEs2pS amuQhbTyH759EwWSygpwKFiFJA5BSsof18Oa3HHT12sqx2/o/N29UHvzye/5shzW75Gf sJ6A== X-Gm-Message-State: AOJu0Yz3fCKNuxAvISxNWqSYZq0kNMOpcDwy1ntl4+pNTwoGk7PR1OmK BN/oUe5C+M9hEKq0xMxRz9Zw44tkW+4ocIPjf9FHUYT8e6tfgf6bWTfQS1Z4ltCcLV0oj2jJTuX 1 X-Received: by 2002:a37:db09:0:b0:783:d550:4b6f with SMTP id e9-20020a37db09000000b00783d5504b6fmr2657278qki.26.1707502098085; Fri, 09 Feb 2024 10:08:18 -0800 (PST) Received: from borderland.rhod.uc.edu ([129.137.96.2]) by smtp.gmail.com with ESMTPSA id j9-20020a37ef09000000b007833008dae8sm911102qkk.98.2024.02.09.10.08.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 10:08:17 -0800 (PST) From: Will Hawkins To: binutils@sourceware.org Cc: Will Hawkins Subject: [PATCH 1/1] objdump: Add callx support for BPF CPU v1 Date: Fri, 9 Feb 2024 13:07:32 -0500 Message-ID: <20240209180734.443763-2-hawkinsw@obs.cr> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240209180734.443763-1-hawkinsw@obs.cr> References: <20240209180734.443763-1-hawkinsw@obs.cr> MIME-Version: 1.0 X-Spam-Status: No, score=-8.7 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: 1790445726627560991 X-GMAIL-MSGID: 1790445735243965252 Add support for disassembling the callx instruction back to CPU v1. include/ChangeLog: * opcode/bpf.h (enum bpf_insn_id): opcodes/ChangeLog: * bpf-opc.c: ChangeLog: * sim/bpf/bpf-sim.c (execute): Signed-off-by: Will Hawkins --- include/opcode/bpf.h | 2 +- opcodes/bpf-opc.c | 2 ++ sim/bpf/bpf-sim.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/opcode/bpf.h b/include/opcode/bpf.h index df1e3bd0918..48cef368e4e 100644 --- a/include/opcode/bpf.h +++ b/include/opcode/bpf.h @@ -202,7 +202,7 @@ enum bpf_insn_id BPF_INSN_JAR, BPF_INSN_JEQR, BPF_INSN_JGTR, BPF_INSN_JSGTR, BPF_INSN_JGER, BPF_INSN_JSGER, BPF_INSN_JLTR, BPF_INSN_JSLTR, BPF_INSN_JSLER, BPF_INSN_JLER, BPF_INSN_JSETR, BPF_INSN_JNER, - BPF_INSN_CALLR, BPF_INSN_CALL, BPF_INSN_EXIT, + BPF_INSN_CALLR, BPF_INSN_CALLX, BPF_INSN_CALL, BPF_INSN_EXIT, /* Compare-and-jump instructions (reg OP imm.) */ BPF_INSN_JEQI, BPF_INSN_JGTI, BPF_INSN_JSGTI, BPF_INSN_JGEI, BPF_INSN_JSGEI, BPF_INSN_JLTI, BPF_INSN_JSLTI, diff --git a/opcodes/bpf-opc.c b/opcodes/bpf-opc.c index 19e096501a2..3f030a39c1b 100644 --- a/opcodes/bpf-opc.c +++ b/opcodes/bpf-opc.c @@ -274,6 +274,8 @@ const struct bpf_opcode bpf_opcodes[] = 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_INSN_CALLX, "callx%W%dr", "callx%w%dr", + 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", diff --git a/sim/bpf/bpf-sim.c b/sim/bpf/bpf-sim.c index c1f103823fb..a3976d0b4bf 100644 --- a/sim/bpf/bpf-sim.c +++ b/sim/bpf/bpf-sim.c @@ -1096,6 +1096,10 @@ execute (SIM_CPU *cpu, struct bpf_insn *insn) BPF_TRACE ("BPF_INSN_CALLR\n"); bpf_call (cpu, DISP (bpf_regs[insn->dst]), insn->src); break; + case BPF_INSN_CALLX: + BPF_TRACE ("BPF_INSN_CALLX\n"); + bpf_call (cpu, DISP (bpf_regs[insn->dst]), insn->src); + break; case BPF_INSN_CALL: BPF_TRACE ("BPF_INSN_CALL\n"); bpf_call (cpu, insn->imm32, insn->src);