xnu-4570.51.1.tar.gz

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

diff --git a/osfmk/i386/machdep_call.h b/osfmk/i386/machdep_call.h
index 142d43f52ca3c578e5867fa057c93221c2f6f126..29a25f4d7118fd5e761ced1e91f30620aac14204 100644 (file)
--- a/osfmk/i386/machdep_call.h
+++ b/osfmk/i386/machdep_call.h
@@ -1,31 +1,29 @@
 /*
 /*

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

  *
  *

- * @APPLE_LICENSE_OSREFERENCE_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 
- * compliance with the License.  The rights granted to you under the 
- * License may not be used to create, or enable the creation or 
- * redistribution of, 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.
- *
- * 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, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * 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.
+ * 
+ * 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,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * 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.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1992 NeXT Computer, Inc.
  */
 /*
  * Copyright (c) 1992 NeXT Computer, Inc.


@@ -43,10 +41,12 @@ typedef union {
        kern_return_t           (*args_1)(uint32_t);
        kern_return_t           (*args64_1)(uint64_t);
        kern_return_t           (*args_2)(uint32_t,uint32_t);
        kern_return_t           (*args_1)(uint32_t);
        kern_return_t           (*args64_1)(uint64_t);
        kern_return_t           (*args_2)(uint32_t,uint32_t);

+       kern_return_t           (*args64_2)(uint64_t,uint64_t);

        kern_return_t           (*args_3)(uint32_t,uint32_t,uint32_t);
        kern_return_t           (*args_4)(uint32_t,uint32_t,uint32_t,uint32_t);
        kern_return_t           (*args_var)(uint32_t,...);
        kern_return_t           (*args_3)(uint32_t,uint32_t,uint32_t);
        kern_return_t           (*args_4)(uint32_t,uint32_t,uint32_t,uint32_t);
        kern_return_t           (*args_var)(uint32_t,...);

-       int                     (*args_bsd_3)(int *, uint32_t,uint32_t,uint32_t);
+       int                     (*args_bsd_3)(uint32_t *, uint32_t,
+                                             uint32_t, uint32_t);

 } machdep_call_routine_t;
 
 #define MACHDEP_CALL_ROUTINE(func, args)       \
 } machdep_call_routine_t;
 
 #define MACHDEP_CALL_ROUTINE(func, args)       \


@@ -54,7 +54,7 @@ typedef union {
        
 #define MACHDEP_CALL_ROUTINE64(func, args)     \
        { { .args64_ ## args = func }, args, 0 }
        
 #define MACHDEP_CALL_ROUTINE64(func, args)     \
        { { .args64_ ## args = func }, args, 0 }

-       
+

 #define MACHDEP_BSD_CALL_ROUTINE(func, args)   \
        { { .args_bsd_ ## args = func }, args, 1 }
 
 #define MACHDEP_BSD_CALL_ROUTINE(func, args)   \
        { { .args_bsd_ ## args = func }, args, 1 }
 


@@ -64,19 +64,22 @@ typedef struct {
     int                                bsd_style;
 } machdep_call_t;
 
     int                                bsd_style;
 } machdep_call_t;
 

-extern machdep_call_t          machdep_call_table[];
-extern machdep_call_t          machdep_call_table64[];
+extern const machdep_call_t            machdep_call_table[];
+extern const machdep_call_t            machdep_call_table64[];

 
 extern int                     machdep_call_count;
 
 
 extern int                     machdep_call_count;
 

-extern kern_return_t           thread_get_cthread_self(void);
-extern kern_return_t           thread_set_cthread_self(uint32_t);
+#if HYPERVISOR
+extern kern_return_t           hv_task_trap(uint64_t,uint64_t);
+extern kern_return_t           hv_thread_trap(uint64_t,uint64_t);
+#endif
+

 extern kern_return_t           thread_fast_set_cthread_self(uint32_t);
 extern kern_return_t           thread_fast_set_cthread_self64(uint64_t);
 extern kern_return_t           thread_set_user_ldt(uint32_t,uint32_t,uint32_t);
 
 extern kern_return_t           thread_fast_set_cthread_self(uint32_t);
 extern kern_return_t           thread_fast_set_cthread_self64(uint64_t);
 extern kern_return_t           thread_set_user_ldt(uint32_t,uint32_t,uint32_t);
 

-extern int                     i386_set_ldt(int *,uint32_t,uint32_t,uint32_t);
-extern int                     i386_get_ldt(int *,uint32_t,uint32_t,uint32_t);
+extern int             i386_set_ldt(uint32_t *,uint32_t,uint32_t,uint32_t);
+extern int             i386_get_ldt(uint32_t *,uint32_t,uint32_t,uint32_t);

 
 extern void                    machdep_syscall(x86_saved_state_t *);
 extern void                    machdep_syscall64(x86_saved_state_t *);
 
 extern void                    machdep_syscall(x86_saved_state_t *);
 extern void                    machdep_syscall64(x86_saved_state_t *);