xnu-4903.241.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 a21a9a792a94af2a91643e9af368317aaf8fdb89..04bd5fb0d974f0b5045d3e6540b77e8df57d0dce 100644 (file)
--- a/osfmk/i386/machdep_call.c
+++ b/osfmk/i386/machdep_call.c
@@ -42,18 +42,23 @@
 
 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),
+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_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[] = {
+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),
        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_CALL_ROUTINE(kern_invalid,0),
        MACHDEP_CALL_ROUTINE64(thread_fast_set_cthread_self64,1),
        MACHDEP_CALL_ROUTINE(kern_invalid,0),