Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / parisc / kernel / traps.c

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 69a253f..ff20060 100644 (file)
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -74,7 +74,10 @@ void show_regs(struct pt_regs *regs)
        char *level;
        unsigned long cr30;
        unsigned long cr31;
-
+       /* carlos says that gcc understands better memory in a struct,
+        * and it makes our life easier with fpregs -- T-Bone */
+       struct { u32 sw[2]; } s;
+       
        level = user_mode(regs) ? KERN_DEBUG : KERN_CRIT;
 
        printk("%s\n", level); /* don't want to have that pretty register dump messed up */
@@ -103,11 +106,33 @@ void show_regs(struct pt_regs *regs)
                printk("%s\n", buf);
        }
 
-#if RIDICULOUSLY_VERBOSE
-       for (i = 0; i < 32; i += 2)
-               printk("%sFR%02d : %016lx  FR%2d : %016lx", level, i,
-                               regs->fr[i], i+1, regs->fr[i+1]);
-#endif
+       /* FR are 64bit everywhere. Need to use asm to get the content
+        * of fpsr/fper1, and we assume that we won't have a FP Identify
+        * in our way, otherwise we're screwed.
+        * The fldd is used to restore the T-bit if there was one, as the
+        * store clears it anyway.
+        * BTW, PA2.0 book says "thou shall not use fstw on FPSR/FPERs". */ 
+       __asm__ (
+               "fstd %%fr0,0(%1)       \n\t"
+               "fldd 0(%1),%%fr0       \n\t"
+               : "=m" (s) : "r" (&s) : "%r0"
+               );
+
+       printk("%s\n", level);
+       printk("%s      VZOUICununcqcqcqcqcqcrmunTDVZOUI\n", level);
+       printbinary(buf, s.sw[0], 32);
+       printk("%sFPSR: %s\n", level, buf);
+       printk("%sFPER1: %08x\n", level, s.sw[1]);
+
+       /* here we'll print fr0 again, tho it'll be meaningless */
+       for (i = 0; i < 32; i += 4) {
+               int j;
+               p = buf;
+               p += sprintf(p, "%sfr%02d-%02d ", level, i, i + 3);
+               for (j = 0; j < 4; j++)
+                       p += sprintf(p, " %016llx", (i+j) == 0 ? 0 : regs->fr[i+j]);
+               printk("%s\n", buf);
+       }
 
        cr30 = mfctl(30);
        cr31 = mfctl(31);
@@ -163,13 +188,19 @@ void show_stack(struct task_struct *task, unsigned long *s)
        struct unwind_frame_info info;
 
        if (!task) {
-               unsigned long sp, ip, rp;
+               unsigned long sp;
+               struct pt_regs *r;
 
 HERE:
                asm volatile ("copy %%r30, %0" : "=r"(sp));
-               ip = (unsigned long)&&HERE;
-               rp = (unsigned long)__builtin_return_address(0);
-               unwind_frame_init(&info, current, sp, ip, rp);
+               r = kzalloc(sizeof(struct pt_regs), GFP_KERNEL);
+               if (!r)
+                       return;
+               r->iaoq[0] = (unsigned long)&&HERE;
+               r->gr[2] = (unsigned long)__builtin_return_address(0);
+               r->gr[30] = sp;
+               unwind_frame_init(&info, current, r);
+               kfree(r);
        } else {
                unwind_frame_init_from_blocked_task(&info, task);
        }
@@ -242,7 +273,7 @@ void handle_gdb_break(struct pt_regs *regs, int wot)
        struct siginfo si;
 
        si.si_code = wot;
-       si.si_addr = (void *) (regs->iaoq[0] & ~3);
+       si.si_addr = (void __user *) (regs->iaoq[0] & ~3);
        si.si_signo = SIGTRAP;
        si.si_errno = 0;
        force_sig_info(SIGTRAP, &si, current);
@@ -263,7 +294,7 @@ void handle_break(unsigned iir, struct pt_regs *regs)
                show_regs(regs);
 #endif
                si.si_code = TRAP_BRKPT;
-               si.si_addr = (void *) (regs->iaoq[0] & ~3);
+               si.si_addr = (void __user *) (regs->iaoq[0] & ~3);
                si.si_signo = SIGTRAP;
                force_sig_info(SIGTRAP, &si, current);
                break;
@@ -281,7 +312,7 @@ void handle_break(unsigned iir, struct pt_regs *regs)
 #endif
                si.si_signo = SIGTRAP;
                si.si_code = TRAP_BRKPT;
-               si.si_addr = (void *) (regs->iaoq[0] & ~3);
+               si.si_addr = (void __user *) (regs->iaoq[0] & ~3);
                force_sig_info(SIGTRAP, &si, current);
                return;
        }
@@ -416,7 +447,7 @@ void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long o
        {
                /* show_stack(NULL, (unsigned long *)regs->gr[30]); */
                struct unwind_frame_info info;
-               unwind_frame_init(&info, current, regs->gr[30], regs->iaoq[0], regs->gr[2]);
+               unwind_frame_init(&info, current, regs);
                do_show_stack(&info);
        }
 
@@ -569,7 +600,7 @@ void handle_interruption(int code, struct pt_regs *regs)
        give_sigill:
                si.si_signo = SIGILL;
                si.si_errno = 0;
-               si.si_addr = (void *) regs->iaoq[0];
+               si.si_addr = (void __user *) regs->iaoq[0];
                force_sig_info(SIGILL, &si, current);
                return;
 
@@ -577,7 +608,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                /* Overflow Trap, let the userland signal handler do the cleanup */
                si.si_signo = SIGFPE;
                si.si_code = FPE_INTOVF;
-               si.si_addr = (void *) regs->iaoq[0];
+               si.si_addr = (void __user *) regs->iaoq[0];
                force_sig_info(SIGFPE, &si, current);
                return;
                
@@ -699,9 +730,9 @@ void handle_interruption(int code, struct pt_regs *regs)
                si.si_signo = SIGSEGV;
                si.si_errno = 0;
                if (code == 7)
-                   si.si_addr = (void *) regs->iaoq[0];
+                   si.si_addr = (void __user *) regs->iaoq[0];
                else
-                   si.si_addr = (void *) regs->ior;
+                   si.si_addr = (void __user *) regs->ior;
                force_sig_info(SIGSEGV, &si, current);
                return;
 
@@ -721,7 +752,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                        si.si_signo = SIGBUS;
                        si.si_code = BUS_OBJERR;
                        si.si_errno = 0;
-                       si.si_addr = (void *) regs->ior;
+                       si.si_addr = (void __user *) regs->ior;
                        force_sig_info(SIGBUS, &si, current);
                        return;
                }
@@ -732,7 +763,7 @@ void handle_interruption(int code, struct pt_regs *regs)
        }
 
        if (user_mode(regs)) {
-           if ((fault_space>>SPACEID_SHIFT) != (regs->sr[7] >> SPACEID_SHIFT)) {
+           if ((fault_space >> SPACEID_SHIFT) != (regs->sr[7] >> SPACEID_SHIFT)) {
 #ifdef PRINT_USER_FAULTS
                if (fault_space == 0)
                        printk(KERN_DEBUG "User Fault on Kernel Space ");
@@ -745,7 +776,7 @@ void handle_interruption(int code, struct pt_regs *regs)
                si.si_signo = SIGSEGV;
                si.si_errno = 0;
                si.si_code = SEGV_MAPERR;
-               si.si_addr = (void *) regs->ior;
+               si.si_addr = (void __user *) regs->ior;
                force_sig_info(SIGSEGV, &si, current);
                return;
            }