Merge from master

doxygen.config

@@ -632,10 +632,6 @@ WARN_LOGFILE           =
 INPUT                  = doxygen-mainpage \
                          include \
                          src \
-                         test_c \
-                         test_regress \
-                         test_sc \
-                         test_v
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

include/verilated.h

@@ -327,7 +327,7 @@ public:  // But internals only - called from VerilatedModule's
 class Verilated {
     // MEMBERS
     // Slow path variables
-    static VerilatedMutex m_mutex;  ///< Mutex for all static members, when VL_THREADED
+    static VerilatedMutex m_mutex;  ///< Mutex for s_s/s_ns members, when VL_THREADED
 
     static VerilatedVoidCb  s_flushCb;		///< Flush callback function
 

include/verilatedos.h

@@ -358,7 +358,6 @@ typedef unsigned long long	vluint64_t;	///< 64-bit unsigned type
 //=========================================================================
 // Performance counters
 
-#if VL_THREADED
 /// The vluint64_t argument is loaded with a high-performance counter for profiling
 /// or 0x0 if not implemeted on this platform
 #if defined(__i386__) || defined(__x86_64__)
@@ -373,7 +372,6 @@ typedef unsigned long long	vluint64_t;	///< 64-bit unsigned type
 // We just silently ignore unknown OSes, as only leads to missing statistics
 # define VL_RDTSC(val) (val) = 0;
 #endif
-#endif
 
 //=========================================================================
 // Threading related OS-specific functions