From e940d0ad629747fd30d1dc318a4c1ab893ac7222 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 22 Dec 2006 14:15:54 +0000 Subject: [PATCH] Handle LongArg's in the FFI on x86 --- compiler/ghci/ByteCodeFFI.lhs | 2 +- compiler/ghci/ByteCodeGen.lhs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/ghci/ByteCodeFFI.lhs b/compiler/ghci/ByteCodeFFI.lhs index 3e12828..982cdec 100644 --- a/compiler/ghci/ByteCodeFFI.lhs +++ b/compiler/ghci/ByteCodeFFI.lhs @@ -263,7 +263,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps NonPtrArg -> i32 DoubleArg -> f64 FloatArg -> f32 - -- LongArg -> i64 + LongArg -> i64 VoidArg -> [] other -> moan64 "ByteCodeFFI.mkMarshalCode_wrk(x86)" (ppr r_rep) diff --git a/compiler/ghci/ByteCodeGen.lhs b/compiler/ghci/ByteCodeGen.lhs index bfc7d75..350148c 100644 --- a/compiler/ghci/ByteCodeGen.lhs +++ b/compiler/ghci/ByteCodeGen.lhs @@ -954,6 +954,7 @@ mkDummyLiteral pr NonPtrArg -> MachWord 0 DoubleArg -> MachDouble 0 FloatArg -> MachFloat 0 + LongArg -> MachWord64 0 _ -> moan64 "mkDummyLiteral" (ppr pr) -- 1.7.10.4