From owner-svn-src-head@freebsd.org Fri Dec 4 14:52:41 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E17934A2B55; Fri, 4 Dec 2020 14:52:41 +0000 (UTC) (envelope-from hselasky@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CnbKP5twkz4pc0; Fri, 4 Dec 2020 14:52:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD07157D2; Fri, 4 Dec 2020 14:52:41 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B4Eqf93029138; Fri, 4 Dec 2020 14:52:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B4Eqfq8029137; Fri, 4 Dec 2020 14:52:41 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <202012041452.0B4Eqfq8029137@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 4 Dec 2020 14:52:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368330 - head/stand/kshim X-SVN-Group: head X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: head/stand/kshim X-SVN-Commit-Revision: 368330 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2020 14:52:41 -0000 Author: hselasky Date: Fri Dec 4 14:52:41 2020 New Revision: 368330 URL: https://svnweb.freebsd.org/changeset/base/368330 Log: Add more macros, types and prototypes for building kernel code into bootloaders. MFC after: 1 week Sponsored by: Mellanox Technologies // NVIDIA Networking Modified: head/stand/kshim/bsd_kernel.h Modified: head/stand/kshim/bsd_kernel.h ============================================================================== --- head/stand/kshim/bsd_kernel.h Fri Dec 4 14:50:55 2020 (r368329) +++ head/stand/kshim/bsd_kernel.h Fri Dec 4 14:52:41 2020 (r368330) @@ -38,6 +38,7 @@ #include #include +#define offsetof(type, field) __builtin_offsetof(type, field) #define howmany(x, y) (((x)+((y)-1))/(y)) #define nitems(x) (sizeof((x)) / sizeof((x)[0])) #define isalpha(x) (((x) >= 'a' && (x) <= 'z') || ((x) >= 'A' && (x) <= 'Z')) @@ -77,6 +78,7 @@ struct sysctl_req { #define EVENTHANDLER_DECLARE(...) #define EVENTHANDLER_INVOKE(...) #define KASSERT(...) +#define CTASSERT(x) _Static_assert(x, "compile-time assertion failed") #define SCHEDULER_STOPPED(x) (0) #define PI_SWI(...) (0) #define UNIQ_NAME(x) x @@ -119,6 +121,8 @@ SYSINIT_ENTRY(uniq##_entry, "sysuninit", (subs), \ #define hz 1000 #undef PAGE_SIZE #define PAGE_SIZE 4096 +#undef PAGE_SHIFT +#define PAGE_SHIFT 12 #undef MIN #define MIN(a,b) (((a) < (b)) ? (a) : (b)) #undef MAX @@ -227,10 +231,21 @@ typedef uint16_t mode_t; typedef uint8_t *caddr_t; #define _UINTPTR_T_DECLARED typedef unsigned long uintptr_t; +#define _UINTMAX_T_DECLARED +typedef unsigned long uintmax_t; +typedef unsigned long vm_paddr_t; #define _SIZE_T_DECLARED typedef unsigned long size_t; -typedef unsigned long u_long; +#define _SSIZE_T_DECLARED +typedef signed long ssize_t; +#define _OFF_T_DECLARED +typedef unsigned long off_t; + +typedef unsigned char u_char; +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; #endif typedef unsigned long bus_addr_t; @@ -491,6 +506,7 @@ void module_register(void *); void *memset(void *, int, size_t len); void *memcpy(void *, const void *, size_t len); +int memcmp(const void *, const void *, size_t len); int printf(const char *,...) __printflike(1, 2); int snprintf(char *restrict str, size_t size, const char *restrict format,...) __printflike(3, 4); size_t strlen(const char *s);