xnu-1228.15.4.tar.gz

[apple/xnu.git] / osfmk / i386 / seg.h

diff --git a/osfmk/i386/seg.h b/osfmk/i386/seg.h
index 7083298dfb9a3802df23c0e6180fa48f72e2129c..9b80f01a0961ed09730b46bcdca1adfc978e22a4 100644 (file)
--- a/osfmk/i386/seg.h
+++ b/osfmk/i386/seg.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -53,13 +53,11 @@
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */

-/*
- */
-

 #ifndef        _I386_SEG_H_
 #define        _I386_SEG_H_
 
 #include <mach_kdb.h>
 #ifndef        _I386_SEG_H_
 #define        _I386_SEG_H_
 
 #include <mach_kdb.h>

+#ifndef ASSEMBLER

 #include <stdint.h>
 #include <mach/vm_types.h>
 #include <architecture/i386/sel.h>
 #include <stdint.h>
 #include <mach/vm_types.h>
 #include <architecture/i386/sel.h>


@@ -95,7 +93,8 @@ selector_to_sel(uint16_t selector)
 }
 
 #define LDTSZ          8192            /* size of the kernel ldt in entries */
 }
 
 #define LDTSZ          8192            /* size of the kernel ldt in entries */

-#define        LDTSZ_MIN       17              /* kernel ldt entries used by the system */
+#define        LDTSZ_MIN       SEL_TO_INDEX(USER_SETTABLE)
+                                       /* kernel ldt entries */

 
 #if    MACH_KDB
 #define        GDTSZ           19
 
 #if    MACH_KDB
 #define        GDTSZ           19


@@ -108,8 +107,6 @@ selector_to_sel(uint16_t selector)
  */
 #define        IDTSZ           256
 
  */
 #define        IDTSZ           256
 

-#ifndef        __ASSEMBLER__
-

 #include <sys/cdefs.h>
 
 /*
 #include <sys/cdefs.h>
 
 /*


@@ -177,7 +174,7 @@ struct fake_descriptor64 {
 };
 #define        FAKE_UBER64(addr32)     { (uint32_t) (addr32), KERNEL_UBER_BASE_HI32 }
 #define        FAKE_COMPAT(addr32)     { (uint32_t) (addr32), 0x0 }
 };
 #define        FAKE_UBER64(addr32)     { (uint32_t) (addr32), KERNEL_UBER_BASE_HI32 }
 #define        FAKE_COMPAT(addr32)     { (uint32_t) (addr32), 0x0 }

-#define        UBER64(addr32)          ((addr64_t) addr32 + KERNEL_UBER_BASE)
+#define        UBER64(addr32)          ((addr64_t) (uintptr_t)addr32 + KERNEL_UBER_BASE)

 
 /*
  * Boot-time data for master (or only) CPU
 
 /*
  * Boot-time data for master (or only) CPU


@@ -317,6 +314,7 @@ __END_DECLS
 #define        DEBUG_TSS       0x90            /* debug TSS (uniprocessor) */
 #endif
 
 #define        DEBUG_TSS       0x90            /* debug TSS (uniprocessor) */
 #endif
 

+#ifndef __ASSEMBLER__

 struct __gdt_desc_struct {
   unsigned short size;
   unsigned long address __attribute__((packed));
 struct __gdt_desc_struct {
   unsigned short size;
   unsigned long address __attribute__((packed));


@@ -328,6 +326,6 @@ struct __idt_desc_struct {
   unsigned long address __attribute__((packed));
   unsigned short pad;
 } __attribute__ ((packed));
   unsigned long address __attribute__((packed));
   unsigned short pad;
 } __attribute__ ((packed));

-
+#endif /* __ASSEMBLER__ */

 
 #endif /* _I386_SEG_H_ */
 
 #endif /* _I386_SEG_H_ */