From nobody Wed Nov 24 04:22:15 2021 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 AE1D11889B1A; Wed, 24 Nov 2021 04:22:15 +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 4HzSX72MCjz3Hc1; Wed, 24 Nov 2021 04:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2ED07237A4; Wed, 24 Nov 2021 04:22:15 +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 1AO4MF6b049615; Wed, 24 Nov 2021 04:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO4MFDB049614; Wed, 24 Nov 2021 04:22:15 GMT (envelope-from git) Date: Wed, 24 Nov 2021 04:22:15 GMT Message-Id: <202111240422.1AO4MFDB049614@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: 8ee8271e2297 - main - arm64: Make machine/reg.h self contained 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/main X-Git-Reftype: branch X-Git-Commit: 8ee8271e22975f77f8c147c81470b8eaee3bbab9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637727735; 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=GwrsiS53WtRL/QeZlhwLlpqGrDKnQvM/K78wwPQgUyM=; b=hp0ZiSmsCQCJoZHgBu71fyfxne5DlQelc/1PXyv2oeooghvwp1H6zHWQhpM93rbKt8zTR5 IjlFJEF7p+ohO6QV9zQ/B3gBVB+fyZBavpCSE4f1dUJ8uXgPFJGfJLigY7Z6ueu9F5ZVQA XFTaOW9ieGvpTYQvoP30AobMha4OurtRSimFx46SYyJDiHFazL12YZgYNzIdVqhY7vsPpn wrlDxe1K6ufeYB4BvAT86KrT8yZY34AbygLBFwTbUuVk1MIpMGWxG16GNMwl8YknKGlBoR P73EyXjMwlgwMO/RdmA/ewTNBpP2HYXtROwyxH1MnbKZ4lgdvoyKkeI8fU5Fuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637727735; a=rsa-sha256; cv=none; b=itbZVZ6rK7GcVcPI3aam/crBIhnc2e4kw8DWtUez/KefKOGRObx0TxEcK6e6v/oWJiC3An l2UJGOuTrT26qThFXaY80jukOhEIne+w7P1T0P3GDov8nyn2X8nIGRI78xqinq6dd3VeLs KUVVW8qGN7c21T+5hYO0k2s3Opm+y8Iwpeb4eOUle+mOiVGCBoeSxOFMQFRewEk7dfu2R3 U6/ZUAoqftc0NdF6FD+F7IHBcSer8QcCHCpPg2aXuuu76DJlaZ56qhYOk020wzDsTCFzzm C3fj+8NibUtP5obt2mwJ5WeMnCspQioja8F/OBzcWt5B4j0CgS1S2c893Zxacg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee8271e22975f77f8c147c81470b8eaee3bbab9 commit 8ee8271e22975f77f8c147c81470b8eaee3bbab9 Author: Warner Losh AuthorDate: 2021-11-24 01:01:01 +0000 Commit: Warner Losh CommitDate: 2021-11-24 04:21:17 +0000 arm64: Make machine/reg.h self contained Make sys/reg.h includable on aarch64 by making machine/reg.h self-contained: Include sys/_types.h and use __uint* instead of uint*. Sponsored by: Netflix --- sys/arm64/include/reg.h | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/sys/arm64/include/reg.h b/sys/arm64/include/reg.h index d7c3354bfd2f..bb151af55ba6 100644 --- a/sys/arm64/include/reg.h +++ b/sys/arm64/include/reg.h @@ -33,12 +33,14 @@ #ifndef _MACHINE_REG_H_ #define _MACHINE_REG_H_ +#include + struct reg { - uint64_t x[30]; - uint64_t lr; - uint64_t sp; - uint64_t elr; - uint32_t spsr; + __uint64_t x[30]; + __uint64_t lr; + __uint64_t sp; + __uint64_t elr; + __uint32_t spsr; }; struct reg32 { @@ -51,8 +53,8 @@ struct reg32 { struct fpreg { __uint128_t fp_q[32]; - uint32_t fp_sr; - uint32_t fp_cr; + __uint32_t fp_sr; + __uint32_t fp_cr; }; struct fpreg32 { @@ -60,20 +62,20 @@ struct fpreg32 { }; struct dbreg { - uint8_t db_debug_ver; - uint8_t db_nbkpts; - uint8_t db_nwtpts; - uint8_t db_pad[5]; + __uint8_t db_debug_ver; + __uint8_t db_nbkpts; + __uint8_t db_nwtpts; + __uint8_t db_pad[5]; struct { - uint64_t dbr_addr; - uint32_t dbr_ctrl; - uint32_t dbr_pad; + __uint64_t dbr_addr; + __uint32_t dbr_ctrl; + __uint32_t dbr_pad; } db_breakregs[16]; struct { - uint64_t dbw_addr; - uint32_t dbw_ctrl; - uint32_t dbw_pad; + __uint64_t dbw_addr; + __uint32_t dbw_ctrl; + __uint32_t dbw_pad; } db_watchregs[16]; };