Blame SOURCES/pr3593-s390-size_t_format_flags.patch

8ba7a7
diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
8ba7a7
--- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -977,7 +977,7 @@
8ba7a7
     for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) {
8ba7a7
       CodeSection* sect = code_section(n);
8ba7a7
       if (!sect->is_allocated() || sect->is_empty())  continue;
8ba7a7
-      xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>",
8ba7a7
+      xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>",
8ba7a7
                      n, sect->limit() - sect->start(), sect->limit() - sect->end());
8ba7a7
     }
8ba7a7
     xtty->print_cr("</blob>");
8ba7a7
diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
8ba7a7
--- openjdk/hotspot/src/share/vm/code/codeCache.cpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -191,7 +191,7 @@
8ba7a7
     }
8ba7a7
     if (PrintCodeCacheExtension) {
8ba7a7
       ResourceMark rm;
8ba7a7
-      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
8ba7a7
+      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)",
8ba7a7
                     (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
8ba7a7
                     (address)_heap->high() - (address)_heap->low_boundary());
8ba7a7
     }
8ba7a7
diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
8ba7a7
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -556,7 +556,7 @@
8ba7a7
     "   [Table]\n"
8ba7a7
     "      [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
8ba7a7
     "      [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n"
8ba7a7
-    "      [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
8ba7a7
+    "      [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
8ba7a7
     "      [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
8ba7a7
     "      [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n"
8ba7a7
     "      [Age Threshold: "UINTX_FORMAT"]",
8ba7a7
diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
8ba7a7
--- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -57,7 +57,7 @@
8ba7a7
     gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: ");
8ba7a7
     gclog_or_tty->print_cr("  "
8ba7a7
                   "  rs.base(): " INTPTR_FORMAT
8ba7a7
-                  "  rs.size(): " INTPTR_FORMAT
8ba7a7
+                  "  rs.size(): " SIZE_FORMAT
8ba7a7
                   "  rs end(): " INTPTR_FORMAT,
8ba7a7
                   p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
8ba7a7
     gclog_or_tty->print_cr("  "
8ba7a7
diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
8ba7a7
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -1285,14 +1285,14 @@
8ba7a7
     }
8ba7a7
     if (PrintGCDetails && Verbose) {
8ba7a7
       // Too early to use gclog_or_tty
8ba7a7
-      tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize);
8ba7a7
+      tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize);
8ba7a7
     }
8ba7a7
 
8ba7a7
     // Code along this path potentially sets NewSize and OldSize
8ba7a7
     if (PrintGCDetails && Verbose) {
8ba7a7
       // Too early to use gclog_or_tty
8ba7a7
-      tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT
8ba7a7
-           " initial_heap_size:  " SIZE_FORMAT
8ba7a7
+      tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT
8ba7a7
+           " initial_heap_size:  " UINTX_FORMAT
8ba7a7
            " max_heap: " SIZE_FORMAT,
8ba7a7
            min_heap_size(), InitialHeapSize, max_heap);
8ba7a7
     }
8ba7a7
@@ -1308,7 +1308,7 @@
8ba7a7
         FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize));
8ba7a7
         if (PrintGCDetails && Verbose) {
8ba7a7
           // Too early to use gclog_or_tty
8ba7a7
-          tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize);
8ba7a7
+          tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize);
8ba7a7
         }
8ba7a7
       }
8ba7a7
       // Unless explicitly requested otherwise, size old gen
8ba7a7
@@ -1318,7 +1318,7 @@
8ba7a7
           FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize));
8ba7a7
           if (PrintGCDetails && Verbose) {
8ba7a7
             // Too early to use gclog_or_tty
8ba7a7
-            tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize);
8ba7a7
+            tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize);
8ba7a7
           }
8ba7a7
         }
8ba7a7
       }
8ba7a7
@@ -1834,7 +1834,7 @@
8ba7a7
 
8ba7a7
       if (PrintGCDetails && Verbose) {
8ba7a7
         // Cannot use gclog_or_tty yet.
8ba7a7
-        tty->print_cr("  Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial);
8ba7a7
+        tty->print_cr("  Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial);
8ba7a7
       }
8ba7a7
       FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
8ba7a7
     }
8ba7a7
@@ -1844,7 +1844,7 @@
8ba7a7
       set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
8ba7a7
       if (PrintGCDetails && Verbose) {
8ba7a7
         // Cannot use gclog_or_tty yet.
8ba7a7
-        tty->print_cr("  Minimum heap size " SIZE_FORMAT, min_heap_size());
8ba7a7
+        tty->print_cr("  Minimum heap size " UINTX_FORMAT, min_heap_size());
8ba7a7
       }
8ba7a7
     }
8ba7a7
   }
8ba7a7
diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
8ba7a7
--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Wed Jan 13 03:43:29 2016 +0000
8ba7a7
+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Wed Jan 13 05:30:26 2016 +0000
8ba7a7
@@ -1382,12 +1382,21 @@
8ba7a7
 
8ba7a7
 #define INTPTR_FORMAT_W(width)   "%" #width PRIxPTR
8ba7a7
 
b8989a
+#if defined(S390) && !defined(_LP64)
8ba7a7
+#define SSIZE_FORMAT          "%z"   PRIdPTR
8ba7a7
+#define SIZE_FORMAT           "%z"   PRIuPTR
8ba7a7
+#define SIZE_FORMAT_HEX       "0x%z" PRIxPTR
8ba7a7
+#define SSIZE_FORMAT_W(width) "%"   #width "z" PRIdPTR
8ba7a7
+#define SIZE_FORMAT_W(width)  "%"   #width "z" PRIuPTR
8ba7a7
+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR
8ba7a7
+#else   // !S390
8ba7a7
 #define SSIZE_FORMAT          "%"   PRIdPTR
8ba7a7
 #define SIZE_FORMAT           "%"   PRIuPTR
8ba7a7
 #define SIZE_FORMAT_HEX       "0x%" PRIxPTR
8ba7a7
 #define SSIZE_FORMAT_W(width) "%"   #width PRIdPTR
8ba7a7
 #define SIZE_FORMAT_W(width)  "%"   #width PRIuPTR
8ba7a7
 #define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR
8ba7a7
+#endif  // S390
8ba7a7
 
8ba7a7
 #define INTX_FORMAT           "%" PRIdPTR
8ba7a7
 #define UINTX_FORMAT          "%" PRIuPTR
2b939e
diff -r 388e9d0905e6 src/share/vm/memory/collectorPolicy.cpp
2b939e
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp	Mon Apr 11 11:33:18 2016 +0000
2b939e
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp	Tue Apr 12 04:12:50 2016 +0100
2b939e
@@ -1056,7 +1056,8 @@
2b939e
     size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
2b939e
     assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected));
2b939e
     assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
2b939e
-        err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize));
2b939e
+        err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT,
2b939e
+		expected, NewSize));
2b939e
   }
2b939e
 
2b939e
 private: