[project @ 2002-06-09 13:37:41 by matthewc]

Initial GHCI support on IA64.

ghc/compiler/ghci/ByteCodeItbls.lhs

@@ -147,9 +147,8 @@ mkJumpToAddr a
            0x8610E000 .|. (lo10 w32),
            0x81C0C000,
            0x01000000 ]
-#endif
 
-#if i386_TARGET_ARCH
+#elif i386_TARGET_ARCH
 -- Let the address to jump to be 0xWWXXYYZZ.
 -- Generate   movl $0xWWXXYYZZ,%eax  ;  jmp *%eax
 -- which is
@@ -165,9 +164,8 @@ mkJumpToAddr a
                0xFF, 0xE0]
      in
          insnBytes
-#endif
 
-#if alpha_TARGET_ARCH
+#elif alpha_TARGET_ARCH
 type ItblCode = Word32
 mkJumpToAddr a
     = [ 0xc3800000      -- br   at, .+4
@@ -177,6 +175,11 @@ mkJumpToAddr a
       , fromIntegral (w64 .&. 0x0000FFFF)
       , fromIntegral ((w64 `shiftR` 32) .&. 0x0000FFFF) ]
     where w64 = fromIntegral (ptrToInt a) :: Word64
+
+#else
+type ItblCode = Word32
+mkJumpToAddr a
+    = undefined
 #endif
 
 

ghc/rts/LinkerInternals.h

 /* -----------------------------------------------------------------------------
- * $Id: LinkerInternals.h,v 1.5 2001/09/04 16:33:04 sewardj Exp $
+ * $Id: LinkerInternals.h,v 1.6 2002/06/09 13:37:44 matthewc Exp $
  *
  * (c) The GHC Team, 2000
  *
@@ -70,7 +70,13 @@ typedef struct _ObjectCode {
        safely be prodded during relocation.  Any attempt to prod
        outside one of these is an error in the linker. */
     ProddableBlock* proddables;
-    
+
+#ifdef ia64_TARGET_ARCH
+    /* Procedure Linkage Table for this object */
+    void *plt;
+    unsigned int pltIndex;
+#endif
+
 } ObjectCode;
 
 extern ObjectCode *objects;