From e75572c879a5fb9d95e4fe95465a5bf19c7db076 Mon Sep 17 00:00:00 2001 From: Alexei Sholik Date: Thu, 6 Jun 2013 10:38:41 +0300 Subject: Deduplicate words in code comments --- src/rt/arch/i386/morestack.S | 8 ++++---- src/rt/rust_kernel.cpp | 2 +- src/rt/rust_task.h | 2 +- src/rt/rust_upcall.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/rt') diff --git a/src/rt/arch/i386/morestack.S b/src/rt/arch/i386/morestack.S index c1cd11fa432..1b276820805 100644 --- a/src/rt/arch/i386/morestack.S +++ b/src/rt/arch/i386/morestack.S @@ -20,7 +20,7 @@ Each Rust function contains an LLVM-generated prologue that compares the stack space required for the current function to - the space space remaining in the current stack segment, + the space remaining in the current stack segment, maintained in a platform-specific TLS slot. The stack limit is strategically maintained by the Rust runtime so that it is always in place whenever a Rust function is running. @@ -55,7 +55,7 @@ tiny fraction of a frame (containing just a return pointer and, on 32-bit, the arguments to __morestack). - We deal with this by claiming that that little bit of stack + We deal with this by claiming that little bit of stack is actually part of the __morestack frame, encoded as DWARF call frame instructions (CFI) by .cfi assembler pseudo-ops. @@ -119,7 +119,7 @@ MORESTACK: // telling the unwinder to consider the Canonical Frame // Address (CFA) for this frame to be the value of the stack // pointer prior to entry to the original function, whereas - // the CFA would typically be the the value of the stack + // the CFA would typically be the value of the stack // pointer prior to entry to this function. This will allow // the unwinder to understand how to skip the tiny partial // frame that the original function created by calling @@ -167,7 +167,7 @@ MORESTACK: // The arguments to upcall_new_stack // The size of the stack arguments to copy to the new stack, - // ane of the the arguments to __morestack + // and of the arguments to __morestack movl 40(%esp),%eax movl %eax,8(%esp) // The address of the stack arguments to the original function diff --git a/src/rt/rust_kernel.cpp b/src/rt/rust_kernel.cpp index bf48554696e..c1c40222f1a 100644 --- a/src/rt/rust_kernel.cpp +++ b/src/rt/rust_kernel.cpp @@ -162,7 +162,7 @@ rust_kernel::release_scheduler_id(rust_sched_id id) { } /* -Called by rust_sched_reaper to join every every terminating scheduler thread, +Called by rust_sched_reaper to join every terminating scheduler thread, so that we can be sure they have completely exited before the process exits. If we don't join them then we can see valgrind errors due to un-freed pthread memory. diff --git a/src/rt/rust_task.h b/src/rt/rust_task.h index 213aee6a9eb..982102cdde0 100644 --- a/src/rt/rust_task.h +++ b/src/rt/rust_task.h @@ -614,7 +614,7 @@ rust_task::prev_stack() { // The LLVM-generated segmented-stack function prolog compares the amount of // stack needed for each frame to the end-of-stack pointer stored in the // TCB. As an optimization, when the frame size is less than 256 bytes, it -// will simply compare %esp to to the stack limit instead of subtracting the +// will simply compare %esp to the stack limit instead of subtracting the // frame size. As a result we need our stack limit to account for those 256 // bytes. const unsigned LIMIT_OFFSET = 256; diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp index 658fdec6df2..c011219ade8 100644 --- a/src/rt/rust_upcall.cpp +++ b/src/rt/rust_upcall.cpp @@ -191,7 +191,7 @@ upcall_malloc(type_desc *td, uintptr_t size) { // FIXME (#2861): Alias used by libcore/rt.rs to avoid naming conflicts with // autogenerated wrappers for upcall_malloc. Remove this when we fully move -// away away from the C upcall path. +// away from the C upcall path. extern "C" CDECL uintptr_t rust_upcall_malloc(type_desc *td, uintptr_t size) { return upcall_malloc(td, size); -- cgit 1.4.1-3-g733a5