xnu-7195.101.1.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / sdt_isa.h

diff --git a/osfmk/mach/i386/sdt_isa.h b/osfmk/mach/i386/sdt_isa.h
index c32239162f8e0429bfbd1e837a7bb33a96cb030f..3c2754db0a5743a0510fc36f1e367d1d95b59777 100644 (file)
--- a/osfmk/mach/i386/sdt_isa.h
+++ b/osfmk/mach/i386/sdt_isa.h
@@ -25,7 +25,7 @@
  */
 
 #ifndef _MACH_I386_SDT_ISA_H
  */
 
 #ifndef _MACH_I386_SDT_ISA_H

-#define        _MACH_I386_SDT_ISA_H
+#define _MACH_I386_SDT_ISA_H

 
 /*
  * Only define when testing.  This makes the calls into actual calls to
 
 /*
  * Only define when testing.  This makes the calls into actual calls to


@@ -40,172 +40,203 @@
  * For the kernel, set an explicit global label so the symbol can be located
  */
 #ifdef __x86_64__
  * For the kernel, set an explicit global label so the symbol can be located
  */
 #ifdef __x86_64__

-#define DTRACE_LAB(p, n)               \
-   "__dtrace_probeDOLLAR" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n)
-
-#define DTRACE_LABEL(p, n)             \
-      ".section __DATA, __data\n\t"    \
-      ".globl " DTRACE_LAB(p, n) "\n\t"        \
-       DTRACE_LAB(p, n) ":" ".quad 1f""\n\t"   \
-       ".text" "\n\t"                  \
-       "1:"
+
+#define DTRACE_LABEL(p, n)                                                              \
+       ".pushsection __DATA, __sdt_cstring, cstring_literals\n\t"                      \
+       "1: .ascii \"" DTRACE_STRINGIFY(p##___) "\\0\"\n\t"                             \
+       "2: .ascii \"" DTRACE_STRINGIFY(n) "\\0\"\n\t"                                  \
+       ".popsection" "\n\t"                                                            \
+       ".pushsection __DATA, __sdt, regular, live_support\n\t"                         \
+       ".p2align       3\n\t"                                                          \
+       "l3_%=:\n\t"                                                                    \
+       ".quad 4f" "\n\t"                                                               \
+       ".quad 1b" "\n\t"                                                               \
+       ".quad 2b" "\n\t"                                                               \
+       ".popsection" "\n\t"                                                            \
+       "4:"

 #else
 #else

-#define DTRACE_LAB(p, n)               \
-   "__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n)
-
-#define DTRACE_LABEL(p, n)             \
-      ".section __DATA, __data\n\t"    \
-      ".globl " DTRACE_LAB(p, n) "\n\t"        \
-       DTRACE_LAB(p, n) ":" ".long 1f""\n\t"   \
-       ".text" "\n\t"                  \
-       "1:"
+
+#define DTRACE_LABEL(p, n)                                                              \
+       ".pushsection __DATA, __sdt_cstring, cstring_literals\n\t"                      \
+       "1: .ascii \"" DATA_STRINGIFY(p##___) "\\0\"\n\t"                               \
+       "2: .ascii \"" DATA_STRINGIFY(n) "\\0\"\n\t"                                    \
+       ".popsection" "\n\t"                                                            \
+       ".pushsection __DATA, __sdt, regular, live_support\n\t"                         \
+       ".p2align       3\n\t"                                                          \
+       "l3_%=:\n\t"                                                                    \
+       ".long 4f""\n\t"                                                                \
+       ".long 1b""\n\t"                                                                \
+       ".long 2b""\n\t"                                                                \
+       ".popsection" "\n\t"                                                            \
+       "4:"

 #endif
 #endif

-#else  /* !KERNEL */
-#define DTRACE_LABEL(p, n)                                                                     \
-       "__dtrace_probe$" DTRACE_TOSTRING(__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"  "\n\t"
-#endif /* !KERNEL */
+#else   /* !KERNEL */
+#define DTRACE_LABEL(p, n)                                                                      \
+       "__dtrace_probe$" DTRACE_TOSTRING(%=__LINE__) DTRACE_STRINGIFY(_##p##___##n) ":"        "\n\t"
+#endif  /* !KERNEL */

 
 #ifdef DTRACE_CALL_TEST
 
 
 #ifdef DTRACE_CALL_TEST
 

-#define DTRACE_CALL(p,n)       \
-       DTRACE_LABEL(p,n)       \
+#define DTRACE_CALL(p, n)        \
+       DTRACE_LABEL(p,n)       \

        DTRACE_CALL_INSN(p,n)
 
 #else
 
        DTRACE_CALL_INSN(p,n)
 
 #else
 

-#define DTRACE_CALL(p,n)       \
-       DTRACE_LABEL(p,n)       \
+#define DTRACE_CALL(p, n)        \
+       DTRACE_LABEL(p,n)       \

        DTRACE_NOPS
 
 #endif
 
 #ifdef __x86_64__
 
        DTRACE_NOPS
 
 #endif
 
 #ifdef __x86_64__
 

-#define DTRACE_NOPS                    \
-       "nop"                   "\n\t"  \
-       "nop"                   "\n\t"  \
-       "nop"                   "\n\t"  
+#define DTRACE_NOPS                     \
+       "nop"                   "\n\t"  \
+       "nop"                   "\n\t"  \
+       "nop"                   "\n\t"

 
 

-#define DTRACE_CALL_INSN(p,n)                                          \
+#define DTRACE_CALL_INSN(p, n)                                           \

        "call _dtracetest" DTRACE_STRINGIFY(_##p##_##n) "\n\t"
 
        "call _dtracetest" DTRACE_STRINGIFY(_##p##_##n) "\n\t"
 

-#define ARG1_EXTENT    1
-#define ARGS2_EXTENT   2
-#define ARGS3_EXTENT   3
-#define ARGS4_EXTENT   4
-#define ARGS5_EXTENT   5
-#define ARGS6_EXTENT   6
-#define ARGS7_EXTENT   7
-#define ARGS8_EXTENT   8
-#define ARGS9_EXTENT   10      
-#define ARGS10_EXTENT  10      
-
-#define DTRACE_CALL0ARGS(provider, name)                                                       \
-       asm volatile (                                                                          \
-                     DTRACE_CALL(provider, name)                                               \
+#define ARG1_EXTENT     1
+#define ARGS2_EXTENT    2
+#define ARGS3_EXTENT    3
+#define ARGS4_EXTENT    4
+#define ARGS5_EXTENT    5
+#define ARGS6_EXTENT    6
+#define ARGS7_EXTENT    7
+#define ARGS8_EXTENT    8
+#define ARGS9_EXTENT    9
+#define ARGS10_EXTENT   10
+
+#define DTRACE_CALL0ARGS(provider, name)                                                        \
+       asm volatile (                                                                          \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     :                                                                         \
+       );
+
+#define DTRACE_CALL1ARG(provider, name)                                                         \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi"                                                         \

        );
 
        );
 

-#define DTRACE_CALL1ARG(provider, name)                                                                \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi"                                                         \
+#define DTRACE_CALL2ARGS(provider, name)                                                        \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi"                                                  \

        );
 
        );
 

-#define DTRACE_CALL2ARGS(provider, name)                                                       \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi"                                                  \
+#define DTRACE_CALL3ARGS(provider, name)                                                        \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx"                                           \

        );
 
        );
 

-#define DTRACE_CALL3ARGS(provider, name)                                                       \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi", "rdx"                                           \
+#define DTRACE_CALL4ARGS(provider, name)                                                        \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx", "rcx"                                    \

        );
 
        );
 

