From nobody Wed Nov 24 04:22:17 2021 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 B72551889B34; Wed, 24 Nov 2021 04:22:18 +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 4HzSXB0kZjz3Ht4; Wed, 24 Nov 2021 04:22:17 +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 74D28239A7; Wed, 24 Nov 2021 04:22:17 +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 1AO4MHe8049670; Wed, 24 Nov 2021 04:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO4MHZL049669; Wed, 24 Nov 2021 04:22:17 GMT (envelope-from git) Date: Wed, 24 Nov 2021 04:22:17 GMT Message-Id: <202111240422.1AO4MHZL049669@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: 76d6bb6a6e8f - main - powerpc: Make machine/reg.h self-contained 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 76d6bb6a6e8f61ed267ac245cdf2d293deade8d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637727738; 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=G9/MfpNvff+JGjcj2khKMB9wdKWzXY3I3xV7aqq9pmA=; b=lYJ2pgC0iz3CdZlcS+8by/0inNIzh3qiSNquIGCzHrxnTrULl79a4dX00iQpKzJwRHhKvG K4KASD6KkdiBkWXb6yu+2Kfe/EtplSKWBq6VptAy11Gkp5x1zWgzpB7VGD3YS8rkkavJNq VGw4gHvvVOxNvcNNetFeEqAzNr4IBIGn1WsJgJUpRVrMVkpwtvgvR84KzF2fTosboXnJ49 Pbw9gslCGu8Z/DpnMKmgOpW5MGa8AjOq2DozA2x02qBkyYBNbdjQc6BhlfCfi48CMVQ70u cSocufg8ey21mxCNyWsThIxKkcsLQJY5YG6C30Nl167VdbvLT3ceajDLkFaiGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637727738; a=rsa-sha256; cv=none; b=CThG9apBx+icICmZbwhDU371BwwUBwZ3jURVlfS+q2qpVo1PfXKFB/iF2t1VKC1POZMNHk YgejyFOogK0wda+UVcJPh5O75Sh/lUg7hPDQQTWfhbxmH+pZj0ITp6+3Bv2sFUdmADu8PN 1mMo6Piwbsg4aKFzw59IsqikMmyNqVZ0bJ5xuVbA33veKgEOI/VhjQlOYvdgVe4Dn1cgXl hQFWkcHoCMIHIXmNQzS3Bcw73/uG1CmpaF7xNN7VeHp45wFv3VQ4WkRa4AdQnnpWLXA/vk sXtnMqd4zu4mzAZu0MfG6h/n9y/2HaGvvGQeM108eB6gbVrH1OTbq31Z2iDQaA== 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=76d6bb6a6e8f61ed267ac245cdf2d293deade8d7 commit 76d6bb6a6e8f61ed267ac245cdf2d293deade8d7 Author: Warner Losh AuthorDate: 2021-11-24 01:50:20 +0000 Commit: Warner Losh CommitDate: 2021-11-24 04:21:18 +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 --- 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 c0bf807ac75e..a5e2f601eaca 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 {