Date: Sun, 13 Apr 2003 11:48:54 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28876 for review Message-ID: <200304131848.h3DImsor099432@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28876 Change 28876 by marcel@marcel_nfs on 2003/04/13 11:48:15 Steer clear from namespace specific types. This fixes building an EPC based world. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#6 edit .. //depot/projects/ia64_epc/sys/ia64/include/signal.h#4 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/include/_regset.h#6 (text+ko) ==== @@ -44,33 +44,33 @@ /* A single FP register. */ struct _ia64_fpreg { - uint64_t fpr_bits[2]; + unsigned char fpr_bits[16]; } __aligned(16); /* * Special registers. */ struct _special { - uint64_t sp; - uint64_t unat; /* NaT before spilling */ - uint64_t rp; - uint64_t pr; - uint64_t pfs; - uint64_t bspstore; - uint64_t rnat; - uint64_t __spare; + unsigned long sp; + unsigned long unat; /* NaT before spilling */ + unsigned long rp; + unsigned long pr; + unsigned long pfs; + unsigned long bspstore; + unsigned long rnat; + unsigned long __spare; /* Userland context and syscalls */ - uint64_t tp; - uint64_t rsc; - uint64_t fpsr; - uint64_t psr; + unsigned long tp; + unsigned long rsc; + unsigned long fpsr; + unsigned long psr; /* ASYNC: Interrupt specific */ - uint64_t gp; - uint64_t ndirty; - uint64_t cfm; - uint64_t iip; - uint64_t ifa; - uint64_t isr; + unsigned long gp; + unsigned long ndirty; + unsigned long cfm; + unsigned long iip; + unsigned long ifa; + unsigned long isr; }; struct _high_fp { @@ -82,18 +82,18 @@ * Preserved registers. */ struct _callee_saved { - uint64_t unat; /* NaT after spilling. */ - uint64_t gr4; - uint64_t gr5; - uint64_t gr6; - uint64_t gr7; - uint64_t br1; - uint64_t br2; - uint64_t br3; - uint64_t br4; - uint64_t br5; - uint64_t lc; - uint64_t __spare; + unsigned long unat; /* NaT after spilling. */ + unsigned long gr4; + unsigned long gr5; + unsigned long gr6; + unsigned long gr7; + unsigned long br1; + unsigned long br2; + unsigned long br3; + unsigned long br4; + unsigned long br5; + unsigned long lc; + unsigned long __spare; }; struct _callee_saved_fp { @@ -123,36 +123,36 @@ * Scratch registers. */ struct _caller_saved { - uint64_t unat; /* NaT after spilling. */ - uint64_t gr2; - uint64_t gr3; - uint64_t gr8; - uint64_t gr9; - uint64_t gr10; - uint64_t gr11; - uint64_t gr14; - uint64_t gr15; - uint64_t gr16; - uint64_t gr17; - uint64_t gr18; - uint64_t gr19; - uint64_t gr20; - uint64_t gr21; - uint64_t gr22; - uint64_t gr23; - uint64_t gr24; - uint64_t gr25; - uint64_t gr26; - uint64_t gr27; - uint64_t gr28; - uint64_t gr29; - uint64_t gr30; - uint64_t gr31; - uint64_t br6; - uint64_t br7; - uint64_t ccv; - uint64_t csd; - uint64_t ssd; + unsigned long unat; /* NaT after spilling. */ + unsigned long gr2; + unsigned long gr3; + unsigned long gr8; + unsigned long gr9; + unsigned long gr10; + unsigned long gr11; + unsigned long gr14; + unsigned long gr15; + unsigned long gr16; + unsigned long gr17; + unsigned long gr18; + unsigned long gr19; + unsigned long gr20; + unsigned long gr21; + unsigned long gr22; + unsigned long gr23; + unsigned long gr24; + unsigned long gr25; + unsigned long gr26; + unsigned long gr27; + unsigned long gr28; + unsigned long gr29; + unsigned long gr30; + unsigned long gr31; + unsigned long br6; + unsigned long br7; + unsigned long ccv; + unsigned long csd; + unsigned long ssd; }; struct _caller_saved_fp { ==== //depot/projects/ia64_epc/sys/ia64/include/signal.h#4 (text+ko) ==== @@ -72,8 +72,8 @@ */ struct sigcontext { struct __sigset sc_mask; /* signal mask to restore */ - uint64_t sc_onstack; - uint64_t sc_flags; + unsigned long sc_onstack; + unsigned long sc_flags; struct _special sc_special; struct _callee_saved sc_preserved; struct _callee_saved_fp sc_preserved_fp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304131848.h3DImsor099432>