From nobody Tue Jan 24 22:12:32 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 4P1h6T0JKGz3bg5q; Tue, 24 Jan 2023 22:12:33 +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 4P1h6S69hhz3D2j; Tue, 24 Jan 2023 22:12:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598352; 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=uEv0Qy2IB2w0RG1SQ5ZpSclQ5ScttQwqsGyR7PT1rSA=; b=AtggjqgYd0v7dNeVbx08Bpc56ejR22b1NI40L1jIAjIwft+0OLVNn52KUzYCXdn5F0EHo7 zH8v7tV8jRzgQX5urM6Wj58XtFkCWna/ppzbPdsp1q1xOgp1TXgWQtu4tx6emirN8toYCZ vI6tiDUjD8BrA/KT3Kh5p1MCM+uNwFehb6EIGr+ByTMY5seS0YxRrJKXvMca1R+EULeUIu T7KQfFwLpuj6WIvM6QK0hHlUKfvNmCbJXjSXsPUCTs3YyTgtbq7fBhb5EJ5p31+Tv5Wh8O on6aAFzA58D0gOvsaBNUe1OvuAWKUZjthfVJfASY//SC7xMSOzb1dp6hf0luUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598352; 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=uEv0Qy2IB2w0RG1SQ5ZpSclQ5ScttQwqsGyR7PT1rSA=; b=CrmkH6MAnRplpvGsMQ06YJEz+cRyu2I1W4mbjD/Via2u9HLpswK3SwmoF8xt3UgnICrYWY tXO0AVT8ruhZ852SxpA0d+eqyzQe51NcQ2atyf6n8sYb8Jp9A8FHRM97f9hx1rln+jA9yS zvRPmTTO2Ii+zko98gYtfHZyDorSMn+bb1nBjraICh4qw1rn85N7EpnqhwbjAz4uCbJHAr DVR0nUA+ZVlyvzCZSQ2hu8tt02Abu4Q8nCVLUla6wc6CamchBrxOw8hlJmeVnemRw9LZq1 XMQekyV2LkXWiF40hEdgN+3S6Sr8Se7/D7K6tAlJqdylSxUELQah6BmNJQQ8bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598352; a=rsa-sha256; cv=none; b=c5r1C/gG/Vb7Zqf5eOhq/mlgZc0PFDa1Tfo1n3AH2xkqSxdP2yf/0EoUXYaw5+W1VBH8QS cEonjN+hc3xHdVGS30a+j//SCwqTfyvTl2e5H6Zrbm3ofv2c59T4TLCw+Z3qSgDtONtmo+ dTmR2qjNh3ZFsPwsBJ/YY59xSOqQGoUYiIK5da5hWTF6x+mpcXHnqKdv8zknyVTnXn3E21 ymwKJ+lWCrwUCO5jRE/IAFAEntA2LNkW2b9SBQjZ4iyhSZSQyLqwJxMLYgeUFzG0w+nc7T nYlHzTcsU1QrSYxwYj7cIh/ryoZ0xxfUICxcJzAZDWFz76KHjvQTCKLQtbilCQ== 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 4P1h6S51k7zQgb; Tue, 24 Jan 2023 22:12:32 +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 30OMCWTJ087171; Tue, 24 Jan 2023 22:12:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMCWTY087170; Tue, 24 Jan 2023 22:12:32 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:12:32 GMT Message-Id: <202301242212.30OMCWTY087170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 468109eba9d2 - stable/13 - stand: use archsw.arch_copyin instead of i386_copyin 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 468109eba9d2dddaf3fc7c91ae736cfd84b777a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=468109eba9d2dddaf3fc7c91ae736cfd84b777a5 commit 468109eba9d2dddaf3fc7c91ae736cfd84b777a5 Author: Warner Losh AuthorDate: 2022-09-16 15:08:23 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:34 +0000 stand: use archsw.arch_copyin instead of i386_copyin Since archsw.arch_copyin is always i386_copyin, this will be a nop in terms of functionality. This is a diff reduction against other copies of the code that differ only by what copyin routine they call. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D36568 (cherry picked from commit a705c72f214293a7aae5f83235a82f126f73e109) --- stand/i386/libi386/bootinfo.c | 10 +++++----- stand/i386/libi386/bootinfo32.c | 8 ++++---- stand/i386/libi386/bootinfo64.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stand/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c index bdf409b00ec0..84a0b3586a1c 100644 --- a/stand/i386/libi386/bootinfo.c +++ b/stand/i386/libi386/bootinfo.c @@ -116,18 +116,18 @@ bi_copyenv(vm_offset_t addr) /* traverse the environment */ for (ep = environ; ep != NULL; ep = ep->ev_next) { - i386_copyin(ep->ev_name, addr, strlen(ep->ev_name)); + archsw.arch_copyin(ep->ev_name, addr, strlen(ep->ev_name)); addr += strlen(ep->ev_name); - i386_copyin("=", addr, 1); + archsw.arch_copyin("=", addr, 1); addr++; if (ep->ev_value != NULL) { - i386_copyin(ep->ev_value, addr, strlen(ep->ev_value)); + archsw.arch_copyin(ep->ev_value, addr, strlen(ep->ev_value)); addr += strlen(ep->ev_value); } - i386_copyin("", addr, 1); + archsw.arch_copyin("", addr, 1); addr++; } - i386_copyin("", addr, 1); + archsw.arch_copyin("", addr, 1); addr++; return(addr); } diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index 7afb11c6a3b7..dd919d0fad93 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -62,7 +62,7 @@ static struct bootinfo bi; #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ - i386_copyin(&x, a, sizeof(x)); \ + archsw.arch_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } @@ -70,7 +70,7 @@ static struct bootinfo bi; COPY32(t, a, c); \ COPY32(strlen(s) + 1, a, c); \ if (c) \ - i386_copyin(s, a, strlen(s) + 1); \ + archsw.arch_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(u_long));\ } @@ -82,7 +82,7 @@ static struct bootinfo bi; COPY32(t, a, c); \ COPY32(sizeof(s), a, c); \ if (c) \ - i386_copyin(&s, a, sizeof(s)); \ + archsw.arch_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(u_long)); \ } @@ -93,7 +93,7 @@ static struct bootinfo bi; COPY32(MODINFO_METADATA | mm->md_type, a, c); \ COPY32(mm->md_size, a, c); \ if (c) \ - i386_copyin(mm->md_data, a, mm->md_size); \ + archsw.arch_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(u_long));\ } diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c index e1dc704e0e1c..1e06c229ec30 100644 --- a/stand/i386/libi386/bootinfo64.c +++ b/stand/i386/libi386/bootinfo64.c @@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$"); #define COPY32(v, a, c) { \ uint32_t x = (v); \ if (c) \ - i386_copyin(&x, a, sizeof(x)); \ + archsw.arch_copyin(&x, a, sizeof(x)); \ a += sizeof(x); \ } @@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$"); COPY32(t, a, c); \ COPY32(strlen(s) + 1, a, c); \ if (c) \ - i386_copyin(s, a, strlen(s) + 1); \ + archsw.arch_copyin(s, a, strlen(s) + 1); \ a += roundup(strlen(s) + 1, sizeof(uint64_t));\ } @@ -83,7 +83,7 @@ __FBSDID("$FreeBSD$"); COPY32(t, a, c); \ COPY32(sizeof(s), a, c); \ if (c) \ - i386_copyin(&s, a, sizeof(s)); \ + archsw.arch_copyin(&s, a, sizeof(s)); \ a += roundup(sizeof(s), sizeof(uint64_t)); \ } @@ -94,7 +94,7 @@ __FBSDID("$FreeBSD$"); COPY32(MODINFO_METADATA | mm->md_type, a, c); \ COPY32(mm->md_size, a, c); \ if (c) \ - i386_copyin(mm->md_data, a, mm->md_size); \ + archsw.arch_copyin(mm->md_data, a, mm->md_size); \ a += roundup(mm->md_size, sizeof(uint64_t));\ }