[commit: ghc] master: nativeGen: detabify/dewhitespace Size (4173ae8)

git at git.haskell.org git at git.haskell.org
Sun Jul 20 21:57:03 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4173ae8699b3509a5aa9331c3036167db4cde480/ghc

>---------------------------------------------------------------

commit 4173ae8699b3509a5aa9331c3036167db4cde480
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Jul 18 22:22:59 2014 -0500

    nativeGen: detabify/dewhitespace Size
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


>---------------------------------------------------------------

4173ae8699b3509a5aa9331c3036167db4cde480
 compiler/nativeGen/Size.hs | 87 +++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 47 deletions(-)

diff --git a/compiler/nativeGen/Size.hs b/compiler/nativeGen/Size.hs
index 1b95ceb..8fe590f 100644
--- a/compiler/nativeGen/Size.hs
+++ b/compiler/nativeGen/Size.hs
@@ -1,22 +1,15 @@
-{-# OPTIONS_GHC -fno-warn-tabs #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and
--- detab the module (please do the detabbing in a separate patch). See
---     http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
--- for details
-
 -- | Sizes on this architecture
--- 	A Size is a combination of width and class
+--      A Size is a combination of width and class
 --
--- 	TODO: 	Rename this to "Format" instead of "Size" to reflect
---		the fact that it represents floating point vs integer.
+--      TODO:   Rename this to "Format" instead of "Size" to reflect
+--              the fact that it represents floating point vs integer.
 --
---	TODO: 	Signed vs unsigned?
+--      TODO:   Signed vs unsigned?
 --
---	TODO:	This module is currenly shared by all architectures because
---		NCGMonad need to know about it to make a VReg. It would be better
---		to have architecture specific formats, and do the overloading
---		properly. eg SPARC doesn't care about FF80.
+--      TODO:   This module is currenly shared by all architectures because
+--              NCGMonad need to know about it to make a VReg. It would be better
+--              to have architecture specific formats, and do the overloading
+--              properly. eg SPARC doesn't care about FF80.
 --
 module Size (
     Size(..),
@@ -38,75 +31,75 @@ import Outputable
 -- without global consequences.
 --
 -- A major use is as an opcode qualifier; thus the opcode
---	mov.l a b
+--      mov.l a b
 -- might be encoded
--- 	MOV II32 a b
+--      MOV II32 a b
 -- where the Size field encodes the ".l" part.
 
 -- ToDo: it's not clear to me that we need separate signed-vs-unsigned sizes
--- 	  here.  I've removed them from the x86 version, we'll see what happens --SDM
+--        here.  I've removed them from the x86 version, we'll see what happens --SDM
 
 -- ToDo: quite a few occurrences of Size could usefully be replaced by Width
 
 data Size
-	= II8 
-	| II16 
-	| II32 
-	| II64 
-	| FF32 
-	| FF64 
-	| FF80
-	deriving (Show, Eq)
+        = II8
+        | II16
+        | II32
+        | II64
+        | FF32
+        | FF64
+        | FF80
+        deriving (Show, Eq)
 
 
 -- | Get the integer size of this width.
 intSize :: Width -> Size
 intSize width
  = case width of
- 	W8 	-> II8
-	W16	-> II16
-	W32	-> II32
-	W64 	-> II64
-	other	-> pprPanic "Size.intSize" (ppr other)
+        W8      -> II8
+        W16     -> II16
+        W32     -> II32
+        W64     -> II64
+        other   -> pprPanic "Size.intSize" (ppr other)
 
 
 -- | Get the float size of this width.
 floatSize :: Width -> Size
 floatSize width
  = case width of
- 	W32	-> FF32
-	W64	-> FF64
-	other 	-> pprPanic "Size.floatSize" (ppr other)
+        W32     -> FF32
+        W64     -> FF64
+        other   -> pprPanic "Size.floatSize" (ppr other)
 
 
 -- | Check if a size represents a floating point value.
 isFloatSize :: Size -> Bool
 isFloatSize size
  = case size of
- 	FF32	-> True
-	FF64	-> True
-	FF80	-> True
-	_	-> False
+        FF32    -> True
+        FF64    -> True
+        FF80    -> True
+        _       -> False
 
 
 -- | Convert a Cmm type to a Size.
 cmmTypeSize :: CmmType -> Size
 cmmTypeSize ty
-	| isFloatType ty	= floatSize (typeWidth ty)
-	| otherwise		= intSize (typeWidth ty)
+        | isFloatType ty        = floatSize (typeWidth ty)
+        | otherwise             = intSize (typeWidth ty)
 
 
 -- | Get the Width of a Size.
 sizeToWidth :: Size -> Width
 sizeToWidth size
  = case size of
- 	II8		-> W8
-	II16		-> W16
-	II32		-> W32
-	II64		-> W64
-	FF32		-> W32
-	FF64		-> W64
-	FF80		-> W80
+        II8             -> W8
+        II16            -> W16
+        II32            -> W32
+        II64            -> W64
+        FF32            -> W32
+        FF64            -> W64
+        FF80            -> W80
 
 sizeInBytes :: Size -> Int
 sizeInBytes = widthInBytes . sizeToWidth



More information about the ghc-commits mailing list