/hg/release/icedtea7-forest-2.6/hotspot: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Feb 6 22:07:46 UTC 2017
changeset c3b1a60ee84b in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=c3b1a60ee84b
author: jwilhelm
date: Sat Feb 04 19:38:29 2017 +0000
8000351, PR3316: Tenuring threshold should be unsigned
Summary: Change the flags and variables related to tenuring threshold to be unsigned
Reviewed-by: jmasa, johnc
changeset a5a1a667a656 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=a5a1a667a656
author: hseigel
date: Sat Feb 04 20:00:32 2017 +0000
7102489, PR3316: RFE: cleanup jlong typedef on __APPLE__and _LLP64 systems.
Summary: Define jlong as long on all LP64 platforms and add JLONG_FORMAT macro.
Reviewed-by: dholmes, coleenp, mikael, kvn
changeset b312abd8da2c in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=b312abd8da2c
author: dholmes
date: Sat Feb 04 23:06:39 2017 +0000
8170888, PR3316: [linux] Experimental support for cgroup memory limits in container (ie Docker) environments
Summary: Set apparent physical memory to cgroup memory limit when UseCGroupMemoryLimitForHeap is true
Reviewed-by: acorn, gtriantafill
Contributed-by: Christine Flood <chf at redhat.com>
changeset 1d30f5a7723e in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=1d30f5a7723e
author: adinn
date: Fri Nov 18 13:19:50 2016 -0500
8165673, PR3320: AArch64: Fix JNI floating point argument handling
Reviewed-by: aph, adinn
Contributed-by: ningsheng.jian at linaro.org
changeset b0661240c3b0 in /hg/release/icedtea7-forest-2.6/hotspot
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/hotspot?cmd=changeset;node=b0661240c3b0
author: andrew
date: Mon Feb 06 22:14:36 2017 +0000
Added tag icedtea-2.6.9pre01 for changeset 1d30f5a7723e
diffstat:
.hgtags | 1 +
src/cpu/aarch64/vm/interpreterRT_aarch64.cpp | 10 +-
src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp | 22 +-
src/cpu/x86/vm/jni_x86.h | 9 +-
src/os/bsd/vm/os_bsd.inline.hpp | 10 +-
src/os/linux/vm/os_linux.inline.hpp | 10 +-
src/os/posix/launcher/java_md.c | 7 +-
src/os/posix/launcher/java_md.h | 8 +-
src/os/solaris/vm/os_solaris.inline.hpp | 5 +-
src/os/windows/launcher/java_md.c | 7 +-
src/os/windows/launcher/java_md.h | 4 +-
src/os/windows/vm/os_windows.cpp | 6 +-
src/os/windows/vm/os_windows.inline.hpp | 3 -
src/share/tools/launcher/java.c | 4 +-
src/share/tools/launcher/java.h | 3 +-
src/share/vm/c1/c1_InstructionPrinter.cpp | 4 +-
src/share/vm/c1/c1_LIR.cpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp | 6 +-
src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp | 4 +-
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp | 6 +-
src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp | 8 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp | 2 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp | 6 +-
src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp | 6 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp | 4 +-
src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp | 4 +-
src/share/vm/gc_implementation/shared/ageTable.cpp | 12 +-
src/share/vm/gc_implementation/shared/ageTable.hpp | 4 +-
src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp | 2 +-
src/share/vm/memory/defNewGeneration.hpp | 4 +-
src/share/vm/memory/threadLocalAllocBuffer.hpp | 2 +-
src/share/vm/memory/universe.cpp | 2 +-
src/share/vm/oops/markOop.hpp | 8 +-
src/share/vm/oops/oop.hpp | 2 +-
src/share/vm/oops/oop.inline.hpp | 2 +-
src/share/vm/opto/idealGraphPrinter.cpp | 4 +-
src/share/vm/opto/type.cpp | 10 +-
src/share/vm/runtime/aprofiler.cpp | 4 +-
src/share/vm/runtime/arguments.cpp | 39 +++-
src/share/vm/runtime/biasedLocking.cpp | 2 +-
src/share/vm/runtime/globals.hpp | 22 +-
src/share/vm/runtime/os.hpp | 4 -
src/share/vm/runtime/perfData.cpp | 4 +-
src/share/vm/runtime/virtualspace.cpp | 4 +-
src/share/vm/runtime/vmStructs.cpp | 2 +-
src/share/vm/services/diagnosticArgument.cpp | 6 +-
src/share/vm/services/heapDumper.cpp | 4 +-
src/share/vm/services/lowMemoryDetector.cpp | 4 +-
src/share/vm/utilities/globalDefinitions.hpp | 8 +
src/share/vm/utilities/globalDefinitions_gcc.hpp | 6 +-
src/share/vm/utilities/ostream.cpp | 6 +-
src/share/vm/utilities/taskqueue.cpp | 6 +-
test/compiler/floatingpoint/TestFloatJNIArgs.java | 86 ++++++++
test/compiler/floatingpoint/TestFloatJNIArgs.sh | 104 ++++++++++
test/compiler/floatingpoint/libTestFloatJNIArgs.c | 68 ++++++
test/test_env.sh | 5 +
59 files changed, 452 insertions(+), 161 deletions(-)
diffs (truncated from 1559 to 500 lines):
diff -r ddd77fd53420 -r b0661240c3b0 .hgtags
--- a/.hgtags Mon Nov 14 06:34:40 2016 +0000
+++ b/.hgtags Mon Feb 06 22:14:36 2017 +0000
@@ -898,3 +898,4 @@
6b87ff3af68f636e473e2254c8e9a8c36ca514a6 icedtea-2.6.8pre01
17b40d99ea3665de2bfffe163b68f2dfcf675cba jdk7u121-b00
223f6c442d4987da3508893fb35e4419b33dc7f7 icedtea-2.6.8
+1d30f5a7723eeeb8092eed80d305fe6cdf530b1f icedtea-2.6.9pre01
diff -r ddd77fd53420 -r b0661240c3b0 src/cpu/aarch64/vm/interpreterRT_aarch64.cpp
--- a/src/cpu/aarch64/vm/interpreterRT_aarch64.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/cpu/aarch64/vm/interpreterRT_aarch64.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2013, Red Hat Inc.
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates.
* All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -131,8 +131,8 @@
if (_num_fp_args < Argument::n_float_register_parameters_c) {
__ ldrs(as_FloatRegister(_num_fp_args++), src);
} else {
- __ ldrh(r0, src);
- __ strh(r0, Address(to(), _stack_offset));
+ __ ldrw(r0, src);
+ __ strw(r0, Address(to(), _stack_offset));
_stack_offset += wordSize;
_num_fp_args++;
}
@@ -350,7 +350,7 @@
_num_fp_args++;
} else {
*_to++ = from_obj;
- _num_int_args++;
+ _num_fp_args++;
}
}
@@ -365,7 +365,7 @@
_num_fp_args++;
} else {
*_to++ = from_obj;
- _num_int_args++;
+ _num_fp_args++;
}
}
diff -r ddd77fd53420 -r b0661240c3b0 src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp
--- a/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -978,7 +978,16 @@
// A float arg may have to do float reg int reg conversion
static void float_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
- if (src.first() != dst.first()) {
+ assert(src.first()->is_stack() && dst.first()->is_stack() ||
+ src.first()->is_reg() && dst.first()->is_reg(), "Unexpected error");
+ if (src.first()->is_stack()) {
+ if (dst.first()->is_stack()) {
+ __ ldrw(rscratch1, Address(rfp, reg2offset_in(src.first())));
+ __ strw(rscratch1, Address(sp, reg2offset_out(dst.first())));
+ } else {
+ ShouldNotReachHere();
+ }
+ } else if (src.first() != dst.first()) {
if (src.is_single_phys_reg() && dst.is_single_phys_reg())
__ fmovs(dst.first()->as_FloatRegister(), src.first()->as_FloatRegister());
else
@@ -1012,7 +1021,16 @@
// A double move
static void double_move(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
- if (src.first() != dst.first()) {
+ assert(src.first()->is_stack() && dst.first()->is_stack() ||
+ src.first()->is_reg() && dst.first()->is_reg(), "Unexpected error");
+ if (src.first()->is_stack()) {
+ if (dst.first()->is_stack()) {
+ __ ldr(rscratch1, Address(rfp, reg2offset_in(src.first())));
+ __ str(rscratch1, Address(sp, reg2offset_out(dst.first())));
+ } else {
+ ShouldNotReachHere();
+ }
+ } else if (src.first() != dst.first()) {
if (src.is_single_phys_reg() && dst.is_single_phys_reg())
__ fmovd(dst.first()->as_FloatRegister(), src.first()->as_FloatRegister());
else
diff -r ddd77fd53420 -r b0661240c3b0 src/cpu/x86/vm/jni_x86.h
--- a/src/cpu/x86/vm/jni_x86.h Mon Nov 14 06:34:40 2016 +0000
+++ b/src/cpu/x86/vm/jni_x86.h Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,14 +38,9 @@
#define JNICALL
typedef int jint;
-#if defined(_LP64) && !defined(__APPLE__)
+#if defined(_LP64)
typedef long jlong;
#else
- /*
- * On _LP64 __APPLE__ "long" and "long long" are both 64 bits,
- * but we use the "long long" typedef to avoid complaints from
- * the __APPLE__ compiler about fprintf formats.
- */
typedef long long jlong;
#endif
diff -r ddd77fd53420 -r b0661240c3b0 src/os/bsd/vm/os_bsd.inline.hpp
--- a/src/os/bsd/vm/os_bsd.inline.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/bsd/vm/os_bsd.inline.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,14 +59,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r ddd77fd53420 -r b0661240c3b0 src/os/linux/vm/os_linux.inline.hpp
--- a/src/os/linux/vm/os_linux.inline.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/linux/vm/os_linux.inline.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,14 +74,6 @@
return ":";
}
-inline const char* os::jlong_format_specifier() {
- return "%lld";
-}
-
-inline const char* os::julong_format_specifier() {
- return "%llu";
-}
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r ddd77fd53420 -r b0661240c3b0 src/os/posix/launcher/java_md.c
--- a/src/os/posix/launcher/java_md.c Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/posix/launcher/java_md.c Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1887,11 +1887,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%lld";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
diff -r ddd77fd53420 -r b0661240c3b0 src/os/posix/launcher/java_md.h
--- a/src/os/posix/launcher/java_md.h Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/posix/launcher/java_md.h Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,12 @@
#define Counter2Micros(counts) (1)
#endif /* HAVE_GETHRTIME */
+#ifdef _LP64
+#define JLONG_FORMAT "%ld"
+#else
+#define JLONG_FORMAT "%lld"
+#endif
+
/*
* Function prototypes.
*/
diff -r ddd77fd53420 -r b0661240c3b0 src/os/solaris/vm/os_solaris.inline.hpp
--- a/src/os/solaris/vm/os_solaris.inline.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/solaris/vm/os_solaris.inline.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,9 +50,6 @@
inline const char* os::line_separator() { return "\n"; }
inline const char* os::path_separator() { return ":"; }
-inline const char* os::jlong_format_specifier() { return "%lld"; }
-inline const char* os::julong_format_specifier() { return "%llu"; }
-
// File names are case-sensitive on windows only
inline int os::file_name_strcmp(const char* s1, const char* s2) {
return strcmp(s1, s2);
diff -r ddd77fd53420 -r b0661240c3b0 src/os/windows/launcher/java_md.c
--- a/src/os/windows/launcher/java_md.c Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/windows/launcher/java_md.c Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1323,11 +1323,6 @@
}
}
-const char *
-jlong_format_specifier() {
- return "%I64d";
-}
-
/*
* Block current thread and continue execution in a new thread
*/
diff -r ddd77fd53420 -r b0661240c3b0 src/os/windows/launcher/java_md.h
--- a/src/os/windows/launcher/java_md.h Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/windows/launcher/java_md.h Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,8 @@
extern int _main(int argc, char **argv);
#endif
+#define JLONG_FORMAT "%I64d"
+
/*
* Function prototypes.
*/
diff -r ddd77fd53420 -r b0661240c3b0 src/os/windows/vm/os_windows.cpp
--- a/src/os/windows/vm/os_windows.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/windows/vm/os_windows.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -3051,7 +3051,7 @@
}
if( Verbose && PrintMiscellaneous ) {
reserveTimer.stop();
- tty->print_cr("reserve_memory of %Ix bytes took %ld ms (%ld ticks)", bytes,
+ tty->print_cr("reserve_memory of %Ix bytes took " JLONG_FORMAT " ms (" JLONG_FORMAT " ticks)", bytes,
reserveTimer.milliseconds(), reserveTimer.ticks());
}
}
@@ -4484,7 +4484,7 @@
if (hFile == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFile() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFile() failed: GetLastError->%ld.", err);
}
return NULL;
}
@@ -4534,7 +4534,7 @@
if (hMap == NULL) {
if (PrintMiscellaneous && Verbose) {
DWORD err = GetLastError();
- tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.");
+ tty->print_cr("CreateFileMapping() failed: GetLastError->%ld.", err);
}
CloseHandle(hFile);
return NULL;
diff -r ddd77fd53420 -r b0661240c3b0 src/os/windows/vm/os_windows.inline.hpp
--- a/src/os/windows/vm/os_windows.inline.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/os/windows/vm/os_windows.inline.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -37,9 +37,6 @@
inline const char* os::path_separator() { return ";"; }
inline const char* os::dll_file_extension() { return ".dll"; }
-inline const char* os::jlong_format_specifier() { return "%I64d"; }
-inline const char* os::julong_format_specifier() { return "%I64u"; }
-
inline const int os::default_file_open_flags() { return O_BINARY | O_NOINHERIT;}
// File names are case-insensitive on windows only
diff -r ddd77fd53420 -r b0661240c3b0 src/share/tools/launcher/java.c
--- a/src/share/tools/launcher/java.c Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/tools/launcher/java.c Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -808,7 +808,7 @@
static int
parse_stack_size(const char *s, jlong *result) {
jlong n = 0;
- int args_read = sscanf(s, jlong_format_specifier(), &n);
+ int args_read = sscanf(s, JLONG_FORMAT, &n);
if (args_read != 1) {
return 0;
}
diff -r ddd77fd53420 -r b0661240c3b0 src/share/tools/launcher/java.h
--- a/src/share/tools/launcher/java.h Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/tools/launcher/java.h Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -86,7 +86,6 @@
jboolean RemovableMachineDependentOption(char * option);
void PrintMachineDependentOptions();
-const char *jlong_format_specifier();
/*
* Block current thread and continue execution in new thread
*/
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/c1/c1_InstructionPrinter.cpp
--- a/src/share/vm/c1/c1_InstructionPrinter.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/c1/c1_InstructionPrinter.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -360,7 +360,7 @@
ValueType* t = x->type();
switch (t->tag()) {
case intTag : output()->print("%d" , t->as_IntConstant ()->value()); break;
- case longTag : output()->print(os::jlong_format_specifier(), t->as_LongConstant()->value()); output()->print("L"); break;
+ case longTag : output()->print(JLONG_FORMAT, t->as_LongConstant()->value()); output()->print("L"); break;
case floatTag : output()->print("%g" , t->as_FloatConstant ()->value()); break;
case doubleTag : output()->print("%gD" , t->as_DoubleConstant()->value()); break;
case objectTag : print_object(x); break;
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/c1/c1_LIR.cpp
--- a/src/share/vm/c1/c1_LIR.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/c1/c1_LIR.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1581,7 +1581,7 @@
switch (type()) {
case T_ADDRESS:out->print("address:%d",as_jint()); break;
case T_INT: out->print("int:%d", as_jint()); break;
- case T_LONG: out->print("lng:%lld", as_jlong()); break;
+ case T_LONG: out->print("lng:" JLONG_FORMAT, as_jlong()); break;
case T_FLOAT: out->print("flt:%f", as_jfloat()); break;
case T_DOUBLE: out->print("dbl:%f", as_jdouble()); break;
case T_OBJECT: out->print("obj:0x%x", as_jobject()); break;
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1198,9 +1198,9 @@
set_promo_size(desired_promo_size);
}
-int CMSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
+uint CMSAdaptiveSizePolicy::compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
- int tenuring_threshold,
+ uint tenuring_threshold,
size_t survivor_limit) {
assert(survivor_limit >= generation_alignment(),
"survivor_limit too small");
@@ -1318,7 +1318,7 @@
gclog_or_tty->print( " avg_promoted_padded_avg: %f"
" avg_pretenured_padded_avg: %f"
- " tenuring_thresh: %d"
+ " tenuring_thresh: %u"
" target_size: " SIZE_FORMAT
" survivor_limit: " SIZE_FORMAT,
gch->gc_stats(1)->avg_promoted()->padded_average(),
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -440,9 +440,9 @@
size_t max_eden_size);
// Calculates new survivor space size; returns a new tenuring threshold
// value. Stores new survivor size in _survivor_size.
- virtual int compute_survivor_space_size_and_threshold(
+ virtual uint compute_survivor_space_size_and_threshold(
bool is_survivor_overflow,
- int tenuring_threshold,
+ uint tenuring_threshold,
size_t survivor_limit);
virtual void compute_tenured_generation_free_space(size_t cur_tenured_free,
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -556,7 +556,7 @@
reportIndexedFreeListStatistics();
size_t total_size = totalSizeInIndexedFreeLists() +
_dictionary->total_chunk_size(DEBUG_ONLY(freelistLock()));
- gclog_or_tty->print(" free=%ld frag=%1.4f\n", total_size, flsFrag());
+ gclog_or_tty->print(" free=" SIZE_FORMAT " frag=%1.4f\n", total_size, flsFrag());
}
}
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
--- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp Mon Feb 06 22:14:36 2017 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -3483,7 +3483,7 @@
if (Verbose && PrintGC) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size - bytes;
- gclog_or_tty->print_cr("Expanding %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Expanding %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
@@ -9538,7 +9538,7 @@
if (Verbose && PrintGCDetails) {
size_t new_mem_size = _virtual_space.committed_size();
size_t old_mem_size = new_mem_size + bytes;
- gclog_or_tty->print_cr("Shrinking %s from %ldK by %ldK to %ldK",
+ gclog_or_tty->print_cr("Shrinking %s from " SIZE_FORMAT "K by " SIZE_FORMAT "K to " SIZE_FORMAT "K",
name(), old_mem_size/K, bytes/K, new_mem_size/K);
}
}
diff -r ddd77fd53420 -r b0661240c3b0 src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Mon Nov 14 06:34:40 2016 +0000
+++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Mon Feb 06 22:14:36 2017 +0000
@@ -854,8 +854,8 @@
//
// Current tenuring threshold, set to 0 if the collector reaches the
- // maximum amount of suvivors regions.
- int _tenuring_threshold;
+ // maximum amount of survivors regions.
+ uint _tenuring_threshold;
// The limit on the number of regions allocated for survivors.
uint _max_survivor_regions;
@@ -872,7 +872,7 @@
size_t _eden_capacity_bytes_before_gc; // Eden capacity before GC
size_t _heap_capacity_bytes_before_gc; // Heap capacity before GC
- // The amount of survor regions after a collection.
+ // The amount of survivor regions after a collection.
uint _recorded_survivor_regions;
// List of survivor regions.
HeapRegion* _recorded_survivor_head;
@@ -884,7 +884,7 @@
uint tenuring_threshold() const { return _tenuring_threshold; }
inline GCAllocPurpose
More information about the distro-pkg-dev
mailing list