xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / i386 / machdep_call.c

diff --git a/osfmk/i386/machdep_call.c b/osfmk/i386/machdep_call.c
index 831bbe18cb0b31980bbc94130ccd48befbcb2660..cde94229291e5695e5907b91d096c130025bda8d 100644 (file)
--- a/osfmk/i386/machdep_call.c
+++ b/osfmk/i386/machdep_call.c
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2000 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@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*


@@ -35,32 +35,36 @@
  * 17 June 1992 ? at NeXT
  *     Created.
  */
  * 17 June 1992 ? at NeXT
  *     Created.
  */

- 
+

 #include <mach/mach_types.h>
 
 #include <i386/machdep_call.h>
 
 #include <mach/mach_types.h>
 
 #include <i386/machdep_call.h>
 

-extern kern_return_t   kern_invalid(void);
+extern kern_return_t    kern_invalid(void);

 
 

-machdep_call_t         machdep_call_table[] = {
-       MACHDEP_CALL_ROUTINE(thread_get_cthread_self,0),
-       MACHDEP_CALL_ROUTINE(thread_set_cthread_self,1),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE(thread_fast_set_cthread_self,1),
-       MACHDEP_CALL_ROUTINE(thread_set_user_ldt,3),
-       MACHDEP_BSD_CALL_ROUTINE(i386_set_ldt,3),
-       MACHDEP_BSD_CALL_ROUTINE(i386_get_ldt,3),
+const machdep_call_t            machdep_call_table[] = {
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_CALL_ROUTINE(thread_fast_set_cthread_self, 1),
+       MACHDEP_CALL_ROUTINE(thread_set_user_ldt, 3),
+       MACHDEP_BSD_CALL_ROUTINE(i386_set_ldt, 3),
+       MACHDEP_BSD_CALL_ROUTINE(i386_get_ldt, 3),

 };
 };

-machdep_call_t         machdep_call_table64[] = {
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE64(thread_fast_set_cthread_self64,1),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
-       MACHDEP_CALL_ROUTINE(kern_invalid,0),
+const machdep_call_t            machdep_call_table64[] = {
+#if HYPERVISOR
+       MACHDEP_CALL_ROUTINE64(hv_task_trap, 2),
+       MACHDEP_CALL_ROUTINE64(hv_thread_trap, 2),
+#else
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+#endif
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_CALL_ROUTINE64(thread_fast_set_cthread_self64, 1),
+       MACHDEP_CALL_ROUTINE(kern_invalid, 0),
+       MACHDEP_BSD_CALL_ROUTINE64(i386_set_ldt64, 3),
+       MACHDEP_BSD_CALL_ROUTINE64(i386_get_ldt64, 3)

 };
 
 };
 

-int    machdep_call_count =
-    (sizeof (machdep_call_table) / sizeof (machdep_call_t));
-
+int     machdep_call_count =
+    (sizeof(machdep_call_table) / sizeof(machdep_call_t));