-#define DTRACE_CALL4ARGS(provider, name)                                                       \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
-                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi", "rdx", "rcx"                                    \
+#define DTRACE_CALL5ARGS(provider, name)                                                        \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
+                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8"                              \

        );
 
        );
 

-#define DTRACE_CALL5ARGS(provider, name)                                                       \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
-                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
-                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8"                              \
+#define DTRACE_CALL6ARGS(provider, name)                                                        \
+       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
+                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
+                     "movq\t0x28(%0),%%r9"                                             "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9"                        \

        );
 
        );
 

-#define DTRACE_CALL6ARGS(provider, name)                                                       \
-       asm volatile ("movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
-                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
-                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
-                     "movq\t0x28(%0),%%r9"                                             "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9"                        \
+#define DTRACE_CALL7ARGS(provider, name)                                                        \
+       asm volatile ("subq\t$0x8,%%rsp"                                                "\n\t"  \
+                     "movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
+                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
+                     "movq\t0x28(%0),%%r9"                                             "\n\t"  \
+                     "movq\t0x30(%0),%%rax"                                            "\n\t"  \
+                     "movq\t%%rax,0x0(%%rsp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addq\t$0x8,%%rsp"                                                "\n\t"  \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "rax"                 \

        );
 
        );
 

-#define DTRACE_CALL7ARGS(provider, name)                                                       \
-       asm volatile ("subq\t$0x8,%%rsp"                                                "\n\t"  \
-                     "movq\t0x0(%0),%%rdi"                                             "\n\t"  \
-                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
-                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
-                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
-                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
-                     "movq\t0x28(%0),%%r9"                                             "\n\t"  \
-                     "movq\t0x30(%0),%%rax"                                            "\n\t"  \
-                     "movq\t%%rax,0x0(%%rsp)"                                          "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                     "addq\t$0x8,%%rsp"                                                "\n\t"  \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "rax"                 \
+#define DTRACE_CALL8ARGS(provider, name)                                                        \
+       asm volatile ("subq\t$0x10,%%rsp"                                               "\n\t"  \
+                     "movq\t0x0(%0),%%rdi"                                             "\n\t"  \
+                     "movq\t0x8(%0),%%rsi"                                             "\n\t"  \
+                     "movq\t0x10(%0),%%rdx"                                            "\n\t"  \
+                     "movq\t0x18(%0),%%rcx"                                            "\n\t"  \
+                     "movq\t0x20(%0),%%r8"                                             "\n\t"  \
+                     "movq\t0x28(%0),%%r9"                                             "\n\t"  \
+                     "movq\t0x30(%0),%%rax"                                            "\n\t"  \
+                     "movq\t%%rax,0x0(%%rsp)"                                          "\n\t"  \
+                     "movq\t0x38(%0),%%rax"                                            "\n\t"  \
+                     "movq\t%%rax,0x8(%%rsp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addq\t$0x10,%%rsp"                                               "\n\t"  \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "rdi", "rsi", "rdx", "rcx", "r8", "r9", "rax"                 \

        );
 
 #endif // __x86_64__
 
 #ifdef __i386__
 
        );
 
 #endif // __x86_64__
 
 #ifdef __i386__
 

