diff --git a/doc/callcc.qbk b/doc/callcc.qbk index f935586..0b09709 100644 --- a/doc/callcc.qbk +++ b/doc/callcc.qbk @@ -415,7 +415,7 @@ performance than __ucontext__ [note Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are -swapped. Using WinFiber implementation migh be an alternative.] +swapped. Using WinFiber implementation might be an alternative.] [heading ucontext_t] diff --git a/doc/context.qbk b/doc/context.qbk index b1327a3..3c2ec7d 100644 --- a/doc/context.qbk +++ b/doc/context.qbk @@ -10,7 +10,7 @@ [authors [Kowalke, Oliver]] [copyright 2014 Oliver Kowalke] [id context] - [purpose C++ Library for swiching different user ctx] + [purpose C++ Library for switching different user ctx] [category text] [license Distributed under the Boost Software License, Version 1.0. diff --git a/doc/context.xml b/doc/context.xml index ef920cd..fb4931d 100644 --- a/doc/context.xml +++ b/doc/context.xml @@ -18,7 +18,7 @@ - C++ Library for swiching different user ctx + C++ Library for switching different user ctx @@ -619,7 +619,7 @@ Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are swapped. - Using WinFiber implementation migh be an alternative. + Using WinFiber implementation might be an alternative. @@ -1707,7 +1707,7 @@ Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are swapped. - Using WinFiber implementation migh be an alternative. + Using WinFiber implementation might be an alternative. @@ -2611,7 +2611,7 @@ time that *this needs to allocate system memory. The third argument max_size controls how many memory might be allocated for stacks - a value of - zero means no uper limit. + zero means no upper limit. @@ -2942,7 +2942,7 @@ <link linkend="context.stack.stack_traits">Class <emphasis>stack_traits</emphasis></link> stack_traits models a stack-traits - providing a way to access certain properites defined by the enironment. Stack + providing a way to access certain properties defined by the environment. Stack allocators use stack-traits to allocate stacks. #include <boost/context/stack_traits.hpp> @@ -3172,7 +3172,7 @@ Sanitizers (GCC/Clang) are confused by the stack switches. The library is required to be compiled with property (b2 command-line) context-impl=ucontext and compilers santizer options. + role="identifier">ucontext and compilers sanitizer options. Users must define BOOST_USE_ASAN before including any Boost.Context headers when linking against Boost binaries. diff --git a/doc/fiber.qbk b/doc/fiber.qbk index b87e494..656cd25 100644 --- a/doc/fiber.qbk +++ b/doc/fiber.qbk @@ -399,7 +399,7 @@ performance than __ucontext__ [note Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are -swapped. Using WinFiber implementation migh be an alternative.] +swapped. Using WinFiber implementation might be an alternative.] [heading ucontext_t] diff --git a/doc/html/context/cc/implementations__fcontext_t__ucontext_t_and_winfiber.html b/doc/html/context/cc/implementations__fcontext_t__ucontext_t_and_winfiber.html index 28517cc..b1c5280 100644 --- a/doc/html/context/cc/implementations__fcontext_t__ucontext_t_and_winfiber.html +++ b/doc/html/context/cc/implementations__fcontext_t__ucontext_t_and_winfiber.html @@ -46,7 +46,7 @@

Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are swapped. - Using WinFiber implementation migh be an alternative. + Using WinFiber implementation might be an alternative.

diff --git a/doc/html/context/ecv1.html b/doc/html/context/ecv1.html index 428da2d..8b31eba 100644 --- a/doc/html/context/ecv1.html +++ b/doc/html/context/ecv1.html @@ -851,7 +851,7 @@

-
Efects:
+
Effects:

Writes the representation of other to stream os. diff --git a/doc/html/context/ecv2.html b/doc/html/context/ecv2.html index af041f0..7fc2386 100644 --- a/doc/html/context/ecv2.html +++ b/doc/html/context/ecv2.html @@ -120,7 +120,7 @@ on *this) and args are the data passed to execution_context::operator(). The return value represents - the execution_context that has to be resumed, after termiantion of this context. + the execution_context that has to be resumed, after termination of this context.

