Changeset 59238 in vbox

Timestamp:

Jan 1, 2016 1:48:46 AM (9 years ago)

Author:

vboxsync

Message:

iprt/x86.h: Bitfield fix for 16-bit compilers.

File:

• trunk/include/iprt/x86.h (modified) (21 diffs)

trunk/include/iprt/x86.h

@@ -1506 +1506 @@
     uint32_t    u20PageNo : 20;
 } X86PTEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PTEBITS, 4);
+#endif
 /** Pointer to a page table entry. */
 typedef X86PTEBITS *PX86PTEBITS;
@@ -1527 +1530 @@
     uint8_t         au8[4];
 } X86PTE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PTE, 4);
+#endif
 /** Pointer to a page table entry. */
 typedef X86PTE *PX86PTE;
@@ -1569 +1575 @@
     uint32_t    u1NoExecute : 1;
 } X86PTEPAEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PTEPAEBITS, 8);
+#endif
 /** Pointer to a page table entry. */
 typedef X86PTEPAEBITS *PX86PTEPAEBITS;
@@ -1590 +1599 @@
     uint8_t         au8[8];
 } X86PTEPAE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PTEPAE, 8);
+#endif
 /** Pointer to a PAE page table entry. */
 typedef X86PTEPAE *PX86PTEPAE;
@@ -1604 +1616 @@
     X86PTE     a[X86_PG_ENTRIES];
 } X86PT;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PT, 4096);
+#endif
 /** Pointer to a page table. */
 typedef X86PT *PX86PT;
@@ -1623 +1638 @@
     X86PTEPAE  a[X86_PG_PAE_ENTRIES];
 } X86PTPAE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PTPAE, 4096);
+#endif
 /** Pointer to a page table. */
 typedef X86PTPAE *PX86PTPAE;
@@ -1699 +1717 @@
     uint32_t    u20PageNo : 20;
 } X86PDEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDEBITS, 4);
+#endif
 /** Pointer to a page directory entry. */
 typedef X86PDEBITS *PX86PDEBITS;
@@ -1740 +1761 @@
     uint32_t    u1NoExecute : 1;
 } X86PDEPAEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDEPAEBITS, 8);
+#endif
 /** Pointer to a page directory entry. */
 typedef X86PDEPAEBITS *PX86PDEPAEBITS;
@@ -1804 +1828 @@
 {
     /** Flags whether(=1) or not the page is present. */
-    unsigned    u1Present : 1;
+    uint32_t    u1Present : 1;
     /** Read(=0) / Write(=1) flag. */
-    unsigned    u1Write : 1;
+    uint32_t    u1Write : 1;
     /** User(=1) / Supervisor (=0) flag. */
-    unsigned    u1User : 1;
+    uint32_t    u1User : 1;
     /** Write Thru flag. If PAT enabled, bit 0 of the index. */
-    unsigned    u1WriteThru : 1;
+    uint32_t    u1WriteThru : 1;
     /** Cache disabled flag. If PAT enabled, bit 1 of the index. */
-    unsigned    u1CacheDisable : 1;
+    uint32_t    u1CacheDisable : 1;
     /** Accessed flag.
      * Indicates that the page have been read or written to. */
-    unsigned    u1Accessed : 1;
+    uint32_t    u1Accessed : 1;
     /** Dirty flag.
      * Indicates that the page has been written to. */
-    unsigned    u1Dirty : 1;
+    uint32_t    u1Dirty : 1;
     /** Page size flag - always 1 for 4MB entries. */
-    unsigned    u1Size : 1;
+    uint32_t    u1Size : 1;
     /** Global flag.  */
-    unsigned    u1Global : 1;
+    uint32_t    u1Global : 1;
     /** Available for use to system software. */
-    unsigned    u3Available : 3;
+    uint32_t    u3Available : 3;
     /** Reserved / If PAT enabled, bit 2 of the index.  */
-    unsigned    u1PAT : 1;
+    uint32_t    u1PAT : 1;
     /** Bits 32-39 of the page number on AMD64.
      * This AMD64 hack allows accessing 40bits of physical memory without PAE. */
-    unsigned    u8PageNoHigh : 8;
+    uint32_t    u8PageNoHigh : 8;
     /** Reserved. */
-    unsigned    u1Reserved : 1;
+    uint32_t    u1Reserved : 1;
     /** Physical Page number of the page. */
-    unsigned    u10PageNo : 10;
+    uint32_t    u10PageNo : 10;
 } X86PDE4MBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDE4MBITS, 4);
