diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-11-01 13:51:01 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-11-01 14:11:22 +0000 |
| commit | dba4fa52ab9bfeadf69ddc6c56e23cbf9f8dd5da (patch) | |
| tree | fe810b11894d22cf9811b67833f603f10e511caa | |
| parent | d7ca7af27f32bf51f46783538fd2fb542636b7a4 (diff) | |
| download | haskell-dba4fa52ab9bfeadf69ddc6c56e23cbf9f8dd5da.tar.gz | |
Fix typos
| -rw-r--r-- | compiler/nativeGen/X86/CodeGen.hs | 4 | ||||
| -rw-r--r-- | compiler/utils/UniqFM.lhs | 2 | ||||
| -rw-r--r-- | rts/StgCRun.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/compiler/nativeGen/X86/CodeGen.hs b/compiler/nativeGen/X86/CodeGen.hs index cfadd57869..b3160ed2ca 100644 --- a/compiler/nativeGen/X86/CodeGen.hs +++ b/compiler/nativeGen/X86/CodeGen.hs @@ -1774,7 +1774,7 @@ genCCall32' dflags target dest_regs args = do let -- Align stack to 16n for calls, assuming a starting stack -- alignment of 16n - word_size on procedure entry. Which we - -- maintiain. See Note [rts/StgCRun.c : Stack Alignment on X86] + -- maintain. See Note [rts/StgCRun.c : Stack Alignment on X86] sizes = map (arg_size . cmmExprType dflags . hintlessCmm) (reverse args) raw_arg_size = sum sizes + wORD_SIZE dflags arg_pad_size = (roundTo 16 $ raw_arg_size) - raw_arg_size @@ -2034,7 +2034,7 @@ genCCall64' dflags target dest_regs args = do -- Align stack to 16n for calls, assuming a starting stack -- alignment of 16n - word_size on procedure entry. Which we - -- maintiain. See Note [rts/StgCRun.c : Stack Alignment on X86] + -- maintain. See Note [rts/StgCRun.c : Stack Alignment on X86] (real_size, adjust_rsp) <- if (tot_arg_size + wORD_SIZE dflags) `rem` 16 == 0 then return (tot_arg_size, nilOL) diff --git a/compiler/utils/UniqFM.lhs b/compiler/utils/UniqFM.lhs index 7b5a7aae44..680300abd4 100644 --- a/compiler/utils/UniqFM.lhs +++ b/compiler/utils/UniqFM.lhs @@ -11,7 +11,7 @@ Basically, the things need to be in class @Uniquable@, and we use the (A similar thing to @UniqSet@, as opposed to @Set@.) The interface is based on @FiniteMap@s, but the implementation uses -@Data.IntMap@, which is both maitained and faster than the past +@Data.IntMap@, which is both maintained and faster than the past implementation (see commit log). The @UniqFM@ interface maps directly to Data.IntMap, only diff --git a/rts/StgCRun.c b/rts/StgCRun.c index b4c15e8722..5789c82f8f 100644 --- a/rts/StgCRun.c +++ b/rts/StgCRun.c @@ -131,7 +131,7 @@ StgWord8 *win32AllocStack(void) * ABI requires this (x64, Mac OSX 32bit/64bit) as well as interfacing with * other libraries through the FFI. * - * As part of this arrangment we must maitain the stack at a 16-byte boundary + * As part of this arrangment we must maintain the stack at a 16-byte boundary * - word_size-bytes (so 16n - 4 for i386 and 16n - 8 for x64) on entry to a * procedure since both GCC and LLVM expect this. This is because the stack * should have been 16-byte boundary aligned and then a call made which pushes |