extern __thread long ust_reg_stack[500];
extern volatile __thread long *ust_reg_stack_ptr;
-
-#ifdef X86_32
+#ifndef __x86_64
struct registers {
- long eax;
- long ebx;
- long ecx;
- long edx;
- long ebp;
- long esp;
+ short ss;
+ short cs;
long esi;
+ long ebp;
+ long edx;
long edi;
- int xds;
- int xes;
- int xfs;
- int xgs;
- long eip;
- int xcs;
+ long ecx;
+ long ebx;
+ long eax;
long eflags;
- int xss;
+ long esp;
};
-static inline save_registers(struct registers *regs)
-{
-}
+#ifdef CONFIG_UST_GDB_INTEGRATION
+
+
+#define save_registers(regsptr) \
+ asm volatile ( \
+ /* save original esp */ \
+ "pushl %%esp\n\t" \
+ /* push original eflags */ \
+ "pushfl\n\t" \
+ /* eax will hold the ptr to the private stack bottom */ \
+ "pushl %%eax\n\t" \
+ /* ebx is used for TLS access */ \
+ "pushl %%ebx\n\t" \
+ /* ecx will be used to temporarily hold the stack bottom addr */ \
+ "pushl %%ecx\n\t" \
+ /* rdi is the input to __tls_get_addr, and also a temp var */ \
+ "pushl %%edi\n\t" \
+ /* Get GOT address */ \
+ "call __i686.get_pc_thunk.bx\n\t" \
+ "addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
+ /* Save registers before call (not using ecx yet but we must preserve \
+ the original value of edx. */ \
+ "pushl %%edx\n\t" \
+ /* Start TLS access of private reg stack pointer */ \
+ "leal ust_reg_stack_ptr@tlsgd(,%%ebx,1),%%eax\n\t" \
+ "call ___tls_get_addr@plt\n\t" \
+ /* --- End TLS access */ \
+ "popl %%edx\n\t" \
+ /* check if ust_reg_stack_ptr has been initialized */ \
+ "movl (%%eax),%%ecx\n\t" \
+ "testl %%ecx,%%ecx\n\t" \
+ "jne 1f\n\t" \
+ "movl %%eax,%%ecx\n\t" \
+ /* Save registers before call (using ecx and we must preserve \
+ the original value of edx. */ \
+ "pushl %%ecx\n\t" \
+ "pushl %%edx\n\t" \
+ /* Start TLS access of private reg stack */ \
+ "leal ust_reg_stack@tlsgd(,%%ebx,1),%%eax\n\t" \
+ "call ___tls_get_addr@plt\n\t" \
+ /* --- End TLS access */ \
+ "popl %%edx\n\t" \
+ "popl %%ecx\n\t" \
+ "addl $500,%%eax\n\t" \
+ "movl %%eax,(%%ecx)\n\t" \
+ "movl %%ecx,%%eax\n\t" \
+ /* now the pointer to the private stack is in eax. \
+ must add stack size so the ptr points to the stack bottom. */ \
+ "1:\n\t" \
+ /* Manually push esp to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 20(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* Manually push eflags to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 16(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* Manually push eax to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 12(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* Manually push ebx to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 8(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* Manually push ecx to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 4(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* Manually push edi to private stack */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl 0(%%esp), %%edi\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edi, (%%ebx)\n\t" \
+ /* now push regs to tls */ \
+ /* -- esp already pushed -- */ \
+ /* -- eax already pushed -- */ \
+ /* -- ebx already pushed -- */ \
+ /* -- ecx already pushed -- */ \
+ /* -- edi already pushed -- */ \
+ "addl $-4,(%%eax)\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%edx,(%%ebx)\n\t" \
+ "addl $-4,(%%eax)\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%ebp,(%%ebx)\n\t" \
+ "addl $-4,(%%eax)\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movl %%esi,(%%ebx)\n\t" \
+ /* push cs */ \
+ "addl $-2,(%%eax)\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movw %%cs, (%%ebx)\n\t" \
+ /* push ss */ \
+ "addl $-2,(%%eax)\n\t" \
+ "movl (%%eax), %%ebx\n\t" \
+ "movw %%ss, (%%ebx)\n\t" \
+ /* restore original values of regs that were used internally */ \
+ "popl %%edi\n\t" \
+ "popl %%ecx\n\t" \
+ "popl %%ebx\n\t" \
+ "popl %%eax\n\t" \
+ /* cancel push of rsp */ \
+ "addl $4,%%esp\n\t" \
+ /* cancel push of eflags */ \
+ "addl $4,%%esp\n\t" \
+ ::: "memory"); \
+ 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_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 */
short ss;
short cs;
- unsigned long rflags;
unsigned long r15;
unsigned long r14;
unsigned long r13;
unsigned long rdi;
unsigned long rbx;
unsigned long rax;
+ unsigned long rflags;
unsigned long rsp;
};
+#ifdef CONFIG_UST_GDB_INTEGRATION
+
#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" \
"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" \
"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));
+#else /* CONFIG_UST_GDB_INTEGRATION */
+
+#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)
projects / ust.git / blobdiff