diff options
| -rw-r--r-- | ChangeLog | 92 | ||||
| -rw-r--r-- | NT_MAKEFILE | 6 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | cord/tests/de.c | 1 | ||||
| -rw-r--r-- | cord/tests/de_win.c | 4 | ||||
| -rw-r--r-- | doc/README.macros | 20 | ||||
| -rw-r--r-- | doc/README.solaris2 | 2 | ||||
| -rw-r--r-- | doc/README.win32 | 12 | ||||
| -rw-r--r-- | doc/README.win64 | 4 | ||||
| -rw-r--r-- | doc/debugging.md | 2 | ||||
| -rw-r--r-- | doc/leak.md | 10 | ||||
| -rw-r--r-- | doc/overview.md | 2 | ||||
| -rw-r--r-- | doc/porting.md | 2 | ||||
| -rw-r--r-- | extra/msvc_dbg.c | 4 | ||||
| -rw-r--r-- | finalize.c | 2 | ||||
| -rw-r--r-- | include/gc/cord.h | 2 | ||||
| -rw-r--r-- | include/gc/gc.h | 4 | ||||
| -rw-r--r-- | include/private/gc_priv.h | 2 | ||||
| -rw-r--r-- | include/private/gcconfig.h | 8 | ||||
| -rw-r--r-- | include/private/pthread_stop_world.h | 2 | ||||
| -rw-r--r-- | mach_dep.c | 2 | ||||
| -rw-r--r-- | mark.c | 4 | ||||
| -rw-r--r-- | mark_rts.c | 2 | ||||
| -rw-r--r-- | misc.c | 4 | ||||
| -rw-r--r-- | os_dep.c | 12 | ||||
| -rw-r--r-- | tools/threadlibs.c | 2 | ||||
| -rw-r--r-- | win32_threads.c | 16 |
28 files changed, 113 insertions, 116 deletions
@@ -506,7 +506,7 @@ * Use clock_gettime() instead of clock() on Cygwin and Linux * Use compiler TLS on FreeBSD and NetBSD * Use mprotect-based VDB on PowerPC and S390 (Linux) -* Use soft dirty bits on Linux (i386, powerpc, s390, x86_64) +* Use soft dirty bits on Linux (x86, powerpc, s390, x64) * Workaround 'condition result<=0 is always false' cppcheck FP in get_maps * Workaround 'push_regs configured incorrectly' error (GCC-11) * Workaround 'same value in both branches of ternary operator' cppcheck FP @@ -1238,7 +1238,7 @@ Also, includes 7.4.22 changes * Fix typo in comment in specific.h * Fix unbounded heap growth in case of intensive disappearing links usage * Remove API symbols renaming in WCC_MAKEFILE -* Support Haiku/amd64 and Haiku/x86 hosts +* Support Haiku/x64 and Haiku/x86 hosts * Support threads for DragonFly in configure * Workaround 'address of auto-variable returned' cppcheck error * Workaround gctest hang on kFreeBSD (if thread-local allocations are on) @@ -1554,7 +1554,7 @@ Also, includes 7.4.6 changes * Show WoW64 warning message if running 32-bit on Win64 (enabled by macro) * Standalone profiling callback for threads suspend/resume * Support (add machine description for) TILE-Gx and TILEPro targets -* Support build for Android 64-bit (arm64, mips64, x86_64) +* Support build for Android 64-bit (arm64, mips64, x64) * Support FreeBSD/aarch64, FreeBSD/mips * Support iOS7 64-bit (AArch64) and iOS8+ 32/64-bit (Darwin) * Support MinGW build in scripts @@ -1783,7 +1783,7 @@ Also, includes 7.2h changes == [7.4.4] 2016-05-25 == * Allow GC_FAST_MALLOC_GRANS() multiple use in a function -* Also enable the TSX workaround for i386 (Linux) +* Also enable the TSX workaround for Linux/x86 * Avoid unstructured procfs on Solaris * Change cord/de main() declaration style from K-R to ANSI C * Change no-argument functions declaration style to ANSI C (cord) @@ -2382,7 +2382,7 @@ Also, includes 7.2 changes * Fix GC_scratch_last_end_ptr update on GC_scratch_alloc failure * Fix GET_MEM argument rounding in GC_scratch_alloc and similar * Fix PARALLEL_MARK for Windows 7+ -* Fix build (broken by fenv.h inclusion) on Linux/x86_64 under uClibc +* Fix build (broken by fenv.h inclusion) on Linux/x64 under uClibc * Fix crash when using GC_malloc_many() as first allocation call * Fix mark stack excessive growth during parallel mark * Fix or remove broken URLs in documentation @@ -2464,7 +2464,7 @@ Also, includes 7.2 changes * Abort in GC_thr_init on pthread_atfork failure (POSIX threads) * Add GC_WIN32_PTHREADS target in configure * Add GC_is_disabled new function to GC API -* Add info that getcontext() resets FPE mask no longer on Linux/x86_64 +* Add info that getcontext() resets FPE mask no longer on Linux/x64 * Add public GC_set_handle_fork to control forked child handling support * Add realloc_test.c test * Add support for Hexagon target @@ -3659,7 +3659,7 @@ include fenv.h if defined (unless NO_GETCONTEXT or HAVE_PUSH_REGS). * mach_dep.c (GC_with_callee_saves_pushed): Restore FPU exception mask corrupted by getcontext if GETCONTEXT_FPU_EXCMASK_BUG. * include/private/gcconfig.h (GETCONTEXT_FPU_EXCMASK_BUG): Define -for Linux/amd64 (since its GLibc getcontext currently has the bug). +for Linux/x64 (since its GLibc getcontext currently has the bug). * allchblk.c (GC_use_entire_heap): Change type to int (as declared in gc.h); set the default value depending on new GC_USE_ENTIRE_HEAP @@ -4055,7 +4055,7 @@ register pushing. * darwin_stop_world.c (GC_push_all_stacks): Set outCount to GC_MACH_THREAD_STATE_COUNT (instead of THREAD_STATE_MAX). * darwin_stop_world.c (GC_push_all_stacks): Remove FIXME and WARN -for i386. +for x86. * doc/README.macros (DARWIN_DONT_PARSE_STACK): Fix a typo. * darwin_stop_world.c (GC_use_mach_handler_thread): Change type @@ -4066,7 +4066,7 @@ Simplify the expressions involving GC_use_mach_handler_thread. Initialize GC_use_mach_handler_thread to TRUE (instead of 1). * include/gc_pthread_redirects.h (GC_pthread_sigmask, GC_dlopen, -pthread_sigmask, dlopen): Don't define for Win32 pthreads (and +pthread_sigmask, dlopen): Don't define for pthreads-win32 (and don't include signal.h and dlfcn.h). * dyn_load.c (GC_register_dynlib_callback): Add FIXME. @@ -4233,7 +4233,7 @@ is not yet). * win32_threads.c (GC_mark_thread_local_free_lists, GC_check_tls): Likewise. -* NT_MAKEFILE: Remove the comment about DLL and Win32S. +* NT_MAKEFILE: Remove the comment about DLL and win32s. * NT_STATIC_THREADS_MAKEFILE: Likewise. * NT_X64_STATIC_THREADS_MAKEFILE: Likewise. * NT_MAKEFILE: Add ".SUFFIXES" directive (to handle gc_cpp.cc @@ -4428,7 +4428,7 @@ GC_enable_incremental() if MAKE_BACKGRAPH is defined, but do invoke it even if parallel marking is enabled. * tests/test.c (reverse_test): Comment out a check for MSWIN32 -(when determining BIG value) assuming outdated win32S. +(when determining BIG value) assuming outdated win32s. * tests/test.c (reverse_test): Rename to reverse_test_inner; change the declaration (to be of GC_fn_type); call itself thru GC_call_with_gc_active() if the argument is zero. @@ -4951,8 +4951,8 @@ with the ANSI C one. define it for OpenBSD. * include/gc_pthread_redirects.h (GC_pthread_sigmask, pthread_sigmask): Don't declare and redefine for OpenBSD. -* include/private/gcconfig.h: Handle OpenBSD (on arm, sh, i386, -amd64, powerpc). +* include/private/gcconfig.h: Handle OpenBSD (on arm, sh, x86, +x64, powerpc). * mach_dep.c (NO_GETCONTEXT): Likewise. * include/private/pthread_stop_world.h (thread_stop_info): Don't define last_stop_count field if OpenBSD. @@ -7334,9 +7334,9 @@ prevent left shift overflow. * os_dep.c: change the type of GC_mem_top_down global variable (containing a flag) to DWORD. * include/gc_config_macros.h: define GC_SOLARIS_THREADS if GC_THREADS -is defined on SunOS x86_64. +is defined on SunOS/x64. * misc.c (GC_init_size_map): Ifdef out GC_ASSERT as a workaround -for VC++ 2008 amd64 (v15.00.21022.08 for x64) compiler bug +for VC++ 2008 x64 (v15.00.21022.08 for x64) compiler bug (the compiler gets hung if invoked with -Ox -D ALL_INTERIOR_POINTERS -D GC_ASSERTIONS) * backgraph.c: cast GC_gc_no value to unsigned short when @@ -7432,7 +7432,7 @@ redundant code. references to deleted variable "code". Remove redundant FREEBSD definitions. * include/private/gcconfig.h (GWW_VDB): Define for X86_64 when -defined for X86. (STATIC): Define as "static" with NO_DEBUGGING. +defined for x86. (STATIC): Define as "static" with NO_DEBUGGING. * include/private/gc_priv.h: Update MAX_HEAP_SECTS. @@ -7510,7 +7510,7 @@ My highlights based on reading the patch: * allchblk.c: Remove GC_freehblk_ptr decl. Make free_list_index_of() static. -* include/gc.h: Use __int64 on win64, define GC_oom_func, +* include/gc.h: Use __int64 on Win64, define GC_oom_func, GC_finalizer_notifier_proc, GC_finalizer_notifier_proc, add getter and setters: GC_get_gc_no, GC_get_parallel, GC_set_oom_fn, GC_set_finalize_on_demand, @@ -7838,18 +7838,18 @@ include/private/gc_priv.h, tests/test_cpp.cc: Replace old style function declarations. Clean up integral types. Remove register declarations. The change in malloc.c and the "int descr" declaration in mark.c are the most likely to have -been real bugs outside of win64. -* msvc_dbg.c: Disable on win64. -* win32_threads.c: Add AMD64 support. -* include/gc.h: no backtrace on AMD64 for now. +been real bugs outside of Win64. +* msvc_dbg.c: Disable on Win64. +* win32_threads.c: Add x64 support. +* include/gc.h: no backtrace on x64 for now. * msvc_dbg.c(GetModuleBase): Replace strcat with strcat_s. -* include/gc.h: (GC_word, GC_signed_word): Fix win64 definitions. +* include/gc.h: (GC_word, GC_signed_word): Fix Win64 definitions. Don't include windows.h in an extern "C" context. -* include/private/gcconfig.h: Fix win64/X86_64 configuration. +* include/private/gcconfig.h: Fix Win64 configuration. * tests/test.c: Eliminate more old style function definitions. -Cleanup pointer and integer casts for win64. +Cleanup pointer and integer casts for Win64. * tests/test_cpp.cc: Don't include gc_priv.h. * NT_STATIC_THREADS_MAKEFILE: Restrict suffixes for VC++ 2005. * NT_X64_STATIC_THREADS_MAKEFILE: New. @@ -8306,7 +8306,7 @@ extremely unlikely circumstances. (Thanks to Jean-Baptiste Nivois for some careful code inspection.) * Added support for kFreeBSD + glibc (thanks to Petr Salinger). * Fix more MacOS threads memory leaks (thanks to Allan Hsu). -* Added initial Solaris/X86-64 support (thanks to Rainer Orth). +* Added initial Solaris/x64 support (thanks to Rainer Orth). == [6.7] 2006-03-03 == @@ -8328,7 +8328,7 @@ to Hanno Boeck). David Ayers). * Use ld instead of nonexistent ldz instruction in Darwin FindTopOfStack (thanks to Andreas Tobler). -* Add support for Darwin/X86 (thanks to Geoff Norton and the Mono +* Add support for Darwin/x86 (thanks to Geoff Norton and the Mono developers). * Merge in some recent gcc fixes. Add ppc64 asm code. (Thanks to Bryce McKinlay and other GCJ developers.) @@ -8444,7 +8444,7 @@ is set (thanks to Alexander Petrossian). Without it, s390x breaks. (Thanks to Ulrich Weigand.) * Applied several MacOSX patches to support older tool chains (thanks to Stefan Ring). -* Bug fix for NetBSD/amd64 (thanks to Marc Recht). +* Bug fix for NetBSD/x64 (thanks to Marc Recht). * Add NetBSD/sh3 support (thanks to Uchiyama Yasushi). * Fixed an uninitialized variable in cordprnt.c. * Eliminated some, but not all, gcc -Wall warnings. @@ -8452,7 +8452,7 @@ to Stefan Ring). (thanks to Dan Grayson). * GC_extend_size_map shouldn't adjust for GC_all_interior_pointers if GC_DONT_ADD_BYTE_AT_END is set. -* Changed some (long) casts to (word) in preparation for win64 (thanks +* Changed some (long) casts to (word) in preparation for Win64 (thanks to Peter Colson). * Changed "int stack_size" declaration in pthread_support.c to use size_t. (Only mattered with GC_ASSERTIONS enabled.) @@ -8517,8 +8517,8 @@ to Andrew Begel). == [6.3alpha6] 2004-05-06 == * Define USE_GENERIC_PUSH_REGS for NetBSD/M68K. -* Fixed the X86_64 PREFETCH macros to correctly handle ia32e (which uses -different prefetch instructions from AMD64). (Thanks to H.J. Lu.) +* Fixed the x64 PREFETCH macros to correctly handle ia32e (which uses +different prefetch instructions on x64). (Thanks to H.J. Lu.) * GC_config_macros.h did not correctly define GC_WIN32_THREADS from GC_THREADS. * Added simple_example.html. @@ -8558,7 +8558,7 @@ It probably made more sense in the gcc context. * Explicitly ensure that NEED_FIND_LIMIT is defined for {Open,Net}BSD/ELF. * Replaced USE_HPUX_TLS macro by USE_COMPILER_TLS, since gcc often supports the same extension on various platforms. -* Added some basic (completely untested) defines for win64, in support +* Added some basic (completely untested) defines for Win64, in support of future work. * Declared GC_jmp_buf in os_dep.s as JMP_BUF instead of jmp_buf, fixing a memory overwrite bug on Solaris and perhaps other platforms. @@ -8745,7 +8745,7 @@ fork() call. Thus incremental collection in the child won't work correctly. (Thanks to Ben Cottrell for pointing this out.) - --enable-redirect-malloc is mostly untested and known not to work on some platforms. -- There seem to be outstanding issues on Solaris/X86, possibly with +- There seem to be outstanding issues on Solaris/x86, possibly with finding the data segment starting address. - Very large root set sizes (> 16 MB or so) could cause the collector to abort with an unexpected mark stack overflow. (Thanks to @@ -8818,7 +8818,7 @@ and patch.) * Added hand-coded structured exception handling support to mark.c. This should enable support of dynamic libraries under win32 with gcc-compiled code. (Thanks to Ranjit Mathew for the patch.) -Turned on dynamic library scanning for win32/gcc. +Turned on dynamic library scanning for gcc on Win32. * Removed some remnants of read wrapping (thanks to Kenneth Schalk). GC_USE_LD_WRAP was probably broken in recent versions. * The build could fail on some platforms since gcconfig.h could include @@ -8968,7 +8968,7 @@ The latter is more reliable and easier on Linux with dl_iterate_phdr. * Added GC_MAXIMUM_HEAP_SIZE environment variable. * Fix configure.in for MIPS/LINUX (thanks to H.J. Lu). * Double page hash table size for -DLARGE_CONFIG. -* Integrated Bo Thorsen's X86-64 support. +* Integrated Bo Thorsen's x64 support. * STACKBOTTOM definition for LINUX/MIPS was partially changed back (thanks to H.J. Lu and Hiroshi Kawashima for resolving this). * Replaced all occurrences of LINUX_DATA_START in gcconfig.h with @@ -9073,7 +9073,7 @@ Jeffrey Mark Siskind). with a system header (thanks to Philip Brown). * Cause win32_threads.c to handle an out of range stack pointer correctly, though currently with a warning. (Thanks to Jonathan Clark for -observing that win32 applications may temporarily use the stack +observing that Windows applications may temporarily use the stack pointer for other purposes, and suggesting a fix. Unfortunately, it's not clear that there is a complete solution to this problem.) @@ -9152,7 +9152,7 @@ collectible (gc_allocator) or GC-traceable, but not collectible which borrows heavily from the SGI implementation, this part of which was written by Matt Austern. Changed test_cpp.cc to very minimally test this. -* On Linux/X86, retry mmap with a different start argument. That should +* On Linux/x86, retry mmap with a different start argument. That should allow the collector to use more (closer to 3GB) of the address space. * Force 64 bit alignment with GCJ support (reflects Bryce McKinlay's patch to the gcc tree). @@ -9174,7 +9174,7 @@ Tilman Vogel; also ported for iPAQ by Oliver Kurth). == [6.1alpha3] 2002-02-07 == * Minor cleanup on the gcconfig.h section for SPARC. -* Minor fix to support Intel compiler for I386/Linux (thanks to +* Minor fix to support Intel compiler for Linux/x86 (thanks to Sven Hartrumpf). * Added SPARC V9 (64-bit) support (thanks to Jeff Sturm). * Restructured the way in which we determine whether or not to keep @@ -9390,7 +9390,7 @@ many people are likely to care, but ...) yet supported. (Incremental collection should work if you have the right kernel. Threads may work with a sufficiently patched pthread library.) -* Changed gcconfig.h to recognize __i386__ as an alternative to i386 in +* Changed gcconfig.h to recognize __i386__ as an alternative to x86 in many places (thanks to Benjamin Lerman). * Made win32_threads.c more tolerant of detaching a thread that it didn't know about (thanks to Paul Nash). @@ -9440,7 +9440,7 @@ for pointing this out). * Added GC_no_dls hook for applications that want to register their own roots. * Integrated Kjetil Matheussen's Amiga changes. -* Added FREEBSD_STACKBOTTOM. Changed the X86/FreeBSD port to use it +* Added FREEBSD_STACKBOTTOM. Changed the FreeBSD/x86 port to use it (thanks to Matthew Flatt). * Added pthread_detach interception for platforms supported by linux_threads.c and irix_threads.c. @@ -9559,10 +9559,10 @@ were and never will be any clients. * Added some code to linux_threads.c to possibly support HPUX threads using the Linux code. Unfortunately, it doesn't work yet, and is currently disabled. -* Added support under Linux/X86 for saving the call chain, both in (debug) +* Added support under Linux/x86 for saving the call chain, both in (debug) objects for client debugging, and in GC_arrays._last_stack for GC debugging. This was previously supported only under Solaris. It is -not enabled by default under X86, since it requires that code be compiled +not enabled by default under x86, since it requires that code be compiled to explicitly gave frame pointers on the call stack. (With gcc this currently happens by default, but is often turned off explicitly.) To turn it on, define SAVE_CALL_CHAIN. @@ -10056,7 +10056,7 @@ supported. The collector now defines USE_MMAP by default on Solaris. * Fixed MSWIN32 detection test. * Added Fergus Henderson's patches to allow putting the collector into a DLL under GNU win32. -* Added Ivan V. Demakov's port to Watcom C on X86. +* Added Ivan V. Demakov's port to Watcom C on x86. * Added Ian Piumarta's Linux/PowerPC port. * Added PointerFreeGC to the placement options in gc_cpp.h (suggested by Brian Burton). This is of course unsafe, and may be controversial. @@ -10287,7 +10287,7 @@ gc_cleanup is miscompiled. * Added Mac fixes. * Fixed os_dep.c to work around what appears to be a new and different VirtualQuery bug under newer -versions of win32S. +versions of win32s. * GC_non_gc_bytes was not correctly maintained by GC_free. Fixed (thanks to James Clark). * Added GC_set_max_heap_size. @@ -10453,8 +10453,8 @@ a problem. * Fixed a gross bug in CORD_prev. * Fixed a bug in blacklst.c that could result in unbounded heap growth during startup on machines that do not clear -memory obtained from the OS (e.g. win32S). -* Ported de editor to win32/win32S. (This is now the only +memory obtained from the OS (e.g. win32s). +* Ported de editor to Win32 and win32s. (This is now the only version with a mouse-sensitive UI. Thanks to Rob Haack for the implementation based on the generic Windows application template.) * Added GC_malloc_ignore_off_page to allocate large arrays @@ -10490,7 +10490,7 @@ optimizer bug. only by reimplementing some fraction of Solaris threads, since Sun doesn't currently make the thread debugging interface available). -* Added non-threads win32 and win32S support. +* Added non-threads Win32 and win32s support. * (Grudgingly, with suitable muttering of obscenities) renamed files so that the collector distribution could live on a FAT file system. Files that are guaranteed to be useless on diff --git a/NT_MAKEFILE b/NT_MAKEFILE index 7ba8738b..4ce7582c 100644 --- a/NT_MAKEFILE +++ b/NT_MAKEFILE @@ -1,4 +1,4 @@ -# Makefile for Windows NT. Assumes Microsoft compiler. +# Makefile for Windows (Win32/64). Assumes Microsoft compiler. # Should be invoked as "nmake -f NT_MAKEFILE [<args>]"; the optional arguments # are: "cpu=AMD64" - to target x64, "cpu=i386" - to target x86, # "enable_static=1" - to build it as a static library, "nodebug=1" - to produce @@ -87,7 +87,7 @@ CXXFLAGS_SPECIFIC=/EHsc .SUFFIXES: .SUFFIXES: .obj .cpp .c -# Atomic_ops installation directory. For win32, the source directory +# Atomic_ops installation directory. For Win32, the source directory # should do, since we only need the headers. # We assume this was manually unpacked. AO_SRC_DIR=libatomic_ops/src @@ -164,7 +164,7 @@ cord\tests\de.obj cord\tests\de_win.obj: include\gc\cord.h include\gc\cord_pos.h cord\tests\de_win.res: cord\tests\de_win.rc cord\tests\de_win.h cord\tests\de_cmds.h $(rc) $(rcvars) -r -fo cord\tests\de_win.res cord\tests\de_win.rc -# Cord/de is a real win32 GUI app. +# Cord/de is a real Windows GUI app. de.exe: cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj gc.lib cord.lib $(link) /MACHINE:$(CPU) /INCREMENTAL:NO $(ldebug) $(lflags) -out:de.exe cord\tests\de.obj cord\tests\de_win.obj cord\tests\de_win.rbj gc.lib cord.lib gdi32.lib user32.lib @@ -260,14 +260,14 @@ include subdirectory. (Normally this is just gc.h. `make cords` adds The collector currently is designed to run essentially unmodified on machines that use a flat 32-bit or 64-bit address space. -That includes the vast majority of Workstations and X86 (X >= 3) PCs. +That includes the vast majority of Workstations and x86 (i386 or later) PCs. In a few cases (OS/2, Win32) a separate makefile is supplied; these have a separate host-specific doc/README.* file. Dynamic libraries are completely supported only under SunOS/Solaris, (and even that support is not functional on the last Sun 3 release), -Linux, FreeBSD, NetBSD, IRIX, HP/UX, Win32 (not Win32s) and OSF/1 +Linux, FreeBSD, NetBSD, IRIX, HP/UX, Win32 (not win32s) and OSF/1 on DEC AXP machines plus perhaps a few others listed near the top of dyn_load.c. On other machines we recommend that you do one of the following: diff --git a/configure.ac b/configure.ac index 02b8abb3..57b1b950 100644 --- a/configure.ac +++ b/configure.ac @@ -1047,7 +1047,7 @@ AC_ARG_ENABLE(gcov, if test "$enable_gcov" = "yes"; then CFLAGS="-D NTHREADS=20 $CFLAGS --coverage" if test "${enable_shared}" = no; then - # FIXME: As of g++-4.8.4/x86_64, in case of shared library build, cpptest + # FIXME: As of g++-4.8.4/x64, in case of shared library build, cpptest # linkage fails with "hidden symbol atexit is referenced by DSO" message. CXXFLAGS="$CXXFLAGS --coverage" fi diff --git a/cord/tests/de.c b/cord/tests/de.c index b5b21f63..722d41cb 100644 --- a/cord/tests/de.c +++ b/cord/tests/de.c @@ -40,7 +40,6 @@ #if (defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) \ || defined(__NT__) || defined(_WIN32)) && !defined(WIN32) /* If this is DOS or win16, we'll fail anyway. */ - /* Might as well assume win32. */ # define WIN32 #endif diff --git a/cord/tests/de_win.c b/cord/tests/de_win.c index 3e815292..244d1ed7 100644 --- a/cord/tests/de_win.c +++ b/cord/tests/de_win.c @@ -12,11 +12,9 @@ */ /* - * The MS Windows specific part of de. + * The Windows specific part of de. * This started as the generic Windows application template * but significant parts didn't survive to the final version. - * - * This was written by a nonexpert windows programmer. */ #if defined(__BORLANDC__) || defined(__CYGWIN__) || defined(__MINGW32__) \ || defined(__NT__) || defined(_WIN32) || defined(WIN32) diff --git a/doc/README.macros b/doc/README.macros index e339bfdb..8582f9ae 100644 --- a/doc/README.macros +++ b/doc/README.macros @@ -40,10 +40,10 @@ GC_NO_THREAD_REDIRECTS Tested by gc.h. Prevents redirection of thread creation routines etc. to GC_ versions. Requires the programmer to explicitly handle thread registration. -GC_NO_THREAD_DECLS Tested by gc.h. MS Windows only. Do not declare +GC_NO_THREAD_DECLS Tested by gc.h. Windows only. Do not declare Windows thread creation routines and do not include windows.h. -GC_DONT_INCLUDE_WINDOWS_H Tested by gc.h. MS Windows only. Do not include +GC_DONT_INCLUDE_WINDOWS_H Tested by gc.h. Windows only. Do not include windows.h from gc.h (but Windows-specific thread creation routines are declared). @@ -57,7 +57,7 @@ _ENABLE_ARRAYNEW operator new[] and delete[] are separately overloadable. Used in gc_cpp.h. -GC_NO_INLINE_STD_NEW Tested by gc_cpp.cc and gc_cpp.h. MS Windows only. +GC_NO_INLINE_STD_NEW Tested by gc_cpp.cc and gc_cpp.h. Windows only. Define the system-wide new and delete operators in gccpp.dll instead of providing an inline version of the operators. @@ -79,7 +79,7 @@ GC_DLL Defined by user if dynamic libraries are being built GC resides in a different DLL, its entry points should be referenced accordingly, and precautions may need to be taken to properly deal with statically allocated - variables in the main program. Used for MS Windows. + variables in the main program. Used for Windows. Also used by GCC v4+ (only when the dynamic shared library is being built) to hide internally used symbols. @@ -160,7 +160,7 @@ GC_DARWIN_THREADS Enables support for Mac OS X pthreads. Deprecated, GC_AIX_THREADS Enables support for IBM AIX threads. Deprecated, use GC_THREADS instead. -GC_DGUX386_THREADS Enables support for DB/UX on I386 threads. +GC_DGUX386_THREADS Enables support for DB/UX x86 threads. See README.DGUX386. (Probably has not been tested recently.) Deprecated, use GC_THREADS instead. @@ -231,7 +231,7 @@ REDIRECT_MALLOC=<X> Causes malloc to be defined as alias for X. be either GC_malloc or GC_malloc_uncollectable, or GC_debug_malloc_replacement. (The latter invokes GC_debug_malloc with dummy source location information, but still results in - properly remembered call stacks on Linux/X86 and Solaris/SPARC. + properly remembered call stacks on Linux/x86 and Solaris/SPARC. It requires that the following two macros also be used.) The former is occasionally useful for working around leaks in code you don't want to (or can't) look at. It may not work for @@ -357,9 +357,9 @@ SHORT_DBG_HDRS Assume that all objects have debug headers. Shorten SAVE_CALL_COUNT=<n> Set the number of call frames saved with objects allocated through the debugging interface. Affects the amount of information generated in leak reports. Only matters on platforms - on which we can quickly generate call stacks, currently Linux/X86, + on which we can quickly generate call stacks, currently Linux/x86, Linux/SPARC, Solaris/SPARC, and platforms that provide execinfo.h. - Default is zero. On X86, client code should NOT be compiled with + Default is zero. On x86, client code should NOT be compiled with -fomit-frame-pointer. SAVE_CALL_NARGS=<n> Set the number of functions arguments to be saved @@ -374,10 +374,10 @@ GC_GCJ_SUPPORT Includes support for gcj (and possibly other systems that include a pointer to a type descriptor in each allocated object). USE_I686_PREFETCH Causes the collector to issue Pentium III style - prefetch instructions. No effect except on Linux/X86 platforms. + prefetch instructions. No effect except on Linux/x86 platforms. Empirically the code appears to still run correctly on Pentium II processors, though with no performance benefit. May not run on other - X86 processors probably. In some cases this improves performance by 15% + x86 processors probably. In some cases this improves performance by 15% or so. USE_3DNOW_PREFETCH Causes the collector to issue AMD 3DNow style diff --git a/doc/README.solaris2 b/doc/README.solaris2 index 85f0ea22..8eb4b9c2 100644 --- a/doc/README.solaris2 +++ b/doc/README.solaris2 @@ -41,7 +41,7 @@ Unless USE_PROC_FOR_LIBRARIES is defined, dlopen disables collection temporarily. In some unlikely cases, this can result in unpleasant heap growth. But it seems better than the race/deadlock issues we had before. -If threads are used on an X86 processor with malloc redirected to +If threads are used on an x86 processor with malloc redirected to GC_malloc, it is necessary to call GC_INIT explicitly before forking the first thread. (This avoids a deadlock arising from calling GC_thr_init with the allocation lock held.) diff --git a/doc/README.win32 b/doc/README.win32 index 5e24db3f..21d14181 100644 --- a/doc/README.win32 +++ b/doc/README.win32 @@ -1,6 +1,6 @@ The collector has at various times been compiled under Windows 95 and later, NT, and XP, with the original Microsoft SDK, with Visual C++ 2.0, 4.0, and 6, -with the GNU win32 tools, with Borland C++ Builder, with Watcom C, with EMX, +with the GNU Win32 tools, with Borland C++ Builder, with Watcom C, with EMX, and with the Digital Mars compiler (DMC). For historical reasons, @@ -15,7 +15,7 @@ message. A toy editor (de.exe) based on cords (heavyweight strings represented as trees) has been ported and is included. -It runs fine under either win32 or win32S. It serves as an example +It runs fine under either Win32 or win32s. It serves as an example of a true Windows application, except that it was written by a nonexpert Windows programmer. (There are some peculiarities in the way files are displayed. The <cr> is displayed explicitly @@ -65,7 +65,7 @@ GNU Tools The collector should be buildable under Cygwin with the "./configure; make check" machinery. -MinGW builds (including for x86_64) are available both directly (on a Windows +MinGW builds (including for x64) are available both directly (on a Windows host) and via cross-compilation, e.g. "./configure --host=i686-pc-mingw32; make check" @@ -104,9 +104,9 @@ Watcom compiler Ivan V. Demakov's README for the Watcom port: The collector has been tested with Watcom C 10.6, 11.0 and OpenWatcom 2.0. -It runs under win32, win32s, and even under msdos with dos4gw +It runs under Win32 and win32s, and even under DOS with dos4gw dos-extender. It should also run under OS/2, though this isn't -tested. Under win32 the collector can be built either as dll +tested. Under Win32 the collector can be built either as dll or as static library. Note that all compilations were done under Windows 95 or NT. @@ -201,7 +201,7 @@ equivalent of _beginthread, and it should not be used. GC_INIT should be called from the main thread before other GC calls. -We strongly advise against using the TerminateThread() win32 API call, +We strongly advise against using the TerminateThread() Windows API call, especially with the garbage collector. Any use is likely to provoke a crash in the GC, since it makes it impossible for the collector to correctly track threads. diff --git a/doc/README.win64 b/doc/README.win64 index eb6e7cd6..ed30665e 100644 --- a/doc/README.win64 +++ b/doc/README.win64 @@ -1,5 +1,5 @@ -64-bit Windows on AMD64/Intel EM64T is supported. A collector can be built -with Microsoft Visual C++ 2005 or with mingw-w64 gcc. +64-bit Windows on AMD64/Intel EM64T (x64) is supported. A collector can be +built with Microsoft Visual C++ 2005 or with mingw-w64 gcc. NT_MAKEFILE has been used in this environment. Type "nmake -f NT_MAKEFILE cpu=AMD64 nodebug=1" in a Visual C++ command line diff --git a/doc/debugging.md b/doc/debugging.md index ab058e4b..9de30804 100644 --- a/doc/debugging.md +++ b/doc/debugging.md @@ -21,7 +21,7 @@ there was not other handler previously installed. We recommend debugging without incremental collection if possible. (This applies directly to UNIX systems. Debugging with incremental collection under -win32 is worse. See README.win32.) +Win32 is worse. See README.win32.) If the application generates an unhandled SIGSEGV or equivalent, it may often be easiest to set the environment variable `GC_LOOP_ON_ABORT`. On many diff --git a/doc/leak.md b/doc/leak.md index 4b7bf2a4..6381d9f0 100644 --- a/doc/leak.md +++ b/doc/leak.md @@ -57,7 +57,7 @@ The same is generally true of thread support. However, the correct leak reports should be generated with linuxthreads, at least. On a few platforms (currently Solaris/SPARC, Irix, and, with -`-DSAVE_CALL_CHAIN`, Linux/X86), `GC_MALLOC` also causes some more information +`-DSAVE_CALL_CHAIN`, Linux/x86), `GC_MALLOC` also causes some more information about its call stack to be saved in the object. Such information is reproduced in the error reports in very non-symbolic form, but it can be very useful with the aid of a debugger. @@ -73,7 +73,7 @@ Assume the collector has been built with `-DFIND_LEAK` or The program to be tested for leaks could look like `tests/leak.c` file of the distribution. -On an Intel X86 Linux system this produces on the stderr stream: +On a Linux/x86 system this produces on the stderr stream: Found 1 leaked objects: @@ -81,7 +81,7 @@ On an Intel X86 Linux system this produces on the stderr stream: (On most unmentioned operating systems, the output is similar to this. If the -collector had been built on Linux/X86 with `-DSAVE_CALL_CHAIN`, the output +collector had been built on Linux/x86 with `-DSAVE_CALL_CHAIN`, the output would be closer to the Solaris example. For this to work, the program should not be compiled with `-fomit_frame_pointer`.) @@ -118,12 +118,12 @@ In many cases, a debugger is needed to interpret the additional information. On systems supporting the `adb` debugger, the `tools/callprocs.sh` script can be used to replace program counter values with symbolic names. The collector tries to generate symbolic names for call stacks if it knows how to do so on -the platform. This is true on Linux/X86, but not on most other platforms. +the platform. This is true on Linux/x86, but not on most other platforms. ## Simplified leak detection under Linux It should be possible to run the collector in the leak detection mode on -a program a.out under Linux/X86 as follows: +a program a.out under Linux/x86 as follows: 1. If possible, ensure that a.out is a single-threaded executable. On some platforms this does not work at all for the multi-threaded programs. diff --git a/doc/overview.md b/doc/overview.md index 3a4097b7..8665e3a6 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -91,7 +91,7 @@ For an overview of the implementation, see [here](gcdescr.md). The garbage collector distribution includes a C string (`cord.h`) package that provides for fast concatenation and substring operations on long strings. -A simple curses- and win32-based editor that represents the entire file as +A simple curses- and Windows-based editor that represents the entire file as a cord is included as a sample application. Performance of the non-incremental collector is typically competitive with diff --git a/doc/porting.md b/doc/porting.md index 60592c35..6025e53f 100644 --- a/doc/porting.md +++ b/doc/porting.md @@ -78,7 +78,7 @@ operating system: * `ALIGNMENT` - Defined to be the largest _N_ such that all pointer are guaranteed to be aligned on _N_-byte boundaries. Defining it to be _1_ will always work, but perform poorly. For all modern 32-bit platforms, this - is 4. For all modern 64-bit platforms, this is 8. Whether or not X86 + is 4. For all modern 64-bit platforms, this is 8. Whether or not x86 qualifies as a modern architecture here is compiler- and OS-dependent. * `DATASTART` - The beginning of the main data segment. The collector will trace all memory between `DATASTART` and `DATAEND` for root pointers. diff --git a/extra/msvc_dbg.c b/extra/msvc_dbg.c index 7385d203..ec54b741 100644 --- a/extra/msvc_dbg.c +++ b/extra/msvc_dbg.c @@ -23,7 +23,7 @@ #if !defined(_M_ARM) && !defined(_M_ARM64) \ && !defined(_M_X64) && defined(_MSC_VER) -/* TODO: arm[64], x86_64 currently miss some machine-dependent code below. */ +/* TODO: arm[64], x64 currently miss some machine-dependent code below. */ /* See also GC_HAVE_BUILTIN_BACKTRACE in gc_config_macros.h. */ #include <stdio.h> @@ -368,7 +368,7 @@ static size_t GetDescriptionFromStack(void* const frames[], size_t count, return buffer - begin; } -/* Compatibility with <execinfo.h> */ +/* Compatibility with execinfo.h: */ int backtrace(void* addresses[], int count) { @@ -619,7 +619,7 @@ GC_API GC_await_finalize_proc GC_CALL GC_get_await_finalize_proc(void) /* overflow is handled by the caller, and is not a disaster. */ #if defined(_MSC_VER) && defined(I386) GC_ATTR_NOINLINE - /* Otherwise some optimizer bug is tickled in VC for X86 (v19, at least). */ + /* Otherwise some optimizer bug is tickled in VC for x86 (v19, at least). */ #endif STATIC void GC_normal_finalize_mark_proc(ptr_t p) { diff --git a/include/gc/cord.h b/include/gc/cord.h index e547f1d3..768c9613 100644 --- a/include/gc/cord.h +++ b/include/gc/cord.h @@ -283,7 +283,7 @@ CORD_API CORD CORD_chars(char c, size_t i); /* The file f must be such that ftell reflects the actual character */ /* position in the file, i.e. the number of characters that can be */ /* or were read with fread. On UNIX systems this is always true. */ -/* On MS Windows systems, f must be opened in binary mode. */ +/* On Windows systems, f must be opened in binary mode. */ CORD_API CORD CORD_from_file(FILE * f); /* Equivalent to the above, except that the entire file will be read */ diff --git a/include/gc/gc.h b/include/gc/gc.h index d180c501..adc7c542 100644 --- a/include/gc/gc.h +++ b/include/gc/gc.h @@ -926,7 +926,7 @@ GC_API int GC_CALL GC_collect_a_little(void); /* integer that happens to be an address inside the array. (Actually, */ /* it reduces the chance of the allocator not finding space for such */ /* an array, since it will try hard to avoid introducing such a false */ -/* reference.) On a SunOS 4.X or MS Windows system this is recommended */ +/* reference.) On a SunOS 4.X or Windows system this is recommended */ /* for arrays likely to be larger than 100 KB or so. For other systems,*/ /* or if the collector is not configured to recognize all interior */ /* pointers, the threshold is normally much higher. */ @@ -2146,7 +2146,7 @@ GC_API int GC_CALL GC_get_force_unmap_on_gcollect(void); GC_INIT_CONF_IGNORE_WARN; \ GC_INIT_CONF_INITIAL_HEAP_SIZE; } -/* win32S may not free all resources on process exit. */ +/* win32s may not free all resources on process exit. */ /* This explicitly deallocates the heap. Defined only for Windows. */ GC_API void GC_CALL GC_win32_free_heap(void); diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h index 01970193..6d7d9c25 100644 --- a/include/private/gc_priv.h +++ b/include/private/gc_priv.h @@ -915,7 +915,7 @@ EXTERN_C_BEGIN /* Incremental GC with MPROTECT_VDB currently requires the */ /* page size to be a multiple of HBLKSIZE. Since most modern */ /* architectures support variable page sizes down to 4 KB, and */ -/* X86 is generally 4 KB, we now default to 4 KB, except for */ +/* x86 is generally 4 KB, we now default to 4 KB, except for */ /* Alpha: Seems to be used with 8 KB pages. */ /* SMALL_CONFIG: Want less block-level fragmentation. */ #ifndef HBLKSIZE diff --git a/include/private/gcconfig.h b/include/private/gcconfig.h index b2437d1b..638e4bb3 100644 --- a/include/private/gcconfig.h +++ b/include/private/gcconfig.h @@ -571,7 +571,7 @@ EXTERN_C_BEGIN # endif # if defined(_MSC_VER) && defined(_M_IA64) # define IA64 -# define MSWIN32 /* Really win64, but we don't treat 64-bit */ +# define MSWIN32 /* Really Win64, but we do not treat 64-bit */ /* variants as a different platform. */ # endif # endif @@ -866,7 +866,7 @@ EXTERN_C_BEGIN * * Each architecture may also define the style of virtual dirty bit * implementation to be used: - * GWW_VDB: Use win32 GetWriteWatch primitive. + * GWW_VDB: Use Win32 GetWriteWatch primitive. * MPROTECT_VDB: Write protect the heap and catch faults. * PROC_VDB: Use the SVR4 /proc primitives to read dirty bits. * SOFT_VDB: Use the Linux /proc primitives to track dirty bits. @@ -2885,7 +2885,7 @@ EXTERN_C_BEGIN /* lock. This isn't safe after the world has stopped. So we must */ /* call GC_register_dynamic_libraries before stopping the world. */ /* For performance reasons, this may be beneficial on other */ - /* platforms as well, though it should be avoided in win32. */ + /* platforms as well, though it should be avoided on Windows. */ #endif /* LINUX */ #if defined(SEARCH_FOR_DATA_START) @@ -3084,7 +3084,7 @@ EXTERN_C_BEGIN #if !defined(MSGBOX_ON_ERROR) && !defined(NO_MSGBOX_ON_ERROR) \ && !defined(SMALL_CONFIG) && defined(MSWIN32) \ && !defined(MSWINRT_FLAVOR) && !defined(MSWIN_XBOX1) - /* Show Windows message box with "OK" button on a GC fatal error. */ + /* Show a Windows message box with "OK" button on a GC fatal error. */ /* Client application is terminated once the user clicks the button. */ # define MSGBOX_ON_ERROR #endif diff --git a/include/private/pthread_stop_world.h b/include/private/pthread_stop_world.h index 7fd000dd..de5d7620 100644 --- a/include/private/pthread_stop_world.h +++ b/include/private/pthread_stop_world.h @@ -43,7 +43,7 @@ struct thread_stop_info { /* going into a syscall. 20 is more than we need, but it's an */ /* overestimate in case the instrumented function uses any callee */ /* saved registers, they may be pushed to the stack much earlier. */ - /* Also, on amd64 'push' puts 8 bytes on the stack even though */ + /* Also, on x64 'push' puts 8 bytes on the stack even though */ /* our pointers are 4 bytes. */ # ifdef ARM32 /* Space for r4-r8, r10-r12, r14. */ @@ -328,7 +328,7 @@ GC_INNER void GC_with_callee_saves_pushed(void (*fn)(ptr_t, void *), ucontext_t ctxt; # ifdef GETCONTEXT_FPU_EXCMASK_BUG /* Workaround a bug (clearing the FPU exception mask) in */ - /* getcontext on Linux/x86_64. */ + /* getcontext on Linux/x64. */ # ifdef X86_64 /* We manipulate FPU control word here just not to force the */ /* client application to use -lm linker option. */ @@ -303,7 +303,7 @@ static void push_roots_and_advance(GC_bool push_all, ptr_t cold_gc_frame) /* register values. In the case of an incremental */ /* collection, the world may be running. */ #ifdef WRAP_MARK_SOME - /* For win32, this is called after we establish a structured */ + /* For Win32, this is called after we establish a structured */ /* exception handler, in case Windows unmaps one of our root */ /* segments. */ STATIC GC_bool GC_mark_some_inner(ptr_t cold_gc_frame) @@ -830,7 +830,7 @@ GC_INNER mse * GC_mark_from(mse *mark_stack_top, mse *mark_stack, /* Try to prefetch the next pointer to be examined ASAP. */ /* Empirically, this also seems to help slightly without */ - /* prefetches, at least on linux/X86. Presumably this loop */ + /* prefetches, at least on linux/x86. Presumably this loop */ /* ends up with less register pressure, and gcc thus ends up */ /* generating slightly better code. Overall gcc code quality */ /* for this loop is still not great. */ @@ -892,7 +892,7 @@ GC_INNER void GC_push_roots(GC_bool all, ptr_t cold_gc_frame) /* not robust against mark stack overflow. */ /* Re-register dynamic libraries, in case one got added. */ /* There is some argument for doing this as late as possible, */ - /* especially on win32, where it can change asynchronously. */ + /* especially on Win32, where it can change asynchronously. */ /* In those cases, we do it here. But on other platforms, it's */ /* not safe with the world stopped, so we do it earlier. */ # if !defined(REGISTER_LIBRARIES_EARLY) @@ -249,7 +249,7 @@ STATIC void GC_init_size_map(void) GC_size_map[i] = ROUNDED_UP_GRANULES(i); # ifndef _MSC_VER GC_ASSERT(GC_size_map[i] < TINY_FREELISTS); - /* Seems to tickle bug in VC++ 2008 for AMD64 */ + /* Seems to tickle bug in VC++ 2008 for x64 */ # endif } /* We leave the rest of the array to be filled in on demand. */ @@ -1401,7 +1401,7 @@ GC_API void GC_CALL GC_enable_incremental(void) LOCK(); if (!GC_incremental) { GC_setpagesize(); - /* if (GC_no_win32_dlls) goto out; Should be win32S test? */ + /* TODO: Should we skip enabling incremental if win32s? */ maybe_install_looping_handler(); /* Before write fault handler! */ if (!GC_is_initialized) { UNLOCK(); @@ -416,7 +416,7 @@ GC_INNER const char * GC_get_maps(void) #endif /* NEED_PROC_MAPS */ #if defined(SEARCH_FOR_DATA_START) - /* The I386 case can be handled without a search. The Alpha case */ + /* The x86 case can be handled without a search. The Alpha case */ /* used to be handled differently as well, but the rules changed */ /* for recent Linux versions. This seems to be the easiest way to */ /* cover all versions. */ @@ -723,7 +723,7 @@ GC_INNER size_t GC_page_size = 0; GetSystemInfo(&GC_sysinfo); # if defined(CYGWIN32) && (defined(MPROTECT_VDB) || defined(USE_MUNMAP)) /* Allocations made with mmap() are aligned to the allocation */ - /* granularity, which (at least on 64-bit Windows OS) is not the */ + /* granularity, which (at least on Win64) is not the */ /* same as the page size. Probably a separate variable could */ /* be added to distinguish the allocation granularity from the */ /* actual page size, but in practice there is no good reason to */ @@ -2015,7 +2015,7 @@ void GC_register_data_segments(void) #ifdef DATASTART_USES_BSDGETDATASTART /* Its unclear whether this should be identical to the above, or */ -/* whether it should apply to non-X86 architectures. */ +/* whether it should apply to non-x86 architectures. */ /* For now we don't assume that there is always an empty page after */ /* etext. But in some cases there actually seems to be slightly more. */ /* This also deals with holes between read-only data and writable data. */ @@ -2962,7 +2962,7 @@ GC_API GC_push_other_roots_proc GC_CALL GC_get_push_other_roots(void) #ifdef GWW_VDB -# define GC_GWW_BUF_LEN (MAXHINCR * HBLKSIZE / 4096 /* X86 page size */) +# define GC_GWW_BUF_LEN (MAXHINCR * HBLKSIZE / 4096 /* x86 page size */) /* Still susceptible to overflow, if there are very large allocations, */ /* and everything is dirty. */ static PVOID gww_buf[GC_GWW_BUF_LEN]; @@ -3478,7 +3478,7 @@ GC_API GC_push_other_roots_proc GC_CALL GC_get_push_other_roots(void) GC_VERBOSE_LOG_PRINTF("Replaced other SIGBUS handler\n"); } # endif -# endif /* ! MS windows */ +# endif /* !MSWIN32 && !MSWINCE */ # if defined(CPPCHECK) && defined(ADDRESS_SANITIZER) GC_noop1((word)&__asan_default_options); # endif @@ -5003,7 +5003,7 @@ GC_API int GC_CALL GC_get_pages_executable(void) /* Call stack save code for debugging. Should probably be in */ /* mach_dep.c, but that requires reorganization. */ -/* I suspect the following works for most X86 *nix variants, so */ +/* I suspect the following works for most *nix x86 variants, so */ /* long as the frame pointer is explicitly stored. In the case of gcc, */ /* compiler flags (e.g. -fomit-frame-pointer) determine whether it is. */ #if defined(I386) && defined(LINUX) && defined(SAVE_CALL_CHAIN) diff --git a/tools/threadlibs.c b/tools/threadlibs.c index 8729099a..4e49f58a 100644 --- a/tools/threadlibs.c +++ b/tools/threadlibs.c @@ -64,7 +64,7 @@ int main(void) # endif # if defined(GC_WIN32_PTHREADS) # ifdef PTW32_STATIC_LIB - /* assume suffix s for static version of the win32 pthread library */ + /* assume suffix s for static version of the pthreads-win32 library */ printf("-lpthreadGC2s -lws2_32\n"); # else printf("-lpthreadGC2\n"); diff --git a/win32_threads.c b/win32_threads.c index 671eb996..ba0d6ba7 100644 --- a/win32_threads.c +++ b/win32_threads.c @@ -420,7 +420,7 @@ STATIC GC_thread GC_register_my_thread_inner(const struct GC_stack_base *sb, { GC_vthread me; - /* The following should be a no-op according to the win32 */ + /* The following should be a no-op according to the Win32 */ /* documentation. There is empirical evidence that it */ /* isn't. - HB */ # if defined(MPROTECT_VDB) && !defined(CYGWIN32) @@ -444,7 +444,7 @@ STATIC GC_thread GC_register_my_thread_inner(const struct GC_stack_base *sb, /* It has been claimed that DllMain is really only executed with */ /* a particular system lock held, and thus careful use of locking */ /* around code that doesn't call back into the system libraries */ - /* might be OK. But this hasn't been tested across all win32 */ + /* might be OK. But this has not been tested across all Win32 */ /* variants. */ for (i = 0; InterlockedExchange(&dll_thread_table[i].tm.long_in_use, 1) != 0; @@ -454,8 +454,8 @@ STATIC GC_thread GC_register_my_thread_inner(const struct GC_stack_base *sb, /* InterlockedExchange is supposed to be replaced by */ /* InterlockedExchangePointer, but that's not really what I */ /* want here. */ - /* FIXME: We should eventually declare Win95 dead and use AO_ */ - /* primitives here. */ + /* FIXME: We should eventually declare Windows 95 dead and use */ + /* AO_ primitives here. */ if (i == MAX_THREADS - 1) ABORT("Too many threads"); } @@ -677,7 +677,7 @@ GC_API void GC_CALL GC_register_altstack(void *stack, GC_word stack_size, /* If a thread has been joined, but we have not yet */ /* been notified, then there may be more than one thread */ -/* in the table with the same win32 id. */ +/* in the table with the same Win32 thread id. */ /* This is OK, but we need a way to delete a specific one. */ /* Does not actually free GC_thread entry, only unlinks it. */ /* If GC_win32_dll_threads is set it should be called from the */ @@ -1052,7 +1052,7 @@ GC_API void * GC_CALL GC_get_my_stackbottom(struct GC_stack_base *sb) #ifdef GC_PTHREADS /* A quick-and-dirty cache of the mapping between pthread_t */ - /* and win32 thread id. */ + /* and Win32 thread id. */ # define PTHREAD_MAP_SIZE 512 DWORD GC_pthread_map_cache[PTHREAD_MAP_SIZE] = {0}; # define PTHREAD_MAP_INDEX(pthread_id) \ @@ -1690,7 +1690,7 @@ STATIC word GC_push_stack_for(GC_thread thread, DWORD me) /* so we scan the entire stack region (down to the stack */ /* limit). There is no 100% guarantee that all the */ /* registers are pushed but we do our best (the proper */ - /* solution would be to fix it inside Windows OS). */ + /* solution would be to fix it inside Windows). */ sp = (ptr_t)tib->StackLimit; } } /* else */ @@ -3075,7 +3075,7 @@ GC_INNER void GC_thr_init(void) } # ifndef GC_NO_PTHREAD_SIGMASK - /* Win32 pthread does not support sigmask. */ + /* pthreads-win32 does not support sigmask. */ /* So, nothing required here... */ GC_API int GC_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset) |