projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-08-13 10:45:16 by simonmar]
[ghc-hetmet.git]
/
ghc
/
compiler
/
nativeGen
/
MachMisc.lhs
diff --git
a/ghc/compiler/nativeGen/MachMisc.lhs
b/ghc/compiler/nativeGen/MachMisc.lhs
index
e588210
..
a641a8a
100644
(file)
--- a/
ghc/compiler/nativeGen/MachMisc.lhs
+++ b/
ghc/compiler/nativeGen/MachMisc.lhs
@@
-65,7
+65,7
@@
import FastString
import GLAEXTS
import TRACE ( trace )
import GLAEXTS
import TRACE ( trace )
-import Maybe ( catMaybes )
+import Maybes ( mapCatMaybes )
\end{code}
\begin{code}
\end{code}
\begin{code}
@@
-94,7
+94,8
@@
where do we start putting the rest of them?
\begin{code}
eXTRA_STK_ARGS_HERE :: Int
eXTRA_STK_ARGS_HERE
\begin{code}
eXTRA_STK_ARGS_HERE :: Int
eXTRA_STK_ARGS_HERE
- = IF_ARCH_alpha(0, IF_ARCH_i386(23{-6x4bytes-}, IF_ARCH_sparc(23, IF_ARCH_powerpc(24,???))))
+ = IF_ARCH_alpha(0, IF_ARCH_i386(23{-6x4bytes-}, IF_ARCH_sparc(23,
+ IF_ARCH_powerpc( IF_OS_darwin(24,8{-SVR4 ABI: Linux-}), ???))))
\end{code}
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
\end{code}
% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@
-116,7
+117,7
@@
save_cands = [BaseReg,Sp,SpLim,Hp,HpLim]
restore_cands = save_cands
volatileSavesOrRestores do_saves vols
restore_cands = save_cands
volatileSavesOrRestores do_saves vols
- = catMaybes (map mkCode vols)
+ = mapCatMaybes mkCode vols
where
mkCode mid
| case mid of { BaseReg -> True; _ -> False }
where
mkCode mid
| case mid of { BaseReg -> True; _ -> False }