diff options
Diffstat (limited to 'arch/x86/ia32/ia32_binfmt.c')
-rw-r--r-- | arch/x86/ia32/ia32_binfmt.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c index e32974c3dd3b..806135c3f975 100644 --- a/arch/x86/ia32/ia32_binfmt.c +++ b/arch/x86/ia32/ia32_binfmt.c | |||
@@ -73,22 +73,22 @@ struct file; | |||
73 | /* Assumes current==process to be dumped */ | 73 | /* Assumes current==process to be dumped */ |
74 | #undef ELF_CORE_COPY_REGS | 74 | #undef ELF_CORE_COPY_REGS |
75 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | 75 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ |
76 | pr_reg[0] = regs->rbx; \ | 76 | pr_reg[0] = regs->bx; \ |
77 | pr_reg[1] = regs->rcx; \ | 77 | pr_reg[1] = regs->cx; \ |
78 | pr_reg[2] = regs->rdx; \ | 78 | pr_reg[2] = regs->dx; \ |
79 | pr_reg[3] = regs->rsi; \ | 79 | pr_reg[3] = regs->si; \ |
80 | pr_reg[4] = regs->rdi; \ | 80 | pr_reg[4] = regs->di; \ |
81 | pr_reg[5] = regs->rbp; \ | 81 | pr_reg[5] = regs->bp; \ |
82 | pr_reg[6] = regs->rax; \ | 82 | pr_reg[6] = regs->ax; \ |
83 | pr_reg[7] = _GET_SEG(ds); \ | 83 | pr_reg[7] = _GET_SEG(ds); \ |
84 | pr_reg[8] = _GET_SEG(es); \ | 84 | pr_reg[8] = _GET_SEG(es); \ |
85 | pr_reg[9] = _GET_SEG(fs); \ | 85 | pr_reg[9] = _GET_SEG(fs); \ |
86 | pr_reg[10] = _GET_SEG(gs); \ | 86 | pr_reg[10] = _GET_SEG(gs); \ |
87 | pr_reg[11] = regs->orig_rax; \ | 87 | pr_reg[11] = regs->orig_ax; \ |
88 | pr_reg[12] = regs->rip; \ | 88 | pr_reg[12] = regs->ip; \ |
89 | pr_reg[13] = regs->cs; \ | 89 | pr_reg[13] = regs->cs; \ |
90 | pr_reg[14] = regs->eflags; \ | 90 | pr_reg[14] = regs->flags; \ |
91 | pr_reg[15] = regs->rsp; \ | 91 | pr_reg[15] = regs->sp; \ |
92 | pr_reg[16] = regs->ss; | 92 | pr_reg[16] = regs->ss; |
93 | 93 | ||
94 | 94 | ||
@@ -205,9 +205,9 @@ do { \ | |||
205 | asm volatile("movl %0,%%fs" :: "r" (0)); \ | 205 | asm volatile("movl %0,%%fs" :: "r" (0)); \ |
206 | asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS)); \ | 206 | asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS)); \ |
207 | load_gs_index(0); \ | 207 | load_gs_index(0); \ |
208 | (regs)->rip = (new_rip); \ | 208 | (regs)->ip = (new_rip); \ |
209 | (regs)->rsp = (new_rsp); \ | 209 | (regs)->sp = (new_rsp); \ |
210 | (regs)->eflags = 0x200; \ | 210 | (regs)->flags = X86_EFLAGS_IF; \ |
211 | (regs)->cs = __USER32_CS; \ | 211 | (regs)->cs = __USER32_CS; \ |
212 | (regs)->ss = __USER32_DS; \ | 212 | (regs)->ss = __USER32_DS; \ |
213 | set_fs(USER_DS); \ | 213 | set_fs(USER_DS); \ |
@@ -233,13 +233,13 @@ extern int syscall32_setup_pages(struct linux_binprm *, int exstack); | |||
233 | static void elf32_init(struct pt_regs *regs) | 233 | static void elf32_init(struct pt_regs *regs) |
234 | { | 234 | { |
235 | struct task_struct *me = current; | 235 | struct task_struct *me = current; |
236 | regs->rdi = 0; | 236 | regs->di = 0; |
237 | regs->rsi = 0; | 237 | regs->si = 0; |
238 | regs->rdx = 0; | 238 | regs->dx = 0; |
239 | regs->rcx = 0; | 239 | regs->cx = 0; |
240 | regs->rax = 0; | 240 | regs->ax = 0; |
241 | regs->rbx = 0; | 241 | regs->bx = 0; |
242 | regs->rbp = 0; | 242 | regs->bp = 0; |
243 | regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 = | 243 | regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 = |
244 | regs->r13 = regs->r14 = regs->r15 = 0; | 244 | regs->r13 = regs->r14 = regs->r15 = 0; |
245 | me->thread.fs = 0; | 245 | me->thread.fs = 0; |