X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FByteCodeGen.lhs;h=e171a38505fc2e84909230c4197821167315de83;hb=ae4bf23ecc1552e18623670b12eba6ba81afa711;hp=bd292810ad3af1105d99e15e3c0f856e7ae008ca;hpb=b515d109750e00630dfaf6055a1ded8dfd61b415;p=ghc-hetmet.git

diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs
index bd29281..e171a38 100644
--- a/compiler/ghci/ByteCodeGen.lhs
+++ b/compiler/ghci/ByteCodeGen.lhs
@@ -49,7 +49,6 @@ import Constants
 import Data.List
 import Foreign
 import Foreign.C
-import Control.Exception	( throwDyn )
 
 import GHC.Exts		( Int(..), ByteArray# )
 
@@ -1016,11 +1015,11 @@ generateCCall d0 s p (CCallSpec target cconv _) fn args_r_to_l
                       stdcall_adj_target
 #ifdef mingw32_TARGET_OS
                           | StdCallConv <- cconv
-                          = mkFastString (unpackFS target ++ '@':show size)
+                          = let size = a_reps_sizeW * wORD_SIZE in
+                            mkFastString (unpackFS target ++ '@':show size)
 #endif
                           | otherwise
                           = target
-                      size = a_reps_sizeW * wORD_SIZE
 
      -- in
      (is_static, static_target_addr) <- get_target_info
@@ -1220,6 +1219,7 @@ pushAtom _ _ (AnnLit lit)
         MachFloat _   -> code FloatArg
         MachDouble _  -> code DoubleArg
         MachChar _    -> code NonPtrArg
+	MachNullAddr  -> code NonPtrArg
         MachStr s     -> pushStr s
         l             -> pprPanic "pushAtom" (ppr l)
      where
@@ -1401,7 +1401,7 @@ idSizeW id = cgRepSizeW (typeCgRep (idType id))
 -- See bug #1257
 unboxedTupleException :: a
 unboxedTupleException 
-   = throwDyn 
+   = ghcError 
         (ProgramError 
            ("Error: bytecode compiler can't handle unboxed tuples.\n"++
             "  Possibly due to foreign import/export decls in source.\n"++