x86: rename the struct pt_regs members for 32/64-bit consistency

We have a lot of code which differs only by the naming of specific
members of structures that contain registers.  In order to enable
additional unifications, this patch drops the e- or r- size prefix
from the register names in struct pt_regs, and drops the x- prefixes
for segment registers on the 32-bit side.

This patch also performs the equivalent renames in some additional
places that might be candidates for unification in the future.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 58 insertions, 57 deletions

diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index ab0178ebe00..4b228fd83b3 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -39,7 +39,7 @@ asmlinkage long
 sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
                 struct pt_regs *regs)
 {
-        return do_sigaltstack(uss, uoss, regs->rsp);
+        return do_sigaltstack(uss, uoss, regs->sp);
 }
 
 
@@ -62,10 +62,11 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned
         /* Always make any pending restarted system calls return -EINTR */
         current_thread_info()->restart_block.fn = do_no_restart_syscall;
 
+#define COPYR(x)        err |= __get_user(regs->x, &sc->r ## x)
 #define COPY(x)         err |= __get_user(regs->x, &sc->x)
 
-        COPY(rdi); COPY(rsi); COPY(rbp); COPY(rsp); COPY(rbx);
-        COPY(rdx); COPY(rcx); COPY(rip);
+        COPYR(di); COPYR(si); COPYR(bp); COPYR(sp); COPYR(bx);
+        COPYR(dx); COPYR(cx); COPYR(ip);
         COPY(r8);
         COPY(r9);
         COPY(r10);
@@ -87,8 +88,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, unsigned
         {
                 unsigned int tmpflags;
                 err |= __get_user(tmpflags, &sc->eflags);
-                regs->eflags = (regs->eflags & ~0x40DD5) | (tmpflags & 0x40DD5);
-                regs->orig_rax = -1;            /* disable syscall checks */
+                regs->flags = (regs->flags & ~0x40DD5) | (tmpflags & 0x40DD5);
+                regs->orig_ax = -1;             /* disable syscall checks */
         }
 
         {
@@ -119,9 +120,9 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
 {
         struct rt_sigframe __user *frame;
         sigset_t set;
-        unsigned long eax;
+        unsigned long ax;
 
-        frame = (struct rt_sigframe __user *)(regs->rsp - 8);
+        frame = (struct rt_sigframe __user *)(regs->sp - 8);
         if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) {
                 goto badframe;
         } 
@@ -135,17 +136,17 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
         recalc_sigpending();
         spin_unlock_irq(&current->sighand->siglock);
         
-        if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &eax))
+        if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
                 goto badframe;
 
 #ifdef DEBUG_SIG
-        printk("%d sigreturn rip:%lx rsp:%lx frame:%p rax:%lx\n",current->pid,regs->rip,regs->rsp,frame,eax);
+        printk("%d sigreturn ip:%lx sp:%lx frame:%p ax:%lx\n",current->pid,regs->ip,regs->sp,frame,ax);
 #endif
 
-        if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->rsp) == -EFAULT)
+        if (do_sigaltstack(&frame->uc.uc_stack, NULL, regs->sp) == -EFAULT)
                 goto badframe;
 
-        return eax;
+        return ax;
 
 badframe:
         signal_fault(regs,frame,"sigreturn");
@@ -165,14 +166,14 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned lo
         err |= __put_user(0, &sc->gs);
         err |= __put_user(0, &sc->fs);
 
-        err |= __put_user(regs->rdi, &sc->rdi);
-        err |= __put_user(regs->rsi, &sc->rsi);
-        err |= __put_user(regs->rbp, &sc->rbp);
-        err |= __put_user(regs->rsp, &sc->rsp);
-        err |= __put_user(regs->rbx, &sc->rbx);
-        err |= __put_user(regs->rdx, &sc->rdx);
-        err |= __put_user(regs->rcx, &sc->rcx);
-        err |= __put_user(regs->rax, &sc->rax);
+        err |= __put_user(regs->di, &sc->rdi);
+        err |= __put_user(regs->si, &sc->rsi);
+        err |= __put_user(regs->bp, &sc->rbp);
+        err |= __put_user(regs->sp, &sc->rsp);
+        err |= __put_user(regs->bx, &sc->rbx);
+        err |= __put_user(regs->dx, &sc->rdx);
+        err |= __put_user(regs->cx, &sc->rcx);
+        err |= __put_user(regs->ax, &sc->rax);
         err |= __put_user(regs->r8, &sc->r8);
         err |= __put_user(regs->r9, &sc->r9);
         err |= __put_user(regs->r10, &sc->r10);
