---

yaml --- r: 180255 b: refs/heads/master c: dbead40 h: refs/heads/master i: 180253: 51e4285 180251: d4e6989 180247: d43339d 180239: 294e04a 180223: d6ecfc0 v: v3
git-mirror · Feb 1, 2010 · 8954718 · 8954718
1 parent 7da7e6c
commit 8954718
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c540b9ff0f8679ba924fac072aeb7d63fa473190
+refs/heads/master: dbead405801c8d5aa1bc21ab6e2a47f060d47c06
diff --git a/trunk/arch/arm/vfp/vfpmodule.c b/trunk/arch/arm/vfp/vfpmodule.c
@@ -197,10 +197,13 @@ static void vfp_raise_exceptions(u32 exceptions, u32 inst, u32 fpscr, struct pt_
 	}
 
 	/*
-	 * Update the FPSCR with the additional exception flags.
+	 * If any of the status flags are set, update the FPSCR.
 	 * Comparison instructions always return at least one of
 	 * these flags set.
 	 */
+	if (exceptions & (FPSCR_N|FPSCR_Z|FPSCR_C|FPSCR_V))
+		fpscr &= ~(FPSCR_N|FPSCR_Z|FPSCR_C|FPSCR_V);
+
 	fpscr |= exceptions;
 
 	fmxr(FPSCR, fpscr);