[commit: ghc] master: nativeGen: detabify/dewhitespace SPARC/CodeGen/Amode (6babdc8)

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


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6babdc824319d01d4836973defecca1ae3284e97/ghc

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

commit 6babdc824319d01d4836973defecca1ae3284e97
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Jul 18 22:29:03 2014 -0500

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


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

6babdc824319d01d4836973defecca1ae3284e97
 compiler/nativeGen/SPARC/CodeGen/Amode.hs | 32 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/compiler/nativeGen/SPARC/CodeGen/Amode.hs b/compiler/nativeGen/SPARC/CodeGen/Amode.hs
index f0aed0d..8d9a303 100644
--- a/compiler/nativeGen/SPARC/CodeGen/Amode.hs
+++ b/compiler/nativeGen/SPARC/CodeGen/Amode.hs
@@ -1,13 +1,5 @@
-
-{-# 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
-
 module SPARC.CodeGen.Amode (
-	getAmode
+        getAmode
 )
 
 where
@@ -29,8 +21,8 @@ import OrdList
 
 -- | Generate code to reference a memory address.
 getAmode
-	:: CmmExpr 	-- ^ expr producing an address
-	-> NatM Amode
+        :: CmmExpr      -- ^ expr producing an address
+        -> NatM Amode
 
 getAmode tree@(CmmRegOff _ _)
     = do dflags <- getDynFlags
@@ -50,7 +42,7 @@ getAmode (CmmMachOp (MO_Add _) [x, CmmLit (CmmInt i _)])
   = do
        (reg, code) <- getSomeReg x
        let
-     	 off  = ImmInt (fromInteger i)
+         off  = ImmInt (fromInteger i)
        return (Amode (AddrRegImm reg off) code)
 
 getAmode (CmmMachOp (MO_Add _) [x, y])
@@ -58,23 +50,23 @@ getAmode (CmmMachOp (MO_Add _) [x, y])
     (regX, codeX) <- getSomeReg x
     (regY, codeY) <- getSomeReg y
     let
-    	code = codeX `appOL` codeY
+        code = codeX `appOL` codeY
     return (Amode (AddrRegReg regX regY) code)
 
 getAmode (CmmLit lit)
   = do
-	let imm__2	= litToImm lit
-	tmp1 	<- getNewRegNat II32
-	tmp2	<- getNewRegNat II32
+        let imm__2      = litToImm lit
+        tmp1    <- getNewRegNat II32
+        tmp2    <- getNewRegNat II32
 
-	let code = toOL	[ SETHI (HI imm__2) tmp1
-			, OR    False tmp1 (RIImm (LO imm__2)) tmp2]
+        let code = toOL [ SETHI (HI imm__2) tmp1
+                        , OR    False tmp1 (RIImm (LO imm__2)) tmp2]
 
-	return (Amode (AddrRegReg tmp2 g0) code)
+        return (Amode (AddrRegReg tmp2 g0) code)
 
 getAmode other
   = do
        (reg, code) <- getSomeReg other
        let
-    	    off  = ImmInt 0
+            off  = ImmInt 0
        return (Amode (AddrRegImm reg off) code)



More information about the ghc-commits mailing list