@@ -183,8 +184,8 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned lo
         err |= __put_user(regs->r15, &sc->r15);
         err |= __put_user(me->thread.trap_no, &sc->trapno);
         err |= __put_user(me->thread.error_code, &sc->err);
-        err |= __put_user(regs->rip, &sc->rip);
-        err |= __put_user(regs->eflags, &sc->eflags);
+        err |= __put_user(regs->ip, &sc->rip);
+        err |= __put_user(regs->flags, &sc->eflags);
         err |= __put_user(mask, &sc->oldmask);
         err |= __put_user(me->thread.cr2, &sc->cr2);
 
@@ -198,18 +199,18 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned lo
 static void __user *
 get_stack(struct k_sigaction *ka, struct pt_regs *regs, unsigned long size)
 {
-        unsigned long rsp;
+        unsigned long sp;
 
         /* Default to using normal stack - redzone*/
-        rsp = regs->rsp - 128;
+        sp = regs->sp - 128;
 
         /* This is the X/Open sanctioned signal stack switching.  */
         if (ka->sa.sa_flags & SA_ONSTACK) {
-                if (sas_ss_flags(rsp) == 0)
-                        rsp = current->sas_ss_sp + current->sas_ss_size;
+                if (sas_ss_flags(sp) == 0)
+                        sp = current->sas_ss_sp + current->sas_ss_size;
         }
 
-        return (void __user *)round_down(rsp - size, 16); 
+        return (void __user *)round_down(sp - size, 16);
 }
 
 static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
