merged

Author: drmeister

src/core/array_bit.cc

@@ -134,7 +134,7 @@ CL_DEFUN SimpleBitVector_sp core__sbv_bit_not(SimpleBitVector_sp vec, SimpleBitV
     }                                                                                                                              \
     i = nwords;                                                                                                                    \
     if (leftover != 0) {                                                                                                           \
-      bit_array_word mask = ((1 << leftover) - 1) << (BIT_ARRAY_WORD_BITS - leftover);                                             \
+      bit_array_word mask = (((bit_array_word)1 << leftover) - 1) << (BIT_ARRAY_WORD_BITS - leftover);                             \
       word = bytes[i] & mask;                                                                                                      \
       statement                                                                                                                    \
     }                                                                                                                              \
@@ -199,7 +199,9 @@ void SimpleBitVector_getOnIndices(SimpleBitVector_sp x, vector<size_t>& res) {
   }
 }
 
-bool SimpleBitVector_isZero(SimpleBitVector_sp vec) { return core__sbv_zerop(vec); }
+bool SimpleBitVector_isZero(SimpleBitVector_sp vec) {
+  return core__sbv_zerop(vec);
+}
 
 bool BitVectorNs_O::equal(T_sp other) const {
   if (&*other == this)

src/core/function.cc

@@ -770,15 +770,20 @@ void maybe_verify_dladdr( core::ClaspXepFunction& entryPoints,
                           core::T_sp code,
                           core::FunctionDescription_sp functionDescription,
                           gctools::GatherObjects* gatherP ) {
-  gatherP->_SimpleFunCount++;
   if (gc::IsA<llvmo::Library_sp>(code)) {
+    gatherP->_SimpleFunCount++;
     bool failed_dladdr = false;
     for (size_t ii = 0; ii < ClaspXepFunction::Entries; ++ii) {
       Dl_info info;
       void* address = (void*)entryPoints._EntryPoints[ii].load();
       if (gatherP->_uniqueEntryPoints.count(address)==0) {
         gatherP->_uniqueEntryPoints.insert(address);
         int ret = dladdr((void*)address, &info);
+        printf("%s:%d:%s dladdr ret=%d for entry point[%zu] %p for %s\n",
+                 __FILE__, __LINE__, __FUNCTION__,
+               ret,
+                 ii, (void*)address,
+                 _rep_(functionDescription->_functionName).c_str());
         if (ret == 0) {
           failed_dladdr = true;
           gatherP->_uniqueEntryPointsFailedDladdr.insert(address);

src/gctools/boehmGarbageCollection.cc

@@ -555,21 +555,21 @@ void clasp_gc_room(std::ostringstream& OutputStream, RoomVerbosity verbosity) {
     OutputStream << "Total object memory usage (bytes): " << std::setw(10) << totalSize << '\n';
   }
 #endif
-  OutputStream << "Total GC_get_heap_size():        " << std::setw(12) << GC_get_heap_size() << '\n';
-  OutputStream << "Total GC_get_free_bytes():       " << std::setw(12) << GC_get_free_bytes() << '\n';
-  OutputStream << "Total GC_get_bytes_since_gc():   " << std::setw(12) << GC_get_bytes_since_gc() << '\n';
-  OutputStream << "Total GC_get_total_bytes():      " << std::setw(12) << GC_get_total_bytes() << '\n';
-  OutputStream << "Total number of JITDylibs:       " << std::setw(12) << cl__length(_lisp->_Roots._JITDylibs) << '\n';
-  OutputStream << "Total number of Libraries:       " << std::setw(12) << cl__length(_lisp->_Roots._AllLibraries) << '\n';
-  OutputStream << "Total number of ObjectFiles:     " << std::setw(12) << cl__length(_lisp->_Roots._AllObjectFiles) << '\n';
-  OutputStream << "Total number of CodeBlocks:      " << std::setw(12) << cl__length(_lisp->_Roots._AllCodeBlocks) << '\n';
-  OutputStream << "Total number of SimpleFun:       " << std::setw(12) << gatherObjects._SimpleFunCount << '\n';
+  OutputStream << "Total GC_get_heap_size():                      " << std::setw(12) << GC_get_heap_size() << '\n';
+  OutputStream << "Total GC_get_free_bytes():                     " << std::setw(12) << GC_get_free_bytes() << '\n';
+  OutputStream << "Total GC_get_bytes_since_gc():                 " << std::setw(12) << GC_get_bytes_since_gc() << '\n';
+  OutputStream << "Total GC_get_total_bytes():                    " << std::setw(12) << GC_get_total_bytes() << '\n';
+  OutputStream << "Total number of JITDylibs:                     " << std::setw(12) << cl__length(_lisp->_Roots._JITDylibs) << '\n';
+  OutputStream << "Total number of Libraries:                     " << std::setw(12) << cl__length(_lisp->_Roots._AllLibraries) << '\n';
+  OutputStream << "Total number of ObjectFiles:                   " << std::setw(12) << cl__length(_lisp->_Roots._AllObjectFiles) << '\n';
+  OutputStream << "Total number of CodeBlocks:                    " << std::setw(12) << cl__length(_lisp->_Roots._AllCodeBlocks) << '\n';
+  OutputStream << "Total number of library Simple(Core)Fun:       " << std::setw(12) << gatherObjects._SimpleFunCount << '\n';
   if (gatherObjects._SimpleFunFailedDladdrCount>0) {
-    OutputStream << "Total number of SimpleFun failed dladdr: " << std::setw(12) << gatherObjects._SimpleFunFailedDladdrCount << '\n';
+    OutputStream << "Total of library Simple(Core)Fun dladdr fails: " << std::setw(12) << gatherObjects._SimpleFunFailedDladdrCount << '\n';
   }
-  OutputStream << "Unique entry points:             " << std::setw(12) << gatherObjects._uniqueEntryPoints.size() << '\n';
+  OutputStream << "Unique library Simple(Core)Fun entry points:   " << std::setw(12) << gatherObjects._uniqueEntryPoints.size() << '\n';
   if (gatherObjects._uniqueEntryPointsFailedDladdr.size()>0) {
-    OutputStream << "Unique entry points failed dladdr: " << std::setw(10) << gatherObjects._uniqueEntryPointsFailedDladdr.size() << '\n';
+    OutputStream << "Unique library Simple(Core)Fun dladdr fails:   " << std::setw(10) << gatherObjects._uniqueEntryPointsFailedDladdr.size() << '\n';
   }
   delete static_ReachableClassKinds;
 }