projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix conditional compilation of gdb support
[ust.git]
/
include
/
ust
/
processor.h
diff --git
a/include/ust/processor.h
b/include/ust/processor.h
index a2a332ead3de1111cc5d24f0b4744fab887f17a3..085fa1a5dd4f49b6ed9bd95fba413862054ccd13 100644
(file)
--- a/
include/ust/processor.h
+++ b/
include/ust/processor.h
@@
-7,14
+7,7
@@
extern __thread long ust_reg_stack[500];
extern volatile __thread long *ust_reg_stack_ptr;
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
-
-
-#ifndef x86_64
+#ifndef __x86_64
struct registers {
long eax;
struct registers {
long eax;
@@
-35,19
+28,19
@@
struct registers {
int xss;
};
int xss;
};
-#ifdef CONFIG_UST_GDB_ITEGRATION
+#ifdef CONFIG_UST_GDB_I
N
TEGRATION
#error "GDB integration not supported for x86-32 yet."
#define save_ip()
#define save_registers(a)
#error "GDB integration not supported for x86-32 yet."
#define save_ip()
#define save_registers(a)
-#else /* CONFIG_UST_GDB_ITEGRATION */
+#else /* CONFIG_UST_GDB_I
N
TEGRATION */
#define save_ip()
#define save_registers(a)
#define save_ip()
#define save_registers(a)
-#endif /* CONFIG_UST_GDB_ITEGRATION */
+#endif /* CONFIG_UST_GDB_I
N
TEGRATION */
#define RELATIVE_ADDRESS(__rel_label__) __rel_label__
#define RELATIVE_ADDRESS(__rel_label__) __rel_label__
@@
-78,8
+71,8
@@
struct registers {
unsigned long rsp;
};
unsigned long rsp;
};
-#ifdef CONFIG_UST_GDB_ITEGRATION
-#define save_ip() \
+#ifdef CONFIG_UST_GDB_I
N
TEGRATION
+#define save_ip(
channel,name
) \
asm (".section __marker_addr,\"aw\",@progbits\n\t" \
_ASM_PTR "%c[marker_struct], (1f)\n\t" \
".previous\n\t" \
asm (".section __marker_addr,\"aw\",@progbits\n\t" \
_ASM_PTR "%c[marker_struct], (1f)\n\t" \
".previous\n\t" \
@@
-211,7
+204,7
@@
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));
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 */
+#endif /* CONFIG_UST_GDB_I
N
TEGRATION */
/* 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. */
/* 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. */
This page took
0.023651 seconds
and
4
git commands to generate.