From nobody Mon May 26 15:33:32 2025 X-Original-To: dev-commits-src-main@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 4b5ftP1pnMz5wBXJ; Mon, 26 May 2025 15:33: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b5ftN5R3qz435v; Mon, 26 May 2025 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273612; 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=H2apwGf6VK4YemEAU1sD1a1FQPsO36iazmOh8mi8v8M=; b=rH8U7xzWOVu0qV2hvxQfDaoQkB3v5sYquux7xezAG7OuOOEO7buTne+L7abMtu2GnAWdt8 l9yTMPKKjtSmFkqmq4OGbb0fer5E86ylWkY/RJDQiKEu2x+CHIYk8sGMHUXz8aqtXxgy+n 8aj6b2pyTF6F9fIb3SGi1VTVu6QctorIf4MBr31OmStbtsTpolMFt2zet8k0dcjRN9Yh21 dCs4A310EHeKZYrEE5JZFg8ZM3T9iaHaccW+d86aYWdSQoFsap+YlUSztliHukBV9eFrKu dwWOBBQyHHiGzLXoLJ4rn7NXC9sAPwm+9/8gZdtqB+ihle3DNX/OhNbnaeUBjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748273612; 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=H2apwGf6VK4YemEAU1sD1a1FQPsO36iazmOh8mi8v8M=; b=wrmutGdgwaW9YoNaWWXowCMglPW0AJ/rl/hY9r+LnfqOu7i52vuFQtd/t40Zc6nvlmx2Gc rxBBgJrkcThxvDV+5+7upLDkqCMEsMtB7RXOOjFlHVrKOMtdeAHQsif5KiQHBE2wRzSEA3 g02yTaMaMhRzB245+xWBsehHM4FmKI11+DdOTkg73PzSRmJkXXtju5Ok6mKGCJ/G2ZQoqt SGw5V+u6r0skfTqqUZ1XaztpOFvaDLxA1Pe6z7KQPW8I+W5MMTX6M95v5t5Cbs4a525PfO 8gWPx6qlU/m/8YPX/h8BjAMda0+b8+2xPCj0NHVli5DPFpwz5C5PIT/2HceJhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748273612; a=rsa-sha256; cv=none; b=OWf4wZ8abV95JYi36a4Vqpx41YXMyZ1pImI0TMKzceY/lC9wREizm+YF1Pqi7/Y9JNO9nA ZCzwmEmYna3QEi4zdKxl5nGqVfM+SF9+m1uXs1HXyF5jDDSvBDG5q81CfggpL01ntbJUxb tiEhUMFlOR7Akx037Kb0G0L1X8/oCaF8Jx8l537+nYFdwaQAbfCq35LleqROYFEW3e7jlo IKFt19NKdQoe4ZV0J+fTRRsnJTG1ZR/gFWiQlDKtzDiZMPKGQjhL55zMktbeUL+ocHWFPO EMJ95g7teSmyfDu7PQVwiMPcKG4LnZ37U/dy8Vp7jCoplws9qDM44BSs9zI63A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4b5ftN52qFz1CBZ; Mon, 26 May 2025 15:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54QFXWB5045044; Mon, 26 May 2025 15:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54QFXWEP045041; Mon, 26 May 2025 15:33:32 GMT (envelope-from git) Date: Mon, 26 May 2025 15:33:32 GMT Message-Id: <202505261533.54QFXWEP045041@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 62d1ec7889a8 - main - stand/i386: Initialize archsw at compile time List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 62d1ec7889a864a4c50f727f913384ea50e8a88e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=62d1ec7889a864a4c50f727f913384ea50e8a88e commit 62d1ec7889a864a4c50f727f913384ea50e8a88e Author: Warner Losh AuthorDate: 2025-05-25 15:17:53 +0000 Commit: Warner Losh CommitDate: 2025-05-26 15:30:37 +0000 stand/i386: Initialize archsw at compile time No need to initialize this at runtime. This trades .bss space + code in .text for just .data and is net smaller by 4 bytes. Sponsored by: Netflix --- stand/i386/loader/main.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index e7a42c194326..a7dfb2dde762 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -61,21 +61,35 @@ static uint32_t initial_howto; static uint32_t initial_bootdev; static struct bootinfo *initial_bootinfo; -struct arch_switch archsw; /* MI/MD interface boundary */ - -static void extract_currdev(void); static int isa_inb(int port); static void isa_outb(int port, int value); + +#ifdef LOADER_ZFS_SUPPORT +struct zfs_boot_args *zargs; +static void i386_zfs_probe(void); +#endif + +struct arch_switch archsw = { /* MI/MD interface boundary */ + .arch_autoload = i386_autoload, + .arch_getdev = i386_getdev, + .arch_copyin = i386_copyin, + .arch_copyout = i386_copyout, + .arch_readin = i386_readin, + .arch_isainb = isa_inb, + .arch_isaoutb = isa_outb, + .arch_hypervisor = x86_hypervisor, +#ifdef LOADER_ZFS_SUPPORT + .arch_zfs_probe = i386_zfs_probe, +#endif +}; + +static void extract_currdev(void); void exit(int code); #ifdef LOADER_GELI_SUPPORT #include "geliboot.h" struct geli_boot_args *gargs; struct geli_boot_data *gbdata; #endif -#ifdef LOADER_ZFS_SUPPORT -struct zfs_boot_args *zargs; -static void i386_zfs_probe(void); -#endif /* XXX debugging */ extern char end[]; @@ -182,17 +196,7 @@ main(void) bc_add(initial_bootdev); } - archsw.arch_autoload = i386_autoload; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; - archsw.arch_hypervisor = x86_hypervisor; #ifdef LOADER_ZFS_SUPPORT - archsw.arch_zfs_probe = i386_zfs_probe; - /* * zfsboot and gptzfsboot have always passed KARGS_FLAGS_ZFS, * so if that is set along with KARGS_FLAGS_EXTARG we know we