projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8ae1fd3
)
fix the names of the floating-point operations in the Cmm parser
author
Simon Marlow
<marlowsd@gmail.com>
Wed, 4 May 2011 15:43:35 +0000
(16:43 +0100)
committer
Simon Marlow
<marlowsd@gmail.com>
Wed, 11 May 2011 10:54:02 +0000
(11:54 +0100)
compiler/cmm/CmmParse.y
patch
|
blob
|
history
diff --git
a/compiler/cmm/CmmParse.y
b/compiler/cmm/CmmParse.y
index
4dc7e32
..
0ee429d
100644
(file)
--- a/
compiler/cmm/CmmParse.y
+++ b/
compiler/cmm/CmmParse.y
@@
-689,15
+689,7
@@
machOps = listToUFM $
( "gtu", MO_U_Gt ),
( "ltu", MO_U_Lt ),
( "gtu", MO_U_Gt ),
( "ltu", MO_U_Lt ),
- ( "flt", MO_S_Lt ),
- ( "fle", MO_S_Le ),
- ( "feq", MO_Eq ),
- ( "fne", MO_Ne ),
- ( "fgt", MO_S_Gt ),
- ( "fge", MO_S_Ge ),
- ( "fneg", MO_S_Neg ),
-
- ( "and", MO_And ),
+ ( "and", MO_And ),
( "or", MO_Or ),
( "xor", MO_Xor ),
( "com", MO_Not ),
( "or", MO_Or ),
( "xor", MO_Xor ),
( "com", MO_Not ),
@@
-705,7
+697,20
@@
machOps = listToUFM $
( "shrl", MO_U_Shr ),
( "shra", MO_S_Shr ),
( "shrl", MO_U_Shr ),
( "shra", MO_S_Shr ),
- ( "lobits8", flip MO_UU_Conv W8 ),
+ ( "fadd", MO_F_Add ),
+ ( "fsub", MO_F_Sub ),
+ ( "fneg", MO_F_Neg ),
+ ( "fmul", MO_F_Mul ),
+ ( "fquot", MO_F_Quot ),
+
+ ( "feq", MO_F_Eq ),
+ ( "fne", MO_F_Ne ),
+ ( "fge", MO_F_Ge ),
+ ( "fle", MO_F_Le ),
+ ( "fgt", MO_F_Gt ),
+ ( "flt", MO_F_Lt ),
+
+ ( "lobits8", flip MO_UU_Conv W8 ),
( "lobits16", flip MO_UU_Conv W16 ),
( "lobits32", flip MO_UU_Conv W32 ),
( "lobits64", flip MO_UU_Conv W64 ),
( "lobits16", flip MO_UU_Conv W16 ),
( "lobits32", flip MO_UU_Conv W32 ),
( "lobits64", flip MO_UU_Conv W64 ),