xnu-2422.115.4.tar.gz

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

diff --git a/osfmk/i386/asm.h b/osfmk/i386/asm.h
index a51f8ae925a06437752f58865c512cb4235299d1..b04ac6a7d3ac0a32f08b03fa6603aeec26e89e69 100644 (file)
--- a/osfmk/i386/asm.h
+++ b/osfmk/i386/asm.h
@@ -61,13 +61,6 @@
 #include <gprof.h>
 #endif /* _KERNEL */
 
-#ifdef MACH_KERNEL
-#include <mach_kdb.h>
-#else  /* !MACH_KERNEL */
-#define        MACH_KDB 0
-#endif /* !MACH_KERNEL */
-
-
 #if    defined(MACH_KERNEL) || defined(_KERNEL)
 #include <gprof.h>
 #endif /* MACH_KERNEL || _KERNEL */
@@ -284,17 +277,7 @@
 #define Lgmemload(lab,reg)     movl Lgotoff(lab),reg
 #define Lgmemstore(reg,lab,tmp)        movl reg,Lgotoff(lab)
 
-#ifdef ASSEMBLER
-#if    MACH_KDB
-#include <ddb/stab.h>
-/*
- * This pseudo-assembler line is added so that there will be at least
- *     one N_SO entry in the symbol stable to define the current file name.
- */
-#endif /* MACH_KDB */
-
-#else /* NOT ASSEMBLER */
-
+#ifndef ASSEMBLER
 /* These defines are here for .c files that wish to reference global symbols
  * within __asm__ statements. 
  */
@@ -393,6 +376,7 @@
 
 #define CCALL2(fn, arg1, arg2)                  \
        mov     arg1, %rdi                      ;\
+       mov     arg2, %rsi                      ;\
        CCALL(fn)
 
 #define CCALL3(fn, arg1, arg2, arg3)            \