-#define DTRACE_NOPS                    \
-       "nop"                   "\n\t"  \
-       "leal 0(%%esi), %%esi"  "\n\t"  
+#define DTRACE_NOPS                     \
+       "nop"                   "\n\t"  \
+       "leal 0(%%esi), %%esi"  "\n\t"

 
 

-#define DTRACE_CALL_INSN(p,n)                                          \
+#define DTRACE_CALL_INSN(p, n)                                           \

        "call _dtracetest" DTRACE_STRINGIFY(_##p##_##n) "\n\t"
 
        "call _dtracetest" DTRACE_STRINGIFY(_##p##_##n) "\n\t"
 

-#define ARG1_EXTENT    1
-#define ARGS2_EXTENT   2
-#define ARGS3_EXTENT   4
-#define ARGS4_EXTENT   4
-#define ARGS5_EXTENT   8
-#define ARGS6_EXTENT   8
-#define ARGS7_EXTENT   8
-#define ARGS8_EXTENT   8
-#define ARGS9_EXTENT   12      
-#define ARGS10_EXTENT  12      
+#define ARG1_EXTENT     1
+#define ARGS2_EXTENT    2
+#define ARGS3_EXTENT    4
+#define ARGS4_EXTENT    4
+#define ARGS5_EXTENT    8
+#define ARGS6_EXTENT    8
+#define ARGS7_EXTENT    8
+#define ARGS8_EXTENT    8
+#define ARGS9_EXTENT    12
+#define ARGS10_EXTENT   12

 
 /*
  * Because this code is used in the kernel, we must not touch any floating point
 
 /*
  * Because this code is used in the kernel, we must not touch any floating point


@@ -226,214 +257,214 @@
  * The end result is that we only pipeline two loads/stores at a time. Blech.
  */
 
  * The end result is that we only pipeline two loads/stores at a time. Blech.
  */
 

-#define DTRACE_CALL0ARGS(provider, name)                                                       \
-       asm volatile (                                                                          \
-                     DTRACE_CALL(provider, name)                                               \
-                     "# eat trailing nl +tabfrom DTRACE_CALL"                                  \
-                     :                                                                         \
-                     :                                                                         \
+#define DTRACE_CALL0ARGS(provider, name)                                                        \
+       asm volatile (                                                                          \
+                     DTRACE_CALL(provider, name)                                               \
+                     "# eat trailing nl +tabfrom DTRACE_CALL"                                  \
+                     :                                                                         \
+                     :                                                                         \

        );
 
        );
 

-#define DTRACE_CALL1ARG(provider, name)                                                                \
-       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x10,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax"                                                         \
+#define DTRACE_CALL1ARG(provider, name)                                                         \
+       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x10,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax"                                                         \

        );
 
        );
 

