X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fcmm%2FCmmLex.x;h=22741f86469b43cd7dc919343166409b1edfa83c;hb=24d49415d2833a1338dfb5fd8c5c1c84df6c282b;hp=5b8aa98ba4dc6b4084dc026e0602b428af2bf3b4;hpb=0731082288212fbc6d68204b609f201b8a79149a;p=ghc-hetmet.git

diff --git a/compiler/cmm/CmmLex.x b/compiler/cmm/CmmLex.x
index 5b8aa98..22741f8 100644
--- a/compiler/cmm/CmmLex.x
+++ b/compiler/cmm/CmmLex.x
@@ -11,6 +11,13 @@
 -----------------------------------------------------------------------------
 
 {
+{-# OPTIONS -Wwarn -w #-}
+-- The above warning supression flag is a temporary kludge.
+-- While working on this module you are encouraged to remove it and fix
+-- any warnings in the module. See
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
+-- for details
+
 module CmmLex (
    CmmToken(..), cmmlex,
   ) where
@@ -88,7 +95,8 @@ $white_no_nl+		;
   "&&"			{ kw CmmT_BoolAnd }
   "||"			{ kw CmmT_BoolOr }
   
-  R@decimal		{ global_regN VanillaReg }
+  P@decimal		{ global_regN (\n -> VanillaReg n VGcPtr) }
+  R@decimal		{ global_regN (\n -> VanillaReg n VNonGcPtr) }
   F@decimal		{ global_regN FloatReg }
   D@decimal		{ global_regN DoubleReg }
   L@decimal		{ global_regN LongReg }
@@ -152,6 +160,7 @@ data CmmToken
   | CmmT_bits64
   | CmmT_float32
   | CmmT_float64
+  | CmmT_gcptr
   | CmmT_GlobalReg GlobalReg
   | CmmT_Name	   FastString
   | CmmT_String	   String
@@ -229,7 +238,15 @@ reservedWordsFM = listToUFM $
 	( "bits32",		CmmT_bits32 ),
 	( "bits64",		CmmT_bits64 ),
 	( "float32",		CmmT_float32 ),
-	( "float64",		CmmT_float64 )
+	( "float64",		CmmT_float64 ),
+-- New forms
+	( "b8",			CmmT_bits8 ),
+	( "b16",		CmmT_bits16 ),
+	( "b32",		CmmT_bits32 ),
+	( "b64",		CmmT_bits64 ),
+	( "f32",		CmmT_float32 ),
+	( "f64",		CmmT_float64 ),
+	( "gcptr",		CmmT_gcptr )
 	]
 
 tok_decimal span buf len