X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FByteCodeLink.lhs;h=b1f7e39aed2e1fc5e805c997b14a7955fa48163e;hp=11d4022196aff83d64f5f49a3696ed7e2d1385fb;hb=5289f5d85610f71625a439747a09384876655eb5;hpb=b0046dd679244886fdc62e5cc2a73128d2e018bb

diff --git a/compiler/ghci/ByteCodeLink.lhs b/compiler/ghci/ByteCodeLink.lhs
index 11d4022..b1f7e39 100644
--- a/compiler/ghci/ByteCodeLink.lhs
+++ b/compiler/ghci/ByteCodeLink.lhs
@@ -4,6 +4,7 @@
 ByteCodeLink: Bytecode assembler and linker
 
 \begin{code}
+{-# LANGUAGE BangPatterns #-}
 {-# OPTIONS -optc-DNON_POSIX_SOURCE #-}
 
 {-# OPTIONS -w #-}
@@ -119,13 +120,19 @@ linkBCO' ie ce (UnlinkedBCO nm arity insns_barr bitmap literalsSS ptrsSS)
         let n_literals = sizeSS literalsSS
             n_ptrs     = sizeSS ptrsSS
 
-	ptrs_arr <- mkPtrsArray ie ce n_ptrs ptrs
+        ptrs_arr <- if n_ptrs > 65535
+                    then panic "linkBCO: >= 64k ptrs"
+                    else mkPtrsArray ie ce (fromIntegral n_ptrs) ptrs
 
         let 
             !ptrs_parr = case ptrs_arr of Array _lo _hi _n parr -> parr
 
-            literals_arr = listArray (0, n_literals-1) linked_literals
-                           :: UArray Word16 Word
+            litRange
+             | n_literals > 65535 = panic "linkBCO: >= 64k literals"
+             | n_literals > 0     = (0, fromIntegral n_literals - 1)
+             | otherwise          = (1, 0)
+            literals_arr :: UArray Word16 Word
+            literals_arr = listArray litRange linked_literals
             !literals_barr = case literals_arr of UArray _lo _hi _n barr -> barr
 
 	    !(I# arity#)  = arity
@@ -136,7 +143,8 @@ linkBCO' ie ce (UnlinkedBCO nm arity insns_barr bitmap literalsSS ptrsSS)
 -- we recursively link any sub-BCOs while making the ptrs array
 mkPtrsArray :: ItblEnv -> ClosureEnv -> Word16 -> [BCOPtr] -> IO (Array Word16 HValue)
 mkPtrsArray ie ce n_ptrs ptrs = do
-  marr <- newArray_ (0, n_ptrs-1)
+  let ptrRange = if n_ptrs > 0 then (0, n_ptrs-1) else (1, 0)
+  marr <- newArray_ ptrRange
   let 
     fill (BCOPtrName n)     i = do
 	ptr <- lookupName ce n