-#define DTRACE_CALL2ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x10,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL2ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x10,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL3ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x10,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL3ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x10,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL4ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x10,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL4ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x10,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x10,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL5ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x20,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL5ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x20,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL6ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x20,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL6ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x20,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL7ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
-                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
-                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x20,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL7ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
+                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
+                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x20,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL8ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
-                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x20,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL8ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x20,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
+                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x20,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL9ARGS(provider, name)                                                       \
-       asm volatile ("subl\t$0x30,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
-                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
-                     "movl\t0x20(%0),%%eax"                                            "\n\t"  \
-                     "movl\t%%eax,0x20(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x30,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL9ARGS(provider, name)                                                        \
+       asm volatile ("subl\t$0x30,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
+                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
+                     "movl\t0x20(%0),%%eax"                                            "\n\t"  \
+                     "movl\t%%eax,0x20(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x30,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
        );
 

-#define DTRACE_CALL10ARGS(provider, name)                                                      \
-       asm volatile ("subl\t$0x30,%%esp"                                               "\n\t"  \
-                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
-                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
-                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
-                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
-                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
-                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
-                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
-                     "movl\t0x20(%0),%%eax"                                            "\n\t"  \
-                     "movl\t0x24(%0),%%edx"                                            "\n\t"  \
-                     "movl\t%%eax,0x20(%%esp)"                                         "\n\t"  \
-                     "movl\t%%edx,0x24(%%esp)"                                         "\n\t"  \
-                     DTRACE_CALL(provider, name)                                               \
-                      "addl\t$0x30,%%esp"                                                      \
-                     :                                                                         \
-                     : "r" (__dtrace_args)                                                     \
-                     : "memory", "eax", "edx"                                                  \
+#define DTRACE_CALL10ARGS(provider, name)                                                       \
+       asm volatile ("subl\t$0x30,%%esp"                                               "\n\t"  \
+                     "movl\t0x0(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0x4(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x0(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0x4(%%esp)"                                          "\n\t"  \
+                     "movl\t0x8(%0),%%eax"                                             "\n\t"  \
+                     "movl\t0xC(%0),%%edx"                                             "\n\t"  \
+                     "movl\t%%eax,0x8(%%esp)"                                          "\n\t"  \
+                     "movl\t%%edx,0xC(%%esp)"                                          "\n\t"  \
+                     "movl\t0x10(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x14(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x10(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x14(%%esp)"                                         "\n\t"  \
+                     "movl\t0x18(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x1C(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x18(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x1C(%%esp)"                                         "\n\t"  \
+                     "movl\t0x20(%0),%%eax"                                            "\n\t"  \
+                     "movl\t0x24(%0),%%edx"                                            "\n\t"  \
+                     "movl\t%%eax,0x20(%%esp)"                                         "\n\t"  \
+                     "movl\t%%edx,0x24(%%esp)"                                         "\n\t"  \
+                     DTRACE_CALL(provider, name)                                               \
+                     "addl\t$0x30,%%esp"                                                       \
+                     :                                                                         \
+                     : "r" (__dtrace_args)                                                     \
+                     : "memory", "eax", "edx"                                                  \

        );
 
 #endif // __i386__
 
        );
 
 #endif // __i386__
 

-#endif /* _MACH_I386_SDT_ISA_H */
+#endif  /* _MACH_I386_SDT_ISA_H */