more fixes of conditional compilation of gdb support

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

diff --git a/include/ust/processor.h b/include/ust/processor.h
index 6caae6e7a7a5d4e338524f69eb7dc78ca34bdc08..7ed7d2ec2a827abe3a644a9aecf0317309cc305d 100644 (file)
--- a/include/ust/processor.h
+++ b/include/ust/processor.h
@@ -7,9 +7,7 @@
 extern __thread long ust_reg_stack[500];
 extern volatile __thread long *ust_reg_stack_ptr;
 
-
-#ifdef x86_32
-#error "32-bit support broken"
+#ifndef __x86_64
 
 struct registers {
        long eax;
@@ -30,15 +28,25 @@ struct registers {
        int  xss;
 };
 
-static inline save_registers(struct registers *regs)
-{
-}
+#ifdef CONFIG_UST_GDB_INTEGRATION
+
+#error "GDB integration not supported for x86-32 yet."
+
+#define save_ip(channel,name)
+#define save_registers(a)
+
+#else /* CONFIG_UST_GDB_INTEGRATION */
+
+#define save_ip(channel,name)
+#define save_registers(a)
+
+#endif /* CONFIG_UST_GDB_INTEGRATION */
 
 #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 */
@@ -63,6 +71,14 @@ struct registers {
        unsigned long rsp;
 };
 
+#ifdef CONFIG_UST_GDB_INTEGRATION
+#define save_ip(channel,name) \
+       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) \
        asm volatile ( \
             /* save original rsp */ \
@@ -188,6 +204,13 @@ struct registers {
        memcpy(regsptr, (void *)ust_reg_stack_ptr, sizeof(struct registers)); \
        ust_reg_stack_ptr = (void *)(((long)ust_reg_stack_ptr) + sizeof(struct registers));
 
+#else /* CONFIG_UST_GDB_INTEGRATION */
+
+#define save_ip(channel,name)
+#define save_registers(a)
+
+#endif /* CONFIG_UST_GDB_INTEGRATION */
+
 /* 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)