From nobody Mon Dec 06 15:56:29 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 B1C7318C5778; Mon, 6 Dec 2021 15:56:34 +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 4J77Mg5NDKz4bVm; Mon, 6 Dec 2021 15:56:31 +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 228266463; Mon, 6 Dec 2021 15:56:29 +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 1B6FuT53033589; Mon, 6 Dec 2021 15:56:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B6FuTrW033588; Mon, 6 Dec 2021 15:56:29 GMT (envelope-from git) Date: Mon, 6 Dec 2021 15:56:29 GMT Message-Id: <202112061556.1B6FuTrW033588@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: 4e45e89d87db - stable/13 - powerpc: 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e45e89d87db6ebda98168b6a3ba660e87ff7e52 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638806194; 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=IvDgJ7lzWE1JTE4IS/Ba5YafauO4meMdAY3Glh8PAVk=; b=yudyUH4zJcG3W7tFrc63HLRB6Znbzon7Y8kcrcZsMKvFx5GWOF4xloKwGS5/9XEdn+f6IN 9kKkWeos+pZsisfttQesOrs3sm4+CgNcalWvPeHxBCoXGmR+5yknkVv+XmbhZCbgi+hm4k FM91CTNFv+L85YQBepMq3a/Cj8jzAfaQuTWvjUcpEC/C2fc8+qn8GVdM/XnVPvxHe4VPIT 1mhfqFPVdAVMiOBSUNvW0tPlbFSt+BUBoVRQQWmrzpkvT3vm5XVc8WhKraNs36NnTlOLoe 48Xh6hGZWS2CwvPmByQw53qrGcLHufI1uhkgl6pQLOFysaP1P099XaQaht7rKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638806194; a=rsa-sha256; cv=none; b=vgBK85T/1UNcw9DJHMN1lws8AxKDL2c6pz+fED8zXzVa0OqXyur243jN0hGuKh219mwNky T0/HT1i9ftD+BVxfl5nhK/KNTb5QQv8UgBYwW11VP4MJ7eYtmBy+ROQVOCa+UU9ZSb5/uE JIEIBlqgVhbrIOhPz8Ud/3KSHWcfgtkHuyhxjlGJ80fttJAdPADNyyny+eVXXgNov9fvc/ RECIq9hiAIsxEhL4Q2rLV4pgdlZ0elTmsMj9L1MgB1eE8q0QfjZi965UZoEF1nSoDFEKW7 DxI+w0S75cim14hraBd2h9XVkgglo1xJNp21UCn2c4rDxodZY41lMuLA3kHV3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e45e89d87db6ebda98168b6a3ba660e87ff7e52 commit 4e45e89d87db6ebda98168b6a3ba660e87ff7e52 Author: Warner Losh AuthorDate: 2021-11-24 01:50:20 +0000 Commit: Warner Losh CommitDate: 2021-12-06 15:55:57 +0000 powerpc: Make machine/reg.h self-contained Make powerpc*'s machine/reg.h self-contained so that sys/reg.h can be self-contained. Sponsored by: Netflix (cherry picked from commit 76d6bb6a6e8f61ed267ac245cdf2d293deade8d7) --- sys/powerpc/include/reg.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/sys/powerpc/include/reg.h b/sys/powerpc/include/reg.h index a824792b0f12..2fc0636e1c93 100644 --- a/sys/powerpc/include/reg.h +++ b/sys/powerpc/include/reg.h @@ -4,14 +4,16 @@ #ifndef _POWERPC_REG_H_ #define _POWERPC_REG_H_ +#include + /* Must match struct trapframe */ struct reg { - register_t fixreg[32]; - register_t lr; - register_t cr; - register_t xer; - register_t ctr; - register_t pc; + __register_t fixreg[32]; + __register_t lr; + __register_t cr; + __register_t xer; + __register_t ctr; + __register_t pc; }; struct fpreg { @@ -21,10 +23,10 @@ struct fpreg { /* Must match pcb.pcb_vec */ struct vmxreg { - uint32_t vr[32][4]; - uint32_t pad[2]; - uint32_t vrsave; - uint32_t vscr; + __uint32_t vr[32][4]; + __uint32_t pad[2]; + __uint32_t vrsave; + __uint32_t vscr; }; struct dbreg { @@ -34,12 +36,12 @@ struct dbreg { #ifdef __LP64__ /* Must match struct trapframe */ struct reg32 { - int32_t fixreg[32]; - int32_t lr; - int32_t cr; - int32_t xer; - int32_t ctr; - int32_t pc; + __int32_t fixreg[32]; + __int32_t lr; + __int32_t cr; + __int32_t xer; + __int32_t ctr; + __int32_t pc; }; struct fpreg32 {