+#endif
 /** Pointer to a page table entry. */
 typedef X86PDE4MBITS *PX86PDE4MBITS;
@@ -1881 +1908 @@
     uint32_t    u1NoExecute : 1;
 } X86PDE2MPAEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDE2MPAEBITS, 8);
+#endif
 /** Pointer to a 2MB PAE page table entry. */
 typedef X86PDE2MPAEBITS *PX86PDE2MPAEBITS;
@@ -1906 +1936 @@
     uint32_t        au32[1];
 } X86PDE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDE, 4);
+#endif
 /** Pointer to a page directory entry. */
 typedef X86PDE *PX86PDE;
@@ -1929 +1962 @@
     uint32_t        au32[2];
 } X86PDEPAE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDEPAE, 8);
+#endif
 /** Pointer to a page directory entry. */
 typedef X86PDEPAE *PX86PDEPAE;
@@ -1942 +1978 @@
     X86PDE      a[X86_PG_ENTRIES];
 } X86PD;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PD, 4096);
+#endif
 /** Pointer to a page directory. */
 typedef X86PD *PX86PD;
@@ -1961 +2000 @@
     X86PDEPAE   a[X86_PG_PAE_ENTRIES];
 } X86PDPAE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDPAE, 4096);
+#endif
 /** Pointer to a PAE page directory. */
 typedef X86PDPAE *PX86PDPAE;
@@ -2031 +2073 @@
     uint32_t    u12Reserved : 12;
 } X86PDPEBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDPEBITS, 8);
+#endif
 /** Pointer to a page directory pointer table entry. */
 typedef X86PDPEBITS *PX86PTPEBITS;
@@ -2067 +2112 @@
     uint32_t    u1NoExecute : 1;
 } X86PDPEAMD64BITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDPEAMD64BITS, 8);
+#endif
 /** Pointer to a page directory pointer table entry. */
 typedef X86PDPEAMD64BITS *PX86PDPEAMD64BITS;
@@ -2090 +2138 @@
     uint32_t        au32[2];
 } X86PDPE;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDPE, 8);
+#endif
 /** Pointer to a page directory pointer table entry. */
 typedef X86PDPE *PX86PDPE;
@@ -2104 +2155 @@
     X86PDPE         a[X86_PG_AMD64_PDPE_ENTRIES];
 } X86PDPT;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PDPT, 4096);
+#endif
 /** Pointer to a page directory pointer table. */
 typedef X86PDPT *PX86PDPT;
@@ -2176 +2230 @@
     uint32_t    u1NoExecute : 1;
 } X86PML4EBITS;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PML4EBITS, 8);
+#endif
 /** Pointer to a page map level-4 entry. */
 typedef X86PML4EBITS *PX86PML4EBITS;
@@ -2197 +2254 @@
     uint32_t        au32[2];
 } X86PML4E;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PML4E, 8);
+#endif
 /** Pointer to a page map level-4 entry. */
 typedef X86PML4E *PX86PML4E;
@@ -2211 +2271 @@
     X86PML4E        a[X86_PG_PAE_ENTRIES];
 } X86PML4;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(X86PML4, 4096);
+#endif
 /** Pointer to a page map level-4. */
 typedef X86PML4 *PX86PML4;