@@ -246,7 +247,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= __put_user(0, &frame->uc.uc_flags);
         err |= __put_user(0, &frame->uc.uc_link);
         err |= __put_user(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
-        err |= __put_user(sas_ss_flags(regs->rsp),
+        err |= __put_user(sas_ss_flags(regs->sp),
                           &frame->uc.uc_stack.ss_flags);
         err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
         err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
@@ -271,21 +272,21 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
                 goto give_sigsegv;
 
 #ifdef DEBUG_SIG
-        printk("%d old rip %lx old rsp %lx old rax %lx\n", current->pid,regs->rip,regs->rsp,regs->rax);
+        printk("%d old ip %lx old sp %lx old ax %lx\n", current->pid,regs->ip,regs->sp,regs->ax);
 #endif
 
         /* Set up registers for signal handler */
-        regs->rdi = sig;
+        regs->di = sig;
         /* In case the signal handler was declared without prototypes */ 
-        regs->rax = 0;  
+        regs->ax = 0;
 
         /* This also works for non SA_SIGINFO handlers because they expect the
            next argument after the signal number on the stack. */
-        regs->rsi = (unsigned long)&frame->info; 
-        regs->rdx = (unsigned long)&frame->uc; 
-        regs->rip = (unsigned long) ka->sa.sa_handler;
+        regs->si = (unsigned long)&frame->info;
+        regs->dx = (unsigned long)&frame->uc;
+        regs->ip = (unsigned long) ka->sa.sa_handler;
 
-        regs->rsp = (unsigned long)frame;
+        regs->sp = (unsigned long)frame;
 
         /* Set up the CS register to run signal handlers in 64-bit mode,
            even if the handler happens to be interrupting 32-bit code. */
@@ -295,12 +296,12 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
            see include/asm-x86_64/uaccess.h for details. */
         set_fs(USER_DS);
 
-        regs->eflags &= ~TF_MASK;
+        regs->flags &= ~TF_MASK;
         if (test_thread_flag(TIF_SINGLESTEP))
                 ptrace_notify(SIGTRAP);
 #ifdef DEBUG_SIG
         printk("SIG deliver (%s:%d): sp=%p pc=%lx ra=%p\n",
-                current->comm, current->pid, frame, regs->rip, frame->pretcode);
+                current->comm, current->pid, frame, regs->ip, frame->pretcode);
 #endif
 
         return 0;
@@ -321,29 +322,29 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
         int ret;
 
 #ifdef DEBUG_SIG
-        printk("handle_signal pid:%d sig:%lu rip:%lx rsp:%lx regs=%p\n",
+        printk("handle_signal pid:%d sig:%lu ip:%lx sp:%lx regs=%p\n",
                 current->pid, sig,
-                regs->rip, regs->rsp, regs);
+                regs->ip, regs->sp, regs);
 #endif
 
         /* Are we from a system call? */
-        if ((long)regs->orig_rax >= 0) {
+        if ((long)regs->orig_ax >= 0) {
                 /* If so, check system call restarting.. */
-                switch (regs->rax) {
+                switch (regs->ax) {
                         case -ERESTART_RESTARTBLOCK:
                         case -ERESTARTNOHAND:
-                                regs->rax = -EINTR;
+                                regs->ax = -EINTR;
                                 break;
 
                         case -ERESTARTSYS:
                                 if (!(ka->sa.sa_flags & SA_RESTART)) {
-                                        regs->rax = -EINTR;
+                                        regs->ax = -EINTR;
                                         break;
                                 }
                                 /* fallthrough */
                         case -ERESTARTNOINTR:
-                                regs->rax = regs->orig_rax;
-                                regs->rip -= 2;
+                                regs->ax = regs->orig_ax;
+                                regs->ip -= 2;
                                 break;
                 }
         }
@@ -352,9 +353,9 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
          * If TF is set due to a debugger (TIF_FORCED_TF), clear the TF
          * flag so that register information in the sigcontext is correct.
          */
-        if (unlikely(regs->eflags & X86_EFLAGS_TF) &&
+        if (unlikely(regs->flags & X86_EFLAGS_TF) &&
             likely(test_and_clear_thread_flag(TIF_FORCED_TF)))
-                regs->eflags &= ~X86_EFLAGS_TF;
+                regs->flags &= ~X86_EFLAGS_TF;
 
 #ifdef CONFIG_IA32_EMULATION
         if (test_thread_flag(TIF_IA32)) {
@@ -426,21 +427,21 @@ static void do_signal(struct pt_regs *regs)
         }
 
         /* Did we come from a system call? */
-        if ((long)regs->orig_rax >= 0) {
+        if ((long)regs->orig_ax >= 0) {
                 /* Restart the system call - no handlers present */
-                long res = regs->rax;
+                long res = regs->ax;
                 switch (res) {
                 case -ERESTARTNOHAND:
                 case -ERESTARTSYS:
                 case -ERESTARTNOINTR:
-                        regs->rax = regs->orig_rax;
-                        regs->rip -= 2;
+                        regs->ax = regs->orig_ax;
+                        regs->ip -= 2;
                         break;
                 case -ERESTART_RESTARTBLOCK:
-                        regs->rax = test_thread_flag(TIF_IA32) ?
+                        regs->ax = test_thread_flag(TIF_IA32) ?
                                         __NR_ia32_restart_syscall :
                                         __NR_restart_syscall;
-                        regs->rip -= 2;
+                        regs->ip -= 2;
                         break;
                 }
         }
@@ -457,13 +458,13 @@ void
 do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
 {
 #ifdef DEBUG_SIG
-        printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%p pending:%x\n",
-               thread_info_flags, regs->rip, regs->rsp, __builtin_return_address(0),signal_pending(current)); 
+        printk("do_notify_resume flags:%x ip:%lx sp:%lx caller:%p pending:%x\n",
+               thread_info_flags, regs->ip, regs->sp, __builtin_return_address(0),signal_pending(current));
 #endif
                
         /* Pending single-step? */
         if (thread_info_flags & _TIF_SINGLESTEP) {
-                regs->eflags |= TF_MASK;
+                regs->flags |= TF_MASK;
                 clear_thread_flag(TIF_SINGLESTEP);
         }
 
@@ -485,8 +486,8 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
 { 
         struct task_struct *me = current; 
         if (show_unhandled_signals && printk_ratelimit())
-                printk("%s[%d] bad frame in %s frame:%p rip:%lx rsp:%lx orax:%lx\n",
-               me->comm,me->pid,where,frame,regs->rip,regs->rsp,regs->orig_rax); 
+                printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx\n",
+               me->comm,me->pid,where,frame,regs->ip,regs->sp,regs->orig_ax);
 
         force_sig(SIGSEGV, me); 
 }