| 1 |
diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp |
| 2 |
--- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 03:43:29 2016 +0000 |
| 3 |
+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 05:30:26 2016 +0000 |
| 4 |
@@ -977,7 +977,7 @@ |
| 5 |
for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++) { |
| 6 |
CodeSection* sect = code_section(n); |
| 7 |
if (!sect->is_allocated() || sect->is_empty()) continue; |
| 8 |
- xtty->print_cr("<sect index='%d' size='" SIZE_FORMAT "' free='" SIZE_FORMAT "'/>", |
| 9 |
+ xtty->print_cr("<sect index='%d' size='" INTX_FORMAT "' free='" INTX_FORMAT "'/>", |
| 10 |
n, sect->limit() - sect->start(), sect->limit() - sect->end()); |
| 11 |
} |
| 12 |
xtty->print_cr("</blob>"); |
| 13 |
diff -r cf43a852f486 src/share/vm/code/codeCache.cpp |
| 14 |
--- openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 03:43:29 2016 +0000 |
| 15 |
+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 05:30:26 2016 +0000 |
| 16 |
@@ -191,7 +191,7 @@ |
| 17 |
} |
| 18 |
if (PrintCodeCacheExtension) { |
| 19 |
ResourceMark rm; |
| 20 |
- tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)", |
| 21 |
+ tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" INTX_FORMAT " bytes)", |
| 22 |
(intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(), |
| 23 |
(address)_heap->high() - (address)_heap->low_boundary()); |
| 24 |
} |
| 25 |
diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp |
| 26 |
--- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 03:43:29 2016 +0000 |
| 27 |
+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13 05:30:26 2016 +0000 |
| 28 |
@@ -556,7 +556,7 @@ |
| 29 |
" [Table]\n" |
| 30 |
" [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n" |
| 31 |
" [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max: "SIZE_FORMAT"]\n" |
| 32 |
- " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" |
| 33 |
+ " [Entries: "UINTX_FORMAT", Load: "G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added: "UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n" |
| 34 |
" [Resize Count: "UINTX_FORMAT", Shrink Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold: "UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n" |
| 35 |
" [Rehash Count: "UINTX_FORMAT", Rehash Threshold: "UINTX_FORMAT", Hash Seed: 0x%x]\n" |
| 36 |
" [Age Threshold: "UINTX_FORMAT"]", |
| 37 |
diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp |
| 38 |
--- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 03:43:29 2016 +0000 |
| 39 |
+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 05:30:26 2016 +0000 |
| 40 |
@@ -57,7 +57,7 @@ |
| 41 |
gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray: "); |
| 42 |
gclog_or_tty->print_cr(" " |
| 43 |
" rs.base(): " INTPTR_FORMAT |
| 44 |
- " rs.size(): " INTPTR_FORMAT |
| 45 |
+ " rs.size(): " SIZE_FORMAT |
| 46 |
" rs end(): " INTPTR_FORMAT, |
| 47 |
p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size())); |
| 48 |
gclog_or_tty->print_cr(" " |
| 49 |
diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp |
| 50 |
--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 03:43:29 2016 +0000 |
| 51 |
+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 05:30:26 2016 +0000 |
| 52 |
@@ -1285,14 +1285,14 @@ |
| 53 |
} |
| 54 |
if (PrintGCDetails && Verbose) { |
| 55 |
// Too early to use gclog_or_tty |
| 56 |
- tty->print_cr("CMS ergo set MaxNewSize: " SIZE_FORMAT, MaxNewSize); |
| 57 |
+ tty->print_cr("CMS ergo set MaxNewSize: " UINTX_FORMAT, MaxNewSize); |
| 58 |
} |
| 59 |
|
| 60 |
// Code along this path potentially sets NewSize and OldSize |
| 61 |
if (PrintGCDetails && Verbose) { |
| 62 |
// Too early to use gclog_or_tty |
| 63 |
- tty->print_cr("CMS set min_heap_size: " SIZE_FORMAT |
| 64 |
- " initial_heap_size: " SIZE_FORMAT |
| 65 |
+ tty->print_cr("CMS set min_heap_size: " UINTX_FORMAT |
| 66 |
+ " initial_heap_size: " UINTX_FORMAT |
| 67 |
" max_heap: " SIZE_FORMAT, |
| 68 |
min_heap_size(), InitialHeapSize, max_heap); |
| 69 |
} |
| 70 |
@@ -1308,7 +1308,7 @@ |
| 71 |
FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize)); |
| 72 |
if (PrintGCDetails && Verbose) { |
| 73 |
// Too early to use gclog_or_tty |
| 74 |
- tty->print_cr("CMS ergo set NewSize: " SIZE_FORMAT, NewSize); |
| 75 |
+ tty->print_cr("CMS ergo set NewSize: " UINTX_FORMAT, NewSize); |
| 76 |
} |
| 77 |
} |
| 78 |
// Unless explicitly requested otherwise, size old gen |
| 79 |
@@ -1318,7 +1318,7 @@ |
| 80 |
FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap - NewSize)); |
| 81 |
if (PrintGCDetails && Verbose) { |
| 82 |
// Too early to use gclog_or_tty |
| 83 |
- tty->print_cr("CMS ergo set OldSize: " SIZE_FORMAT, OldSize); |
| 84 |
+ tty->print_cr("CMS ergo set OldSize: " UINTX_FORMAT, OldSize); |
| 85 |
} |
| 86 |
} |
| 87 |
} |
| 88 |
@@ -1834,7 +1834,7 @@ |
| 89 |
|
| 90 |
if (PrintGCDetails && Verbose) { |
| 91 |
// Cannot use gclog_or_tty yet. |
| 92 |
- tty->print_cr(" Initial heap size " SIZE_FORMAT, (uintx)reasonable_initial); |
| 93 |
+ tty->print_cr(" Initial heap size " SIZE_FORMAT, (size_t)reasonable_initial); |
| 94 |
} |
| 95 |
FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial); |
| 96 |
} |
| 97 |
@@ -1844,7 +1844,7 @@ |
| 98 |
set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize)); |
| 99 |
if (PrintGCDetails && Verbose) { |
| 100 |
// Cannot use gclog_or_tty yet. |
| 101 |
- tty->print_cr(" Minimum heap size " SIZE_FORMAT, min_heap_size()); |
| 102 |
+ tty->print_cr(" Minimum heap size " UINTX_FORMAT, min_heap_size()); |
| 103 |
} |
| 104 |
} |
| 105 |
} |
| 106 |
diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp |
| 107 |
--- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 03:43:29 2016 +0000 |
| 108 |
+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 05:30:26 2016 +0000 |
| 109 |
@@ -1382,12 +1382,21 @@ |
| 110 |
|
| 111 |
#define INTPTR_FORMAT_W(width) "%" #width PRIxPTR |
| 112 |
|
| 113 |
+#if defined(S390) && !defined(_LP64) |
| 114 |
+#define SSIZE_FORMAT "%z" PRIdPTR |
| 115 |
+#define SIZE_FORMAT "%z" PRIuPTR |
| 116 |
+#define SIZE_FORMAT_HEX "0x%z" PRIxPTR |
| 117 |
+#define SSIZE_FORMAT_W(width) "%" #width "z" PRIdPTR |
| 118 |
+#define SIZE_FORMAT_W(width) "%" #width "z" PRIuPTR |
| 119 |
+#define SIZE_FORMAT_HEX_W(width) "0x%" #width "z" PRIxPTR |
| 120 |
+#else // !S390 |
| 121 |
#define SSIZE_FORMAT "%" PRIdPTR |
| 122 |
#define SIZE_FORMAT "%" PRIuPTR |
| 123 |
#define SIZE_FORMAT_HEX "0x%" PRIxPTR |
| 124 |
#define SSIZE_FORMAT_W(width) "%" #width PRIdPTR |
| 125 |
#define SIZE_FORMAT_W(width) "%" #width PRIuPTR |
| 126 |
#define SIZE_FORMAT_HEX_W(width) "0x%" #width PRIxPTR |
| 127 |
+#endif // S390 |
| 128 |
|
| 129 |
#define INTX_FORMAT "%" PRIdPTR |
| 130 |
#define UINTX_FORMAT "%" PRIuPTR |
| 131 |
diff -r 388e9d0905e6 src/share/vm/memory/collectorPolicy.cpp |
| 132 |
--- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Mon Apr 11 11:33:18 2016 +0000 |
| 133 |
+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Apr 12 04:12:50 2016 +0100 |
| 134 |
@@ -1056,7 +1056,8 @@ |
| 135 |
size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size); |
| 136 |
assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu", msp.initial_gen0_size(), expected)); |
| 137 |
assert(FLAG_IS_ERGO(NewSize) && NewSize == expected, |
| 138 |
- err_msg("NewSize should have been set ergonomically to %zu, but was %zu", expected, NewSize)); |
| 139 |
+ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT ", but was " UINTX_FORMAT, |
| 140 |
+ expected, NewSize)); |
| 141 |
} |
| 142 |
|
| 143 |
private: |
Parent Directory
| 
Revision Log