fix warning

[ust.git] / include / ust / processor.h

diff --git a/include/ust/processor.h b/include/ust/processor.h
index bc24e7edddc39cd3f938e4388ccd4b416550cc72..a2a332ead3de1111cc5d24f0b4744fab887f17a3 100644 (file)
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -7,8 +7,14 @@
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
+#ifndef CONFIG_UST_GDB_INTEGRATION
+static inline void save_ip(void)
+{
+}
+#endif
+
 
-#ifdef X86_32
+#ifndef x86_64
 
 struct registers {
        long eax;
@@ -29,21 +35,30 @@ struct registers {
        int  xss;
 };
 
-static inline save_registers(struct registers *regs)
-{
-}
+#ifdef CONFIG_UST_GDB_ITEGRATION
+
+#error "GDB integration not supported for x86-32 yet."
+
+#define save_ip()
+#define save_registers(a)
+
+#else /* CONFIG_UST_GDB_ITEGRATION */
+
+#define save_ip()
+#define save_registers(a)
+
+#endif /* CONFIG_UST_GDB_ITEGRATION */
 
 #define RELATIVE_ADDRESS(__rel_label__) __rel_label__
 
 #define _ASM_PTR ".long "
 
-#else
+#else /* below is code for x86-64 */
 
 struct registers {
        int padding; /* 4 bytes */
        short ss;
        short cs;
-       unsigned long rflags;
        unsigned long r15;
        unsigned long r14;
        unsigned long r13;
@@ -59,31 +74,62 @@ struct registers {
        unsigned long rdi;
        unsigned long rbx;
        unsigned long rax;
+       unsigned long rflags;
        unsigned long rsp;
 };
 
+#ifdef CONFIG_UST_GDB_ITEGRATION
+#define save_ip() \
+       asm (".section __marker_addr,\"aw\",@progbits\n\t"      \
+              _ASM_PTR "%c[marker_struct], (1f)\n\t"           \
+              ".previous\n\t"                                  \
+              "1:\n\t"                                         \
+               :: [marker_struct] "i" (&__mark_##channel##_##name));\
+
 #define save_registers(regsptr) \
-       if(ust_reg_stack_ptr == NULL) { \
-               ust_reg_stack_ptr = (long*)((long)ust_reg_stack)+500; \
-       } \
        asm volatile ( \
             /* save original rsp */ \
             "pushq %%rsp\n\t" \
+            /* push original rflags */ \
+            "pushfq\n\t" \
              /* rax will hold the ptr to the private stack bottom */ \
             "pushq %%rax\n\t" \
             /* rbx will be used to temporarily hold the stack bottom addr */ \
             "pushq %%rbx\n\t" \
             /* rdi is the input to __tls_get_addr, and also a temp var */ \
             "pushq %%rdi\n\t" \
-            /* Start TLS access of private reg stack */ \
+            /* Start TLS access of private reg stack pointer */ \
             ".byte 0x66\n\t" \
             "leaq ust_reg_stack_ptr@tlsgd(%%rip), %%rdi\n\t" \
             ".word 0x6666\n\t" \
             "rex64\n\t" \
             "call __tls_get_addr@plt\n\t" \
             /* --- End TLS access */ \
+            /* check if ust_reg_stack_ptr has been initialized */ \
+            "movq (%%rax),%%rbx\n\t" \
+            "testq %%rbx,%%rbx\n\t" \
+            "jne 1f\n\t" \
+            "movq %%rax,%%rbx\n\t" \
+            /* Start TLS access of private reg stack */ \
+            ".byte 0x66\n\t" \
+            "leaq ust_reg_stack@tlsgd(%%rip), %%rdi\n\t" \
+            ".word 0x6666\n\t" \
+            "rex64\n\t" \
+            "call __tls_get_addr@plt\n\t" \
+            /* --- End TLS access */ \
+            "addq $500,%%rax\n\t" \
+            "movq %%rax,(%%rbx)\n\t" \
+            "movq %%rbx,%%rax\n\t" \
+            /* now the pointer to the private stack is in rax.
+               must add stack size so the ptr points to the stack bottom. */ \
+       "1:\n\t" \
             /* Manually push rsp to private stack */ \
             "addq $-8,(%%rax)\n\t" \
+            "movq 32(%%rsp), %%rdi\n\t" \
+            "movq (%%rax), %%rbx\n\t" \
+            "movq %%rdi, (%%rbx)\n\t" \
+            /* Manually push eflags to private stack */ \
+            "addq $-8,(%%rax)\n\t" \
             "movq 24(%%rsp), %%rdi\n\t" \
             "movq (%%rax), %%rbx\n\t" \
             "movq %%rdi, (%%rbx)\n\t" \
@@ -143,11 +189,6 @@ struct registers {
             "addq $-8,(%%rax)\n\t" \
             "movq (%%rax), %%rbx\n\t" \
             "movq %%r15,(%%rbx)\n\t" \
-            /* deal with rflags */ \
-            "pushfq\n\t" /* push rflags on stack */ \
-            "addq $-8,(%%rax)\n\t" \
-            "movq (%%rax), %%rbx\n\t" \
-            "popq (%%rbx)\n\t" \
             /* push cs */ \
             "addq $-2,(%%rax)\n\t" \
             "movq (%%rax), %%rbx\n\t" \
@@ -164,10 +205,14 @@ struct registers {
             "popq %%rax\n\t" \
             /* cancel push of rsp */ \
             "addq $8,%%rsp\n\t" \
+            /* cancel push of rflags */ \
+            "addq $8,%%rsp\n\t" \
             ::); \
        memcpy(regsptr, (void *)ust_reg_stack_ptr, sizeof(struct registers)); \
        ust_reg_stack_ptr = (void *)(((long)ust_reg_stack_ptr) + sizeof(struct registers));
 
+#endif /* CONFIG_UST_GDB_ITEGRATION */
+
 /* Macro to insert the address of a relative jump in an assembly stub,
  * in a relocatable way. On x86-64, this uses a special (%rip) notation. */
 #define RELATIVE_ADDRESS(__rel_label__) __rel_label__(%%rip)