Benefits of execution_context (v2) @@ -780,7 +780,7 @@

-
Efects:
+
Effects:

Writes the representation of other to stream os. diff --git a/doc/html/context/ff/implementations__fcontext_t__ucontext_t_and_winfiber.html b/doc/html/context/ff/implementations__fcontext_t__ucontext_t_and_winfiber.html index 05bd4ae..248c725 100644 --- a/doc/html/context/ff/implementations__fcontext_t__ucontext_t_and_winfiber.html +++ b/doc/html/context/ff/implementations__fcontext_t__ucontext_t_and_winfiber.html @@ -46,7 +46,7 @@

Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are swapped. - Using WinFiber implementation migh be an alternative. + Using WinFiber implementation might be an alternative.

diff --git a/doc/html/context/fib/implementations__fcontext_t__ucontext_t_and_winfiber.html b/doc/html/context/fib/implementations__fcontext_t__ucontext_t_and_winfiber.html index 3a745a8..627c6e4 100644 --- a/doc/html/context/fib/implementations__fcontext_t__ucontext_t_and_winfiber.html +++ b/doc/html/context/fib/implementations__fcontext_t__ucontext_t_and_winfiber.html @@ -46,7 +46,7 @@

Because the TIB (thread information block on Windows) is not fully described in the MSDN, it might be possible that not all required TIB-parts are swapped. - Using WinFiber implementation migh be an alternative. + Using WinFiber implementation might be an alternative.

diff --git a/doc/html/context/stack/pooled_fixedsize.html b/doc/html/context/stack/pooled_fixedsize.html index 9a35ebc..870cca7 100644 --- a/doc/html/context/stack/pooled_fixedsize.html +++ b/doc/html/context/stack/pooled_fixedsize.html @@ -73,7 +73,7 @@ time that *this needs to allocate system memory. The third argument max_size controls how many memory might be allocated for stacks - a value of - zero means no uper limit. + zero means no upper limit.

diff --git a/doc/html/context/stack/sanitizers.html b/doc/html/context/stack/sanitizers.html index 2d66cda..06d3b0e 100644 --- a/doc/html/context/stack/sanitizers.html +++ b/doc/html/context/stack/sanitizers.html @@ -28,7 +28,7 @@

Sanitizers (GCC/Clang) are confused by the stack switches. The library is - required to be compiled with property (b2 command-line) context-impl=ucontext and compilers santizer options. + required to be compiled with property (b2 command-line) context-impl=ucontext and compilers sanitizer options. Users must define BOOST_USE_ASAN before including any Boost.Context headers when linking against Boost binaries.

diff --git a/doc/html/context/stack/stack_traits.html b/doc/html/context/stack/stack_traits.html index c999ee7..b33c644 100644 --- a/doc/html/context/stack/stack_traits.html +++ b/doc/html/context/stack/stack_traits.html @@ -28,7 +28,7 @@

stack_traits models a stack-traits - providing a way to access certain properites defined by the enironment. Stack + providing a way to access certain properties defined by the environment. Stack allocators use stack-traits to allocate stacks.

#include <boost/context/stack_traits.hpp>
diff --git a/doc/stack.qbk b/doc/stack.qbk
index 171a796..152920a 100644
--- a/doc/stack.qbk
+++ b/doc/stack.qbk
@@ -131,7 +131,7 @@ stack grows downwards/upwards) the stored address is the highest/lowest
 address of the stack. Argument `next_size` determines the number of stacks to
 request from the system the first time that `*this` needs to allocate system
 memory. The third argument `max_size` controls how many memory might be
-allocated for stacks - a value of zero means no uper limit.]]
+allocated for stacks - a value of zero means no upper limit.]]
 ]
 
 [heading `stack_context allocate()`]
