From owner-p4-projects Sun Sep 22 23:57:19 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE84F37B404; Sun, 22 Sep 2002 23:57:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5718B37B401 for ; Sun, 22 Sep 2002 23:57:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC42D43E42 for ; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8N6vFCo063139 for ; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8N6vFtq063135 for perforce@freebsd.org; Sun, 22 Sep 2002 23:57:15 -0700 (PDT) Date: Sun, 22 Sep 2002 23:57:15 -0700 (PDT) Message-Id: <200209230657.g8N6vFtq063135@freefall.freebsd.org> X-Authentication-Warning: freefall.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm Subject: PERFORCE change 17975 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17975 Change 17975 by peter@peter_overcee on 2002/09/22 23:56:20 integrate i386_hammer for segments.h tweaks and __packed crud Affected files ... .. //depot/projects/hammer/sys/x86_64/include/npx.h#5 integrate .. //depot/projects/hammer/sys/x86_64/include/segments.h#7 integrate Differences ... ==== //depot/projects/hammer/sys/x86_64/include/npx.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/i386/include/npx.h,v 1.25 2002/09/16 19:25:41 mini Exp $ + * $FreeBSD: src/sys/i386/include/npx.h,v 1.26 2002/09/23 05:55:10 peter Exp $ */ /* @@ -75,7 +75,7 @@ } sv_fp[8]; struct xmmacc sv_xmm[16]; u_char sv_pad[96]; -} __attribute__((aligned(16))); +} __aligned(16); /* * The hardware default control word for i387's and later coprocessors is ==== //depot/projects/hammer/sys/x86_64/include/segments.h#7 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/i386/include/segments.h,v 1.30 2002/09/22 04:45:21 peter Exp $ + * $FreeBSD: src/sys/i386/include/segments.h,v 1.31 2002/09/23 06:50:07 peter Exp $ */ #ifndef _MACHINE_SEGMENTS_H_ @@ -64,8 +64,7 @@ */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __attribute__ ((packed)); - /* segment base address (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ unsigned sd_type:5 ; /* segment type */ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ @@ -82,8 +81,7 @@ */ struct segment_descriptor { unsigned sd_lolimit:16 ; /* segment extent (lsb) */ - unsigned sd_lobase:24 __attribute__ ((packed)); - /* segment base address (lsb) */ + unsigned sd_lobase:24 __packed; /* segment base address (lsb) */ unsigned sd_type:5 ; /* segment type */ unsigned sd_dpl:2 ; /* segment descriptor priority level */ unsigned sd_p:1 ; /* segment descriptor present */ @@ -180,8 +178,8 @@ * region descriptors, used to load gdt/idt tables before segments yet exist. */ struct region_descriptor { - unsigned rd_limit:16; /* segment extent */ - unsigned rd_base:32 __attribute__ ((packed)); /* base address */ + unsigned rd_limit:16; /* segment extent */ + unsigned rd_base:32 __packed; /* base address */ }; /* To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message