From nobody Tue May 23 15:13:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QQdB36gpQz4CZcr; Tue, 23 May 2023 15:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQdB35gpSz4D39; Tue, 23 May 2023 15:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684854811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caASTqU4LCEsryGyF0i2dTUSV0AqEW3SjWGZT9RQ7DU=; b=KXfcFMTa6WVhoq6Bantwl8drgM0oQLl6duKaKZFdIvpUYT/mZOcMXCjKRlH1UiqJpxTenN eQ82ou+VYp3y1Q/WqFqymxaPxfM1CoaCvbrDeZ11w+qgYsI8b6kum5OguH9/FjGGD/itSr hEzs0d4LfTGGSBoiS053crIbTwytqPi2jFfJwxzhNpnKLuRd7cEtHth0h86u/4RvXJbZcq IqqPWz044LmnhEu4Gov3L/WpnPPDa5zEBezw9vHl2J5D9PBMPw+h+vRc3Q87jPGtW9OsCG hkeApmhoxpzx6gGY1AGa3gZCwdZagoaZH/wlJqI1uXEBckaYXnQyh8T3XPdAzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684854811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=caASTqU4LCEsryGyF0i2dTUSV0AqEW3SjWGZT9RQ7DU=; b=Yx2zwDcTgnPpD+puxqPYGKJ68CxHhrJQDi9TNJAmWsTdfeDVEihH56H8+oV2KP5LeFu5zN pI1IV4ei+8miZeOUUcnEuSo6XRix5nZKoFOfYEdoHEBWMdNemk1AGExZyV8OjjPfqAPQz/ tgBlwZG/4e0n1wn9S0I7A+m4jZ0ByW54rMlBoBaLpLsotMMDO6ax3D2e6KiuP0uIkM2n6X UdKS9AusisBTFaGtD2SQLARlXMGjDJq56evuFuESnAb8xZLYYf6oDQWWx7Bt13qZwuxlmK 9CznWnEYH2hB1H5lKHcpu/rMHp1fgKcZ1EyGZbqA5RW9F0oFTbo8/Jmtk54P3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684854811; a=rsa-sha256; cv=none; b=rnNPhbh1VQZadaCutHhqm1AB6MvoUtv8GvsFwwcT/9nHJROM4+/it/MIc8df0FM4kg6eue qP2M5TREikR6AOzP0237fYAr9CYGaEW9HeancyyLev/mtrnwQ8o84daKtPSbzA7t8wPLDi OW72Ya6Ti1czAGS2Pr9RkK+Km+31DCT4+cF8JI+2z6JZxz2RBlKZfCnLdBq3NbqnqgB6eO R0yKyuCBZEwDsYETCEjg6SU0f1UIui7zTkOiDKLa6m2biPKJBMeN5Vxg+lIy9vfUjixmZj 5ygldVKgomFcikFOEx19GgCfLPnE1nXrmbH0vkIef8EIzCk2u6lb91AP0zJmvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QQdB34c5Wz14mJ; Tue, 23 May 2023 15:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NFDVCC098760; Tue, 23 May 2023 15:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NFDVXd098759; Tue, 23 May 2023 15:13:31 GMT (envelope-from git) Date: Tue, 23 May 2023 15:13:31 GMT Message-Id: <202305231513.34NFDVXd098759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: ff624eb63606 - main - kinst: use dtrace_dis_get_byte() instead of own copy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff624eb63606534304f2867db260e2c405ea1645 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ff624eb63606534304f2867db260e2c405ea1645 commit ff624eb63606534304f2867db260e2c405ea1645 Author: Christos Margiolis AuthorDate: 2023-05-23 15:12:18 +0000 Commit: Christos Margiolis CommitDate: 2023-05-23 15:12:18 +0000 kinst: use dtrace_dis_get_byte() instead of own copy No functional change intended. Reviewed by: markj Approved by: markj (mentor) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39872 --- sys/cddl/dev/kinst/amd64/kinst_isa.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sys/cddl/dev/kinst/amd64/kinst_isa.c b/sys/cddl/dev/kinst/amd64/kinst_isa.c index b89c3ce15a1a..5035f43be440 100644 --- a/sys/cddl/dev/kinst/amd64/kinst_isa.c +++ b/sys/cddl/dev/kinst/amd64/kinst_isa.c @@ -246,18 +246,6 @@ kinst_set_disp32(struct kinst_probe *kp, uint8_t *bytes) kp->kp_md.disp = (int64_t)disp32; } -static int -kinst_dis_get_byte(void *p) -{ - int ret; - uint8_t **instr = p; - - ret = **instr; - (*instr)++; - - return (ret); -} - /* * Set up all of the state needed to faithfully execute a probed instruction. * @@ -294,7 +282,7 @@ kinst_instr_dissect(struct kinst_probe *kp, uint8_t **instr) kpmd = &kp->kp_md; d86.d86_data = instr; - d86.d86_get_byte = kinst_dis_get_byte; + d86.d86_get_byte = dtrace_dis_get_byte; d86.d86_check_func = NULL; if (dtrace_disx86(&d86, SIZE64) != 0) { KINST_LOG("failed to disassemble instruction at: %p", *instr);