From 271502ff37a81fb5292056a1885c705192ef76c5 Mon Sep 17 00:00:00 2001 From: wolfgang Date: Sun, 19 Jan 2003 18:41:19 +0000 Subject: [PATCH] [project @ 2003-01-19 18:41:19 by wolfgang] Fix two really bad typos in the Mac OS X specific code MERGE TO STABLE --- ghc/compiler/ghci/ByteCodeFFI.lhs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghc/compiler/ghci/ByteCodeFFI.lhs b/ghc/compiler/ghci/ByteCodeFFI.lhs index 4db2707..78cfa61 100644 --- a/ghc/compiler/ghci/ByteCodeFFI.lhs +++ b/ghc/compiler/ghci/ByteCodeFFI.lhs @@ -463,7 +463,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps parameterArea = sum [ getPrimRepSize a_rep * bytes_per_word | (_, a_rep) <- arg_offs_n_reps ] savedRegisterArea = 4 - frameSize = padTo16 (linkageArea + min parameterArea 32 + savedRegisterArea) + frameSize = padTo16 (linkageArea + max parameterArea 32 + savedRegisterArea) padTo16 x = case x `mod` 16 of 0 -> x y -> x - y + 16 @@ -475,7 +475,7 @@ mkMarshalCode_wrk cconv (r_offW, r_rep) addr_offW arg_offs_n_reps offsetW' = offsetW + getPrimRepSize a_rep pass_word w - | w < 8 = + | offsetW + w < 8 = [0x801f0000 -- lwz rX, src(r31) .|. (fromIntegral src .&. 0xFFFF) .|. (fromIntegral (offsetW+w+3) `shiftL` 21)] -- 1.7.10.4