@@ -256,7 +256,7 @@ available stack allocator.]
 [section:stack_traits Class ['stack_traits]]
 
 ['stack_traits] models a __stack_traits__ providing a way to access certain
-properites defined by the enironment. Stack allocators use __stack_traits__ to
+properties defined by the environment. Stack allocators use __stack_traits__ to
 allocate stacks.
 
         #include 
@@ -357,7 +357,7 @@ compiled with `valgrind=on`.
 
 Sanitizers (GCC/Clang) are confused by the stack switches.
 The library is required to be compiled with property (b2 command-line)
-`context-impl=ucontext` and compilers santizer options.
+`context-impl=ucontext` and compilers sanitizer options.
 Users must define `BOOST_USE_ASAN` before including any Boost.Context headers
 when linking against Boost binaries.
 
diff --git a/include/boost/context/continuation_fcontext.hpp b/include/boost/context/continuation_fcontext.hpp
index 0977e0f..671dfe1 100644
--- a/include/boost/context/continuation_fcontext.hpp
+++ b/include/boost/context/continuation_fcontext.hpp
@@ -74,7 +74,7 @@ template< typename Rec >
 transfer_t context_exit( transfer_t t) noexcept {
     Rec * rec = static_cast< Rec * >( t.data);
 #if BOOST_CONTEXT_SHADOW_STACK
-    // destory shadow stack
+    // destroy shadow stack
     std::size_t ss_size = *((unsigned long*)(reinterpret_cast< uintptr_t >( rec)- 16));
     long unsigned int ss_base = *((unsigned long*)(reinterpret_cast< uintptr_t >( rec)- 8));
     munmap((void *)ss_base, ss_size);
@@ -174,7 +174,7 @@ fcontext_t create_context1( StackAlloc && salloc, Fn && fn) {
 	void * storage = reinterpret_cast< void * >(
 			( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( Record) ) )
             & ~static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     Record * record = new ( storage) Record{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // 64byte gab between control structure and stack top
@@ -216,7 +216,7 @@ fcontext_t create_context2( preallocated palloc, StackAlloc && salloc, Fn && fn)
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( Record) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context-stack
+    // placement new for control structure on context-stack
     Record * record = new ( storage) Record{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // 64byte gab between control structure and stack top
diff --git a/include/boost/context/continuation_ucontext.hpp b/include/boost/context/continuation_ucontext.hpp
index 3b74b25..5b632dc 100644
--- a/include/boost/context/continuation_ucontext.hpp
+++ b/include/boost/context/continuation_ucontext.hpp
@@ -287,7 +287,7 @@ static activation_record * create_context1( StackAlloc && salloc, Fn && fn) {
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // stack bottom
@@ -330,7 +330,7 @@ static activation_record * create_context2( preallocated palloc, StackAlloc && s
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // stack bottom
diff --git a/include/boost/context/continuation_winfib.hpp b/include/boost/context/continuation_winfib.hpp
index 060930c..dc41684 100644
--- a/include/boost/context/continuation_winfib.hpp
+++ b/include/boost/context/continuation_winfib.hpp
@@ -251,7 +251,7 @@ static activation_record * create_context1( StackAlloc && salloc, Fn && fn) {
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // create user-context
@@ -268,7 +268,7 @@ static activation_record * create_context2( preallocated palloc, StackAlloc && s
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // create user-context
diff --git a/include/boost/context/detail/config.hpp b/include/boost/context/detail/config.hpp
index 218d6c3..beec75f 100644
--- a/include/boost/context/detail/config.hpp
+++ b/include/boost/context/detail/config.hpp
@@ -67,7 +67,7 @@
 #if defined(__cpp_lib_integer_sequence) && __cpp_lib_integer_sequence >= 201304
 # undef BOOST_CONTEXT_NO_CXX14_INTEGER_SEQUENCE
 #endif
-// workaroud: MSVC 14 does not provide macros to test for compile-time integer sequence
+// workaround: MSVC 14 does not provide macros to test for compile-time integer sequence
 #if _MSC_VER > 1800 // _MSC_VER == 1800 -> MS Visual Studio 2013
 # undef BOOST_CONTEXT_NO_INDEX_SEQUENCE
 #endif
@@ -78,7 +78,7 @@
 # endif
 #endif
 
-// workaroud: MSVC 14 does support constexpr
+// workaround: MSVC 14 does support constexpr
 #if _MSC_VER > 1800 // _MSC_VER == 1800 -> MS Visual Studio 2013
 # undef BOOST_NO_CXX11_CONSTEXPR
 #endif
@@ -112,7 +112,7 @@
 // modern architectures have cachelines with 64byte length
 // ARM Cortex-A15 32/64byte, Cortex-A9 16/32/64bytes
 // MIPS 74K: 32byte, 4KEc: 16byte
-// ist should be safe to use 64byte for all
+// it should be safe to use 64byte for all
 static constexpr std::size_t cache_alignment{ 64 };
 static constexpr std::size_t cacheline_length{ 64 };
 // lookahead size for prefetching
diff --git a/include/boost/context/fiber_fcontext.hpp b/include/boost/context/fiber_fcontext.hpp
index 9c53069..4c5b654 100644
--- a/include/boost/context/fiber_fcontext.hpp
+++ b/include/boost/context/fiber_fcontext.hpp
@@ -123,7 +123,7 @@ template< typename Rec >
 transfer_t fiber_exit( transfer_t t) noexcept {
     Rec * rec = static_cast< Rec * >( t.data);
 #if BOOST_CONTEXT_SHADOW_STACK
-    // destory shadow stack
+    // destroy shadow stack
     std::size_t ss_size = *((unsigned long*)(reinterpret_cast< uintptr_t >( rec)- 16));
     long unsigned int ss_base = *((unsigned long*)(reinterpret_cast< uintptr_t >( rec)- 8));
     munmap((void *)ss_base, ss_size);
@@ -220,7 +220,7 @@ fcontext_t create_fiber1( StackAlloc && salloc, Fn && fn) {
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( Record) ) )
             & ~static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     Record * record = new ( storage) Record{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // 64byte gab between control structure and stack top
@@ -262,7 +262,7 @@ fcontext_t create_fiber2( preallocated palloc, StackAlloc && salloc, Fn && fn) {
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( Record) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context-stack
+    // placwment new for control structure on context-stack
     Record * record = new ( storage) Record{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // 64byte gab between control structure and stack top
diff --git a/include/boost/context/fiber_ucontext.hpp b/include/boost/context/fiber_ucontext.hpp
index 459b107..687e1c2 100644
--- a/include/boost/context/fiber_ucontext.hpp
+++ b/include/boost/context/fiber_ucontext.hpp
@@ -312,7 +312,7 @@ static fiber_activation_record * create_fiber1( StackAlloc && salloc, Fn && fn)
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // stack bottom
@@ -363,7 +363,7 @@ static fiber_activation_record * create_fiber2( preallocated palloc, StackAlloc
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // stack bottom
diff --git a/include/boost/context/fiber_winfib.hpp b/include/boost/context/fiber_winfib.hpp
index bb895ac..ff29a8e 100644
--- a/include/boost/context/fiber_winfib.hpp
+++ b/include/boost/context/fiber_winfib.hpp
@@ -250,7 +250,7 @@ static fiber_activation_record * create_fiber1( StackAlloc && salloc, Fn && fn)
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( sctx.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // create user-context
@@ -267,7 +267,7 @@ static fiber_activation_record * create_fiber2( preallocated palloc, StackAlloc
     void * storage = reinterpret_cast< void * >(
             ( reinterpret_cast< uintptr_t >( palloc.sp) - static_cast< uintptr_t >( sizeof( capture_t) ) )
             & ~ static_cast< uintptr_t >( 0xff) );
-    // placment new for control structure on context stack
+    // placement new for control structure on context stack
     capture_t * record = new ( storage) capture_t{
             palloc.sctx, std::forward< StackAlloc >( salloc), std::forward< Fn >( fn) };
     // create user-context
diff --git a/src/asm/make_i386_ms_pe_clang_gas.S b/src/asm/make_i386_ms_pe_clang_gas.S
index 79f5024..694db68 100644
--- a/src/asm/make_i386_ms_pe_clang_gas.S
+++ b/src/asm/make_i386_ms_pe_clang_gas.S
@@ -62,7 +62,7 @@ _make_fcontext:
     movl  %ecx, 0x14(%eax)
     /* second arg of make_fcontext() == size of context-stack */
     movl  0x8(%esp), %edx
-    /* negate stack size for LEA instruction (== substraction) */
+    /* negate stack size for LEA instruction (== subtraction) */
     negl  %edx
     /* compute bottom address of context stack (limit) */
     leal  (%ecx,%edx), %ecx
@@ -94,7 +94,7 @@ _make_fcontext:
     /* traverse current seh chain to get the last exception handler installed by Windows */
     /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */
     /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */
-    /* at its end by RaiseException all seh andlers are disregarded if not present and the */
+    /* at its end by RaiseException all seh handlers are disregarded if not present and the */
     /* program is aborted */
     /* load NT_TIB into ECX */
     movl  %fs:(0x0), %ecx
diff --git a/src/asm/make_i386_ms_pe_gas.asm b/src/asm/make_i386_ms_pe_gas.asm
index 608ddf3..e36395f 100644
--- a/src/asm/make_i386_ms_pe_gas.asm
+++ b/src/asm/make_i386_ms_pe_gas.asm
@@ -62,7 +62,7 @@ _make_fcontext:
     movl  %ecx, 0x14(%eax)
     /* second arg of make_fcontext() == size of context-stack */
     movl  0x8(%esp), %edx
-    /* negate stack size for LEA instruction (== substraction) */
+    /* negate stack size for LEA instruction (== subtraction) */
     negl  %edx
     /* compute bottom address of context stack (limit) */
     leal  (%ecx,%edx), %ecx
@@ -94,7 +94,7 @@ _make_fcontext:
     /* traverse current seh chain to get the last exception handler installed by Windows */
     /* note that on Windows Server 2008 and 2008 R2, SEHOP is activated by default */
     /* the exception handler chain is tested for the presence of ntdll.dll!FinalExceptionHandler */
-    /* at its end by RaiseException all seh andlers are disregarded if not present and the */
+    /* at its end by RaiseException all seh handlers are disregarded if not present and the */
     /* program is aborted */
     /* load NT_TIB into ECX */
     movl  %fs:(0x0), %ecx
diff --git a/src/asm/make_i386_ms_pe_masm.asm b/src/asm/make_i386_ms_pe_masm.asm
index 5246465..3879396 100644
--- a/src/asm/make_i386_ms_pe_masm.asm
+++ b/src/asm/make_i386_ms_pe_masm.asm
@@ -53,7 +53,7 @@ make_fcontext PROC BOOST_CONTEXT_EXPORT
     mov  [eax+014h], ecx
     ; second arg of make_fcontext() == size of context-stack
     mov  edx, [esp+08h]
-    ; negate stack size for LEA instruction (== substraction)
+    ; negate stack size for LEA instruction (== subtraction)
     neg  edx
     ; compute bottom address of context stack (limit)
     lea  ecx, [ecx+edx]
diff --git a/src/asm/make_mips64_n64_elf_gas.S b/src/asm/make_mips64_n64_elf_gas.S
index 40f29a5..c43f2ff 100644
--- a/src/asm/make_mips64_n64_elf_gas.S
+++ b/src/asm/make_mips64_n64_elf_gas.S
@@ -70,7 +70,7 @@ make_fcontext:
     # save global pointer in context-data
     sd  $gp, 136($v0)
 
-    # psudo instruction compute abs address of label finish based on GP
+    # pseudo instruction compute abs address of label finish based on GP
     dla  $t9, finish
 
     # save address of finish as return-address for context-function
diff --git a/src/asm/make_sparc64_sysv_elf_gas.S b/src/asm/make_sparc64_sysv_elf_gas.S
index 3e7ee80..3d50447 100644
--- a/src/asm/make_sparc64_sysv_elf_gas.S
+++ b/src/asm/make_sparc64_sysv_elf_gas.S
@@ -45,7 +45,7 @@ make_fcontext:
 	add	%l0, (trampoline - 1b - 8), %l0
 	stx	%l0, [%i0 + I7]
 
-	# Save framepointer to first stack frame but first substract the BIAS
+	# Save framepointer to first stack frame but first subtract the BIAS
 	add	%i0, CC64FSZ - BIAS, %l0
 	stx	%l0, [%i0 + SP]
 
diff --git a/src/asm/make_x86_64_ms_pe_clang_gas.S b/src/asm/make_x86_64_ms_pe_clang_gas.S
index 62bb796..e186c38 100644
--- a/src/asm/make_x86_64_ms_pe_clang_gas.S
+++ b/src/asm/make_x86_64_ms_pe_clang_gas.S
@@ -113,7 +113,7 @@ make_fcontext:
     /* save top address of context stack as 'base' */
     movq  %rcx, 0xc8(%rax)
     /* second arg of make_fcontext() == size of context-stack */
-    /* negate stack size for LEA instruction (== substraction) */
+    /* negate stack size for LEA instruction (== subtraction) */
     negq  %rdx
     /* compute bottom address of context stack (limit) */
     leaq  (%rcx,%rdx), %rcx
diff --git a/src/asm/make_x86_64_ms_pe_gas.asm b/src/asm/make_x86_64_ms_pe_gas.asm
index 7107d6f..7146637 100644
--- a/src/asm/make_x86_64_ms_pe_gas.asm
+++ b/src/asm/make_x86_64_ms_pe_gas.asm
@@ -113,7 +113,7 @@ make_fcontext:
     /* save top address of context stack as 'base' */
     movq  %rcx, 0xc8(%rax)
     /* second arg of make_fcontext() == size of context-stack */
-    /* negate stack size for LEA instruction (== substraction) */
+    /* negate stack size for LEA instruction (== subtraction) */
     negq  %rdx
     /* compute bottom address of context stack (limit) */
     leaq  (%rcx,%rdx), %rcx
diff --git a/src/asm/make_x86_64_ms_pe_masm.asm b/src/asm/make_x86_64_ms_pe_masm.asm
index 98e68a2..a6c2b14 100644
--- a/src/asm/make_x86_64_ms_pe_masm.asm
+++ b/src/asm/make_x86_64_ms_pe_masm.asm
@@ -110,7 +110,7 @@ make_fcontext PROC BOOST_CONTEXT_EXPORT FRAME
     ; save top address of context stack as 'base'
     mov  [rax+0c8h], rcx
     ; second arg of make_fcontext() == size of context-stack
-    ; negate stack size for LEA instruction (== substraction)
+    ; negate stack size for LEA instruction (== subtraction)
     neg  rdx
     ; compute bottom address of context stack (limit)
     lea  rcx, [rcx+rdx]
diff --git a/test/test_callcc.cpp b/test/test_callcc.cpp
index d776f12..249adcb 100644
--- a/test/test_callcc.cpp
+++ b/test/test_callcc.cpp
@@ -479,7 +479,7 @@ void test_badcatch() {
         BOOST_CHECK_EQUAL( 3., value3);
         // the destruction of ctx here will cause a forced_unwind to be thrown that is not caught
         // in fn19.  That will trigger the "not caught" assertion in ~forced_unwind.  Getting that
-        // assertion to propogate bak here cleanly is non-trivial, and there seems to not be a good
+        // assertion to propagate back here cleanly is non-trivial, and there seems to not be a good
         // way to hook directly into the assertion when it happens on an alternate stack.
         std::move( c);
     }
diff --git a/test/test_fiber.cpp b/test/test_fiber.cpp
index 0514322..e5f1e9e 100644
--- a/test/test_fiber.cpp
+++ b/test/test_fiber.cpp
@@ -501,7 +501,7 @@ void test_badcatch() {
         BOOST_CHECK_EQUAL( 3., value3);
         // the destruction of ctx here will cause a forced_unwind to be thrown that is not caught
         // in fn19.  That will trigger the "not caught" assertion in ~forced_unwind.  Getting that
-        // assertion to propogate bak here cleanly is non-trivial, and there seems to not be a good
+        // assertion to propagate back here cleanly is non-trivial, and there seems to not be a good
         // way to hook directly into the assertion when it happens on an alternate stack.
         std::move( f);
     }