Patched in Tegra support.

5 files changed, 34 insertions, 6 deletions

diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S
index d18dde95b8a..cafa1835433 100644
--- a/arch/arm/nwfpe/entry.S
+++ b/arch/arm/nwfpe/entry.S
@@ -20,8 +20,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/opcodes.h>
-
 /* This is the kernel's entry point into the floating point emulator.
 It is called from the kernel with code similar to this:
 
@@ -83,11 +81,11 @@ nwfpe_enter:
         mov     r6, r0                  @ save the opcode
 emulate:
         ldr     r1, [sp, #S_PSR]        @ fetch the PSR
-        bl      arm_check_condition     @ check the condition
-        cmp     r0, #ARM_OPCODE_CONDTEST_PASS   @ condition passed?
+        bl      checkCondition          @ check the condition
+        cmp     r0, #0                  @ r0 = 0 ==> condition failed
 
         @ if condition code failed to match, next insn
-        bne     next                    @ get the next instruction;
+        beq     next                    @ get the next instruction;
 
         mov     r0, r6                  @ prepare for EmulateAll()
         bl      EmulateAll              @ emulate the instruction
diff --git a/arch/arm/nwfpe/fpa11.c b/arch/arm/nwfpe/fpa11.c
index 2782ebcc2ed..cc60acde84d 100644
--- a/arch/arm/nwfpe/fpa11.c
+++ b/arch/arm/nwfpe/fpa11.c
@@ -28,6 +28,7 @@
 
 #include <linux/compiler.h>
 #include <linux/string.h>
+#include <asm/system.h>
 
 /* Reset the FPA11 chip.  Called to initialize and reset the emulator. */
 static void resetFPA11(void)
diff --git a/arch/arm/nwfpe/fpmodule.c b/arch/arm/nwfpe/fpmodule.c
index 4e729f055a8..cb7658e8acc 100644
--- a/arch/arm/nwfpe/fpmodule.c
+++ b/arch/arm/nwfpe/fpmodule.c
@@ -147,7 +147,7 @@ void float_raise(signed char flags)
 #ifdef CONFIG_DEBUG_USER
         if (flags & debug)
                 printk(KERN_DEBUG
-                       "NWFPE: %s[%d] takes exception %08x at %pf from %08lx\n",
+                       "NWFPE: %s[%d] takes exception %08x at %p from %08lx\n",
                        current->comm, current->pid, flags,
                        __builtin_return_address(0), GET_USERREG()->ARM_pc);
 #endif
diff --git a/arch/arm/nwfpe/fpopcode.c b/arch/arm/nwfpe/fpopcode.c
index ff983467308..922b8110758 100644
--- a/arch/arm/nwfpe/fpopcode.c
+++ b/arch/arm/nwfpe/fpopcode.c
@@ -61,3 +61,29 @@ const float32 float32Constant[] = {
         0x41200000              /* single 10.0 */
 };
 
+/* condition code lookup table
+ index into the table is test code: EQ, NE, ... LT, GT, AL, NV
+ bit position in short is condition code: NZCV */
+static const unsigned short aCC[16] = {
+        0xF0F0,                 // EQ == Z set
+        0x0F0F,                 // NE
+        0xCCCC,                 // CS == C set
+        0x3333,                 // CC
+        0xFF00,                 // MI == N set
+        0x00FF,                 // PL
+        0xAAAA,                 // VS == V set
+        0x5555,                 // VC
+        0x0C0C,                 // HI == C set && Z clear
+        0xF3F3,                 // LS == C clear || Z set
+        0xAA55,                 // GE == (N==V)
+        0x55AA,                 // LT == (N!=V)
+        0x0A05,                 // GT == (!Z && (N==V))
+        0xF5FA,                 // LE == (Z || (N!=V))
+        0xFFFF,                 // AL always
+        0                       // NV
+};
+
+unsigned int checkCondition(const unsigned int opcode, const unsigned int ccodes)
+{
+        return (aCC[opcode >> 28] >> (ccodes >> 28)) & 1;
+}
diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h
index 78f02dbfaa8..786e4c96156 100644
--- a/arch/arm/nwfpe/fpopcode.h
+++ b/arch/arm/nwfpe/fpopcode.h
@@ -475,6 +475,9 @@ static inline unsigned int getDestinationSize(const unsigned int opcode)
         return (nRc);
 }
 
+extern unsigned int checkCondition(const unsigned int opcode,
+                                   const unsigned int ccodes);
+
 extern const float64 float64Constant[];
 extern const float32 float32Constant[];