OK I've pushed reversion patches to the HEAD ghc repo and to 'base'. Attached.
Maybe Vincent can figure out what went wrong.
Simon
From: [email protected] [mailto:[email protected]] On
Behalf Of Simon Peyton-Jones
Sent: 11 June 2013 21:10
To: Ian Lynagh ([email protected])
Cc: [email protected]
Subject: Build broken: urgent
Ian
This getRegister bug is killing my Windows builds too; indeed every 32-bit
build is broken, and that is stalling a lot of people, now including me.
Could you perhaps revert the patch (around 6 June) that caused this, until it's
sorted out?
Thanks
Simon
"inplace/bin/ghc-stage1.exe" -hisuf hi -osuf o -hcsuf hc -static -H32m -O
-Werror -Wall -H64m -O0 -package-name ghc-prim-0.3.1.0 -hide-all-packages -i
-ilibraries/ghc-prim/. -ilibraries/ghc-prim/dist-install/build
-ilibraries/ghc-prim/dist-install/build/autogen
-Ilibraries/ghc-prim/dist-install/build
-Ilibraries/ghc-prim/dist-install/build/autogen -Ilibraries/ghc-prim/.
-optP-include -optPlibraries/ghc-prim/dist-install/build/autogen/cabal_macros.h
-package rts-1.0 -package-name ghc-prim -XHaskell98 -XCPP -XMagicHash
-XForeignFunctionInterface -XUnliftedFFITypes -XUnboxedTuples -XEmptyDataDecls
-XNoImplicitPrelude -O2 -O -dcore-lint -fno-warn-deprecated-flags
-no-user-package-db -rtsopts -odir libraries/ghc-prim/dist-install/build
-hidir libraries/ghc-prim/dist-install/build -stubdir
libraries/ghc-prim/dist-install/build -dynamic-too -c
libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs -o
libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.o -dyno
libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.dyn_o
ghc-stage1.exe: panic! (the 'impossible' happened)
(GHC version 7.7.20130611 for i386-unknown-mingw32):
getRegister(x86) I64[Sp]
Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
bash-3.1$
--- Begin Message ---
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base
On branch : master
https://github.com/ghc/packages-base/commit/2f8c5bff9ccb762b34467e069f208f28538cc18e
>---------------------------------------------------------------
commit 2f8c5bff9ccb762b34467e069f208f28538cc18e
Author: Simon Peyton Jones <[email protected]>
Date: Tue Jun 11 21:50:04 2013 +0100
Revert "expose new Word operation to swap endianness for Word{16,32,64}"
This reverts commit 3ef0f91d4e9a3649581557ec4ba663db4306d7d5.
>---------------------------------------------------------------
Data/Word.hs | 18 ------------------
GHC/Word.hs | 18 +-----------------
2 files changed, 1 insertions(+), 35 deletions(-)
diff --git a/Data/Word.hs b/Data/Word.hs
index c844c4d..39aa1a8 100644
--- a/Data/Word.hs
+++ b/Data/Word.hs
@@ -22,9 +22,6 @@ module Data.Word
Word,
Word8, Word16, Word32, Word64,
- -- * byte swapping
- byteSwap16, byteSwap32, byteSwap64,
-
-- * Notes
-- $notes
@@ -36,21 +33,6 @@ import GHC.Word
#ifdef __HUGS__
import Hugs.Word
-
-byteSwap16 :: Word16 -> Word16
-byteSwap16 w = (w `shift` -8) .|. (w `shift` 8)
-
-byteSwap32 :: Word32 -> Word32
-byteSwap32 w =
- (w `shift` -24) .|. (w `shift` 24)
- .|. ((w `shift` -8) .&. 0xff00) .|. ((w .&. 0xff00) `shift` 8)
-
-byteSwap64 :: Word64 -> Word64
-byteSwap64 w =
- (w `shift` -56) .|. (w `shift` 56)
- .|. ((w `shift` -40) .&. 0xff00) .|. ((w .&. 0xff00) `shift` 40)
- .|. ((w `shift` -24) .&. 0xff0000) .|. ((w .&. 0xff0000) `shift` 24)
- .|. ((w `shift` -8) .&. 0xff000000) .|. ((w .&. 0xff000000) `shift` 8)
#endif
{- $notes
diff --git a/GHC/Word.hs b/GHC/Word.hs
index 3419a24..75957df 100644
--- a/GHC/Word.hs
+++ b/GHC/Word.hs
@@ -23,10 +23,7 @@
module GHC.Word (
Word(..), Word8(..), Word16(..), Word32(..), Word64(..),
uncheckedShiftL64#,
- uncheckedShiftRL64#,
- byteSwap16,
- byteSwap32,
- byteSwap64
+ uncheckedShiftRL64#
) where
import Data.Bits
@@ -303,9 +300,6 @@ instance Bits Word16 where
instance FiniteBits Word16 where
finiteBitSize _ = 16
-byteSwap16 :: Word16 -> Word16
-byteSwap16 (W16# w#) = W16# (byteSwap16# w#)
-
{-# RULES
"fromIntegral/Word8->Word16" fromIntegral = \(W8# x#) -> W16# x#
"fromIntegral/Word16->Word16" fromIntegral = id :: Word16 -> Word16
@@ -530,9 +524,6 @@ instance Read Word32 where
readsPrec p s = [(fromIntegral (x::Int), r) | (x, r) <- readsPrec p s]
#endif
-byteSwap32 :: Word32 -> Word32
-byteSwap32 (W32# w#) = W32# (byteSwap32# w#)
-
------------------------------------------------------------------------
-- type Word64
------------------------------------------------------------------------
@@ -781,10 +772,3 @@ instance Ix Word64 where
instance Read Word64 where
readsPrec p s = [(fromInteger x, r) | (x, r) <- readsPrec p s]
-#if WORD_SIZE_IN_BITS < 64
-byteSwap64 :: Word64 -> Word64
-byteSwap64 (W64# w#) = W64# (byteSwap64# w#)
-#else
-byteSwap64 :: Word64 -> Word64
-byteSwap64 (W64# w#) = W64# (byteSwap# w#)
-#endif
_______________________________________________
ghc-commits mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/ghc-commits
--- End Message ---
--- Begin Message ---
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/4aa7fc89fbdbe38d362e59c93fe8ec02185c8073
>---------------------------------------------------------------
commit 4aa7fc89fbdbe38d362e59c93fe8ec02185c8073
Author: Simon Peyton Jones <[email protected]>
Date: Tue Jun 11 23:28:06 2013 +0100
Comment out function; consequence of reverting a553f18
>---------------------------------------------------------------
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index b426cc5..d7ddbdd 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -387,8 +387,8 @@ genCall env target res args = do
`appOL` retStmt, top1 ++ top2 ++ top3)
-genCallSimpleCast _ _ _ dsts _ =
- panic ("genCallSimpleCast: " ++ show (length dsts) ++ " dsts")
+-- genCallSimpleCast _ _ _ dsts _ =
+-- panic ("genCallSimpleCast: " ++ show (length dsts) ++ " dsts")
-- | Create a function pointer from a target.
getFunPtr :: LlvmEnv -> (LMString -> LlvmType) -> ForeignTarget
_______________________________________________
ghc-commits mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/ghc-commits
--- End Message ---
--- Begin Message ---
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
https://github.com/ghc/ghc/commit/91979ed2f0f01d8a3559c4e26d6662d6dd44b442
>---------------------------------------------------------------
commit 91979ed2f0f01d8a3559c4e26d6662d6dd44b442
Author: Simon Peyton Jones <[email protected]>
Date: Tue Jun 11 21:12:58 2013 +0100
Revert "Add support for byte endian swapping for Word 16/32/64."
This reverts commit 1c5b0511a89488f5280523569d45ee61c0d09ffa.
compiler/cmm/CmmMachOp.hs | 1 -
compiler/cmm/PprC.hs | 1 -
compiler/codeGen/StgCmmPrim.hs | 12 -------
compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 60 +++++++++++++--------------------
compiler/nativeGen/CPrim.hs | 9 -----
compiler/nativeGen/PPC/CodeGen.hs | 1 -
compiler/nativeGen/SPARC/CodeGen.hs | 1 -
compiler/nativeGen/X86/CodeGen.hs | 14 --------
compiler/nativeGen/X86/Instr.hs | 3 --
compiler/nativeGen/X86/Ppr.hs | 1 -
compiler/prelude/primops.txt.pp | 9 -----
11 files changed, 24 insertions(+), 88 deletions(-)
Diff suppressed because of size. To see it, use:
git show 91979ed2f0f01d8a3559c4e26d6662d6dd44b442
_______________________________________________
ghc-commits mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/ghc-commits
--- End Message ---
_______________________________________________
ghc-devs mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/ghc-devs
