From: Ben.Lippmeier@anu.edu.au <unknown>
Date: Sun, 15 Feb 2009 07:23:25 +0000 (+0000)
Subject: NCG: validate fixes for x86_64-linux
X-Git-Tag: 2009-03-13~73
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=72636a93a047af23461df5123edc2342b2dec48d

NCG: validate fixes for x86_64-linux
---

diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs
index 43495a4..135ac36 100644
--- a/compiler/nativeGen/X86/CodeGen.hs
+++ b/compiler/nativeGen/X86/CodeGen.hs
@@ -2038,8 +2038,8 @@ condFltReg cond x y = do
 #elif x86_64_TARGET_ARCH
 condFltReg cond x y = do
   CondCode _ cond cond_code <- condFltCode cond x y
-  tmp1 <- getNewRegNat wordSize
-  tmp2 <- getNewRegNat wordSize
+  tmp1 <- getNewRegNat archWordSize
+  tmp2 <- getNewRegNat archWordSize
   let 
 	-- We have to worry about unordered operands (eg. comparisons
 	-- against NaN).  If the operands are unordered, the comparison
diff --git a/compiler/nativeGen/X86/Ppr.hs b/compiler/nativeGen/X86/Ppr.hs
index ffd839a..bdbeebd 100644
--- a/compiler/nativeGen/X86/Ppr.hs
+++ b/compiler/nativeGen/X86/Ppr.hs
@@ -301,6 +301,7 @@ pprSize x
 #elif x86_64_TARGET_ARCH
 		FF32  -> sLit "ss"	-- "scalar single-precision float" (SSE2)
 		FF64  -> sLit "sd"	-- "scalar double-precision float" (SSE2)
+                _     -> panic "X86.Ppr.pprSize: no match"
 #else
 		_     -> panic "X86.Ppr.pprSize: no match"
 #endif