--- a/.hgtags Thu Sep 12 07:57:00 2019 +0200
+++ b/.hgtags Thu Sep 12 15:04:00 2019 +0200
@@ -585,3 +585,4 @@
bf4c808a4488025a415f867e54c8b088417e08a0 jdk-14+11
8570f22b9b6ac6bec673899b582150865696e425 jdk-14+12
fbbe6672ae15deaf350a9e935290a36f57ba9c25 jdk-14+13
+cddef3bde924f3ff4f17f3d369280cf69d0450e5 jdk-14+14
--- a/make/RunTests.gmk Thu Sep 12 07:57:00 2019 +0200
+++ b/make/RunTests.gmk Thu Sep 12 15:04:00 2019 +0200
@@ -98,13 +98,15 @@
JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler
JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar
+JTREG_FAILURE_HANDLER_TIMEOUT ?= 0
+
ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), )
JTREG_FAILURE_HANDLER_OPTIONS := \
-timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \
-observerDir:$(JTREG_FAILURE_HANDLER) \
-timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \
-observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \
- -timeoutHandlerTimeout:0
+ -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT)
endif
GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \
@@ -276,10 +278,11 @@
$(eval $(call SetTestOpt,JOBS,JTREG))
$(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
+$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
$(eval $(call ParseKeywordVariable, JTREG, \
- SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \
- MAX_MEM RUN_PROBLEM_LISTS, \
+ SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
+ TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \
STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
EXTRA_PROBLEM_LISTS AOT_MODULES, \
))
--- a/make/data/charsetmapping/charsets Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/charsetmapping/charsets Thu Sep 12 15:04:00 2019 +0200
@@ -592,9 +592,6 @@
alias ms936 # JDK historical
alias ms_936 // IANA aliases
-# The definition of this charset may be overridden by the init method,
-# below, if the sun.nio.cs.map property is defined.
-#
charset Shift_JIS SJIS
package sun.nio.cs.ext
type dbcs
@@ -609,8 +606,6 @@
alias x-sjis
alias csShiftJIS
-# The definition of this charset may be overridden by the init method,
-# below, if the sun.nio.cs.map property is defined.
charset windows-31j MS932
package sun.nio.cs.ext
type dbcs
--- a/make/data/charsetmapping/stdcs-linux Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/charsetmapping/stdcs-linux Thu Sep 12 15:04:00 2019 +0200
@@ -25,4 +25,4 @@
JIS_X_0208_Solaris
JIS_X_0212_Solaris
MS932
-SJIS # SJIS must go together with MS932 to support sun.nio.cs.map
+SJIS
--- a/make/data/charsetmapping/stdcs-windows Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/charsetmapping/stdcs-windows Thu Sep 12 15:04:00 2019 +0200
@@ -8,8 +8,8 @@
MS1258
MS874
MS932
-JIS_X_0201 # JIS_X_0201 is used by MS932 in its contains() method
-SJIS # SJIS must go together with MS932 to support sun.nio.cs.map
+JIS_X_0201
+SJIS
MS936
MS949
MS950
--- a/make/data/symbols/java.base-D.sym.txt Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/symbols/java.base-D.sym.txt Thu Sep 12 15:04:00 2019 +0200
@@ -90,6 +90,10 @@
innerclass innerClass java/lang/ProcessHandle$Info outerClass java/lang/ProcessHandle innerClassName Info flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+class name java/lang/Runtime
+-method name traceInstructions descriptor (Z)V
+-method name traceMethodCalls descriptor (Z)V
+
class name java/lang/StrictMath
-method name max descriptor (FF)F
-method name max descriptor (DD)D
@@ -104,6 +108,9 @@
header extends java/lang/Object implements java/io/Serializable,java/lang/Comparable,java/lang/CharSequence,java/lang/constant/Constable,java/lang/constant/ConstantDesc flags 31 signature Ljava/lang/Object;Ljava/io/Serializable;Ljava/lang/Comparable<Ljava/lang/String;>;Ljava/lang/CharSequence;Ljava/lang/constant/Constable;Ljava/lang/constant/ConstantDesc;
innerclass innerClass java/util/Spliterator$OfInt outerClass java/util/Spliterator innerClassName OfInt flags 609
innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
+method name stripIndent descriptor ()Ljava/lang/String; flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+method name translateEscapes descriptor ()Ljava/lang/String; flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+method name formatted descriptor ([Ljava/lang/Object;)Ljava/lang/String; flags 81 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
class name java/lang/System
header extends java/lang/Object nestMembers java/lang/System$LoggerFinder,java/lang/System$Logger,java/lang/System$Logger$Level flags 31
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/symbols/java.security.jgss-D.sym.txt Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,31 @@
+#
+# Copyright (c) 2019, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name javax/security/auth/kerberos/KerberosPrincipal
+field name KRB_NT_ENTERPRISE descriptor I constantValue 10 flags 19
+
--- a/make/data/symbols/jdk.compiler-D.sym.txt Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/symbols/jdk.compiler-D.sym.txt Thu Sep 12 15:04:00 2019 +0200
@@ -26,6 +26,19 @@
# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
# ##########################################################
#
+class name com/sun/source/tree/BreakTree
+-method name getValue descriptor ()Lcom/sun/source/tree/ExpressionTree;
+
+class name com/sun/source/tree/Tree$Kind
+field name YIELD descriptor Lcom/sun/source/tree/Tree$Kind; flags 4019 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+
+class name com/sun/source/tree/TreeVisitor
+method name visitYield descriptor (Lcom/sun/source/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 401 deprecated true signature (Lcom/sun/source/tree/YieldTree;TP;)TR; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+
+class name com/sun/source/tree/YieldTree
+header extends java/lang/Object implements com/sun/source/tree/StatementTree flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+method name getValue descriptor ()Lcom/sun/source/tree/ExpressionTree; flags 401
+
class name com/sun/source/util/JavacTask
method name setParameterNameProvider descriptor (Lcom/sun/source/util/ParameterNameProvider;)V flags 1
@@ -33,3 +46,9 @@
header extends java/lang/Object flags 601
method name getParameterName descriptor (Ljavax/lang/model/element/VariableElement;)Ljava/lang/CharSequence; flags 401
+class name com/sun/source/util/SimpleTreeVisitor
+method name visitYield descriptor (Lcom/sun/source/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 deprecated true signature (Lcom/sun/source/tree/YieldTree;TP;)TR; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+
+class name com/sun/source/util/TreeScanner
+method name visitYield descriptor (Lcom/sun/source/tree/YieldTree;Ljava/lang/Object;)Ljava/lang/Object; flags 1 deprecated true signature (Lcom/sun/source/tree/YieldTree;TP;)TR; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="13")
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/symbols/jdk.jartool-D.sym.txt Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,40 @@
+#
+# Copyright (c) 2019, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+# ##########################################################
+# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
+# ##########################################################
+#
+class name jdk/security/jarsigner/JarSigner
+header extends java/lang/Object nestMembers jdk/security/jarsigner/JarSigner$Builder flags 31
+innerclass innerClass jdk/security/jarsigner/JarSigner$Builder outerClass jdk/security/jarsigner/JarSigner innerClassName Builder flags 9
+innerclass innerClass java/util/jar/Attributes$Name outerClass java/util/jar/Attributes innerClassName Name flags 9
+innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
+innerclass innerClass java/util/Base64$Encoder outerClass java/util/Base64 innerClassName Encoder flags 9
+
+class name jdk/security/jarsigner/JarSigner$Builder
+header extends java/lang/Object nestHost jdk/security/jarsigner/JarSigner flags 21
+innerclass innerClass jdk/security/jarsigner/JarSigner$Builder outerClass jdk/security/jarsigner/JarSigner innerClassName Builder flags 9
+innerclass innerClass java/security/KeyStore$PrivateKeyEntry outerClass java/security/KeyStore innerClassName PrivateKeyEntry flags 19
+
--- a/make/data/symbols/symbols Thu Sep 12 07:57:00 2019 +0200
+++ b/make/data/symbols/symbols Thu Sep 12 15:04:00 2019 +0200
@@ -36,4 +36,4 @@
platform version A base 9 files java.activation-A.sym.txt:java.base-A.sym.txt:java.compiler-A.sym.txt:java.corba-A.sym.txt:java.datatransfer-A.sym.txt:java.desktop-A.sym.txt:java.instrument-A.sym.txt:java.logging-A.sym.txt:java.management-A.sym.txt:java.management.rmi-A.sym.txt:java.naming-A.sym.txt:java.prefs-A.sym.txt:java.rmi-A.sym.txt:java.scripting-A.sym.txt:java.se-A.sym.txt:java.se.ee-A.sym.txt:java.security.jgss-A.sym.txt:java.security.sasl-A.sym.txt:java.smartcardio-A.sym.txt:java.sql-A.sym.txt:java.sql.rowset-A.sym.txt:java.transaction-A.sym.txt:java.xml-A.sym.txt:java.xml.bind-A.sym.txt:java.xml.crypto-A.sym.txt:java.xml.ws-A.sym.txt:java.xml.ws.annotation-A.sym.txt:jdk.accessibility-A.sym.txt:jdk.attach-A.sym.txt:jdk.charsets-A.sym.txt:jdk.compiler-A.sym.txt:jdk.crypto.cryptoki-A.sym.txt:jdk.crypto.ec-A.sym.txt:jdk.dynalink-A.sym.txt:jdk.editpad-A.sym.txt:jdk.hotspot.agent-A.sym.txt:jdk.httpserver-A.sym.txt:jdk.incubator.httpclient-A.sym.txt:jdk.jartool-A.sym.txt:jdk.javadoc-A.sym.txt:jdk.jcmd-A.sym.txt:jdk.jconsole-A.sym.txt:jdk.jdeps-A.sym.txt:jdk.jdi-A.sym.txt:jdk.jdwp.agent-A.sym.txt:jdk.jlink-A.sym.txt:jdk.jshell-A.sym.txt:jdk.jsobject-A.sym.txt:jdk.jstatd-A.sym.txt:jdk.localedata-A.sym.txt:jdk.management-A.sym.txt:jdk.management.agent-A.sym.txt:jdk.naming.dns-A.sym.txt:jdk.naming.rmi-A.sym.txt:jdk.net-A.sym.txt:jdk.pack-A.sym.txt:jdk.policytool-A.sym.txt:jdk.rmic-A.sym.txt:jdk.scripting.nashorn-A.sym.txt:jdk.sctp-A.sym.txt:jdk.security.auth-A.sym.txt:jdk.security.jgss-A.sym.txt:jdk.unsupported-A.sym.txt:jdk.xml.dom-A.sym.txt:jdk.zipfs-A.sym.txt
platform version B base A files java.activation-B.sym.txt:java.base-B.sym.txt:java.compiler-B.sym.txt:java.corba-B.sym.txt:java.datatransfer-B.sym.txt:java.desktop-B.sym.txt:java.instrument-B.sym.txt:java.logging-B.sym.txt:java.management-B.sym.txt:java.management.rmi-B.sym.txt:java.naming-B.sym.txt:java.net.http-B.sym.txt:java.prefs-B.sym.txt:java.rmi-B.sym.txt:java.scripting-B.sym.txt:java.se-B.sym.txt:java.se.ee-B.sym.txt:java.security.jgss-B.sym.txt:java.security.sasl-B.sym.txt:java.smartcardio-B.sym.txt:java.sql-B.sym.txt:java.sql.rowset-B.sym.txt:java.transaction-B.sym.txt:java.transaction.xa-B.sym.txt:java.xml-B.sym.txt:java.xml.bind-B.sym.txt:java.xml.crypto-B.sym.txt:java.xml.ws-B.sym.txt:java.xml.ws.annotation-B.sym.txt:jdk.accessibility-B.sym.txt:jdk.attach-B.sym.txt:jdk.charsets-B.sym.txt:jdk.compiler-B.sym.txt:jdk.crypto.cryptoki-B.sym.txt:jdk.crypto.ec-B.sym.txt:jdk.dynalink-B.sym.txt:jdk.editpad-B.sym.txt:jdk.hotspot.agent-B.sym.txt:jdk.httpserver-B.sym.txt:jdk.incubator.httpclient-B.sym.txt:jdk.jartool-B.sym.txt:jdk.javadoc-B.sym.txt:jdk.jcmd-B.sym.txt:jdk.jconsole-B.sym.txt:jdk.jdeps-B.sym.txt:jdk.jdi-B.sym.txt:jdk.jdwp.agent-B.sym.txt:jdk.jfr-B.sym.txt:jdk.jlink-B.sym.txt:jdk.jshell-B.sym.txt:jdk.jsobject-B.sym.txt:jdk.jstatd-B.sym.txt:jdk.localedata-B.sym.txt:jdk.management-B.sym.txt:jdk.management.agent-B.sym.txt:jdk.management.jfr-B.sym.txt:jdk.naming.dns-B.sym.txt:jdk.naming.rmi-B.sym.txt:jdk.net-B.sym.txt:jdk.pack-B.sym.txt:jdk.rmic-B.sym.txt:jdk.scripting.nashorn-B.sym.txt:jdk.sctp-B.sym.txt:jdk.security.auth-B.sym.txt:jdk.security.jgss-B.sym.txt:jdk.unsupported-B.sym.txt:jdk.xml.dom-B.sym.txt:jdk.zipfs-B.sym.txt
platform version C base B files java.base-C.sym.txt:java.compiler-C.sym.txt:java.desktop-C.sym.txt:java.naming-C.sym.txt:java.rmi-C.sym.txt:java.xml-C.sym.txt:jdk.compiler-C.sym.txt:jdk.jfr-C.sym.txt:jdk.jsobject-C.sym.txt:jdk.unsupported-C.sym.txt
-platform version D base C files java.base-D.sym.txt:java.compiler-D.sym.txt:java.desktop-D.sym.txt:java.management-D.sym.txt:java.management.rmi-D.sym.txt:java.net.http-D.sym.txt:java.xml-D.sym.txt:java.xml.crypto-D.sym.txt:jdk.compiler-D.sym.txt:jdk.httpserver-D.sym.txt:jdk.javadoc-D.sym.txt:jdk.jlink-D.sym.txt:jdk.jshell-D.sym.txt
+platform version D base C files java.base-D.sym.txt:java.compiler-D.sym.txt:java.desktop-D.sym.txt:java.management-D.sym.txt:java.management.rmi-D.sym.txt:java.net.http-D.sym.txt:java.security.jgss-D.sym.txt:java.xml-D.sym.txt:java.xml.crypto-D.sym.txt:jdk.compiler-D.sym.txt:jdk.httpserver-D.sym.txt:jdk.jartool-D.sym.txt:jdk.javadoc-D.sym.txt:jdk.jlink-D.sym.txt:jdk.jshell-D.sym.txt
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -2557,13 +2557,8 @@
tty->print_cr("r31 = 0x%016lx", regs[31]);
BREAKPOINT;
}
- ThreadStateTransition::transition(thread, _thread_in_vm, saved_state);
- } else {
- ttyLocker ttyl;
- ::tty->print_cr("=============== DEBUG MESSAGE: %s ================\n",
- msg);
- assert(false, "DEBUG MESSAGE: %s", msg);
}
+ fatal("DEBUG MESSAGE: %s", msg);
}
void MacroAssembler::push_call_clobbered_registers() {
--- a/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -598,6 +598,7 @@
BLOCK_COMMENT("call MacroAssembler::debug");
__ mov(rscratch1, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
__ blr(rscratch1);
+ __ hlt(0);
return start;
}
--- a/src/hotspot/cpu/x86/macroAssembler_x86.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/x86/macroAssembler_x86.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -427,13 +427,8 @@
print_state32(rdi, rsi, rbp, rsp, rbx, rdx, rcx, rax, eip);
BREAKPOINT;
}
- } else {
- ttyLocker ttyl;
- ::tty->print_cr("=============== DEBUG MESSAGE: %s ================\n", msg);
- }
- // Don't assert holding the ttyLock
- assert(false, "DEBUG MESSAGE: %s", msg);
- ThreadStateTransition::transition(thread, _thread_in_vm, saved_state);
+ }
+ fatal("DEBUG MESSAGE: %s", msg);
}
void MacroAssembler::print_state32(int rdi, int rsi, int rbp, int rsp, int rbx, int rdx, int rcx, int rax, int eip) {
@@ -892,15 +887,9 @@
if (os::message_box(msg, "Execution stopped, print registers?")) {
print_state64(pc, regs);
BREAKPOINT;
- assert(false, "start up GDB");
}
- ThreadStateTransition::transition(thread, _thread_in_vm, saved_state);
- } else {
- ttyLocker ttyl;
- ::tty->print_cr("=============== DEBUG MESSAGE: %s ================\n",
- msg);
- assert(false, "DEBUG MESSAGE: %s", msg);
- }
+ }
+ fatal("DEBUG MESSAGE: %s", msg);
}
void MacroAssembler::print_state64(int64_t pc, int64_t regs[]) {
--- a/src/hotspot/cpu/x86/rdtsc_x86.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/x86/rdtsc_x86.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -62,7 +62,7 @@
fstart = os::rdtsc();
// use sleep to prevent compiler from optimizing
- os::sleep(JavaThread::current(), FT_SLEEP_MILLISECS);
+ JavaThread::current()->sleep(FT_SLEEP_MILLISECS);
end = os::elapsed_counter();
OrderAccess::fence();
--- a/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_32.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -710,8 +710,7 @@
__ pusha(); // push registers (eip = return address & msg are already pushed)
BLOCK_COMMENT("call MacroAssembler::debug");
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug32)));
- __ popa();
- __ ret(3 * wordSize); // pop arguments
+ __ hlt();
return start;
}
--- a/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/cpu/x86/stubGenerator_x86_64.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1129,10 +1129,7 @@
__ andptr(rsp, -16); // align stack as required by ABI
BLOCK_COMMENT("call MacroAssembler::debug");
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64)));
- __ mov(rsp, r12); // restore rsp
- __ popa(); // pop registers (includes r12)
- __ ret(4 * wordSize); // pop caller saved stuff
-
+ __ hlt();
return start;
}
--- a/src/hotspot/os/aix/os_aix.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/aix/os_aix.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -554,7 +554,7 @@
const size_t bufsize =
MAX2((size_t)MAXPATHLEN, // For dll_dir & friends.
(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR)); // extensions dir
- char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
// sysclasspath, java_home, dll_dir
{
@@ -596,7 +596,7 @@
// Concatenate user and invariant part of ld_library_path.
// That's +1 for the colon and +1 for the trailing '\0'.
- char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char, strlen(v) + 1 + sizeof(DEFAULT_LIBPATH) + 1, mtInternal);
+ char *ld_library_path = NEW_C_HEAP_ARRAY(char, strlen(v) + 1 + sizeof(DEFAULT_LIBPATH) + 1, mtInternal);
sprintf(ld_library_path, "%s%s" DEFAULT_LIBPATH, v, v_colon);
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path);
--- a/src/hotspot/os/aix/os_perf_aix.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/aix/os_perf_aix.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -443,12 +443,12 @@
}
bool CPUPerformanceInterface::CPUPerformance::initialize() {
- size_t tick_array_size = (_counters.nProcs +1) * sizeof(CPUPerfTicks);
- _counters.cpus = (CPUPerfTicks*)NEW_C_HEAP_ARRAY(char, tick_array_size, mtInternal);
+ size_t array_entry_count = _counters.nProcs + 1;
+ _counters.cpus = NEW_C_HEAP_ARRAY(CPUPerfTicks, array_entry_count, mtInternal);
if (NULL == _counters.cpus) {
return false;
}
- memset(_counters.cpus, 0, tick_array_size);
+ memset(_counters.cpus, 0, array_entry_count * sizeof(*_counters.cpus));
// For the CPU load total
get_total_ticks(-1, &_counters.cpus[_counters.nProcs]);
--- a/src/hotspot/os/aix/perfMemory_aix.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/aix/perfMemory_aix.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2018 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -685,7 +685,7 @@
if (statbuf.st_ctime > oldest_ctime) {
char* user = strchr(dentry->d_name, '_') + 1;
- if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
+ FREE_C_HEAP_ARRAY(char, oldest_user);
oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
strcpy(oldest_user, user);
--- a/src/hotspot/os/bsd/os_bsd.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/bsd/os_bsd.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -337,7 +337,7 @@
const size_t bufsize =
MAX2((size_t)MAXPATHLEN, // For dll_dir & friends.
(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
- char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
// sysclasspath, java_home, dll_dir
{
@@ -387,10 +387,10 @@
const char *v_colon = ":";
if (v == NULL) { v = ""; v_colon = ""; }
// That's +1 for the colon and +1 for the trailing '\0'.
- char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
- strlen(v) + 1 +
- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
- mtInternal);
+ char *ld_library_path = NEW_C_HEAP_ARRAY(char,
+ strlen(v) + 1 +
+ sizeof(SYS_EXT_DIR) + sizeof("/lib/") + strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH) + 1,
+ mtInternal);
sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib/%s:" DEFAULT_LIBPATH, v, v_colon, cpu_arch);
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path);
@@ -418,7 +418,7 @@
const size_t bufsize =
MAX2((size_t)MAXPATHLEN, // for dll_dir & friends.
(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + system_ext_size); // extensions dir
- char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
// sysclasspath, java_home, dll_dir
{
@@ -480,10 +480,10 @@
// could cause a change in behavior, but Apple's Java6 behavior
// can be achieved by putting "." at the beginning of the
// JAVA_LIBRARY_PATH environment variable.
- char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
- strlen(v) + 1 + strlen(l) + 1 +
- system_ext_size + 3,
- mtInternal);
+ char *ld_library_path = NEW_C_HEAP_ARRAY(char,
+ strlen(v) + 1 + strlen(l) + 1 +
+ system_ext_size + 3,
+ mtInternal);
sprintf(ld_library_path, "%s%s%s%s%s" SYS_EXTENSIONS_DIR ":" SYS_EXTENSIONS_DIRS ":.",
v, v_colon, l, l_colon, user_home_dir);
Arguments::set_library_path(ld_library_path);
--- a/src/hotspot/os/bsd/perfMemory_bsd.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/bsd/perfMemory_bsd.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -591,7 +591,7 @@
if (statbuf.st_ctime > oldest_ctime) {
char* user = strchr(dentry->d_name, '_') + 1;
- if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
+ FREE_C_HEAP_ARRAY(char, oldest_user);
oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
strcpy(oldest_user, user);
--- a/src/hotspot/os/linux/osContainer_linux.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/linux/osContainer_linux.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -62,7 +62,6 @@
};
inline bool OSContainer::is_containerized() {
- assert(_is_initialized, "OSContainer not initialized");
return _is_containerized;
}
--- a/src/hotspot/os/linux/os_linux.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/linux/os_linux.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -428,7 +428,7 @@
const size_t bufsize =
MAX2((size_t)MAXPATHLEN, // For dll_dir & friends.
(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
- char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
// sysclasspath, java_home, dll_dir
{
@@ -477,10 +477,10 @@
const char *v_colon = ":";
if (v == NULL) { v = ""; v_colon = ""; }
// That's +1 for the colon and +1 for the trailing '\0'.
- char *ld_library_path = (char *)NEW_C_HEAP_ARRAY(char,
- strlen(v) + 1 +
- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
- mtInternal);
+ char *ld_library_path = NEW_C_HEAP_ARRAY(char,
+ strlen(v) + 1 +
+ sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1,
+ mtInternal);
sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon);
Arguments::set_library_path(ld_library_path);
FREE_C_HEAP_ARRAY(char, ld_library_path);
--- a/src/hotspot/os/linux/os_perf_linux.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/linux/os_perf_linux.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -503,12 +503,12 @@
}
bool CPUPerformanceInterface::CPUPerformance::initialize() {
- size_t tick_array_size = (_counters.nProcs +1) * sizeof(os::Linux::CPUPerfTicks);
- _counters.cpus = (os::Linux::CPUPerfTicks*)NEW_C_HEAP_ARRAY(char, tick_array_size, mtInternal);
+ size_t array_entry_count = _counters.nProcs + 1;
+ _counters.cpus = NEW_C_HEAP_ARRAY(os::Linux::CPUPerfTicks, array_entry_count, mtInternal);
if (NULL == _counters.cpus) {
return false;
}
- memset(_counters.cpus, 0, tick_array_size);
+ memset(_counters.cpus, 0, array_entry_count * sizeof(*_counters.cpus));
// For the CPU load total
os::Linux::get_tick_information(&_counters.cpus[_counters.nProcs], -1);
--- a/src/hotspot/os/linux/perfMemory_linux.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/linux/perfMemory_linux.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -629,7 +629,7 @@
if (statbuf.st_ctime > oldest_ctime) {
char* user = strchr(dentry->d_name, '_') + 1;
- if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
+ FREE_C_HEAP_ARRAY(char, oldest_user);
oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
strcpy(oldest_user, user);
--- a/src/hotspot/os/posix/os_posix.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/posix/os_posix.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -645,7 +645,8 @@
void os::interrupt(Thread* thread) {
debug_only(Thread::check_for_dangling_thread_pointer(thread);)
-
+ assert(thread->is_Java_thread(), "invariant");
+ JavaThread* jt = (JavaThread*) thread;
OSThread* osthread = thread->osthread();
if (!osthread->interrupted()) {
@@ -654,13 +655,12 @@
// resulting in multiple notifications. We do, however, want the store
// to interrupted() to be visible to other threads before we execute unpark().
OrderAccess::fence();
- ParkEvent * const slp = thread->_SleepEvent ;
+ ParkEvent * const slp = jt->_SleepEvent ;
if (slp != NULL) slp->unpark() ;
}
// For JSR166. Unpark even if interrupt status already was set
- if (thread->is_Java_thread())
- ((JavaThread*)thread)->parker()->unpark();
+ jt->parker()->unpark();
ParkEvent * ev = thread->_ParkEvent ;
if (ev != NULL) ev->unpark() ;
@@ -682,7 +682,7 @@
// is allowed and not harmful, and the possibility is so rare that
// it is not worth the added complexity to add yet another lock.
// For the sleep event an explicit reset is performed on entry
- // to os::sleep, so there is no early return. It has also been
+ // to JavaThread::sleep, so there is no early return. It has also been
// recommended not to put the interrupted flag into the "event"
// structure because it hides the issue.
if (interrupted && clear_interrupted) {
@@ -2049,7 +2049,7 @@
// shake out uses of park() and unpark() without checking state conditions
// properly. This spurious return doesn't manifest itself in any user code
// but only in the correctly written condition checking loops of ObjectMonitor,
- // Mutex/Monitor, Thread::muxAcquire and os::sleep
+ // Mutex/Monitor, Thread::muxAcquire and JavaThread::sleep
if (Atomic::xchg(1, &_event) >= 0) return;
--- a/src/hotspot/os/solaris/os_perf_solaris.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/solaris/os_perf_solaris.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -300,12 +300,12 @@
}
// Data structure(s) for saving CPU load (one per CPU)
- size_t tick_array_size = _counters.nProcs * sizeof(CPUPerfTicks);
- _counters.jvmTicks = (CPUPerfTicks*)NEW_C_HEAP_ARRAY(char, tick_array_size, mtInternal);
+ size_t array_entry_count = _counters.nProcs;
+ _counters.jvmTicks = NEW_C_HEAP_ARRAY(CPUPerfTicks, array_entry_count, mtInternal);
if (NULL == _counters.jvmTicks) {
return false;
}
- memset(_counters.jvmTicks, 0, tick_array_size);
+ memset(_counters.jvmTicks, 0, array_entry_count * sizeof(*_counters.jvmTicks));
// Get kstat cpu_stat counters for every CPU
// loop over kstat to find our cpu_stat(s)
@@ -326,9 +326,7 @@
}
CPUPerformanceInterface::CPUPerformance::~CPUPerformance() {
- if (_counters.jvmTicks != NULL) {
- FREE_C_HEAP_ARRAY(char, _counters.jvmTicks);
- }
+ FREE_C_HEAP_ARRAY(char, _counters.jvmTicks);
if (_counters.kstat_ctrl != NULL) {
kstat_close(_counters.kstat_ctrl);
}
--- a/src/hotspot/os/solaris/os_solaris.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/solaris/os_solaris.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -454,9 +454,7 @@
board = 0;
}
}
- if (available_id != NULL) {
- FREE_C_HEAP_ARRAY(bool, available_id);
- }
+ FREE_C_HEAP_ARRAY(bool, available_id);
return true;
}
@@ -493,9 +491,7 @@
result = false;
}
}
- if (id_array != NULL) {
- FREE_C_HEAP_ARRAY(processorid_t, id_array);
- }
+ FREE_C_HEAP_ARRAY(processorid_t, id_array);
return result;
}
@@ -562,7 +558,7 @@
MAX3((size_t)MAXPATHLEN, // For dll_dir & friends.
sizeof(SYS_EXT_DIR) + sizeof("/lib/"), // invariant ld_library_path
(size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir
- char *buf = (char *)NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
+ char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal);
// sysclasspath, java_home, dll_dir
{
@@ -648,7 +644,7 @@
// through the dlinfo() call, so only add additional space for the path
// components explicitly added here.
size_t library_path_size = info->dls_size + strlen(common_path);
- library_path = (char *)NEW_C_HEAP_ARRAY(char, library_path_size, mtInternal);
+ library_path = NEW_C_HEAP_ARRAY(char, library_path_size, mtInternal);
library_path[0] = '\0';
// Construct the desired Java library path from the linker's library
--- a/src/hotspot/os/solaris/perfMemory_solaris.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/solaris/perfMemory_solaris.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -591,7 +591,7 @@
if (statbuf.st_ctime > oldest_ctime) {
char* user = strchr(dentry->d_name, '_') + 1;
- if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
+ FREE_C_HEAP_ARRAY(char, oldest_user);
oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
strcpy(oldest_user, user);
--- a/src/hotspot/os/windows/os_perf_windows.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/windows/os_perf_windows.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -136,7 +136,7 @@
}
static CounterQueryP create_counter_query() {
- CounterQueryP const query = NEW_C_HEAP_ARRAY(CounterQueryS, 1, mtInternal);
+ CounterQueryP const query = NEW_C_HEAP_OBJ(CounterQueryS, mtInternal);
memset(query, 0, sizeof(CounterQueryS));
return query;
}
@@ -144,7 +144,7 @@
static void destroy_counter_query(CounterQueryP query) {
assert(query != NULL, "invariant");
pdh_cleanup(&query->query.query, &query->counter);
- FREE_C_HEAP_ARRAY(CounterQueryS, query);
+ FREE_C_HEAP_OBJ(query);
}
static MultiCounterQueryP create_multi_counter_query() {
@@ -182,7 +182,7 @@
static void destroy_counter_query(ProcessQueryP process_query) {
destroy_multi_counter_query(&process_query->set);
- FREE_C_HEAP_ARRAY(ProcessQueryS, process_query);
+ FREE_C_HEAP_OBJ(process_query);
}
static int open_query(HQUERY* query) {
@@ -199,7 +199,7 @@
assert(!query->initialized, "invariant");
assert(0 == query->noOfCounters, "invariant");
assert(query->counters == NULL, "invariant");
- query->counters = (HCOUNTER*)NEW_C_HEAP_ARRAY(char, nofCounters * sizeof(HCOUNTER), mtInternal);
+ query->counters = NEW_C_HEAP_ARRAY(HCOUNTER, nofCounters, mtInternal);
if (query->counters == NULL) {
return OS_ERR;
}
@@ -225,11 +225,9 @@
}
static void deallocate_counters(MultiCounterQueryP query) {
- if (query->counters != NULL) {
- FREE_C_HEAP_ARRAY(char, query->counters);
- query->counters = NULL;
- query->noOfCounters = 0;
- }
+ FREE_C_HEAP_ARRAY(char, query->counters);
+ query->counters = NULL;
+ query->noOfCounters = 0;
}
static OSReturn add_counter(UpdateQueryP query, HCOUNTER* counter, const char* path, bool first_sample_on_init) {
@@ -388,7 +386,7 @@
if (OS_ERR == current_process_idx) {
return NULL;
}
- ProcessQueryP const process_query = NEW_C_HEAP_ARRAY(ProcessQueryS, 1, mtInternal);
+ ProcessQueryP const process_query = NEW_C_HEAP_OBJ(ProcessQueryS, mtInternal);
memset(process_query, 0, sizeof(ProcessQueryS));
process_query->set.queries = NEW_C_HEAP_ARRAY(MultiCounterQueryS, current_process_idx + 1, mtInternal);
memset(process_query->set.queries, 0, sizeof(MultiCounterQueryS) * (current_process_idx + 1));
@@ -659,14 +657,10 @@
}
static void deallocate_pdh_constants() {
- if (process_image_name != NULL) {
- FREE_C_HEAP_ARRAY(char, process_image_name);
- process_image_name = NULL;
- }
- if (pdh_IDProcess_counter_fmt != NULL) {
- FREE_C_HEAP_ARRAY(char, pdh_IDProcess_counter_fmt);
- pdh_IDProcess_counter_fmt = NULL;
- }
+ FREE_C_HEAP_ARRAY(char, process_image_name);
+ process_image_name = NULL;
+ FREE_C_HEAP_ARRAY(char, pdh_IDProcess_counter_fmt);
+ pdh_IDProcess_counter_fmt = NULL;
}
static int allocate_pdh_constants() {
@@ -1352,16 +1346,10 @@
CPUInformationInterface::~CPUInformationInterface() {
if (_cpu_info != NULL) {
- const char* cpu_name = _cpu_info->cpu_name();
- if (cpu_name != NULL) {
- FREE_C_HEAP_ARRAY(char, cpu_name);
- _cpu_info->set_cpu_name(NULL);
- }
- const char* cpu_desc = _cpu_info->cpu_description();
- if (cpu_desc != NULL) {
- FREE_C_HEAP_ARRAY(char, cpu_desc);
- _cpu_info->set_cpu_description(NULL);
- }
+ FREE_C_HEAP_ARRAY(char, _cpu_info->cpu_name());
+ _cpu_info->set_cpu_name(NULL);
+ FREE_C_HEAP_ARRAY(char, _cpu_info->cpu_description());
+ _cpu_info->set_cpu_description(NULL);
delete _cpu_info;
_cpu_info = NULL;
}
--- a/src/hotspot/os/windows/os_windows.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/windows/os_windows.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -2727,9 +2727,7 @@
int _numa_used_node_count;
void free_node_list() {
- if (_numa_used_node_list != NULL) {
- FREE_C_HEAP_ARRAY(int, _numa_used_node_list);
- }
+ FREE_C_HEAP_ARRAY(int, _numa_used_node_list);
}
public:
@@ -3597,7 +3595,8 @@
void os::interrupt(Thread* thread) {
debug_only(Thread::check_for_dangling_thread_pointer(thread);)
-
+ assert(thread->is_Java_thread(), "invariant");
+ JavaThread* jt = (JavaThread*) thread;
OSThread* osthread = thread->osthread();
osthread->set_interrupted(true);
// More than one thread can get here with the same value of osthread,
@@ -3607,14 +3606,12 @@
OrderAccess::release();
SetEvent(osthread->interrupt_event());
// For JSR166: unpark after setting status
- if (thread->is_Java_thread()) {
- ((JavaThread*)thread)->parker()->unpark();
- }
+ jt->parker()->unpark();
ParkEvent * ev = thread->_ParkEvent;
if (ev != NULL) ev->unpark();
- ev = thread->_SleepEvent;
+ ev = jt->_SleepEvent;
if (ev != NULL) ev->unpark();
}
--- a/src/hotspot/os/windows/perfMemory_windows.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/os/windows/perfMemory_windows.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -394,7 +394,7 @@
if (statbuf.st_ctime > latest_ctime) {
char* user = strchr(dentry->d_name, '_') + 1;
- if (latest_user != NULL) FREE_C_HEAP_ARRAY(char, latest_user);
+ FREE_C_HEAP_ARRAY(char, latest_user);
latest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1, mtInternal);
strcpy(latest_user, user);
@@ -764,7 +764,7 @@
lpSA->lpSecurityDescriptor = NULL;
// free the security attributes structure
- FREE_C_HEAP_ARRAY(char, lpSA);
+ FREE_C_HEAP_OBJ(lpSA);
}
}
@@ -1073,8 +1073,8 @@
// allocate and initialize the security attributes structure and
// return it to the caller.
//
- LPSECURITY_ATTRIBUTES lpSA = (LPSECURITY_ATTRIBUTES)
- NEW_C_HEAP_ARRAY(char, sizeof(SECURITY_ATTRIBUTES), mtInternal);
+ LPSECURITY_ATTRIBUTES lpSA =
+ NEW_C_HEAP_OBJ(SECURITY_ATTRIBUTES, mtInternal);
lpSA->nLength = sizeof(SECURITY_ATTRIBUTES);
lpSA->lpSecurityDescriptor = pSD;
lpSA->bInheritHandle = FALSE;
--- a/src/hotspot/share/aot/aotCodeHeap.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/aot/aotCodeHeap.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -212,12 +212,8 @@
}
AOTCodeHeap::~AOTCodeHeap() {
- if (_classes != NULL) {
- FREE_C_HEAP_ARRAY(AOTClass, _classes);
- }
- if (_code_to_aot != NULL) {
- FREE_C_HEAP_ARRAY(CodeToAMethod, _code_to_aot);
- }
+ FREE_C_HEAP_ARRAY(AOTClass, _classes);
+ FREE_C_HEAP_ARRAY(CodeToAMethod, _code_to_aot);
}
AOTLib::AOTLib(void* handle, const char* name, int dso_id) : _valid(true), _dl_handle(handle), _dso_id(dso_id) {
--- a/src/hotspot/share/classfile/classLoader.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/classfile/classLoader.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -383,10 +383,8 @@
assert(_singleton == this, "must be");
DEBUG_ONLY(_singleton = NULL);
- if (_name != NULL) {
- FREE_C_HEAP_ARRAY(const char, _name);
- _name = NULL;
- }
+ FREE_C_HEAP_ARRAY(const char, _name);
+
if (_jimage != NULL) {
(*JImageClose)(_jimage);
_jimage = NULL;
--- a/src/hotspot/share/classfile/classLoaderExt.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/classfile/classLoaderExt.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -55,7 +55,7 @@
void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
if (UseSharedSpaces) {
warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
- FileMapInfo::current_info()->header()->set_has_platform_or_app_classes(false);
+ FileMapInfo::current_info()->set_has_platform_or_app_classes(false);
}
ClassLoader::add_to_boot_append_entries(new_entry);
}
--- a/src/hotspot/share/classfile/moduleEntry.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/classfile/moduleEntry.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -284,7 +284,7 @@
// This is okay because the unnamed module gets created before the ClassLoaderData
// is available to other threads.
ModuleEntry* ModuleEntry::new_unnamed_module_entry(Handle module_handle, ClassLoaderData* cld) {
- ModuleEntry* entry = (ModuleEntry*) NEW_C_HEAP_ARRAY(char, sizeof(ModuleEntry), mtModule);
+ ModuleEntry* entry = NEW_C_HEAP_OBJ(ModuleEntry, mtModule);
// Initialize everything BasicHashtable would
entry->set_next(NULL);
@@ -311,7 +311,7 @@
void ModuleEntry::delete_unnamed_module() {
// Do not need unlink_entry() since the unnamed module is not in the hashtable
- FREE_C_HEAP_ARRAY(char, this);
+ FREE_C_HEAP_OBJ(this);
}
ModuleEntryTable::ModuleEntryTable(int table_size)
--- a/src/hotspot/share/classfile/systemDictionaryShared.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -744,11 +744,11 @@
}
bool SystemDictionaryShared::has_platform_or_app_classes() {
- if (FileMapInfo::current_info()->header()->has_platform_or_app_classes()) {
+ if (FileMapInfo::current_info()->has_platform_or_app_classes()) {
return true;
}
if (DynamicArchive::is_mapped() &&
- FileMapInfo::dynamic_info()->header()->has_platform_or_app_classes()) {
+ FileMapInfo::dynamic_info()->has_platform_or_app_classes()) {
return true;
}
return false;
@@ -1059,10 +1059,8 @@
FREE_C_HEAP_ARRAY(DTConstraint, p->_verifier_constraints);
p->_verifier_constraints = NULL;
}
- if (p->_verifier_constraint_flags != NULL) {
- FREE_C_HEAP_ARRAY(char, p->_verifier_constraint_flags);
- p->_verifier_constraint_flags = NULL;
- }
+ FREE_C_HEAP_ARRAY(char, p->_verifier_constraint_flags);
+ p->_verifier_constraint_flags = NULL;
_dumptime_table->remove(k);
}
--- a/src/hotspot/share/code/codeBlob.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/code/codeBlob.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -155,10 +155,8 @@
}
void CodeBlob::flush() {
- if (_oop_maps) {
- FREE_C_HEAP_ARRAY(unsigned char, _oop_maps);
- _oop_maps = NULL;
- }
+ FREE_C_HEAP_ARRAY(unsigned char, _oop_maps);
+ _oop_maps = NULL;
_strings.free();
}
--- a/src/hotspot/share/compiler/oopMap.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/compiler/oopMap.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -732,7 +732,7 @@
_required = heap_size();
// We need to allocate a chunk big enough to hold the ImmutableOopMapSet and all of its ImmutableOopMaps
- address buffer = (address) NEW_C_HEAP_ARRAY(unsigned char, _required, mtCode);
+ address buffer = NEW_C_HEAP_ARRAY(unsigned char, _required, mtCode);
return generate_into(buffer);
}
--- a/src/hotspot/share/gc/cms/gSpaceCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/cms/gSpaceCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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,5 +74,5 @@
}
GSpaceCounters::~GSpaceCounters() {
- if (_name_space != NULL) FREE_C_HEAP_ARRAY(char, _name_space);
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
--- a/src/hotspot/share/gc/cms/parNewGeneration.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/cms/parNewGeneration.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1245,7 +1245,7 @@
assert(_num_par_pushes > 0, "Tautology");
#endif
if (from_space_obj->forwardee() == from_space_obj) {
- oopDesc* listhead = NEW_C_HEAP_ARRAY(oopDesc, 1, mtGC);
+ oopDesc* listhead = NEW_C_HEAP_OBJ(oopDesc, mtGC);
listhead->forward_to(from_space_obj);
from_space_obj = listhead;
}
@@ -1401,7 +1401,7 @@
// This can become a scaling bottleneck when there is work queue overflow coincident
// with promotion failure.
oopDesc* f = cur;
- FREE_C_HEAP_ARRAY(oopDesc, f);
+ FREE_C_HEAP_OBJ(f);
} else if (par_scan_state->should_be_partially_scanned(obj_to_push, cur)) {
assert(arrayOop(cur)->length() == 0, "entire array remaining to be scanned");
obj_to_push = cur;
--- a/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/epsilon/epsilonMonitoringSupport.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -72,9 +72,7 @@
}
~EpsilonSpaceCounters() {
- if (_name_space != NULL) {
- FREE_C_HEAP_ARRAY(char, _name_space);
- }
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
inline void update_all(size_t capacity, size_t used) {
--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -3613,7 +3613,6 @@
p->record_or_add_time_secs(termination_phase, worker_id, cl.term_time());
p->record_or_add_thread_work_item(termination_phase, worker_id, cl.term_attempts());
}
- assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation");
}
virtual void start_work(uint worker_id) { }
@@ -3655,14 +3654,22 @@
class G1EvacuateRegionsTask : public G1EvacuateRegionsBaseTask {
G1RootProcessor* _root_processor;
+ void verify_trim_ticks(G1ParScanThreadState* pss, const char* location) {
+ assert(pss->trim_ticks().seconds() == 0.0, "Unexpected partial trimming during evacuation at %s %.3lf " JLONG_FORMAT, location, pss->trim_ticks().seconds(), pss->trim_ticks().value());
+ }
+
void scan_roots(G1ParScanThreadState* pss, uint worker_id) {
_root_processor->evacuate_roots(pss, worker_id);
+ verify_trim_ticks(pss, "roots");
_g1h->rem_set()->scan_heap_roots(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::ObjCopy);
+ verify_trim_ticks(pss, "heap roots");
_g1h->rem_set()->scan_collection_set_regions(pss, worker_id, G1GCPhaseTimes::ScanHR, G1GCPhaseTimes::CodeRoots, G1GCPhaseTimes::ObjCopy);
+ verify_trim_ticks(pss, "scan cset");
}
void evacuate_live_objects(G1ParScanThreadState* pss, uint worker_id) {
G1EvacuateRegionsBaseTask::evacuate_live_objects(pss, worker_id, G1GCPhaseTimes::ObjCopy, G1GCPhaseTimes::Termination);
+ verify_trim_ticks(pss, "evac live");
}
void start_work(uint worker_id) {
--- a/src/hotspot/share/gc/g1/g1CollectionSet.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1CollectionSet.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -72,9 +72,7 @@
}
G1CollectionSet::~G1CollectionSet() {
- if (_collection_set_regions != NULL) {
- FREE_C_HEAP_ARRAY(uint, _collection_set_regions);
- }
+ FREE_C_HEAP_ARRAY(uint, _collection_set_regions);
free_optional_regions();
clear_candidates();
}
--- a/src/hotspot/share/gc/g1/g1RemSetSummary.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/g1/g1RemSetSummary.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -107,9 +107,7 @@
}
G1RemSetSummary::~G1RemSetSummary() {
- if (_rs_threads_vtimes) {
- FREE_C_HEAP_ARRAY(double, _rs_threads_vtimes);
- }
+ FREE_C_HEAP_ARRAY(double, _rs_threads_vtimes);
}
void G1RemSetSummary::set(G1RemSetSummary* other) {
--- a/src/hotspot/share/gc/g1/heapRegionManager.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/g1/heapRegionManager.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -531,9 +531,7 @@
}
HeapRegionClaimer::~HeapRegionClaimer() {
- if (_claims != NULL) {
- FREE_C_HEAP_ARRAY(uint, _claims);
- }
+ FREE_C_HEAP_ARRAY(uint, _claims);
}
uint HeapRegionClaimer::offset_for_worker(uint worker_id) const {
--- a/src/hotspot/share/gc/g1/sparsePRT.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/g1/sparsePRT.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -104,14 +104,8 @@
}
RSHashTable::~RSHashTable() {
- if (_entries != NULL) {
- FREE_C_HEAP_ARRAY(SparsePRTEntry, _entries);
- _entries = NULL;
- }
- if (_buckets != NULL) {
- FREE_C_HEAP_ARRAY(int, _buckets);
- _buckets = NULL;
- }
+ FREE_C_HEAP_ARRAY(SparsePRTEntry, _entries);
+ FREE_C_HEAP_ARRAY(int, _buckets);
}
void RSHashTable::clear() {
--- a/src/hotspot/share/gc/parallel/psCompactionManager.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/parallel/psCompactionManager.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -76,7 +76,6 @@
assert(_manager_array == NULL, "Attempt to initialize twice");
_manager_array = NEW_C_HEAP_ARRAY(ParCompactionManager*, parallel_gc_threads+1, mtGC);
- guarantee(_manager_array != NULL, "Could not allocate manager_array");
_stack_array = new OopTaskQueueSet(parallel_gc_threads);
guarantee(_stack_array != NULL, "Could not allocate stack_array");
--- a/src/hotspot/share/gc/parallel/spaceCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/parallel/spaceCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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
@@ -66,5 +66,5 @@
}
SpaceCounters::~SpaceCounters() {
- if (_name_space != NULL) FREE_C_HEAP_ARRAY(char, _name_space);
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
--- a/src/hotspot/share/gc/serial/cSpaceCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/serial/cSpaceCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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
@@ -66,7 +66,7 @@
}
CSpaceCounters::~CSpaceCounters() {
- if (_name_space != NULL) FREE_C_HEAP_ARRAY(char, _name_space);
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
void CSpaceCounters::update_capacity() {
--- a/src/hotspot/share/gc/shared/cardTableRS.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/cardTableRS.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -624,26 +624,11 @@
}
CardTableRS::~CardTableRS() {
- if (_last_cur_val_in_gen) {
- FREE_C_HEAP_ARRAY(CardValue, _last_cur_val_in_gen);
- _last_cur_val_in_gen = NULL;
- }
- if (_lowest_non_clean) {
- FREE_C_HEAP_ARRAY(CardArr, _lowest_non_clean);
- _lowest_non_clean = NULL;
- }
- if (_lowest_non_clean_chunk_size) {
- FREE_C_HEAP_ARRAY(size_t, _lowest_non_clean_chunk_size);
- _lowest_non_clean_chunk_size = NULL;
- }
- if (_lowest_non_clean_base_chunk_index) {
- FREE_C_HEAP_ARRAY(uintptr_t, _lowest_non_clean_base_chunk_index);
- _lowest_non_clean_base_chunk_index = NULL;
- }
- if (_last_LNC_resizing_collection) {
- FREE_C_HEAP_ARRAY(int, _last_LNC_resizing_collection);
- _last_LNC_resizing_collection = NULL;
- }
+ FREE_C_HEAP_ARRAY(CardValue, _last_cur_val_in_gen);
+ FREE_C_HEAP_ARRAY(CardArr, _lowest_non_clean);
+ FREE_C_HEAP_ARRAY(size_t, _lowest_non_clean_chunk_size);
+ FREE_C_HEAP_ARRAY(uintptr_t, _lowest_non_clean_base_chunk_index);
+ FREE_C_HEAP_ARRAY(int, _last_LNC_resizing_collection);
}
void CardTableRS::initialize() {
@@ -656,11 +641,7 @@
NEW_C_HEAP_ARRAY(uintptr_t, _max_covered_regions, mtGC);
_last_LNC_resizing_collection =
NEW_C_HEAP_ARRAY(int, _max_covered_regions, mtGC);
- if (_lowest_non_clean == NULL
- || _lowest_non_clean_chunk_size == NULL
- || _lowest_non_clean_base_chunk_index == NULL
- || _last_LNC_resizing_collection == NULL)
- vm_exit_during_initialization("couldn't allocate an LNC array.");
+
for (int i = 0; i < _max_covered_regions; i++) {
_lowest_non_clean[i] = NULL;
_lowest_non_clean_chunk_size[i] = 0;
--- a/src/hotspot/share/gc/shared/collectorCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/collectorCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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
@@ -63,9 +63,7 @@
}
CollectorCounters::~CollectorCounters() {
- if (_name_space != NULL) {
- FREE_C_HEAP_ARRAY(char, _name_space);
- }
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
TraceCollectorStats::TraceCollectorStats(CollectorCounters* c) :
--- a/src/hotspot/share/gc/shared/generationCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/generationCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2019, 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
@@ -80,9 +80,7 @@
}
GenerationCounters::~GenerationCounters() {
- if (_name_space != NULL) {
- FREE_C_HEAP_ARRAY(char, _name_space);
- }
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
void GenerationCounters::update_all() {
--- a/src/hotspot/share/gc/shared/hSpaceCounters.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/hSpaceCounters.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -67,9 +67,7 @@
}
HSpaceCounters::~HSpaceCounters() {
- if (_name_space != NULL) {
- FREE_C_HEAP_ARRAY(char, _name_space);
- }
+ FREE_C_HEAP_ARRAY(char, _name_space);
}
void HSpaceCounters::update_capacity(size_t v) {
--- a/src/hotspot/share/gc/shared/referenceProcessor.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/referenceProcessor.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -119,9 +119,6 @@
_discovered_refs = NEW_C_HEAP_ARRAY(DiscoveredList,
_max_num_queues * number_of_subclasses_of_ref(), mtGC);
- if (_discovered_refs == NULL) {
- vm_exit_during_initialization("Could not allocated RefProc Array");
- }
_discoveredSoftRefs = &_discovered_refs[0];
_discoveredWeakRefs = &_discoveredSoftRefs[_max_num_queues];
_discoveredFinalRefs = &_discoveredWeakRefs[_max_num_queues];
--- a/src/hotspot/share/gc/shared/workgroup.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shared/workgroup.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -40,10 +40,6 @@
void AbstractWorkGang::initialize_workers() {
log_develop_trace(gc, workgang)("Constructing work gang %s with %u threads", name(), total_workers());
_workers = NEW_C_HEAP_ARRAY(AbstractGangWorker*, total_workers(), mtInternal);
- if (_workers == NULL) {
- vm_exit_out_of_memory(0, OOM_MALLOC_ERROR, "Cannot create GangWorker array.");
- }
-
add_workers(true);
}
@@ -409,7 +405,6 @@
SubTasksDone::SubTasksDone(uint n) :
_tasks(NULL), _n_tasks(n), _threads_completed(0) {
_tasks = NEW_C_HEAP_ARRAY(uint, n, mtInternal);
- guarantee(_tasks != NULL, "alloc failure");
clear();
}
@@ -459,7 +454,7 @@
SubTasksDone::~SubTasksDone() {
- if (_tasks != NULL) FREE_C_HEAP_ARRAY(uint, _tasks);
+ FREE_C_HEAP_ARRAY(uint, _tasks);
}
// *** SequentialSubTasksDone
--- a/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/shenandoahPacer.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -242,7 +242,7 @@
}
cur = MAX2<size_t>(1, cur);
- os::sleep(JavaThread::current(), cur);
+ JavaThread::current()->sleep(cur);
double end = os::elapsedTime();
total = (size_t)((end - start) * 1000);
--- a/src/hotspot/share/gc/z/zArray.inline.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zArray.inline.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, 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
@@ -36,9 +36,7 @@
template <typename T>
inline ZArray<T>::~ZArray() {
- if (_array != NULL) {
- FREE_C_HEAP_ARRAY(T, _array);
- }
+ FREE_C_HEAP_ARRAY(T, _array);
}
template <typename T>
--- a/src/hotspot/share/gc/z/zBarrier.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zBarrier.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -72,7 +72,7 @@
return true;
}
-template <bool finalizable, bool publish>
+template <bool follow, bool finalizable, bool publish>
uintptr_t ZBarrier::mark(uintptr_t addr) {
uintptr_t good_addr;
@@ -89,7 +89,7 @@
// Mark
if (should_mark_through<finalizable>(addr)) {
- ZHeap::heap()->mark_object<finalizable, publish>(good_addr);
+ ZHeap::heap()->mark_object<follow, finalizable, publish>(good_addr);
}
return good_addr;
@@ -108,7 +108,7 @@
}
uintptr_t ZBarrier::relocate_or_mark(uintptr_t addr) {
- return during_relocate() ? relocate(addr) : mark<Strong, Publish>(addr);
+ return during_relocate() ? relocate(addr) : mark<Follow, Strong, Publish>(addr);
}
uintptr_t ZBarrier::relocate_or_remap(uintptr_t addr) {
@@ -174,11 +174,11 @@
// Mark barrier
//
uintptr_t ZBarrier::mark_barrier_on_oop_slow_path(uintptr_t addr) {
- return mark<Strong, Overflow>(addr);
+ return mark<Follow, Strong, Overflow>(addr);
}
uintptr_t ZBarrier::mark_barrier_on_finalizable_oop_slow_path(uintptr_t addr) {
- const uintptr_t good_addr = mark<Finalizable, Overflow>(addr);
+ const uintptr_t good_addr = mark<Follow, Finalizable, Overflow>(addr);
if (ZAddress::is_good(addr)) {
// If the oop was already strongly marked/good, then we do
// not want to downgrade it to finalizable marked/good.
@@ -200,7 +200,15 @@
assert(during_mark(), "Invalid phase");
// Mark
- return mark<Strong, Publish>(addr);
+ return mark<Follow, Strong, Publish>(addr);
+}
+
+uintptr_t ZBarrier::mark_barrier_on_invisible_root_oop_slow_path(uintptr_t addr) {
+ assert(SafepointSynchronize::is_at_safepoint(), "Should be at safepoint");
+ assert(during_mark(), "Invalid phase");
+
+ // Mark
+ return mark<DontFollow, Strong, Publish>(addr);
}
//
--- a/src/hotspot/share/gc/z/zBarrier.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zBarrier.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -32,6 +32,9 @@
class ZBarrier : public AllStatic {
private:
+ static const bool Follow = true;
+ static const bool DontFollow = false;
+
static const bool Strong = false;
static const bool Finalizable = true;
@@ -51,7 +54,7 @@
static bool during_mark();
static bool during_relocate();
template <bool finalizable> static bool should_mark_through(uintptr_t addr);
- template <bool finalizable, bool publish> static uintptr_t mark(uintptr_t addr);
+ template <bool follow, bool finalizable, bool publish> static uintptr_t mark(uintptr_t addr);
static uintptr_t remap(uintptr_t addr);
static uintptr_t relocate(uintptr_t addr);
static uintptr_t relocate_or_mark(uintptr_t addr);
@@ -69,6 +72,7 @@
static uintptr_t mark_barrier_on_oop_slow_path(uintptr_t addr);
static uintptr_t mark_barrier_on_finalizable_oop_slow_path(uintptr_t addr);
static uintptr_t mark_barrier_on_root_oop_slow_path(uintptr_t addr);
+ static uintptr_t mark_barrier_on_invisible_root_oop_slow_path(uintptr_t addr);
static uintptr_t relocate_barrier_on_root_oop_slow_path(uintptr_t addr);
@@ -106,6 +110,7 @@
static void mark_barrier_on_oop_field(volatile oop* p, bool finalizable);
static void mark_barrier_on_oop_array(volatile oop* p, size_t length, bool finalizable);
static void mark_barrier_on_root_oop_field(oop* p);
+ static void mark_barrier_on_invisible_root_oop_field(oop* p);
// Relocate barrier
static void relocate_barrier_on_root_oop_field(oop* p);
--- a/src/hotspot/share/gc/z/zBarrier.inline.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zBarrier.inline.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -326,6 +326,11 @@
root_barrier<is_good_or_null_fast_path, mark_barrier_on_root_oop_slow_path>(p, o);
}
+inline void ZBarrier::mark_barrier_on_invisible_root_oop_field(oop* p) {
+ const oop o = *p;
+ root_barrier<is_good_or_null_fast_path, mark_barrier_on_invisible_root_oop_slow_path>(p, o);
+}
+
//
// Relocate barrier
//
--- a/src/hotspot/share/gc/z/zHeap.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zHeap.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -140,7 +140,7 @@
// Marking
bool is_object_live(uintptr_t addr) const;
bool is_object_strongly_live(uintptr_t addr) const;
- template <bool finalizable, bool publish> void mark_object(uintptr_t addr);
+ template <bool follow, bool finalizable, bool publish> void mark_object(uintptr_t addr);
void mark_start();
void mark(bool initial);
void mark_flush_and_free(Thread* thread);
--- a/src/hotspot/share/gc/z/zHeap.inline.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zHeap.inline.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -60,10 +60,10 @@
return page->is_object_strongly_live(addr);
}
-template <bool finalizable, bool publish>
+template <bool follow, bool finalizable, bool publish>
inline void ZHeap::mark_object(uintptr_t addr) {
assert(ZGlobalPhase == ZPhaseMark, "Mark not allowed");
- _mark.mark_object<finalizable, publish>(addr);
+ _mark.mark_object<follow, finalizable, publish>(addr);
}
inline uintptr_t ZHeap::alloc_tlab(size_t size) {
--- a/src/hotspot/share/gc/z/zHeapIterator.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zHeapIterator.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -193,7 +193,7 @@
ZStatTimerDisable disable;
// Push roots to visit
- push_roots<ZRootsIteratorNoInvisible, false /* Concurrent */, false /* Weak */>();
+ push_roots<ZRootsIterator, false /* Concurrent */, false /* Weak */>();
push_roots<ZConcurrentRootsIteratorClaimOther, true /* Concurrent */, false /* Weak */>();
if (VisitWeaks) {
push_roots<ZWeakRootsIterator, false /* Concurrent */, true /* Weak */>();
--- a/src/hotspot/share/gc/z/zMark.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zMark.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -133,6 +133,9 @@
// Update thread local address bad mask
ZThreadLocalData::set_address_bad_mask(thread, ZAddressBadMask);
+ // Mark invisible root
+ ZThreadLocalData::do_invisible_root(thread, ZBarrier::mark_barrier_on_invisible_root_oop_field);
+
// Retire TLAB
ZThreadLocalAllocBuffer::retire(thread);
}
@@ -156,7 +159,7 @@
ZMarkRootsTask(ZMark* mark) :
ZTask("ZMarkRootsTask"),
_mark(mark),
- _roots(true /* visit_invisible */, false /* visit_jvmti_weak_export */) {}
+ _roots(false /* visit_jvmti_weak_export */) {}
virtual void work() {
_roots.oops_do(&_cl);
@@ -339,7 +342,7 @@
return;
}
- // Decode object address
+ // Decode object address and follow flag
const uintptr_t addr = entry.object_address();
if (!try_mark_object(cache, addr, finalizable)) {
@@ -348,7 +351,13 @@
}
if (is_array(addr)) {
- follow_array_object(objArrayOop(ZOop::from_address(addr)), finalizable);
+ // Decode follow flag
+ const bool follow = entry.follow();
+
+ // The follow flag is currently only relevant for object arrays
+ if (follow) {
+ follow_array_object(objArrayOop(ZOop::from_address(addr)), finalizable);
+ }
} else {
follow_object(ZOop::from_address(addr), finalizable);
}
--- a/src/hotspot/share/gc/z/zMark.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zMark.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -105,7 +105,7 @@
bool is_initialized() const;
- template <bool finalizable, bool publish> void mark_object(uintptr_t addr);
+ template <bool follow, bool finalizable, bool publish> void mark_object(uintptr_t addr);
void start();
void mark(bool initial);
--- a/src/hotspot/share/gc/z/zMark.inline.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zMark.inline.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -31,12 +31,12 @@
#include "runtime/thread.hpp"
#include "utilities/debug.hpp"
-template <bool finalizable, bool publish>
+template <bool follow, bool finalizable, bool publish>
inline void ZMark::mark_object(uintptr_t addr) {
assert(ZAddress::is_marked(addr), "Should be marked");
ZMarkThreadLocalStacks* const stacks = ZThreadLocalData::stacks(Thread::current());
ZMarkStripe* const stripe = _stripes.stripe_for_addr(addr);
- ZMarkStackEntry entry(addr, finalizable);
+ ZMarkStackEntry entry(addr, follow, finalizable);
stacks->push(&_allocator, &_stripes, stripe, entry, publish);
}
--- a/src/hotspot/share/gc/z/zMarkStackEntry.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zMarkStackEntry.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -35,16 +35,18 @@
// ------------
//
// 6
-// 3 2 1 0
-// +---------------------------------------------------------------------+-+-+
-// |11111111 11111111 11111111 11111111 11111111 11111111 11111111 111111|1|1|
-// +---------------------------------------------------------------------+-+-+
-// | | |
-// | 1-1 Partial Array Flag (1-bit) * |
-// | |
-// | 0-0 Final Flag (1-bit) *
+// 3 3 2 1 0
+// +--------------------------------------------------------------------+-+-+-+
+// |11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111|1|1|1|
+// +--------------------------------------------------------------------+-+-+-+
+// | | | |
+// | 2-2 Follow Flag (1-bit) * | |
+// | | |
+// | 1-1 Partial Array Flag (1-bit) * |
+// | |
+// | 0-0 Final Flag (1-bit) *
// |
-// * 63-2 Object Address (62-bits)
+// * 63-3 Object Address (61-bits)
//
//
// Partial array entry
@@ -69,7 +71,8 @@
private:
typedef ZBitField<uint64_t, bool, 0, 1> field_finalizable;
typedef ZBitField<uint64_t, bool, 1, 1> field_partial_array;
- typedef ZBitField<uint64_t, uintptr_t, 2, 62> field_object_address;
+ typedef ZBitField<uint64_t, bool, 2, 1> field_follow;
+ typedef ZBitField<uint64_t, uintptr_t, 3, 61> field_object_address;
typedef ZBitField<uint64_t, size_t, 2, 30> field_partial_array_length;
typedef ZBitField<uint64_t, size_t, 32, 32> field_partial_array_offset;
@@ -83,8 +86,9 @@
// what _entry is initialized to.
}
- ZMarkStackEntry(uintptr_t object_address, bool finalizable) :
+ ZMarkStackEntry(uintptr_t object_address, bool follow, bool finalizable) :
_entry(field_object_address::encode(object_address) |
+ field_follow::encode(follow) |
field_partial_array::encode(false) |
field_finalizable::encode(finalizable)) {}
@@ -110,6 +114,10 @@
return field_partial_array_length::decode(_entry);
}
+ bool follow() const {
+ return field_follow::decode(_entry);
+ }
+
uintptr_t object_address() const {
return field_object_address::decode(_entry);
}
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -25,46 +25,24 @@
#include "gc/z/zThreadLocalData.hpp"
#include "gc/z/zObjArrayAllocator.hpp"
#include "gc/z/zUtils.inline.hpp"
-#include "memory/universe.hpp"
#include "oops/arrayKlass.hpp"
#include "runtime/interfaceSupport.inline.hpp"
-#include "runtime/handles.hpp"
-#include "runtime/os.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/globalDefinitions.hpp"
-
-// To avoid delaying safepoints, clearing of arrays is split up in segments
-// with safepoint polling inbetween. However, we can't have a not-yet-cleared
-// array of oops on the heap when we safepoint since the GC will then stumble
-// across uninitialized oops. To avoid this we let an array of oops be an
-// array of a primitive type of the same size until the clearing has completed.
-// A max segment size of 64K was chosen because benchmarking suggests that is
-// offers a good trade-off between allocation time and time-to-safepoint.
-
-static Klass* substitute_object_array_klass(Klass* klass) {
- if (!klass->is_objArray_klass()) {
- return klass;
- }
-
- Klass* const substitute_klass = Universe::longArrayKlassObj();
- const BasicType type = ArrayKlass::cast(klass)->element_type();
- const BasicType substitute_type = ArrayKlass::cast(substitute_klass)->element_type();
- assert(type2aelembytes(type) == type2aelembytes(substitute_type), "Element size mismatch");
- return substitute_klass;
-}
ZObjArrayAllocator::ZObjArrayAllocator(Klass* klass, size_t word_size, int length, Thread* thread) :
- ObjArrayAllocator(substitute_object_array_klass(klass), word_size, length, false /* do_zero */, thread),
- _final_klass(klass) {}
+ ObjArrayAllocator(klass, word_size, length, false /* do_zero */, thread) {}
oop ZObjArrayAllocator::finish(HeapWord* mem) const {
- // Set mark word and initial klass pointer
+ // Initialize object header and length field
ObjArrayAllocator::finish(mem);
- // Keep the array alive across safepoints, but make it invisible
- // to the heap itarator until the final klass pointer has been set
+ // Keep the array alive across safepoints through an invisible
+ // root. Invisible roots are not visited by the heap itarator
+ // and the marking logic will not attempt to follow its elements.
ZThreadLocalData::set_invisible_root(_thread, (oop*)&mem);
+ // A max segment size of 64K was chosen because microbenchmarking
+ // suggested that it offered a good trade-off between allocation
+ // time and time-to-safepoint
const size_t segment_max = ZUtils::bytes_to_words(64 * K);
const size_t skip = arrayOopDesc::header_size(ArrayKlass::cast(_klass)->element_type());
size_t remaining = _word_size - skip;
@@ -81,12 +59,6 @@
}
}
- if (_klass != _final_klass) {
- // Set final klass pointer
- oopDesc::release_set_klass(mem, _final_klass);
- }
-
- // Make the array visible to the heap iterator
ZThreadLocalData::clear_invisible_root(_thread);
return oop(mem);
--- a/src/hotspot/share/gc/z/zObjArrayAllocator.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zObjArrayAllocator.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -27,9 +27,6 @@
#include "gc/shared/memAllocator.hpp"
class ZObjArrayAllocator : public ObjArrayAllocator {
-private:
- Klass* const _final_klass;
-
public:
ZObjArrayAllocator(Klass* klass, size_t word_size, int length, Thread* thread);
--- a/src/hotspot/share/gc/z/zRelocate.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zRelocate.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -48,6 +48,9 @@
// Update thread local address bad mask
ZThreadLocalData::set_address_bad_mask(thread, ZAddressBadMask);
+ // Relocate invisible root
+ ZThreadLocalData::do_invisible_root(thread, ZBarrier::relocate_barrier_on_root_oop_field);
+
// Remap TLAB
ZThreadLocalAllocBuffer::remap(thread);
}
@@ -69,7 +72,7 @@
public:
ZRelocateRootsTask() :
ZTask("ZRelocateRootsTask"),
- _roots(true /* visit_invisible */, true /* visit_jvmti_weak_export */) {}
+ _roots(true /* visit_jvmti_weak_export */) {}
virtual void work() {
// During relocation we need to visit the JVMTI
--- a/src/hotspot/share/gc/z/zRootsIterator.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zRootsIterator.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -159,25 +159,19 @@
class ZRootsIteratorThreadClosure : public ThreadClosure {
private:
ZRootsIteratorClosure* _cl;
- const bool _visit_invisible;
public:
- ZRootsIteratorThreadClosure(ZRootsIteratorClosure* cl, bool visit_invisible) :
- _cl(cl),
- _visit_invisible(visit_invisible) {}
+ ZRootsIteratorThreadClosure(ZRootsIteratorClosure* cl) :
+ _cl(cl) {}
virtual void do_thread(Thread* thread) {
ZRootsIteratorCodeBlobClosure code_cl(_cl);
thread->oops_do(_cl, ClassUnloading ? &code_cl : NULL);
_cl->do_thread(thread);
- if (_visit_invisible && ZThreadLocalData::has_invisible_root(thread)) {
- _cl->do_oop(ZThreadLocalData::invisible_root(thread));
- }
}
};
-ZRootsIterator::ZRootsIterator(bool visit_invisible, bool visit_jvmti_weak_export) :
- _visit_invisible(visit_invisible),
+ZRootsIterator::ZRootsIterator(bool visit_jvmti_weak_export) :
_visit_jvmti_weak_export(visit_jvmti_weak_export),
_universe(this),
_object_synchronizer(this),
@@ -246,7 +240,7 @@
void ZRootsIterator::do_threads(ZRootsIteratorClosure* cl) {
ZStatTimer timer(ZSubPhasePauseRootsThreads);
ResourceMark rm;
- ZRootsIteratorThreadClosure thread_cl(cl, _visit_invisible);
+ ZRootsIteratorThreadClosure thread_cl(cl);
Threads::possibly_parallel_threads_do(true, &thread_cl);
}
--- a/src/hotspot/share/gc/z/zRootsIterator.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zRootsIterator.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -84,7 +84,6 @@
class ZRootsIterator {
private:
- bool _visit_invisible;
bool _visit_jvmti_weak_export;
void do_universe(ZRootsIteratorClosure* cl);
@@ -106,18 +105,12 @@
ZParallelOopsDo<ZRootsIterator, &ZRootsIterator::do_code_cache> _code_cache;
public:
- ZRootsIterator(bool visit_invisible = true, bool visit_jvmti_weak_export = false);
+ ZRootsIterator(bool visit_jvmti_weak_export = false);
~ZRootsIterator();
void oops_do(ZRootsIteratorClosure* cl);
};
-class ZRootsIteratorNoInvisible : public ZRootsIterator {
-public:
- ZRootsIteratorNoInvisible() :
- ZRootsIterator(false /* visit_invisible */, false /* visit_jvmti_weak_export */) {}
-};
-
class ZConcurrentRootsIterator {
private:
ZOopStorageIterator _jni_handles_iter;
--- a/src/hotspot/share/gc/z/zThreadLocalData.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/gc/z/zThreadLocalData.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -63,22 +63,20 @@
}
static void set_invisible_root(Thread* thread, oop* root) {
- assert(!has_invisible_root(thread), "Already set");
+ assert(data(thread)->_invisible_root == NULL, "Already set");
data(thread)->_invisible_root = root;
}
static void clear_invisible_root(Thread* thread) {
- assert(has_invisible_root(thread), "Should be set");
+ assert(data(thread)->_invisible_root != NULL, "Should be set");
data(thread)->_invisible_root = NULL;
}
- static bool has_invisible_root(Thread* thread) {
- return data(thread)->_invisible_root != NULL;
- }
-
- static oop* invisible_root(Thread* thread) {
- assert(has_invisible_root(thread), "Should be set");
- return data(thread)->_invisible_root;
+ template <typename T>
+ static void do_invisible_root(Thread* thread, T f) {
+ if (data(thread)->_invisible_root != NULL) {
+ f(data(thread)->_invisible_root);
+ }
}
static ByteSize address_bad_mask_offset() {
--- a/src/hotspot/share/include/cds.h Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/include/cds.h Thu Sep 12 15:04:00 2019 +0200
@@ -36,22 +36,23 @@
#define NUM_CDS_REGIONS 8 // this must be the same as MetaspaceShared::n_regions
#define CDS_ARCHIVE_MAGIC 0xf00baba2
#define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8
-#define CURRENT_CDS_ARCHIVE_VERSION 7
+#define CURRENT_CDS_ARCHIVE_VERSION 8
#define INVALID_CDS_ARCHIVE_VERSION -1
struct CDSFileMapRegion {
- int _crc; // crc checksum of the current space
- size_t _file_offset; // sizeof(this) rounded to vm page size
+ int _crc; // crc checksum of the current space
+ size_t _file_offset; // sizeof(this) rounded to vm page size
union {
- char* _base; // copy-on-write base address
- size_t _offset; // offset from the compressed oop encoding base, only used
- // by archive heap space
+ char* _base; // copy-on-write base address
+ size_t _offset; // offset from the compressed oop encoding base, only used
+ // by archive heap space
} _addr;
- size_t _used; // for setting space top on read
- int _read_only; // read only space?
- int _allow_exec; // executable code in space?
- void* _oopmap; // bitmap for relocating embedded oops
+ size_t _used; // for setting space top on read
+ int _read_only; // read only space?
+ int _allow_exec; // executable code in space?
+ void* _oopmap; // bitmap for relocating embedded oops
size_t _oopmap_size_in_bits;
+ int _is_heap_region; // used in debug build only.
};
struct CDSFileMapHeaderBase {
--- a/src/hotspot/share/interpreter/abstractInterpreter.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/interpreter/abstractInterpreter.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -208,7 +208,7 @@
address AbstractInterpreter::get_trampoline_code_buffer(AbstractInterpreter::MethodKind kind) {
const size_t trampoline_size = SharedRuntime::trampoline_size();
- address addr = MetaspaceShared::cds_i2i_entry_code_buffers((size_t)(AbstractInterpreter::number_of_method_entries) * trampoline_size);
+ address addr = MetaspaceShared::i2i_entry_code_buffers((size_t)(AbstractInterpreter::number_of_method_entries) * trampoline_size);
addr += (size_t)(kind) * trampoline_size;
return addr;
--- a/src/hotspot/share/interpreter/oopMapCache.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/interpreter/oopMapCache.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -594,9 +594,9 @@
void OopMapCache::compute_one_oop_map(const methodHandle& method, int bci, InterpreterOopMap* entry) {
// Due to the invariants above it's tricky to allocate a temporary OopMapCacheEntry on the stack
- OopMapCacheEntry* tmp = NEW_C_HEAP_ARRAY(OopMapCacheEntry, 1, mtClass);
+ OopMapCacheEntry* tmp = NEW_C_HEAP_OBJ(OopMapCacheEntry, mtClass);
tmp->initialize();
tmp->fill(method, bci);
entry->resource_copy(tmp);
- FREE_C_HEAP_ARRAY(OopMapCacheEntry, tmp);
+ FREE_C_HEAP_OBJ(tmp);
}
--- a/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/stacktrace/jfrStackTraceRepository.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -272,9 +272,7 @@
}
JfrStackTraceRepository::StackTrace::~StackTrace() {
- if (_frames != NULL) {
- FREE_C_HEAP_ARRAY(JfrStackFrame, _frames);
- }
+ FREE_C_HEAP_ARRAY(JfrStackFrame, _frames);
}
bool JfrStackTraceRepository::StackTrace::equals(const JfrStackTrace& rhs) const {
--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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
@@ -117,9 +117,7 @@
assert(t->is_Java_thread(), "invariant");
JfrJavaSupport::destroy_global_jni_handle(tl->java_event_writer());
}
- if (tl->_stackframes != NULL) {
- FREE_C_HEAP_ARRAY(JfrStackFrame, tl->_stackframes);
- }
+ FREE_C_HEAP_ARRAY(JfrStackFrame, tl->_stackframes);
tl->_dead = true;
}
--- a/src/hotspot/share/jfr/utilities/jfrHashtable.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jfr/utilities/jfrHashtable.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -92,10 +92,8 @@
--_number_of_entries;
}
void free_buckets() {
- if (NULL != _buckets) {
- FREE_C_HEAP_ARRAY(Bucket, _buckets);
- _buckets = NULL;
- }
+ FREE_C_HEAP_ARRAY(Bucket, _buckets);
+ _buckets = NULL;
}
TableEntry* bucket(size_t i) { return _buckets[i].get_entry();}
TableEntry** bucket_addr(size_t i) { return _buckets[i].entry_addr(); }
--- a/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciCodeInstaller.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -510,9 +510,7 @@
#if INCLUDE_AOT
RelocBuffer::~RelocBuffer() {
- if (_buffer != NULL) {
- FREE_C_HEAP_ARRAY(char, _buffer);
- }
+ FREE_C_HEAP_ARRAY(char, _buffer);
}
address RelocBuffer::begin() const {
--- a/src/hotspot/share/jvmci/jvmciCompiler.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciCompiler.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -81,7 +81,7 @@
do {
// Loop until there is something in the queue.
do {
- os::sleep((JavaThread*)THREAD, 100);
+ ((JavaThread*)THREAD)->sleep(100);
qsize = CompileBroker::queue_size(CompLevel_full_optimization);
} while (!_bootstrap_compilation_request_handled && first_round && qsize == 0);
first_round = false;
--- a/src/hotspot/share/jvmci/jvmciRuntime.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -942,7 +942,7 @@
}
} else {
// Allow error reporting thread to print the stack trace.
- os::sleep(THREAD, 200);
+ THREAD->sleep(200);
}
before_exit(THREAD);
--- a/src/hotspot/share/memory/allocation.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/allocation.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -64,6 +64,7 @@
return p;
}
+// handles NULL pointers
void FreeHeap(void* p) {
os::free(p);
}
--- a/src/hotspot/share/memory/allocation.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/allocation.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -80,16 +80,21 @@
// stored in the array then must pay attention to calling destructors
// at needed.
//
-// NEW_RESOURCE_ARRAY(type, size)
-// NEW_RESOURCE_OBJ(type)
-// NEW_C_HEAP_ARRAY(type, size)
-// NEW_C_HEAP_OBJ(type, memflags)
-// FREE_C_HEAP_ARRAY(type, old)
-// FREE_C_HEAP_OBJ(objname, type, memflags)
-// char* AllocateHeap(size_t size, const char* name);
-// void FreeHeap(void* p);
+// NEW_RESOURCE_ARRAY*
+// REALLOC_RESOURCE_ARRAY*
+// FREE_RESOURCE_ARRAY*
+// NEW_RESOURCE_OBJ*
+// NEW_C_HEAP_ARRAY*
+// REALLOC_C_HEAP_ARRAY*
+// FREE_C_HEAP_ARRAY*
+// NEW_C_HEAP_OBJ*
+// FREE_C_HEAP_OBJ
//
-
+// char* AllocateHeap(size_t size, MEMFLAGS flags, const NativeCallStack& stack, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+// char* AllocateHeap(size_t size, MEMFLAGS flags, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+// char* ReallocateHeap(char *old, size_t size, MEMFLAGS flag, AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+// void FreeHeap(void* p);
+//
// In non product mode we introduce a super class for all allocation classes
// that supports printing.
// We avoid the superclass in product mode to save space.
@@ -179,6 +184,7 @@
MEMFLAGS flag,
AllocFailType alloc_failmode = AllocFailStrategy::EXIT_OOM);
+// handles NULL pointers
void FreeHeap(void* p);
template <MEMFLAGS F> class CHeapObj ALLOCATION_SUPER_CLASS_SPEC {
--- a/src/hotspot/share/memory/dynamicArchive.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/dynamicArchive.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -652,7 +652,7 @@
it->push(&_symbols->at(i));
}
- _header->_shared_path_table.metaspace_pointers_do(it);
+ _header->shared_path_table_metaspace_pointers_do(it);
// Do not call these again, as we have already collected all the classes and symbols
// that we want to archive. Also, these calls would corrupt the tables when
@@ -733,14 +733,13 @@
init_first_dump_space(reserved_bottom);
FileMapInfo* mapinfo = new FileMapInfo(false);
- _header = (DynamicArchiveHeader*)mapinfo->_header;
+ _header = mapinfo->dynamic_header();
Thread* THREAD = Thread::current();
FileMapInfo* base_info = FileMapInfo::current_info();
- int* crc = _header->_base_archive_crc;
- *crc++ = base_info->crc(); // base archive header crc
+ _header->set_base_header_crc(base_info->crc());
for (int i = 0; i < MetaspaceShared::n_regions; i++) {
- *crc++ = base_info->space_crc(i);
+ _header->set_base_region_crc(i, base_info->space_crc(i));
}
_header->populate(base_info, os::vm_allocation_granularity());
}
@@ -907,9 +906,9 @@
RelocateBufferToTarget patcher(this, (address*)_alloc_bottom, _buffer_to_target_delta);
_ptrmap.iterate(&patcher);
- Array<u8>* table = _header->_shared_path_table.table();
+ Array<u8>* table = _header->shared_path_table().table();
table = to_target(table);
- _header->_shared_path_table.set_table(table);
+ _header->relocate_shared_path_table(table);
}
static void write_archive_info(FileMapInfo* dynamic_info, DynamicArchiveHeader *header) {
@@ -933,7 +932,7 @@
int num_klasses = _klasses->length();
int num_symbols = _symbols->length();
- _header->_read_only_tables_start = to_target(read_only_tables_start);
+ _header->set_read_only_tables_start(to_target(read_only_tables_start));
FileMapInfo* dynamic_info = FileMapInfo::dynamic_info();
assert(dynamic_info != NULL, "Sanity");
@@ -953,10 +952,11 @@
address base = to_target(_alloc_bottom);
address top = address(current_dump_space()->top()) + _buffer_to_target_delta;
- int file_size = int(top - base);
+ size_t file_size = pointer_delta(top, base, sizeof(char));
- log_info(cds, dynamic)("Written dynamic archive " PTR_FORMAT " - " PTR_FORMAT " [%d bytes header, %d bytes total]",
- p2i(base), p2i(top), (int)_header->_header_size, file_size);
+ log_info(cds, dynamic)("Written dynamic archive " PTR_FORMAT " - " PTR_FORMAT
+ " [" SIZE_FORMAT " bytes header, " SIZE_FORMAT " bytes total]",
+ p2i(base), p2i(top), _header->header_size(), file_size);
log_info(cds, dynamic)("%d klasses; %d symbols", num_klasses, num_symbols);
}
@@ -1046,8 +1046,8 @@
DynamicArchiveBuilder* DynamicArchive::_builder = NULL;
void DynamicArchive::map_failed(FileMapInfo* mapinfo) {
- if (mapinfo->_header != NULL) {
- os::free(mapinfo->_header);
+ if (mapinfo->dynamic_header() != NULL) {
+ os::free((void*)mapinfo->dynamic_header());
}
delete mapinfo;
}
@@ -1081,15 +1081,12 @@
}
address DynamicArchive::map_impl(FileMapInfo* mapinfo) {
-
-
// Read header
if (!mapinfo->initialize(false)) {
return NULL;
}
- _dynamic_header = (DynamicArchiveHeader*)mapinfo->header();
-
+ _dynamic_header = mapinfo->dynamic_header();
int regions[] = {MetaspaceShared::rw,
MetaspaceShared::ro,
MetaspaceShared::mc};
@@ -1111,7 +1108,7 @@
return NULL;
}
- intptr_t* buffer = (intptr_t*)_dynamic_header->_read_only_tables_start;
+ intptr_t* buffer = (intptr_t*)_dynamic_header->read_only_tables_start();
ReadClosure rc(&buffer);
SymbolTable::serialize_shared_table_header(&rc, false);
SystemDictionaryShared::serialize_dictionary_headers(&rc, false);
@@ -1122,18 +1119,17 @@
bool DynamicArchive::validate(FileMapInfo* dynamic_info) {
// Check if the recorded base archive matches with the current one
FileMapInfo* base_info = FileMapInfo::current_info();
- DynamicArchiveHeader* dynamic_header = (DynamicArchiveHeader*)dynamic_info->header();
- int* crc = dynamic_header->_base_archive_crc;
+ DynamicArchiveHeader* dynamic_header = dynamic_info->dynamic_header();
// Check the header crc
- if (*crc++ != base_info->crc()) {
+ if (dynamic_header->base_header_crc() != base_info->crc()) {
FileMapInfo::fail_continue("Archive header checksum verification failed.");
return false;
}
// Check each space's crc
for (int i = 0; i < MetaspaceShared::n_regions; i++) {
- if (*crc++ != base_info->space_crc(i)) {
+ if (dynamic_header->base_region_crc(i) != base_info->space_crc(i)) {
FileMapInfo::fail_continue("Archive region #%d checksum verification failed.", i);
return false;
}
--- a/src/hotspot/share/memory/dynamicArchive.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/dynamicArchive.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -37,12 +37,24 @@
#include "utilities/macros.hpp"
#include "utilities/resourceHash.hpp"
-// We want to include all archive header information in the dynamic archive.
-// This helps simplify the process if the base layer archive is missing at
-// dynamic archiving time.
-struct DynamicArchiveHeader : public FileMapHeader {
- // crc for the base archive header and regions
- int _base_archive_crc[MetaspaceShared::n_regions+1];
+class DynamicArchiveHeader : public FileMapHeader {
+ friend class CDSOffsets;
+private:
+ int _base_header_crc;
+ int _base_region_crc[MetaspaceShared::n_regions];
+
+public:
+ int base_header_crc() const { return _base_header_crc; }
+ int base_region_crc(int i) const {
+ assert(is_valid_region(i), "must be");
+ return _base_region_crc[i];
+ }
+
+ void set_base_header_crc(int c) { _base_header_crc = c; }
+ void set_base_region_crc(int i, int c) {
+ assert(is_valid_region(i), "must be");
+ _base_region_crc[i] = c;
+ }
};
class DynamicArchive : AllStatic {
--- a/src/hotspot/share/memory/filemap.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/filemap.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -38,8 +38,8 @@
#include "memory/filemap.hpp"
#include "memory/heapShared.inline.hpp"
#include "memory/iterator.inline.hpp"
+#include "memory/metadataFactory.hpp"
#include "memory/metaspace.hpp"
-#include "memory/metadataFactory.hpp"
#include "memory/metaspaceClosure.hpp"
#include "memory/metaspaceShared.hpp"
#include "memory/oopFactory.hpp"
@@ -193,9 +193,9 @@
}
_header = (FileMapHeader*)os::malloc(header_size, mtInternal);
memset((void*)_header, 0, header_size);
- _header->_header_size = header_size;
- _header->_version = INVALID_CDS_ARCHIVE_VERSION;
- _header->_has_platform_or_app_classes = true;
+ _header->set_header_size(header_size);
+ _header->set_version(INVALID_CDS_ARCHIVE_VERSION);
+ _header->set_has_platform_or_app_classes(true);
_file_offset = 0;
_file_open = false;
}
@@ -211,7 +211,7 @@
}
void FileMapInfo::populate_header(size_t alignment) {
- _header->populate(this, alignment);
+ header()->populate(this, alignment);
}
void FileMapHeader::populate(FileMapInfo* mapinfo, size_t alignment) {
@@ -661,7 +661,7 @@
char* runtime_boot_path = Arguments::get_sysclasspath();
char* rp = skip_first_path_entry(runtime_boot_path);
assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
- int dp_len = _header->_app_class_paths_start_index - 1; // ignore the first path to the module image
+ int dp_len = header()->app_class_paths_start_index() - 1; // ignore the first path to the module image
bool mismatch = false;
bool relaxed_check = !header()->has_platform_or_app_classes();
@@ -724,7 +724,7 @@
// run 1: -cp NE3:a.jar:NE4:b.jar -> a.jar:b.jar -> matched
// run 2: -cp x.jar:NE4:b.jar -> x.jar:b.jar -> mismatched
- int j = _header->_app_class_paths_start_index;
+ int j = header()->app_class_paths_start_index();
mismatch = check_paths(j, shared_app_paths_len, rp_array);
if (mismatch) {
return fail("[APP classpath mismatch, actual: -Djava.class.path=", appcp);
@@ -753,7 +753,7 @@
_validating_shared_path_table = true;
// Load the shared path table info from the archive header
- _shared_path_table = _header->_shared_path_table;
+ _shared_path_table = header()->shared_path_table();
if (DynamicDumpSharedSpaces) {
// Only support dynamic dumping with the usage of the default CDS archive
// or a simple base archive.
@@ -763,30 +763,30 @@
// When dynamic archiving is enabled, the _shared_path_table is overwritten
// to include the application path and stored in the top layer archive.
assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
- if (_header->_app_class_paths_start_index > 1) {
+ if (header()->app_class_paths_start_index() > 1) {
DynamicDumpSharedSpaces = false;
warning(
"Dynamic archiving is disabled because base layer archive has appended boot classpath");
}
- if (_header->_num_module_paths > 0) {
+ if (header()->num_module_paths() > 0) {
DynamicDumpSharedSpaces = false;
warning(
"Dynamic archiving is disabled because base layer archive has module path");
}
}
- log_paths("Expecting BOOT path=", 0, _header->_app_class_paths_start_index);
- log_paths("Expecting -Djava.class.path=", _header->_app_class_paths_start_index, _header->_app_module_paths_start_index);
+ log_paths("Expecting BOOT path=", 0, header()->app_class_paths_start_index());
+ log_paths("Expecting -Djava.class.path=", header()->app_class_paths_start_index(), header()->app_module_paths_start_index());
- int module_paths_start_index = _header->_app_module_paths_start_index;
+ int module_paths_start_index = header()->app_module_paths_start_index();
int shared_app_paths_len = 0;
// validate the path entries up to the _max_used_path_index
- for (int i=0; i < _header->_max_used_path_index + 1; i++) {
+ for (int i=0; i < header()->max_used_path_index() + 1; i++) {
if (i < module_paths_start_index) {
if (shared_path(i)->validate()) {
// Only count the app class paths not from the "Class-path" attribute of a jar manifest.
- if (!shared_path(i)->from_class_path_attr() && i >= _header->_app_class_paths_start_index) {
+ if (!shared_path(i)->from_class_path_attr() && i >= header()->app_class_paths_start_index()) {
shared_app_paths_len++;
}
log_info(class, path)("ok");
@@ -808,7 +808,7 @@
}
}
- if (_header->_max_used_path_index == 0) {
+ if (header()->max_used_path_index() == 0) {
// default archive only contains the module image in the bootclasspath
assert(shared_path(0)->is_modules_image(), "first shared_path must be the modules image");
} else {
@@ -842,14 +842,14 @@
// app classes).
assert(UseSharedSpaces, "runtime only");
- for (int i = _header->_app_module_paths_start_index + _header->_num_module_paths;
+ for (int i = header()->app_module_paths_start_index() + header()->num_module_paths();
i < get_number_of_shared_paths();
i++) {
SharedClassPathEntry* ent = shared_path(i);
if (!ent->check_non_existent()) {
warning("Archived non-system classes are disabled because the "
"file %s exists", ent->name());
- _header->_has_platform_or_app_classes = false;
+ header()->set_has_platform_or_app_classes(false);
}
}
}
@@ -875,7 +875,7 @@
}
if (is_static) {
FileMapHeader* static_header = (FileMapHeader*)header;
- if (static_header->_magic != CDS_ARCHIVE_MAGIC) {
+ if (static_header->magic() != CDS_ARCHIVE_MAGIC) {
os::free(header);
os::close(fd);
vm_exit_during_initialization("Not a base shared archive", archive_name);
@@ -883,7 +883,7 @@
}
} else {
DynamicArchiveHeader* dynamic_header = (DynamicArchiveHeader*)header;
- if (dynamic_header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) {
+ if (dynamic_header->magic() != CDS_DYNAMIC_ARCHIVE_MAGIC) {
os::free(header);
os::close(fd);
vm_exit_during_initialization("Not a top shared archive", archive_name);
@@ -913,18 +913,18 @@
os::close(fd);
return false;
}
- if (dynamic_header->_magic != CDS_DYNAMIC_ARCHIVE_MAGIC) {
+ if (dynamic_header->magic() != CDS_DYNAMIC_ARCHIVE_MAGIC) {
// Not a dynamic header, no need to proceed further.
*size = 0;
os::free(dynamic_header);
os::close(fd);
return false;
}
- if (dynamic_header->_base_archive_is_default) {
+ if (dynamic_header->base_archive_is_default()) {
*base_archive_name = Arguments::get_default_shared_archive_path();
} else {
// read the base archive name
- size_t name_size = dynamic_header->_base_archive_name_size;
+ size_t name_size = dynamic_header->base_archive_name_size();
if (name_size == 0) {
os::free(dynamic_header);
os::close(fd);
@@ -948,14 +948,14 @@
}
void FileMapInfo::restore_shared_path_table() {
- _shared_path_table = _current_info->_header->_shared_path_table;
+ _shared_path_table = _current_info->header()->shared_path_table();
}
// Read the FileMapInfo information from the file.
bool FileMapInfo::init_from_file(int fd, bool is_static) {
size_t sz = is_static ? sizeof(FileMapHeader) : sizeof(DynamicArchiveHeader);
- size_t n = os::read(fd, _header, (unsigned int)sz);
+ size_t n = os::read(fd, header(), (unsigned int)sz);
if (n != sz) {
fail_continue("Unable to read the file header.");
return false;
@@ -967,66 +967,68 @@
}
unsigned int expected_magic = is_static ? CDS_ARCHIVE_MAGIC : CDS_DYNAMIC_ARCHIVE_MAGIC;
- if (_header->_magic != expected_magic) {
+ if (header()->magic() != expected_magic) {
log_info(cds)("_magic expected: 0x%08x", expected_magic);
- log_info(cds)(" actual: 0x%08x", _header->_magic);
+ log_info(cds)(" actual: 0x%08x", header()->magic());
FileMapInfo::fail_continue("The shared archive file has a bad magic number.");
return false;
}
- if (_header->_version != CURRENT_CDS_ARCHIVE_VERSION) {
+ if (header()->version() != CURRENT_CDS_ARCHIVE_VERSION) {
log_info(cds)("_version expected: %d", CURRENT_CDS_ARCHIVE_VERSION);
- log_info(cds)(" actual: %d", _header->_version);
+ log_info(cds)(" actual: %d", header()->version());
fail_continue("The shared archive file has the wrong version.");
return false;
}
- if (_header->_header_size != sz) {
+ if (header()->header_size() != sz) {
log_info(cds)("_header_size expected: " SIZE_FORMAT, sz);
- log_info(cds)(" actual: " SIZE_FORMAT, _header->_header_size);
+ log_info(cds)(" actual: " SIZE_FORMAT, header()->header_size());
FileMapInfo::fail_continue("The shared archive file has an incorrect header size.");
return false;
}
- if (_header->_jvm_ident[JVM_IDENT_MAX-1] != 0) {
+ const char* actual_ident = header()->jvm_ident();
+
+ if (actual_ident[JVM_IDENT_MAX-1] != 0) {
FileMapInfo::fail_continue("JVM version identifier is corrupted.");
return false;
}
- char header_version[JVM_IDENT_MAX];
- get_header_version(header_version);
- if (strncmp(_header->_jvm_ident, header_version, JVM_IDENT_MAX-1) != 0) {
- log_info(cds)("_jvm_ident expected: %s", header_version);
- log_info(cds)(" actual: %s", _header->_jvm_ident);
+ char expected_ident[JVM_IDENT_MAX];
+ get_header_version(expected_ident);
+ if (strncmp(actual_ident, expected_ident, JVM_IDENT_MAX-1) != 0) {
+ log_info(cds)("_jvm_ident expected: %s", expected_ident);
+ log_info(cds)(" actual: %s", actual_ident);
FileMapInfo::fail_continue("The shared archive file was created by a different"
" version or build of HotSpot");
return false;
}
if (VerifySharedSpaces) {
- int expected_crc = _header->compute_crc();
- if (expected_crc != _header->_crc) {
+ int expected_crc = header()->compute_crc();
+ if (expected_crc != header()->crc()) {
log_info(cds)("_crc expected: %d", expected_crc);
- log_info(cds)(" actual: %d", _header->_crc);
+ log_info(cds)(" actual: %d", header()->crc());
FileMapInfo::fail_continue("Header checksum verification failed.");
return false;
}
}
- _file_offset = n + _header->_base_archive_name_size; // accounts for the size of _base_archive_name
+ _file_offset = n + header()->base_archive_name_size(); // accounts for the size of _base_archive_name
if (is_static) {
// just checking the last region is sufficient since the archive is written
// in sequential order
size_t len = lseek(fd, 0, SEEK_END);
- CDSFileMapRegion* si = space_at(MetaspaceShared::last_valid_region);
+ FileMapRegion* si = space_at(MetaspaceShared::last_valid_region);
// The last space might be empty
- if (si->_file_offset > len || len - si->_file_offset < si->_used) {
+ if (si->file_offset() > len || len - si->file_offset() < si->used()) {
fail_continue("The shared archive file has been truncated.");
return false;
}
- SharedBaseAddress = _header->_shared_base_address;
+ SharedBaseAddress = header()->shared_base_address();
}
return true;
@@ -1096,20 +1098,41 @@
void FileMapInfo::write_header() {
char* base_archive_name = NULL;
- if (_header->_magic == CDS_DYNAMIC_ARCHIVE_MAGIC) {
+ if (header()->magic() == CDS_DYNAMIC_ARCHIVE_MAGIC) {
base_archive_name = (char*)Arguments::GetSharedArchivePath();
- _header->_base_archive_name_size = (int)strlen(base_archive_name) + 1;
- _header->_base_archive_is_default = FLAG_IS_DEFAULT(SharedArchiveFile);
+ header()->set_base_archive_name_size(strlen(base_archive_name) + 1);
+ header()->set_base_archive_is_default(FLAG_IS_DEFAULT(SharedArchiveFile));
}
assert(is_file_position_aligned(), "must be");
- write_bytes(_header, _header->_header_size);
+ write_bytes(header(), header()->header_size());
if (base_archive_name != NULL) {
- write_bytes(base_archive_name, (size_t)_header->_base_archive_name_size);
+ write_bytes(base_archive_name, header()->base_archive_name_size());
}
align_file_position();
}
+void FileMapRegion::init(bool is_heap_region, char* base, size_t size, bool read_only,
+ bool allow_exec, int crc) {
+ _is_heap_region = is_heap_region;
+
+ if (is_heap_region) {
+ assert(!DynamicDumpSharedSpaces, "must be");
+ assert((base - (char*)CompressedKlassPointers::base()) % HeapWordSize == 0, "Sanity");
+ if (base != NULL) {
+ _addr._offset = (intx)CompressedOops::encode_not_null((oop)base);
+ } else {
+ _addr._offset = 0;
+ }
+ } else {
+ _addr._base = base;
+ }
+ _used = size;
+ _read_only = read_only;
+ _allow_exec = allow_exec;
+ _crc = crc;
+}
+
// Dump region to file.
// This is called twice for each region during archiving, once before
// the archive file is open (_file_open is false) and once after.
@@ -1117,37 +1140,25 @@
bool read_only, bool allow_exec) {
assert(DumpSharedSpaces || DynamicDumpSharedSpaces, "Dump time only");
- CDSFileMapRegion* si = space_at(region);
+ FileMapRegion* si = space_at(region);
char* target_base = base;
if (DynamicDumpSharedSpaces) {
+ assert(!HeapShared::is_heap_region(region), "dynamic archive doesn't support heap regions");
target_base = DynamicArchive::buffer_to_target(base);
}
if (_file_open) {
- guarantee(si->_file_offset == _file_offset, "file offset mismatch.");
+ guarantee(si->file_offset() == _file_offset, "file offset mismatch.");
log_info(cds)("Shared file region %d: " SIZE_FORMAT_HEX_W(08)
" bytes, addr " INTPTR_FORMAT " file offset " SIZE_FORMAT_HEX_W(08),
region, size, p2i(target_base), _file_offset);
} else {
- si->_file_offset = _file_offset;
+ si->set_file_offset(_file_offset);
}
- if (HeapShared::is_heap_region(region)) {
- assert((target_base - (char*)CompressedKlassPointers::base()) % HeapWordSize == 0, "Sanity");
- if (target_base != NULL) {
- si->_addr._offset = (intx)CompressedOops::encode_not_null((oop)target_base);
- } else {
- si->_addr._offset = 0;
- }
- } else {
- si->_addr._base = target_base;
- }
- si->_used = size;
- si->_read_only = read_only;
- si->_allow_exec = allow_exec;
+ int crc = ClassLoader::crc32(0, base, (jint)size);
+ si->init(HeapShared::is_heap_region(region), target_base, size, read_only, allow_exec, crc);
- // Use the current 'base' when computing the CRC value and writing out data
- si->_crc = ClassLoader::crc32(0, base, (jint)size);
if (base != NULL) {
write_bytes_aligned(base, size);
}
@@ -1217,8 +1228,8 @@
}
write_region(i, start, size, false, false);
if (size > 0) {
- space_at(i)->_oopmap = oopmaps->at(arr_idx)._oopmap;
- space_at(i)->_oopmap_size_in_bits = oopmaps->at(arr_idx)._oopmap_size_in_bits;
+ space_at(i)->init_oopmap(oopmaps->at(arr_idx)._oopmap,
+ oopmaps->at(arr_idx)._oopmap_size_in_bits);
}
}
return total_size;
@@ -1291,20 +1302,20 @@
// Remap the shared readonly space to shared readwrite, private.
bool FileMapInfo::remap_shared_readonly_as_readwrite() {
int idx = MetaspaceShared::ro;
- CDSFileMapRegion* si = space_at(idx);
- if (!si->_read_only) {
+ FileMapRegion* si = space_at(idx);
+ if (!si->read_only()) {
// the space is already readwrite so we are done
return true;
}
- size_t used = si->_used;
+ size_t used = si->used();
size_t size = align_up(used, os::vm_allocation_granularity());
if (!open_for_read()) {
return false;
}
char *addr = region_addr(idx);
- char *base = os::remap_memory(_fd, _full_path, si->_file_offset,
+ char *base = os::remap_memory(_fd, _full_path, si->file_offset(),
addr, size, false /* !read_only */,
- si->_allow_exec);
+ si->allow_exec());
close();
// These have to be errors because the shared region is now unmapped.
if (base == NULL) {
@@ -1315,7 +1326,7 @@
log_error(cds)("Unable to remap shared readonly space (errno=%d).", errno);
vm_exit(1);
}
- si->_read_only = false;
+ si->set_read_only(false);
return true;
}
@@ -1368,8 +1379,8 @@
char* FileMapInfo::map_region(int i, char** top_ret) {
assert(!HeapShared::is_heap_region(i), "sanity");
- CDSFileMapRegion* si = space_at(i);
- size_t used = si->_used;
+ FileMapRegion* si = space_at(i);
+ size_t used = si->used();
size_t alignment = Metaspace::reserve_alignment();
size_t size = align_up(used, alignment);
char *requested_addr = region_addr(i);
@@ -1377,19 +1388,19 @@
#ifdef _WINDOWS
// Windows cannot remap read-only shared memory to read-write when required for
// RedefineClasses, which is also used by JFR. Always map windows regions as RW.
- si->_read_only = false;
+ si->set_read_only(false);
#else
// If a tool agent is in use (debugging enabled), or JFR, we must map the address space RW
if (JvmtiExport::can_modify_any_class() || JvmtiExport::can_walk_any_space() ||
Arguments::has_jfr_option()) {
- si->_read_only = false;
+ si->set_read_only(false);
}
#endif // _WINDOWS
// map the contents of the CDS archive in this memory
- char *base = os::map_memory(_fd, _full_path, si->_file_offset,
- requested_addr, size, si->_read_only,
- si->_allow_exec);
+ char *base = os::map_memory(_fd, _full_path, si->file_offset(),
+ requested_addr, size, si->read_only(),
+ si->allow_exec());
if (base == NULL || base != requested_addr) {
fail_continue("Unable to map %s shared space at required address.", shared_region_name[i]);
_memory_mapping_failed = true;
@@ -1421,11 +1432,11 @@
return count;
}
-address FileMapInfo::decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode) {
+address FileMapInfo::decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode) {
if (with_current_oop_encoding_mode) {
- return (address)CompressedOops::decode_not_null(offset_of_space(spc));
+ return (address)CompressedOops::decode_not_null(spc->offset());
} else {
- return (address)HeapShared::decode_from_archive(offset_of_space(spc));
+ return (address)HeapShared::decode_from_archive(spc->offset());
}
}
@@ -1436,7 +1447,7 @@
#if INCLUDE_CDS_JAVA_HEAP
bool FileMapInfo::has_heap_regions() {
- return (_header->_space[MetaspaceShared::first_closed_archive_heap_region]._used > 0);
+ return (space_at(MetaspaceShared::first_closed_archive_heap_region)->used() > 0);
}
// Returns the address range of the archived heap regions computed using the
@@ -1450,8 +1461,8 @@
for (int i = MetaspaceShared::first_closed_archive_heap_region;
i <= MetaspaceShared::last_valid_region;
i++) {
- CDSFileMapRegion* si = space_at(i);
- size_t size = si->_used;
+ FileMapRegion* si = space_at(i);
+ size_t size = si->used();
if (size > 0) {
address s = start_address_as_decoded_with_current_oop_encoding_mode(si);
address e = s + size;
@@ -1547,7 +1558,7 @@
// At run time, they may not be inside the heap, so we move them so
// that they are now near the top of the runtime time. This can be done by
// the simple math of adding the delta as shown above.
- address dumptime_heap_end = (address)_header->_heap_end;
+ address dumptime_heap_end = header()->heap_end();
address runtime_heap_end = (address)CompressedOops::end();
delta = runtime_heap_end - dumptime_heap_end;
}
@@ -1555,7 +1566,7 @@
log_info(cds)("CDS heap data relocation delta = " INTX_FORMAT " bytes", delta);
HeapShared::init_narrow_oop_decoding(narrow_oop_base() + delta, narrow_oop_shift());
- CDSFileMapRegion* si = space_at(MetaspaceShared::first_closed_archive_heap_region);
+ FileMapRegion* si = space_at(MetaspaceShared::first_closed_archive_heap_region);
address relocated_closed_heap_region_bottom = start_address_as_decoded_from_archive(si);
if (!is_aligned(relocated_closed_heap_region_bottom, HeapRegion::GrainBytes)) {
// Align the bottom of the closed archive heap regions at G1 region boundary.
@@ -1610,13 +1621,13 @@
bool FileMapInfo::map_heap_data(MemRegion **heap_mem, int first,
int max, int* num, bool is_open_archive) {
MemRegion * regions = new MemRegion[max];
- CDSFileMapRegion* si;
+ FileMapRegion* si;
int region_num = 0;
for (int i = first;
i < first + max; i++) {
si = space_at(i);
- size_t size = si->_used;
+ size_t size = si->used();
if (size > 0) {
HeapWord* start = (HeapWord*)start_address_as_decoded_from_archive(si);
regions[region_num] = MemRegion(start, size / HeapWordSize);
@@ -1649,9 +1660,9 @@
for (int i = 0; i < region_num; i++) {
si = space_at(first + i);
char* addr = (char*)regions[i].start();
- char* base = os::map_memory(_fd, _full_path, si->_file_offset,
- addr, regions[i].byte_size(), si->_read_only,
- si->_allow_exec);
+ char* base = os::map_memory(_fd, _full_path, si->file_offset(),
+ addr, regions[i].byte_size(), si->read_only(),
+ si->allow_exec());
if (base == NULL || base != addr) {
// dealloc the regions from java heap
dealloc_archive_heap_regions(regions, region_num, is_open_archive);
@@ -1661,7 +1672,7 @@
return false;
}
- if (VerifySharedSpaces && !region_crc_check(addr, regions[i].byte_size(), si->_crc)) {
+ if (VerifySharedSpaces && !region_crc_check(addr, regions[i].byte_size(), si->crc())) {
// dealloc the regions from java heap
dealloc_archive_heap_regions(regions, region_num, is_open_archive);
log_info(cds)("UseSharedSpaces: mapped heap regions are corrupt");
@@ -1692,9 +1703,9 @@
void FileMapInfo::patch_archived_heap_embedded_pointers(MemRegion* ranges, int num_ranges,
int first_region_idx) {
for (int i=0; i<num_ranges; i++) {
- CDSFileMapRegion* si = space_at(i + first_region_idx);
- HeapShared::patch_archived_heap_embedded_pointers(ranges[i], (address)si->_oopmap,
- si->_oopmap_size_in_bits);
+ FileMapRegion* si = space_at(i + first_region_idx);
+ HeapShared::patch_archived_heap_embedded_pointers(ranges[i], (address)si->oopmap(),
+ si->oopmap_size_in_bits());
}
}
@@ -1738,14 +1749,13 @@
bool FileMapInfo::verify_region_checksum(int i) {
assert(VerifySharedSpaces, "sanity");
-
- size_t sz = space_at(i)->_used;
+ size_t sz = space_at(i)->used();
if (sz == 0) {
return true; // no data
+ } else {
+ return region_crc_check(region_addr(i), sz, space_at(i)->crc());
}
-
- return region_crc_check(region_addr(i), sz, space_at(i)->_crc);
}
void FileMapInfo::unmap_regions(int regions[], char* saved_base[], size_t len) {
@@ -1760,8 +1770,8 @@
void FileMapInfo::unmap_region(int i) {
assert(!HeapShared::is_heap_region(i), "sanity");
- CDSFileMapRegion* si = space_at(i);
- size_t used = si->_used;
+ FileMapRegion* si = space_at(i);
+ size_t used = si->used();
size_t size = align_up(used, os::vm_allocation_granularity());
if (used == 0) {
@@ -1828,13 +1838,13 @@
}
char* FileMapInfo::region_addr(int idx) {
- CDSFileMapRegion* si = space_at(idx);
+ FileMapRegion* si = space_at(idx);
if (HeapShared::is_heap_region(idx)) {
assert(DumpSharedSpaces, "The following doesn't work at runtime");
- return si->_used > 0 ?
+ return si->used() > 0 ?
(char*)start_address_as_decoded_with_current_oop_encoding_mode(si) : NULL;
} else {
- return si->_addr._base;
+ return si->base();
}
}
@@ -1903,7 +1913,7 @@
}
bool FileMapInfo::validate_header(bool is_static) {
- return _header->validate();
+ return header()->validate();
}
// Check if a given address is within one of the shared regions
@@ -1913,7 +1923,7 @@
idx == MetaspaceShared::mc ||
idx == MetaspaceShared::md, "invalid region index");
char* base = region_addr(idx);
- if (p >= base && p < base + space_at(idx)->_used) {
+ if (p >= base && p < base + space_at(idx)->used()) {
return true;
}
return false;
@@ -1931,7 +1941,7 @@
char *addr = map_info->region_addr(i);
if (addr != NULL) {
map_info->unmap_region(i);
- map_info->space_at(i)->_addr._base = NULL;
+ map_info->space_at(i)->mark_invalid();
}
}
}
--- a/src/hotspot/share/memory/filemap.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/filemap.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -55,7 +55,6 @@
void set_name(const char* name, TRAPS);
-protected:
u1 _type;
bool _from_class_path_attr;
time_t _timestamp; // jar timestamp, 0 if is directory, modules image or other
@@ -122,24 +121,70 @@
}
Array<u8>* table() {return _table;}
void set_table(Array<u8>* table) {_table = table;}
-
};
-struct FileMapHeader : public CDSFileMapHeaderBase {
+
+class FileMapRegion: private CDSFileMapRegion {
+ void assert_is_heap_region() const {
+ assert(_is_heap_region, "must be heap region");
+ }
+ void assert_is_not_heap_region() const {
+ assert(!_is_heap_region, "must not be heap region");
+ }
+
+public:
+ static FileMapRegion* cast(CDSFileMapRegion* p) {
+ return (FileMapRegion*)p;
+ }
+
+ // Accessors
+ int crc() const { return _crc; }
+ size_t file_offset() const { return _file_offset; }
+ char* base() const { assert_is_not_heap_region(); return _addr._base; }
+ narrowOop offset() const { assert_is_heap_region(); return (narrowOop)(_addr._offset); }
+ size_t used() const { return _used; }
+ bool read_only() const { return _read_only != 0; }
+ bool allow_exec() const { return _allow_exec != 0; }
+ void* oopmap() const { return _oopmap; }
+ size_t oopmap_size_in_bits() const { return _oopmap_size_in_bits; }
+
+ void set_file_offset(size_t s) { _file_offset = s; }
+ void set_read_only(bool v) { _read_only = v; }
+ void mark_invalid() { _addr._base = NULL; }
+
+ void init(bool is_heap_region, char* base, size_t size, bool read_only,
+ bool allow_exec, int crc);
+
+ void init_oopmap(void* map, size_t size_in_bits) {
+ _oopmap = map;
+ _oopmap_size_in_bits = size_in_bits;
+ }
+};
+
+class FileMapHeader: private CDSFileMapHeaderBase {
+ friend class CDSOffsets;
+ friend class VMStructs;
+
size_t _header_size;
+
+ // The following fields record the states of the VM during dump time.
+ // They are compared with the runtime states to see if the archive
+ // can be used.
size_t _alignment; // how shared archive should be aligned
int _obj_alignment; // value of ObjectAlignmentInBytes
address _narrow_oop_base; // compressed oop encoding base
int _narrow_oop_shift; // compressed oop encoding shift
- bool _compact_strings; // value of CompactStrings
+ bool _compact_strings; // value of CompactStrings
uintx _max_heap_size; // java max heap size during dumping
CompressedOops::Mode _narrow_oop_mode; // compressed oop encoding mode
int _narrow_klass_shift; // save narrow klass base and shift
address _narrow_klass_base;
+
+
char* _misc_data_patching_start;
char* _read_only_tables_start;
- address _cds_i2i_entry_code_buffers;
- size_t _cds_i2i_entry_code_buffers_size;
+ address _i2i_entry_code_buffers;
+ size_t _i2i_entry_code_buffers_size;
size_t _core_spaces_size; // number of bytes allocated by the core spaces
// (mc, md, ro, rw and od).
address _heap_end; // heap end at dump time.
@@ -148,10 +193,10 @@
// The following fields are all sanity checks for whether this archive
// will function correctly with this JVM and the bootclasspath it's
// invoked with.
- char _jvm_ident[JVM_IDENT_MAX]; // identifier for jvm
+ char _jvm_ident[JVM_IDENT_MAX]; // identifier string of the jvm that created this dump
// size of the base archive name including NULL terminator
- int _base_archive_name_size;
+ size_t _base_archive_name_size;
// The following is a table of all the boot/app/module path entries that were used
// during dumping. At run time, we validate these entries according to their
@@ -171,36 +216,99 @@
size_t _shared_base_address; // SharedBaseAddress used at dump time
bool _allow_archiving_with_java_agent; // setting of the AllowArchivingWithJavaAgent option
- void set_has_platform_or_app_classes(bool v) {
- _has_platform_or_app_classes = v;
+public:
+ // Accessors -- fields declared in CDSFileMapHeaderBase
+ unsigned int magic() const {return _magic;}
+ int crc() const { return _crc; }
+ int version() const { return _version; }
+
+ void set_crc(int crc_value) { _crc = crc_value; }
+ void set_version(int v) { _version = v; }
+
+ // Accessors -- fields declared in FileMapHeader
+
+ size_t header_size() const { return _header_size; }
+ size_t alignment() const { return _alignment; }
+ int obj_alignment() const { return _obj_alignment; }
+ address narrow_oop_base() const { return _narrow_oop_base; }
+ int narrow_oop_shift() const { return _narrow_oop_shift; }
+ bool compact_strings() const { return _compact_strings; }
+ uintx max_heap_size() const { return _max_heap_size; }
+ CompressedOops::Mode narrow_oop_mode() const { return _narrow_oop_mode; }
+ int narrow_klass_shift() const { return _narrow_klass_shift; }
+ address narrow_klass_base() const { return _narrow_klass_base; }
+ char* misc_data_patching_start() const { return _misc_data_patching_start; }
+ char* read_only_tables_start() const { return _read_only_tables_start; }
+ address i2i_entry_code_buffers() const { return _i2i_entry_code_buffers; }
+ size_t i2i_entry_code_buffers_size() const { return _i2i_entry_code_buffers_size; }
+ size_t core_spaces_size() const { return _core_spaces_size; }
+ address heap_end() const { return _heap_end; }
+ bool base_archive_is_default() const { return _base_archive_is_default; }
+ const char* jvm_ident() const { return _jvm_ident; }
+ size_t base_archive_name_size() const { return _base_archive_name_size; }
+ size_t shared_base_address() const { return _shared_base_address; }
+ bool has_platform_or_app_classes() const { return _has_platform_or_app_classes; }
+ SharedPathTable shared_path_table() const { return _shared_path_table; }
+
+ // FIXME: These should really return int
+ jshort max_used_path_index() const { return _max_used_path_index; }
+ jshort app_module_paths_start_index() const { return _app_module_paths_start_index; }
+ jshort app_class_paths_start_index() const { return _app_class_paths_start_index; }
+ jshort num_module_paths() const { return _num_module_paths; }
+
+ void set_core_spaces_size(size_t s) { _core_spaces_size = s; }
+ void set_has_platform_or_app_classes(bool v) { _has_platform_or_app_classes = v; }
+ void set_misc_data_patching_start(char* p) { _misc_data_patching_start = p; }
+ void set_read_only_tables_start(char* p) { _read_only_tables_start = p; }
+ void set_base_archive_name_size(size_t s) { _base_archive_name_size = s; }
+ void set_base_archive_is_default(bool b) { _base_archive_is_default = b; }
+ void set_header_size(size_t s) { _header_size = s; }
+
+ void set_i2i_entry_code_buffers(address p, size_t s) {
+ _i2i_entry_code_buffers = p;
+ _i2i_entry_code_buffers_size = s;
}
- bool has_platform_or_app_classes() { return _has_platform_or_app_classes; }
- jshort max_used_path_index() { return _max_used_path_index; }
- jshort app_module_paths_start_index() { return _app_module_paths_start_index; }
+
+ void relocate_shared_path_table(Array<u8>* t) {
+ assert(DynamicDumpSharedSpaces, "only");
+ _shared_path_table.set_table(t);
+ }
+
+ void shared_path_table_metaspace_pointers_do(MetaspaceClosure* it) {
+ assert(DynamicDumpSharedSpaces, "only");
+ _shared_path_table.metaspace_pointers_do(it);
+ }
bool validate();
int compute_crc();
- CDSFileMapRegion* space_at(int i) {
- assert(i >= 0 && i < NUM_CDS_REGIONS, "invalid region");
- return &_space[i];
+ FileMapRegion* space_at(int i) {
+ assert(is_valid_region(i), "invalid region");
+ return FileMapRegion::cast(&_space[i]);
}
-public:
+
void populate(FileMapInfo* info, size_t alignment);
+
+ static bool is_valid_region(int region) {
+ return (0 <= region && region < NUM_CDS_REGIONS);
+ }
};
class FileMapInfo : public CHeapObj<mtInternal> {
private:
friend class ManifestStream;
friend class VMStructs;
- friend struct FileMapHeader;
+ friend class CDSOffsets;
+ friend class FileMapHeader;
- bool _is_static;
- bool _file_open;
- int _fd;
- size_t _file_offset;
+ bool _is_static;
+ bool _file_open;
+ int _fd;
+ size_t _file_offset;
+ const char* _full_path;
+ const char* _base_archive_name;
+ FileMapHeader* _header;
-private:
// TODO: Probably change the following to be non-static
static SharedPathTable _shared_path_table;
static bool _validating_shared_path_table;
@@ -209,76 +317,75 @@
// mapped. This structure gets written to a file. It is not a class, so
// that the compilers don't add any compiler-private data to it.
-public:
- struct FileMapHeaderBase : public CHeapObj<mtClass> {
- // Need to put something here. Otherwise, in product build, because CHeapObj has no virtual
- // methods, we would get sizeof(FileMapHeaderBase) == 1 with gcc.
- intx _dummy;
- };
-
-
- FileMapHeader * _header;
-
- const char* _full_path;
- char* _base_archive_name;
-
static FileMapInfo* _current_info;
static FileMapInfo* _dynamic_archive_info;
static bool _heap_pointers_need_patching;
static bool _memory_mapping_failed;
static GrowableArray<const char*>* _non_existent_class_paths;
+ FileMapHeader *header() const { return _header; }
+
+public:
static bool get_base_archive_name_from_header(const char* archive_name,
int* size, char** base_archive_name);
static bool check_archive(const char* archive_name, bool is_static);
void restore_shared_path_table();
- bool init_from_file(int fd, bool is_static);
+ bool init_from_file(int fd, bool is_static);
static void metaspace_pointers_do(MetaspaceClosure* it);
void log_paths(const char* msg, int start_idx, int end_idx);
-public:
FileMapInfo(bool is_static);
~FileMapInfo();
- int compute_header_crc() { return _header->compute_crc(); }
- void set_header_crc(int crc) { _header->_crc = crc; }
- int space_crc(int i) { return space_at(i)->_crc; }
+ // Accessors
+ int compute_header_crc() const { return header()->compute_crc(); }
+ void set_header_crc(int crc) { header()->set_crc(crc); }
+ int space_crc(int i) const { return space_at(i)->crc(); }
void populate_header(size_t alignment);
bool validate_header(bool is_static);
void invalidate();
- int crc() { return _header->_crc; }
- int version() { return _header->_version; }
- size_t alignment() { return _header->_alignment; }
- CompressedOops::Mode narrow_oop_mode() { return _header->_narrow_oop_mode; }
- address narrow_oop_base() const { return _header->_narrow_oop_base; }
- int narrow_oop_shift() const { return _header->_narrow_oop_shift; }
- uintx max_heap_size() const { return _header->_max_heap_size; }
- address narrow_klass_base() const { return _header->_narrow_klass_base; }
- int narrow_klass_shift() const { return _header->_narrow_klass_shift; }
- struct FileMapHeader* header() { return _header; }
- char* misc_data_patching_start() { return _header->_misc_data_patching_start; }
- void set_misc_data_patching_start(char* p) { _header->_misc_data_patching_start = p; }
- char* read_only_tables_start() { return _header->_read_only_tables_start; }
- void set_read_only_tables_start(char* p) { _header->_read_only_tables_start = p; }
+ int crc() const { return header()->crc(); }
+ int version() const { return header()->version(); }
+ size_t alignment() const { return header()->alignment(); }
+ address narrow_oop_base() const { return header()->narrow_oop_base(); }
+ int narrow_oop_shift() const { return header()->narrow_oop_shift(); }
+ uintx max_heap_size() const { return header()->max_heap_size(); }
+ address narrow_klass_base() const { return header()->narrow_klass_base(); }
+ int narrow_klass_shift() const { return header()->narrow_klass_shift(); }
+
+ CompressedOops::Mode narrow_oop_mode() const { return header()->narrow_oop_mode(); }
+ jshort app_module_paths_start_index() const { return header()->app_module_paths_start_index(); }
+ jshort app_class_paths_start_index() const { return header()->app_class_paths_start_index(); }
+
+ char* misc_data_patching_start() const { return header()->misc_data_patching_start(); }
+ void set_misc_data_patching_start(char* p) const { header()->set_misc_data_patching_start(p); }
+ char* read_only_tables_start() const { return header()->read_only_tables_start(); }
+ void set_read_only_tables_start(char* p) const { header()->set_read_only_tables_start(p); }
bool is_file_position_aligned() const;
void align_file_position();
- address cds_i2i_entry_code_buffers() {
- return _header->_cds_i2i_entry_code_buffers;
- }
- void set_cds_i2i_entry_code_buffers(address addr) {
- _header->_cds_i2i_entry_code_buffers = addr;
+ address i2i_entry_code_buffers() const { return header()->i2i_entry_code_buffers(); }
+ size_t i2i_entry_code_buffers_size() const { return header()->i2i_entry_code_buffers_size(); }
+ void set_i2i_entry_code_buffers(address addr, size_t s) const {
+ header()->set_i2i_entry_code_buffers(addr, s);
}
- size_t cds_i2i_entry_code_buffers_size() {
- return _header->_cds_i2i_entry_code_buffers_size;
+
+ void set_core_spaces_size(size_t s) const { header()->set_core_spaces_size(s); }
+ size_t core_spaces_size() const { return header()->core_spaces_size(); }
+
+ class DynamicArchiveHeader* dynamic_header() const {
+ assert(!_is_static, "must be");
+ return (DynamicArchiveHeader*)header();
}
- void set_cds_i2i_entry_code_buffers_size(size_t s) {
- _header->_cds_i2i_entry_code_buffers_size = s;
+
+ void set_has_platform_or_app_classes(bool v) {
+ header()->set_has_platform_or_app_classes(v);
}
- void set_core_spaces_size(size_t s) { _header->_core_spaces_size = s; }
- size_t core_spaces_size() { return _header->_core_spaces_size; }
+ bool has_platform_or_app_classes() const {
+ return header()->has_platform_or_app_classes();
+ }
static FileMapInfo* current_info() {
CDS_ONLY(return _current_info;)
@@ -385,25 +492,21 @@
bool region_crc_check(char* buf, size_t size, int expected_crc) NOT_CDS_RETURN_(false);
void dealloc_archive_heap_regions(MemRegion* regions, int num, bool is_open) NOT_CDS_JAVA_HEAP_RETURN;
- CDSFileMapRegion* space_at(int i) {
- return _header->space_at(i);
- }
-
- narrowOop offset_of_space(CDSFileMapRegion* spc) {
- return (narrowOop)(spc->_addr._offset);
+ FileMapRegion* space_at(int i) const {
+ return header()->space_at(i);
}
// The starting address of spc, as calculated with CompressedOop::decode_non_null()
- address start_address_as_decoded_with_current_oop_encoding_mode(CDSFileMapRegion* spc) {
+ address start_address_as_decoded_with_current_oop_encoding_mode(FileMapRegion* spc) {
return decode_start_address(spc, true);
}
// The starting address of spc, as calculated with HeapShared::decode_from_archive()
- address start_address_as_decoded_from_archive(CDSFileMapRegion* spc) {
+ address start_address_as_decoded_from_archive(FileMapRegion* spc) {
return decode_start_address(spc, false);
}
- address decode_start_address(CDSFileMapRegion* spc, bool with_current_oop_encoding_mode);
+ address decode_start_address(FileMapRegion* spc, bool with_current_oop_encoding_mode);
#if INCLUDE_JVMTI
static ClassPathEntry** _classpath_entries_for_jvmti;
--- a/src/hotspot/share/memory/metaspaceShared.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/metaspaceShared.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -80,8 +80,8 @@
bool MetaspaceShared::_has_error_classes;
bool MetaspaceShared::_archive_loading_failed = false;
bool MetaspaceShared::_remapped_readwrite = false;
-address MetaspaceShared::_cds_i2i_entry_code_buffers = NULL;
-size_t MetaspaceShared::_cds_i2i_entry_code_buffers_size = 0;
+address MetaspaceShared::_i2i_entry_code_buffers = NULL;
+size_t MetaspaceShared::_i2i_entry_code_buffers_size = 0;
size_t MetaspaceShared::_core_spaces_size = 0;
void* MetaspaceShared::_shared_metaspace_static_top = NULL;
@@ -356,14 +356,14 @@
if (size > 0) {
SystemDictionaryShared::allocate_shared_data_arrays(size, THREAD);
if (!DynamicDumpSharedSpaces) {
- FileMapHeader* header;
+ FileMapInfo* info;
if (FileMapInfo::dynamic_info() == NULL) {
- header = FileMapInfo::current_info()->header();
+ info = FileMapInfo::current_info();
} else {
- header = FileMapInfo::dynamic_info()->header();
+ info = FileMapInfo::dynamic_info();
}
- ClassLoaderExt::init_paths_start_index(header->_app_class_paths_start_index);
- ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index);
+ ClassLoaderExt::init_paths_start_index(info->app_class_paths_start_index());
+ ClassLoaderExt::init_app_module_paths_start_index(info->app_module_paths_start_index());
}
}
}
@@ -492,20 +492,20 @@
soc->do_tag(666);
}
-address MetaspaceShared::cds_i2i_entry_code_buffers(size_t total_size) {
+address MetaspaceShared::i2i_entry_code_buffers(size_t total_size) {
if (DumpSharedSpaces) {
- if (_cds_i2i_entry_code_buffers == NULL) {
- _cds_i2i_entry_code_buffers = (address)misc_code_space_alloc(total_size);
- _cds_i2i_entry_code_buffers_size = total_size;
+ if (_i2i_entry_code_buffers == NULL) {
+ _i2i_entry_code_buffers = (address)misc_code_space_alloc(total_size);
+ _i2i_entry_code_buffers_size = total_size;
}
} else if (UseSharedSpaces) {
- assert(_cds_i2i_entry_code_buffers != NULL, "must already been initialized");
+ assert(_i2i_entry_code_buffers != NULL, "must already been initialized");
} else {
return NULL;
}
- assert(_cds_i2i_entry_code_buffers_size == total_size, "must not change");
- return _cds_i2i_entry_code_buffers;
+ assert(_i2i_entry_code_buffers_size == total_size, "must not change");
+ return _i2i_entry_code_buffers;
}
uintx MetaspaceShared::object_delta_uintx(void* obj) {
@@ -1545,8 +1545,8 @@
mapinfo->populate_header(os::vm_allocation_granularity());
mapinfo->set_read_only_tables_start(read_only_tables_start);
mapinfo->set_misc_data_patching_start(vtbl_list);
- mapinfo->set_cds_i2i_entry_code_buffers(MetaspaceShared::cds_i2i_entry_code_buffers());
- mapinfo->set_cds_i2i_entry_code_buffers_size(MetaspaceShared::cds_i2i_entry_code_buffers_size());
+ mapinfo->set_i2i_entry_code_buffers(MetaspaceShared::i2i_entry_code_buffers(),
+ MetaspaceShared::i2i_entry_code_buffers_size());
mapinfo->set_core_spaces_size(core_spaces_size);
for (int pass=1; pass<=2; pass++) {
@@ -2043,8 +2043,8 @@
void MetaspaceShared::initialize_shared_spaces() {
FileMapInfo *mapinfo = FileMapInfo::current_info();
- _cds_i2i_entry_code_buffers = mapinfo->cds_i2i_entry_code_buffers();
- _cds_i2i_entry_code_buffers_size = mapinfo->cds_i2i_entry_code_buffers_size();
+ _i2i_entry_code_buffers = mapinfo->i2i_entry_code_buffers();
+ _i2i_entry_code_buffers_size = mapinfo->i2i_entry_code_buffers_size();
// _core_spaces_size is loaded from the shared archive immediatelly after mapping
assert(_core_spaces_size == mapinfo->core_spaces_size(), "sanity");
char* buffer = mapinfo->misc_data_patching_start();
--- a/src/hotspot/share/memory/metaspaceShared.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/memory/metaspaceShared.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -183,8 +183,8 @@
static bool _has_error_classes;
static bool _archive_loading_failed;
static bool _remapped_readwrite;
- static address _cds_i2i_entry_code_buffers;
- static size_t _cds_i2i_entry_code_buffers_size;
+ static address _i2i_entry_code_buffers;
+ static size_t _i2i_entry_code_buffers_size;
static size_t _core_spaces_size;
static void* _shared_metaspace_static_top;
public:
@@ -332,13 +332,13 @@
return align_up(byte_size, BytesPerWord);
}
- static address cds_i2i_entry_code_buffers(size_t total_size);
+ static address i2i_entry_code_buffers(size_t total_size);
- static address cds_i2i_entry_code_buffers() {
- return _cds_i2i_entry_code_buffers;
+ static address i2i_entry_code_buffers() {
+ return _i2i_entry_code_buffers;
}
- static size_t cds_i2i_entry_code_buffers_size() {
- return _cds_i2i_entry_code_buffers_size;
+ static size_t i2i_entry_code_buffers_size() {
+ return _i2i_entry_code_buffers_size;
}
static void relocate_klass_ptr(oop o);
--- a/src/hotspot/share/oops/instanceKlass.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/oops/instanceKlass.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -2546,7 +2546,7 @@
// unreference array name derived from this class name (arrays of an unloaded
// class can't be referenced anymore).
if (_array_name != NULL) _array_name->decrement_refcount();
- if (_source_debug_extension != NULL) FREE_C_HEAP_ARRAY(char, _source_debug_extension);
+ FREE_C_HEAP_ARRAY(char, _source_debug_extension);
}
void InstanceKlass::set_source_debug_extension(const char* array, int length) {
--- a/src/hotspot/share/opto/compile.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/opto/compile.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -3471,7 +3471,7 @@
// address computations.
n->as_Type()->set_type(TypeLong::INT);
ResourceMark rm;
- Node_List wq;
+ Unique_Node_List wq;
wq.push(n);
for (uint next = 0; next < wq.size(); next++) {
Node *m = wq.at(next);
@@ -3486,7 +3486,6 @@
// redundant
for (DUIterator_Fast imax, i = k->fast_outs(imax); i < imax; i++) {
Node* u = k->fast_out(i);
- assert(!wq.contains(u), "shouldn't process one node several times");
if (u->Opcode() == Op_LShiftL ||
u->Opcode() == Op_AddL ||
u->Opcode() == Op_SubL ||
--- a/src/hotspot/share/opto/escape.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/opto/escape.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -2125,6 +2125,9 @@
return NULL;
}
PointsToNode* ptn = ptnode_adr(idx);
+ if (ptn == NULL) {
+ return NULL;
+ }
if (ptn->is_JavaObject()) {
return ptn->as_JavaObject();
}
--- a/src/hotspot/share/opto/loopPredicate.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/opto/loopPredicate.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -301,73 +301,6 @@
return clone_loop_predicates(old_entry, new_entry, clone_limit_check, this, &this->_igvn);
}
-void PhaseIdealLoop::clone_loop_predicates_fix_mem(ProjNode* dom_proj , ProjNode* proj,
- PhaseIdealLoop* loop_phase,
- PhaseIterGVN* igvn) {
- Compile* C = NULL;
- if (loop_phase != NULL) {
- igvn = &loop_phase->igvn();
- }
- C = igvn->C;
- ProjNode* other_dom_proj = dom_proj->in(0)->as_Multi()->proj_out(1-dom_proj->_con);
- Node* dom_r = other_dom_proj->unique_ctrl_out();
- if (dom_r->is_Region()) {
- assert(dom_r->unique_ctrl_out()->is_Call(), "unc expected");
- ProjNode* other_proj = proj->in(0)->as_Multi()->proj_out(1-proj->_con);
- Node* r = other_proj->unique_ctrl_out();
- assert(r->is_Region() && r->unique_ctrl_out()->is_Call(), "cloned predicate should have caused region to be added");
- for (DUIterator_Fast imax, i = dom_r->fast_outs(imax); i < imax; i++) {
- Node* dom_use = dom_r->fast_out(i);
- if (dom_use->is_Phi() && dom_use->bottom_type() == Type::MEMORY) {
- assert(dom_use->in(0) == dom_r, "");
- Node* phi = NULL;
- for (DUIterator_Fast jmax, j = r->fast_outs(jmax); j < jmax; j++) {
- Node* use = r->fast_out(j);
- if (use->is_Phi() && use->bottom_type() == Type::MEMORY &&
- use->adr_type() == dom_use->adr_type()) {
- assert(use->in(0) == r, "");
- assert(phi == NULL, "only one phi");
- phi = use;
- }
- }
- if (phi == NULL) {
- const TypePtr* adr_type = dom_use->adr_type();
- int alias = C->get_alias_index(adr_type);
- Node* call = r->unique_ctrl_out();
- Node* mem = call->in(TypeFunc::Memory);
- MergeMemNode* mm = NULL;
- if (mem->is_MergeMem()) {
- mm = mem->clone()->as_MergeMem();
- if (adr_type == TypePtr::BOTTOM) {
- mem = mem->as_MergeMem()->base_memory();
- } else {
- mem = mem->as_MergeMem()->memory_at(alias);
- }
- } else {
- mm = MergeMemNode::make(mem);
- }
- phi = PhiNode::make(r, mem, Type::MEMORY, adr_type);
- if (adr_type == TypePtr::BOTTOM) {
- mm->set_base_memory(phi);
- } else {
- mm->set_memory_at(alias, phi);
- }
- if (loop_phase != NULL) {
- loop_phase->register_new_node(mm, r);
- loop_phase->register_new_node(phi, r);
- } else {
- igvn->register_new_node_with_optimizer(mm);
- igvn->register_new_node_with_optimizer(phi);
- }
- igvn->replace_input_of(call, TypeFunc::Memory, mm);
- }
- igvn->replace_input_of(phi, r->find_edge(other_proj), dom_use->in(dom_r->find_edge(other_dom_proj)));
- }
- }
- }
-}
-
-
// Clone loop predicates to cloned loops (peeled, unswitched, split_if).
Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
bool clone_limit_check,
@@ -400,24 +333,14 @@
}
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
// clone predicate
- ProjNode* proj = clone_predicate(predicate_proj, new_entry,
- Deoptimization::Reason_predicate,
- loop_phase, igvn);
- assert(proj != NULL, "IfTrue or IfFalse after clone predicate");
- new_entry = proj;
+ new_entry = clone_predicate(predicate_proj, new_entry,
+ Deoptimization::Reason_predicate,
+ loop_phase, igvn);
+ assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone predicate");
if (TraceLoopPredicate) {
tty->print("Loop Predicate cloned: ");
debug_only( new_entry->in(0)->dump(); );
}
- if (profile_predicate_proj != NULL) {
- // A node that produces memory may be out of loop and depend on
- // a profiled predicates. In that case the memory state at the
- // end of profiled predicates and at the end of predicates are
- // not the same. The cloned predicates are dominated by the
- // profiled predicates but may have the wrong memory
- // state. Update it.
- clone_loop_predicates_fix_mem(profile_predicate_proj, proj, loop_phase, igvn);
- }
}
if (profile_predicate_proj != NULL) { // right pattern that can be used by loop predication
// clone predicate
--- a/src/hotspot/share/opto/loopnode.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/opto/loopnode.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -1131,10 +1131,6 @@
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn);
- static void clone_loop_predicates_fix_mem(ProjNode* dom_proj , ProjNode* proj,
- PhaseIdealLoop* loop_phase,
- PhaseIterGVN* igvn);
-
static Node* clone_loop_predicates(Node* old_entry, Node* new_entry,
bool clone_limit_check,
PhaseIdealLoop* loop_phase,
--- a/src/hotspot/share/opto/subnode.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/opto/subnode.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -819,9 +819,11 @@
}
// See if it is 2 unrelated classes.
- const TypeOopPtr* p0 = r0->isa_oopptr();
- const TypeOopPtr* p1 = r1->isa_oopptr();
- if (p0 && p1) {
+ const TypeOopPtr* oop_p0 = r0->isa_oopptr();
+ const TypeOopPtr* oop_p1 = r1->isa_oopptr();
+ bool both_oop_ptr = oop_p0 && oop_p1;
+
+ if (both_oop_ptr) {
Node* in1 = in(1)->uncast();
Node* in2 = in(2)->uncast();
AllocateNode* alloc1 = AllocateNode::Ideal_allocation(in1, NULL);
@@ -829,13 +831,36 @@
if (MemNode::detect_ptr_independence(in1, alloc1, in2, alloc2, NULL)) {
return TypeInt::CC_GT; // different pointers
}
- ciKlass* klass0 = p0->klass();
- bool xklass0 = p0->klass_is_exact();
- ciKlass* klass1 = p1->klass();
- bool xklass1 = p1->klass_is_exact();
- int kps = (p0->isa_klassptr()?1:0) + (p1->isa_klassptr()?1:0);
+ }
+
+ const TypeKlassPtr* klass_p0 = r0->isa_klassptr();
+ const TypeKlassPtr* klass_p1 = r1->isa_klassptr();
+
+ if (both_oop_ptr || (klass_p0 && klass_p1)) { // both or neither are klass pointers
+ ciKlass* klass0 = NULL;
+ bool xklass0 = false;
+ ciKlass* klass1 = NULL;
+ bool xklass1 = false;
+
+ if (oop_p0) {
+ klass0 = oop_p0->klass();
+ xklass0 = oop_p0->klass_is_exact();
+ } else {
+ assert(klass_p0, "must be non-null if oop_p0 is null");
+ klass0 = klass_p0->klass();
+ xklass0 = klass_p0->klass_is_exact();
+ }
+
+ if (oop_p1) {
+ klass1 = oop_p1->klass();
+ xklass1 = oop_p1->klass_is_exact();
+ } else {
+ assert(klass_p1, "must be non-null if oop_p1 is null");
+ klass1 = klass_p1->klass();
+ xklass1 = klass_p1->klass_is_exact();
+ }
+
if (klass0 && klass1 &&
- kps != 1 && // both or neither are klass pointers
klass0->is_loaded() && !klass0->is_interface() && // do not trust interfaces
klass1->is_loaded() && !klass1->is_interface() &&
(!klass0->is_obj_array_klass() ||
@@ -1054,73 +1079,8 @@
// Simplify an CmpN (compare 2 pointers) node, based on local information.
// If both inputs are constants, compare them.
const Type *CmpNNode::sub( const Type *t1, const Type *t2 ) const {
- const TypePtr *r0 = t1->make_ptr(); // Handy access
- const TypePtr *r1 = t2->make_ptr();
-
- // Undefined inputs makes for an undefined result
- if ((r0 == NULL) || (r1 == NULL) ||
- TypePtr::above_centerline(r0->_ptr) ||
- TypePtr::above_centerline(r1->_ptr)) {
- return Type::TOP;
- }
- if (r0 == r1 && r0->singleton()) {
- // Equal pointer constants (klasses, nulls, etc.)
- return TypeInt::CC_EQ;
- }
-
- // See if it is 2 unrelated classes.
- const TypeOopPtr* p0 = r0->isa_oopptr();
- const TypeOopPtr* p1 = r1->isa_oopptr();
- if (p0 && p1) {
- ciKlass* klass0 = p0->klass();
- bool xklass0 = p0->klass_is_exact();
- ciKlass* klass1 = p1->klass();
- bool xklass1 = p1->klass_is_exact();
- int kps = (p0->isa_klassptr()?1:0) + (p1->isa_klassptr()?1:0);
- if (klass0 && klass1 &&
- kps != 1 && // both or neither are klass pointers
- !klass0->is_interface() && // do not trust interfaces
- !klass1->is_interface()) {
- bool unrelated_classes = false;
- // See if neither subclasses the other, or if the class on top
- // is precise. In either of these cases, the compare is known
- // to fail if at least one of the pointers is provably not null.
- if (klass0->equals(klass1)) { // if types are unequal but klasses are equal
- // Do nothing; we know nothing for imprecise types
- } else if (klass0->is_subtype_of(klass1)) {
- // If klass1's type is PRECISE, then classes are unrelated.
- unrelated_classes = xklass1;
- } else if (klass1->is_subtype_of(klass0)) {
- // If klass0's type is PRECISE, then classes are unrelated.
- unrelated_classes = xklass0;
- } else { // Neither subtypes the other
- unrelated_classes = true;
- }
- if (unrelated_classes) {
- // The oops classes are known to be unrelated. If the joined PTRs of
- // two oops is not Null and not Bottom, then we are sure that one
- // of the two oops is non-null, and the comparison will always fail.
- TypePtr::PTR jp = r0->join_ptr(r1->_ptr);
- if (jp != TypePtr::Null && jp != TypePtr::BotPTR) {
- return TypeInt::CC_GT;
- }
- }
- }
- }
-
- // Known constants can be compared exactly
- // Null can be distinguished from any NotNull pointers
- // Unknown inputs makes an unknown result
- if( r0->singleton() ) {
- intptr_t bits0 = r0->get_con();
- if( r1->singleton() )
- return bits0 == r1->get_con() ? TypeInt::CC_EQ : TypeInt::CC_GT;
- return ( r1->_ptr == TypePtr::NotNull && bits0==0 ) ? TypeInt::CC_GT : TypeInt::CC;
- } else if( r1->singleton() ) {
- intptr_t bits1 = r1->get_con();
- return ( r0->_ptr == TypePtr::NotNull && bits1==0 ) ? TypeInt::CC_GT : TypeInt::CC;
- } else
- return TypeInt::CC;
+ ShouldNotReachHere();
+ return bottom_type();
}
//------------------------------Ideal------------------------------------------
--- a/src/hotspot/share/prims/cdsoffsets.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/prims/cdsoffsets.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -54,7 +54,7 @@
ADD_NEXT(_all, "CDSFileMapRegion::_crc", offset_of(CDSFileMapRegion, _crc)); \
ADD_NEXT(_all, "CDSFileMapRegion::_used", offset_of(CDSFileMapRegion, _used)); \
ADD_NEXT(_all, "file_header_size", sizeof(FileMapHeader)); \
- ADD_NEXT(_all, "DynamicArchiveHeader::_base_archive_crc", offset_of(DynamicArchiveHeader, _base_archive_crc)); \
+ ADD_NEXT(_all, "DynamicArchiveHeader::_base_region_crc", offset_of(DynamicArchiveHeader, _base_region_crc)); \
ADD_NEXT(_all, "CDSFileMapRegion_size", sizeof(CDSFileMapRegion));
int CDSOffsets::find_offset(const char* name) {
--- a/src/hotspot/share/prims/jvm.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/prims/jvm.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -2990,7 +2990,7 @@
} else {
ThreadState old_state = thread->osthread()->get_state();
thread->osthread()->set_state(SLEEPING);
- if (os::sleep(thread, millis) == OS_INTRPT) {
+ if (!thread->sleep(millis)) { // interrupted
// An asynchronous exception (e.g., ThreadDeathException) could have been thrown on
// us while we were sleeping. We do not overwrite those.
if (!HAS_PENDING_EXCEPTION) {
--- a/src/hotspot/share/prims/jvmtiImpl.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/prims/jvmtiImpl.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -881,6 +881,7 @@
void JvmtiSuspendControl::print() {
#ifndef PRODUCT
+ ResourceMark rm;
LogStreamHandle(Trace, jvmti) log_stream;
log_stream.print("Suspended Threads: [");
for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
--- a/src/hotspot/share/prims/unsafe.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/prims/unsafe.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -875,9 +875,7 @@
}
// try/finally clause:
- if (temp_alloc != NULL) {
- FREE_C_HEAP_ARRAY(u1, temp_alloc);
- }
+ FREE_C_HEAP_ARRAY(u1, temp_alloc);
// The anonymous class loader data has been artificially been kept alive to
// this point. The mirror and any instances of this class have to keep
--- a/src/hotspot/share/runtime/arguments.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/arguments.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -941,10 +941,8 @@
(void) JVMFlag::ccstrAtPut(flag, &value, origin);
// JVMFlag always returns a pointer that needs freeing.
FREE_C_HEAP_ARRAY(char, value);
- if (free_this_too != NULL) {
- // JVMFlag made its own copy, so I must delete my own temp. buffer.
- FREE_C_HEAP_ARRAY(char, free_this_too);
- }
+ // JVMFlag made its own copy, so I must delete my own temp. buffer.
+ FREE_C_HEAP_ARRAY(char, free_this_too);
return true;
}
--- a/src/hotspot/share/runtime/os.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/os.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -291,7 +291,7 @@
bool retval = false;
size_t fullfnamelen = strlen(JNI_LIB_PREFIX) + strlen(fname) + strlen(JNI_LIB_SUFFIX);
- char* fullfname = (char*)NEW_C_HEAP_ARRAY(char, fullfnamelen + 1, mtInternal);
+ char* fullfname = NEW_C_HEAP_ARRAY(char, fullfnamelen + 1, mtInternal);
if (dll_build_name(fullfname, fullfnamelen + 1, fname)) {
const size_t pnamelen = pname ? strlen(pname) : 0;
@@ -796,7 +796,7 @@
#endif
}
-
+// handles NULL pointers
void os::free(void *memblock) {
NOT_PRODUCT(inc_stat_counter(&num_frees, 1));
#ifdef ASSERT
@@ -1329,7 +1329,7 @@
return NULL;
}
const char psepchar = *os::path_separator();
- char* inpath = (char*)NEW_C_HEAP_ARRAY(char, strlen(path) + 1, mtInternal);
+ char* inpath = NEW_C_HEAP_ARRAY(char, strlen(path) + 1, mtInternal);
if (inpath == NULL) {
return NULL;
}
@@ -1342,7 +1342,8 @@
p++;
p = strchr(p, psepchar);
}
- char** opath = (char**) NEW_C_HEAP_ARRAY(char*, count, mtInternal);
+
+ char** opath = NEW_C_HEAP_ARRAY(char*, count, mtInternal);
// do the actual splitting
p = inpath;
@@ -1356,7 +1357,8 @@
"sun.boot.library.path, to identify potential sources for this path.");
}
// allocate the string and add terminator storage
- char* s = (char*)NEW_C_HEAP_ARRAY_RETURN_NULL(char, len + 1, mtInternal);
+ char* s = NEW_C_HEAP_ARRAY_RETURN_NULL(char, len + 1, mtInternal);
+
if (s == NULL) {
// release allocated storage before returning null
free_array_of_char_arrays(opath, i++);
@@ -1842,57 +1844,3 @@
}
naked_short_sleep(millis);
}
-
-int os::sleep(JavaThread* thread, jlong millis) {
- assert(thread == Thread::current(), "thread consistency check");
-
- ParkEvent * const slp = thread->_SleepEvent;
- // Because there can be races with thread interruption sending an unpark()
- // to the event, we explicitly reset it here to avoid an immediate return.
- // The actual interrupt state will be checked before we park().
- slp->reset();
- // Thread interruption establishes a happens-before ordering in the
- // Java Memory Model, so we need to ensure we synchronize with the
- // interrupt state.
- OrderAccess::fence();
-
- jlong prevtime = javaTimeNanos();
-
- for (;;) {
- // interruption has precedence over timing out
- if (os::is_interrupted(thread, true)) {
- return OS_INTRPT;
- }
-
- jlong newtime = javaTimeNanos();
-
- if (newtime - prevtime < 0) {
- // time moving backwards, should only happen if no monotonic clock
- // not a guarantee() because JVM should not abort on kernel/glibc bugs
- assert(!os::supports_monotonic_clock(),
- "unexpected time moving backwards detected in os::sleep()");
- } else {
- millis -= (newtime - prevtime) / NANOSECS_PER_MILLISEC;
- }
-
- if (millis <= 0) {
- return OS_OK;
- }
-
- prevtime = newtime;
-
- {
- ThreadBlockInVM tbivm(thread);
- OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
-
- thread->set_suspend_equivalent();
- // cleared by handle_special_suspend_equivalent_condition() or
- // java_suspend_self() via check_and_wait_while_suspended()
-
- slp->park(millis);
-
- // were we externally suspended while we were waiting?
- thread->check_and_wait_while_suspended();
- }
- }
-}
--- a/src/hotspot/share/runtime/os.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/os.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -466,8 +466,7 @@
// thread id on Linux/64bit is 64bit, on Windows and Solaris, it's 32bit
static intx current_thread_id();
static int current_process_id();
- // Implementation of java.lang.Thread.sleep for JavaThreads
- static int sleep(JavaThread* thread, jlong ms);
+
// Short standalone OS sleep routines suitable for slow path spin loop.
// Ignores safepoints/suspension/Thread.interrupt() (so keep it short).
// ms/ns = 0, will sleep for the least amount of time allowed by the OS.
@@ -742,6 +741,7 @@
static void* realloc (void *memblock, size_t size, MEMFLAGS flag, const NativeCallStack& stack);
static void* realloc (void *memblock, size_t size, MEMFLAGS flag);
+ // handles NULL pointers
static void free (void *memblock);
static char* strdup(const char *, MEMFLAGS flags = mtInternal); // Like strdup
// Like strdup, but exit VM when strdup() returns NULL
--- a/src/hotspot/share/runtime/os_perf.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/os_perf.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -41,12 +41,8 @@
}
~EnvironmentVariable() {
- if (_key != NULL) {
- FREE_C_HEAP_ARRAY(char, _key);
- }
- if (_value != NULL) {
- FREE_C_HEAP_ARRAY(char, _value);
- }
+ FREE_C_HEAP_ARRAY(char, _key);
+ FREE_C_HEAP_ARRAY(char, _value);
}
EnvironmentVariable(char* key, char* value) {
@@ -181,15 +177,9 @@
}
virtual ~SystemProcess(void) {
- if (_name != NULL) {
- FREE_C_HEAP_ARRAY(char, _name);
- }
- if (_path != NULL) {
- FREE_C_HEAP_ARRAY(char, _path);
- }
- if (_command_line != NULL) {
- FREE_C_HEAP_ARRAY(char, _command_line);
- }
+ FREE_C_HEAP_ARRAY(char, _name);
+ FREE_C_HEAP_ARRAY(char, _path);
+ FREE_C_HEAP_ARRAY(char, _command_line);
}
};
--- a/src/hotspot/share/runtime/perfData.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/perfData.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2019, 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
@@ -85,7 +85,7 @@
const char* prefix = PerfDataManager::ns_to_string(ns);
_name = NEW_C_HEAP_ARRAY(char, strlen(name) + strlen(prefix) + 2, mtInternal);
- assert(_name != NULL && strlen(name) != 0, "invalid name");
+ assert(strlen(name) != 0, "invalid name");
if (ns == NULL_NS) {
// No prefix is added to counters with the NULL_NS namespace.
@@ -113,9 +113,7 @@
}
PerfData::~PerfData() {
- if (_name != NULL) {
- FREE_C_HEAP_ARRAY(char, _name);
- }
+ FREE_C_HEAP_ARRAY(char, _name);
if (is_on_c_heap()) {
FREE_C_HEAP_ARRAY(PerfDataEntry, _pdep);
}
--- a/src/hotspot/share/runtime/sharedRuntime.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -2809,7 +2809,7 @@
void AdapterHandlerEntry::deallocate() {
delete _fingerprint;
#ifdef ASSERT
- if (_saved_code) FREE_C_HEAP_ARRAY(unsigned char, _saved_code);
+ FREE_C_HEAP_ARRAY(unsigned char, _saved_code);
#endif
}
--- a/src/hotspot/share/runtime/synchronizer.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/synchronizer.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1075,17 +1075,8 @@
size_t neededsize = sizeof(PaddedObjectMonitor) * _BLOCKSIZE;
PaddedObjectMonitor* temp;
size_t aligned_size = neededsize + (DEFAULT_CACHE_LINE_SIZE - 1);
- void* real_malloc_addr = (void*)NEW_C_HEAP_ARRAY(char, aligned_size,
- mtInternal);
+ void* real_malloc_addr = NEW_C_HEAP_ARRAY(char, aligned_size, mtInternal);
temp = (PaddedObjectMonitor*)align_up(real_malloc_addr, DEFAULT_CACHE_LINE_SIZE);
-
- // NOTE: (almost) no way to recover if allocation failed.
- // We might be able to induce a STW safepoint and scavenge enough
- // ObjectMonitors to permit progress.
- if (temp == NULL) {
- vm_exit_out_of_memory(neededsize, OOM_MALLOC_ERROR,
- "Allocate ObjectMonitors");
- }
(void)memset((void *) temp, 0, neededsize);
// Format the block.
--- a/src/hotspot/share/runtime/thread.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/thread.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -291,7 +291,6 @@
// The stack would act as a cache to avoid calls to ParkEvent::Allocate()
// and ::Release()
_ParkEvent = ParkEvent::Allocate(this);
- _SleepEvent = ParkEvent::Allocate(this);
_MuxEvent = ParkEvent::Allocate(this);
#ifdef CHECK_UNHANDLED_OOPS
@@ -456,7 +455,6 @@
// It's possible we can encounter a null _ParkEvent, etc., in stillborn threads.
// We NULL out the fields for good hygiene.
ParkEvent::Release(_ParkEvent); _ParkEvent = NULL;
- ParkEvent::Release(_SleepEvent); _SleepEvent = NULL;
ParkEvent::Release(_MuxEvent); _MuxEvent = NULL;
delete handle_area();
@@ -1328,16 +1326,12 @@
{}
NamedThread::~NamedThread() {
- if (_name != NULL) {
- FREE_C_HEAP_ARRAY(char, _name);
- _name = NULL;
- }
+ FREE_C_HEAP_ARRAY(char, _name);
}
void NamedThread::set_name(const char* format, ...) {
guarantee(_name == NULL, "Only get to set name once.");
_name = NEW_C_HEAP_ARRAY(char, max_name_len, mtThread);
- guarantee(_name != NULL, "alloc failure");
va_list ap;
va_start(ap, format);
jio_vsnprintf(_name, max_name_len, format, ap);
@@ -1700,7 +1694,7 @@
_do_not_unlock_if_synchronized = false;
_cached_monitor_info = NULL;
_parker = Parker::Allocate(this);
-
+ _SleepEvent = ParkEvent::Allocate(this);
// Setup safepoint state info for this thread
ThreadSafepointState::create(this);
@@ -1812,6 +1806,10 @@
Parker::Release(_parker);
_parker = NULL;
+ // Return the sleep event to the free list
+ ParkEvent::Release(_SleepEvent);
+ _SleepEvent = NULL;
+
// Free any remaining previous UnrollBlock
vframeArray* old_array = vframe_array_last();
@@ -3236,7 +3234,7 @@
void JavaThread::popframe_free_preserved_args() {
assert(_popframe_preserved_args != NULL, "should not free PopFrame preserved arguments twice");
- FREE_C_HEAP_ARRAY(char, (char*) _popframe_preserved_args);
+ FREE_C_HEAP_ARRAY(char, (char*)_popframe_preserved_args);
_popframe_preserved_args = NULL;
_popframe_preserved_args_size = 0;
}
@@ -3343,6 +3341,62 @@
return NULL;
}
+// java.lang.Thread.sleep support
+// Returns true if sleep time elapsed as expected, and false
+// if the thread was interrupted.
+bool JavaThread::sleep(jlong millis) {
+ assert(this == Thread::current(), "thread consistency check");
+
+ ParkEvent * const slp = this->_SleepEvent;
+ // Because there can be races with thread interruption sending an unpark()
+ // to the event, we explicitly reset it here to avoid an immediate return.
+ // The actual interrupt state will be checked before we park().
+ slp->reset();
+ // Thread interruption establishes a happens-before ordering in the
+ // Java Memory Model, so we need to ensure we synchronize with the
+ // interrupt state.
+ OrderAccess::fence();
+
+ jlong prevtime = os::javaTimeNanos();
+
+ for (;;) {
+ // interruption has precedence over timing out
+ if (os::is_interrupted(this, true)) {
+ return false;
+ }
+
+ if (millis <= 0) {
+ return true;
+ }
+
+ {
+ ThreadBlockInVM tbivm(this);
+ OSThreadWaitState osts(this->osthread(), false /* not Object.wait() */);
+
+ this->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or
+ // java_suspend_self() via check_and_wait_while_suspended()
+
+ slp->park(millis);
+
+ // were we externally suspended while we were waiting?
+ this->check_and_wait_while_suspended();
+ }
+
+ // Update elapsed time tracking
+ jlong newtime = os::javaTimeNanos();
+ if (newtime - prevtime < 0) {
+ // time moving backwards, should only happen if no monotonic clock
+ // not a guarantee() because JVM should not abort on kernel/glibc bugs
+ assert(!os::supports_monotonic_clock(),
+ "unexpected time moving backwards detected in os::sleep()");
+ } else {
+ millis -= (newtime - prevtime) / NANOSECS_PER_MILLISEC;
+ }
+ prevtime = newtime;
+ }
+}
+
static void compiler_thread_entry(JavaThread* thread, TRAPS) {
assert(thread->is_Compiler_thread(), "must be compiler thread");
CompileBroker::compiler_thread_loop();
--- a/src/hotspot/share/runtime/thread.hpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/runtime/thread.hpp Thu Sep 12 15:04:00 2019 +0200
@@ -789,7 +789,6 @@
volatile intptr_t _Stalled;
volatile int _TypeTag;
ParkEvent * _ParkEvent; // for synchronized()
- ParkEvent * _SleepEvent; // for Thread.sleep
ParkEvent * _MuxEvent; // for low-level muxAcquire-muxRelease
int NativeSyncRecursion; // diagnostic
@@ -2055,6 +2054,10 @@
private:
InstanceKlass* _class_to_be_initialized;
+ // java.lang.Thread.sleep support
+public:
+ ParkEvent * _SleepEvent;
+ bool sleep(jlong millis);
};
// Inline implementation of JavaThread::current
--- a/src/hotspot/share/services/diagnosticArgument.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/services/diagnosticArgument.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -36,9 +36,7 @@
StringArrayArgument::~StringArrayArgument() {
for (int i=0; i<_array->length(); i++) {
- if(_array->at(i) != NULL) { // Safety check
- FREE_C_HEAP_ARRAY(char, _array->at(i));
- }
+ FREE_C_HEAP_ARRAY(char, _array->at(i));
}
delete _array;
}
@@ -197,10 +195,8 @@
}
template <> void DCmdArgument<char*>::destroy_value() {
- if (_value != NULL) {
- FREE_C_HEAP_ARRAY(char, _value);
- set_value(NULL);
- }
+ FREE_C_HEAP_ARRAY(char, _value);
+ set_value(NULL);
}
template <> void DCmdArgument<NanoTimeArgument>::parse_value(const char* str,
--- a/src/hotspot/share/services/heapDumper.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/services/heapDumper.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -686,6 +686,16 @@
// fixes up the current dump record and writes HPROF_HEAP_DUMP_END record
static void end_of_dump(DumpWriter* writer);
+
+ static oop mask_dormant_archived_object(oop o) {
+ if (o != NULL && o->klass()->java_mirror() == NULL) {
+ // Ignore this object since the corresponding java mirror is not loaded.
+ // Might be a dormant archive object.
+ return NULL;
+ } else {
+ return o;
+ }
+ }
};
// write a header of the given type
@@ -761,6 +771,13 @@
case JVM_SIGNATURE_CLASS :
case JVM_SIGNATURE_ARRAY : {
oop o = obj->obj_field_access<ON_UNKNOWN_OOP_REF | AS_NO_KEEPALIVE>(offset);
+ if (o != NULL && log_is_enabled(Debug, cds, heap) && mask_dormant_archived_object(o) == NULL) {
+ ResourceMark rm;
+ log_debug(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s) referenced by " INTPTR_FORMAT " (%s)",
+ p2i(o), o->klass()->external_name(),
+ p2i(obj), obj->klass()->external_name());
+ }
+ o = mask_dormant_archived_object(o);
assert(oopDesc::is_oop_or_null(o), "Expected an oop or NULL at " PTR_FORMAT, p2i(o));
writer->write_objectID(o);
break;
@@ -958,11 +975,6 @@
// creates HPROF_GC_INSTANCE_DUMP record for the given object
void DumperSupport::dump_instance(DumpWriter* writer, oop o) {
Klass* k = o->klass();
- if (k->java_mirror() == NULL) {
- // Ignoring this object since the corresponding java mirror is not loaded.
- // Might be a dormant archive object.
- return;
- }
writer->write_u1(HPROF_GC_INSTANCE_DUMP);
writer->write_objectID(o);
@@ -1148,6 +1160,13 @@
// [id]* elements
for (int index = 0; index < length; index++) {
oop o = array->obj_at(index);
+ if (o != NULL && log_is_enabled(Debug, cds, heap) && mask_dormant_archived_object(o) == NULL) {
+ ResourceMark rm;
+ log_debug(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s) referenced by " INTPTR_FORMAT " (%s)",
+ p2i(o), o->klass()->external_name(),
+ p2i(array), array->klass()->external_name());
+ }
+ o = mask_dormant_archived_object(o);
writer->write_objectID(o);
}
}
@@ -1427,6 +1446,11 @@
}
}
+ if (DumperSupport::mask_dormant_archived_object(o) == NULL) {
+ log_debug(cds, heap)("skipped dormant archived object " INTPTR_FORMAT " (%s)", p2i(o), o->klass()->external_name());
+ return;
+ }
+
if (o->is_instance()) {
// create a HPROF_GC_INSTANCE record for each object
DumperSupport::dump_instance(writer(), o);
--- a/src/hotspot/share/services/memoryManager.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/services/memoryManager.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -143,8 +143,8 @@
GCStatInfo::GCStatInfo(int num_pools) {
// initialize the arrays for memory usage
- _before_gc_usage_array = (MemoryUsage*) NEW_C_HEAP_ARRAY(MemoryUsage, num_pools, mtInternal);
- _after_gc_usage_array = (MemoryUsage*) NEW_C_HEAP_ARRAY(MemoryUsage, num_pools, mtInternal);
+ _before_gc_usage_array = NEW_C_HEAP_ARRAY(MemoryUsage, num_pools, mtInternal);
+ _after_gc_usage_array = NEW_C_HEAP_ARRAY(MemoryUsage, num_pools, mtInternal);
_usage_array_size = num_pools;
clear();
}
--- a/src/hotspot/share/utilities/hashtable.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/src/hotspot/share/utilities/hashtable.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -101,10 +101,8 @@
}
template <MEMFLAGS F> void BasicHashtable<F>::free_buckets() {
- if (NULL != _buckets) {
- FREE_C_HEAP_ARRAY(HashtableBucket, _buckets);
- _buckets = NULL;
- }
+ FREE_C_HEAP_ARRAY(HashtableBucket, _buckets);
+ _buckets = NULL;
}
// For oops and Strings the size of the literal is interesting. For other types, nobody cares.
--- a/src/java.base/share/classes/java/io/BufferedReader.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/java/io/BufferedReader.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -302,6 +302,8 @@
* (EOF).
*
* @param ignoreLF If true, the next '\n' will be skipped
+ * @param term Output: Whether a line terminator was encountered
+ * while reading the line; may be {@code null}.
*
* @return A String containing the contents of the line, not including
* any line-termination characters, or null if the end of the
@@ -311,13 +313,14 @@
*
* @exception IOException If an I/O error occurs
*/
- String readLine(boolean ignoreLF) throws IOException {
+ String readLine(boolean ignoreLF, boolean[] term) throws IOException {
StringBuffer s = null;
int startChar;
synchronized (lock) {
ensureOpen();
boolean omitLF = ignoreLF || skipLF;
+ if (term != null) term[0] = false;
bufferLoop:
for (;;) {
@@ -344,6 +347,7 @@
for (i = nextChar; i < nChars; i++) {
c = cb[i];
if ((c == '\n') || (c == '\r')) {
+ if (term != null) term[0] = true;
eol = true;
break charLoop;
}
@@ -389,7 +393,7 @@
* @see java.nio.file.Files#readAllLines
*/
public String readLine() throws IOException {
- return readLine(false);
+ return readLine(false, null);
}
/**
--- a/src/java.base/share/classes/java/io/LineNumberReader.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/java/io/LineNumberReader.java Thu Sep 12 15:04:00 2019 +0200
@@ -25,7 +25,6 @@
package java.io;
-
/**
* A buffered character-input stream that keeps track of line numbers. This
* class defines methods {@link #setLineNumber(int)} and {@link
@@ -200,9 +199,10 @@
*/
public String readLine() throws IOException {
synchronized (lock) {
- String l = super.readLine(skipLF);
+ boolean[] term = new boolean[1];
+ String l = super.readLine(skipLF, term);
skipLF = false;
- if (l != null)
+ if (l != null && term[0])
lineNumber++;
return l;
}
--- a/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/java/lang/constant/MethodTypeDescImpl.java Thu Sep 12 15:04:00 2019 +0200
@@ -26,6 +26,8 @@
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Arrays;
import java.util.List;
@@ -132,7 +134,14 @@
@Override
public MethodType resolveConstantDesc(MethodHandles.Lookup lookup) throws ReflectiveOperationException {
- MethodType mtype = MethodType.fromMethodDescriptorString(descriptorString(), lookup.lookupClass().getClassLoader());
+ MethodType mtype = AccessController.doPrivileged(new PrivilegedAction<>() {
+ @Override
+ public MethodType run() {
+ return MethodType.fromMethodDescriptorString(descriptorString(),
+ lookup.lookupClass().getClassLoader());
+ }
+ });
+
// let's check that the lookup has access to all the types in the method type
lookup.accessClass(mtype.returnType());
for (Class<?> paramType: mtype.parameterArray()) {
--- a/src/java.base/share/classes/java/lang/invoke/MethodType.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java Thu Sep 12 15:04:00 2019 +0200
@@ -46,9 +46,11 @@
import sun.invoke.util.BytecodeDescriptor;
import sun.invoke.util.VerifyType;
import sun.invoke.util.Wrapper;
+import sun.security.util.SecurityConstants;
import static java.lang.invoke.MethodHandleStatics.UNSAFE;
import static java.lang.invoke.MethodHandleStatics.newIllegalArgumentException;
+import static java.lang.invoke.MethodType.fromDescriptor;
/**
* A method type represents the arguments and return type accepted and
@@ -1076,9 +1078,8 @@
/**
* Finds or creates an instance of a method type, given the spelling of its bytecode descriptor.
* Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}.
- * Any class or interface name embedded in the descriptor string
- * will be resolved by calling {@link ClassLoader#loadClass(java.lang.String)}
- * on the given loader (or if it is null, on the system class loader).
+ * Any class or interface name embedded in the descriptor string will be
+ * resolved by the given loader (or if it is null, on the system class loader).
* <p>
* Note that it is possible to encounter method types which cannot be
* constructed by this method, because their component types are
@@ -1092,10 +1093,19 @@
* @throws NullPointerException if the string is null
* @throws IllegalArgumentException if the string is not well-formed
* @throws TypeNotPresentException if a named type cannot be found
+ * @throws SecurityException if the security manager is present and
+ * {@code loader} is {@code null} and the caller does not have the
+ * {@link RuntimePermission}{@code ("getClassLoader")}
*/
public static MethodType fromMethodDescriptorString(String descriptor, ClassLoader loader)
throws IllegalArgumentException, TypeNotPresentException
{
+ if (loader == null) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
+ }
+ }
return fromDescriptor(descriptor,
(loader == null) ? ClassLoader.getSystemClassLoader() : loader);
}
--- a/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java Thu Sep 12 15:04:00 2019 +0200
@@ -306,7 +306,7 @@
/**
* Changes the parse style to be strict for the remainder of the formatter.
* <p>
- * Parsing can be strict or lenient - by default its strict.
+ * Parsing can be strict or lenient - by default it is strict.
* This controls the degree of flexibility in matching the text and sign styles.
* <p>
* When used, this method changes the parsing to be strict from this point onwards.
@@ -325,7 +325,7 @@
* Changes the parse style to be lenient for the remainder of the formatter.
* Note that case sensitivity is set separately to this method.
* <p>
- * Parsing can be strict or lenient - by default its strict.
+ * Parsing can be strict or lenient - by default it is strict.
* This controls the degree of flexibility in matching the text and sign styles.
* Applications calling this method should typically also call {@link #parseCaseInsensitive()}.
* <p>
@@ -3200,7 +3200,7 @@
char ch = text.charAt(pos++);
int digit = context.getDecimalStyle().convertToDigit(ch);
if (digit < 0) {
- if (pos < minEndPos) {
+ if (pos <= minEndPos) {
return ~position; // need at least min width digits
}
pos--;
--- a/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/sun/invoke/util/BytecodeDescriptor.java Thu Sep 12 15:04:00 2019 +0200
@@ -90,9 +90,7 @@
i[0] = endc+1;
String name = str.substring(begc, endc).replace('/', '.');
try {
- return (loader == null)
- ? Class.forName(name, false, null)
- : loader.loadClass(name);
+ return Class.forName(name, false, loader);
} catch (ClassNotFoundException ex) {
throw new TypeNotPresentException(name, ex);
}
--- a/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -35,7 +35,6 @@
import java.util.Map;
import java.util.Set;
import jdk.internal.vm.annotation.Stable;
-import sun.security.action.GetPropertyAction;
public class StandardCharsets extends CharsetProvider {
@@ -120,8 +119,6 @@
}
private Charset lookup(String charsetName) {
- init();
-
// By checking these built-ins we can avoid initializing Aliases,
// Classes and Cache eagerly during bootstrap.
//
@@ -177,7 +174,6 @@
public final Iterator<Charset> charsets() {
Set<String> charsetNames;
synchronized (this) {
- init();
// Ensure initialized in synchronized block
charsetNames = classMap().keySet();
aliasMap();
@@ -202,53 +198,4 @@
};
}
-
- private boolean initialized = false;
-
- /* provider the sun.nio.cs.map property fir sjis/ms932 mapping hack
- */
- private void init() {
- if (initialized)
- return;
- if (!jdk.internal.misc.VM.isBooted())
- return;
- initialized = true;
-
- String map = GetPropertyAction.privilegedGetProperty("sun.nio.cs.map");
- if (map != null) {
- Map<String,String> aliasMap = aliasMap();
- Map<String,String> classMap = classMap();
- String[] maps = map.split(",");
- for (int i = 0; i < maps.length; i++) {
- if (maps[i].equalsIgnoreCase("Windows-31J/Shift_JIS")) {
- // if we dont have both sjis and ms932, do nothing
- if (classMap.get("shift_jis") == null ||
- classMap.get("windows-31j") == null) {
- break;
- }
- aliases_MS932 = new String[] {
- "MS932", // JDK historical
- "windows-932",
- "csWindows31J",
- "shift-jis",
- "ms_kanji",
- "x-sjis",
- "csShiftJIS",
- // This alias takes precedence over the actual
- // Shift_JIS charset itself since aliases are always
- // resolved first, before looking up canonical names.
- "shift_jis"
- };
- aliases_SJIS = new String[] { "sjis" };
-
- for (String alias : aliases_MS932) {
- aliasMap.put(toLower(alias), "windows-31j");
- }
- cache().put("shift_jis", null);
- break;
- }
- }
- }
- }
-
}
--- a/src/java.base/share/lib/security/default.policy Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/share/lib/security/default.policy Thu Sep 12 15:04:00 2019 +0200
@@ -105,7 +105,6 @@
grant codeBase "jrt:/jdk.charsets" {
permission java.util.PropertyPermission "os.name", "read";
- permission java.util.PropertyPermission "sun.nio.cs.map", "read";
permission java.lang.RuntimePermission "charsetProvider";
permission java.lang.RuntimePermission
"accessClassInPackage.jdk.internal.misc";
--- a/src/java.base/unix/native/libnet/NetworkInterface.c Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.base/unix/native/libnet/NetworkInterface.c Thu Sep 12 15:04:00 2019 +0200
@@ -239,6 +239,7 @@
ifs = enumInterfaces(env);
if (ifs == NULL) {
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
return NULL;
}
--- a/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.compiler/share/classes/javax/tools/DiagnosticCollector.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2019, 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
@@ -43,6 +43,11 @@
private List<Diagnostic<? extends S>> diagnostics =
Collections.synchronizedList(new ArrayList<Diagnostic<? extends S>>());
+ /**
+ * Creates a new instance of DiagnosticCollector.
+ */
+ public DiagnosticCollector() {}
+
public void report(Diagnostic<? extends S> diagnostic) {
Objects.requireNonNull(diagnostic);
diagnostics.add(diagnostic);
--- a/src/java.compiler/share/classes/javax/tools/ToolProvider.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.compiler/share/classes/javax/tools/ToolProvider.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -45,6 +45,12 @@
private static final String systemJavaCompilerName = "com.sun.tools.javac.api.JavacTool";
/**
+ * Do not call.
+ */
+ @Deprecated(forRemoval=true, since="14")
+ public ToolProvider() {}
+
+ /**
* Returns the Java™ programming language compiler provided
* with this platform.
* <p>The file manager returned by calling
--- a/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c Thu Sep 12 07:57:00 2019 +0200
+++ b/src/java.desktop/share/native/libawt/awt/image/BufImgSurfaceData.c Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -351,6 +351,7 @@
cData->img_clr_tbl = initCubemap(pRgb, bisdo->lutsize, 32);
if (cData->img_clr_tbl == NULL) {
+ (*env)->ReleasePrimitiveArrayCritical(env, bisdo->lutarray, pRgb, JNI_ABORT);
free(cData);
return (ColorData*)NULL;
}
--- a/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -29,11 +29,8 @@
package sun.nio.cs.ext;
-import java.lang.ref.SoftReference;
import java.nio.charset.Charset;
import java.nio.charset.spi.CharsetProvider;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
/**
* Provider for extended charsets.
@@ -53,188 +50,6 @@
}
- private boolean initialized = false;
-
- // If the sun.nio.cs.map property is defined on the command line we won't
- // see it in the system-properties table until after the charset subsystem
- // has been initialized. We therefore delay the effect of this property
- // until after the JRE has completely booted.
- //
- // At the moment following values for this property are supported, property
- // value string is case insensitive.
- //
- // (1)"Windows-31J/Shift_JIS"
- // In 1.4.1 we added a correct implementation of the Shift_JIS charset
- // but in previous releases this charset name had been treated as an alias
- // for Windows-31J, aka MS932. Users who have existing code that depends
- // upon this alias can restore the previous behavior by defining this
- // property to have this value.
- //
- // (2)"x-windows-50221/ISO-2022-JP"
- // "x-windows-50220/ISO-2022-JP"
- // "x-windows-iso2022jp/ISO-2022-JP"
- // The charset ISO-2022-JP is a "standard based" implementation by default,
- // which supports ASCII, JIS_X_0201 and JIS_X_0208 mappings based encoding
- // and decoding only.
- // There are three Microsoft iso-2022-jp variants, namely x-windows-50220,
- // x-windows-50221 and x-windows-iso2022jp which behaves "slightly" differently
- // compared to the "standard based" implementation. See ISO2022_JP.java for
- // detailed description. Users who prefer the behavior of MS iso-2022-jp
- // variants should use these names explicitly instead of using "ISO-2022-JP"
- // and its aliases. However for those who need the ISO-2022-JP charset behaves
- // exactly the same as MS variants do, above properties can be defined to
- // switch.
- //
- // If we need to define other charset-alias mappings in the future then
- // this property could be further extended, the general idea being that its
- // value should be of the form
- //
- // new-charset-1/old-charset-1,new-charset-2/old-charset-2,...
- //
- // where each charset named to the left of a slash is intended to replace
- // (most) uses of the charset named to the right of the slash.
- //
- protected void init() {
- if (initialized)
- return;
- if (!jdk.internal.misc.VM.isBooted())
- return;
-
- String map = getProperty("sun.nio.cs.map");
- boolean sjisIsMS932 = false;
- boolean iso2022jpIsMS50221 = false;
- boolean iso2022jpIsMS50220 = false;
- boolean iso2022jpIsMSISO2022JP = false;
- if (map != null) {
- String[] maps = map.split(",");
- for (int i = 0; i < maps.length; i++) {
- if (maps[i].equalsIgnoreCase("Windows-31J/Shift_JIS")) {
- sjisIsMS932 = true;
- } else if (maps[i].equalsIgnoreCase("x-windows-50221/ISO-2022-JP")) {
- iso2022jpIsMS50221 = true;
- } else if (maps[i].equalsIgnoreCase("x-windows-50220/ISO-2022-JP")) {
- iso2022jpIsMS50220 = true;
- } else if (maps[i].equalsIgnoreCase("x-windows-iso2022jp/ISO-2022-JP")) {
- iso2022jpIsMSISO2022JP = true;
- }
- }
- }
- if (sjisIsMS932 && hasCharset("Shift_JIS")) {
- deleteCharset("Shift_JIS",
- new String[] {
- // IANA aliases
- "sjis", // historical
- "shift_jis",
- "shift-jis",
- "ms_kanji",
- "x-sjis",
- "csShiftJIS"
- });
- deleteCharset("windows-31j",
- new String[] {
- "MS932", // JDK historical
- "windows-932",
- "csWindows31J"
- });
- charset("Shift_JIS", "SJIS",
- new String[] {
- // IANA aliases
- "sjis" // JDK historical
- });
- charset("windows-31j", "MS932",
- new String[] {
- "MS932", // JDK historical
- "windows-932",
- "csWindows31J",
- "shift-jis",
- "ms_kanji",
- "x-sjis",
- "csShiftJIS",
- // This alias takes precedence over the actual
- // Shift_JIS charset itself since aliases are always
- // resolved first, before looking up canonical names.
- "shift_jis"
- });
- }
- if (iso2022jpIsMS50221 ||
- iso2022jpIsMS50220 ||
- iso2022jpIsMSISO2022JP) {
- deleteCharset("ISO-2022-JP",
- new String[] {
- "iso2022jp",
- "jis",
- "csISO2022JP",
- "jis_encoding",
- "csjisencoding"
- });
- if (iso2022jpIsMS50221) {
- deleteCharset("x-windows-50221",
- new String[] {
- "cp50221",
- "ms50221"
- });
- charset("x-windows-50221", "MS50221",
- new String[] {
- "cp50221",
- "ms50221",
- "iso-2022-jp",
- "iso2022jp",
- "jis",
- "csISO2022JP",
- "jis_encoding",
- "csjisencoding"
- });
- } else if (iso2022jpIsMS50220) {
- deleteCharset("x-windows-50220",
- new String[] {
- "cp50220",
- "ms50220"
- });
- charset("x-windows-50220", "MS50220",
- new String[] {
- "cp50220",
- "ms50220",
- "iso-2022-jp",
- "iso2022jp",
- "jis",
- "csISO2022JP",
- "jis_encoding",
- "csjisencoding"
- });
- } else {
- deleteCharset("x-windows-iso2022jp",
- new String[] {
- "windows-iso2022jp"
- });
- charset("x-windows-iso2022jp", "MSISO2022JP",
- new String[] {
- "windows-iso2022jp",
- "iso-2022-jp",
- "iso2022jp",
- "jis",
- "csISO2022JP",
- "jis_encoding",
- "csjisencoding"
- });
-
-
- }
- }
- initialized = true;
- }
-
- private static String getProperty(String key) {
- // this method may be called during initialization of
- // system class loader and thus not using lambda
- return AccessController.doPrivileged(
- new PrivilegedAction<String>() {
- @Override
- public String run() {
- return System.getProperty(key);
- }
- });
- }
-
public static String[] aliasesFor(String charsetName) {
if (instance == null)
return null;
--- a/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c Thu Sep 12 15:04:00 2019 +0200
@@ -109,6 +109,7 @@
exceptionMessage = (char *) malloc(sizeof(char) * (strlen(systemErrorMessage) + strlen(libraryNameStr) + 1));
if (exceptionMessage == NULL) {
throwOutOfMemoryError(env, 0);
+ (*env)->ReleaseStringUTFChars(env, jPkcs11ModulePath, libraryNameStr);
return;
}
strcpy(exceptionMessage, systemErrorMessage);
--- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java Thu Sep 12 15:04:00 2019 +0200
@@ -40,6 +40,7 @@
import com.sun.jdi.connect.*;
import java.util.*;
+import java.util.concurrent.CopyOnWriteArrayList;
import java.io.*;
public class TTY implements EventNotifier {
@@ -48,7 +49,7 @@
/**
* List of Strings to execute at each stop.
*/
- private List<String> monitorCommands = new ArrayList<String>();
+ private List<String> monitorCommands = new CopyOnWriteArrayList<>();
private int monitorCount = 0;
/**
--- a/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.jdwp.agent/unix/native/libjdwp/linker_md.c Thu Sep 12 15:04:00 2019 +0200
@@ -34,6 +34,7 @@
#include <stdlib.h>
#include <string.h>
+#include "util.h"
#include "path_md.h"
#ifdef __APPLE__
@@ -45,8 +46,10 @@
static void dll_build_name(char* buffer, size_t buflen,
const char* paths, const char* fname) {
char *path, *paths_copy, *next_token;
+ *buffer = '\0';
- paths_copy = strdup(paths);
+ paths_copy = jvmtiAllocate((int)strlen(paths) + 1);
+ strcpy(paths_copy, paths);
if (paths_copy == NULL) {
return;
}
@@ -55,15 +58,18 @@
path = strtok_r(paths_copy, PATH_SEPARATOR, &next_token);
while (path != NULL) {
- snprintf(buffer, buflen, "%s/lib%s." LIB_SUFFIX, path, fname);
- if (access(buffer, F_OK) == 0) {
+ size_t result_len = (size_t)snprintf(buffer, buflen, "%s/lib%s." LIB_SUFFIX, path, fname);
+ if (result_len >= buflen) {
+ EXIT_ERROR(JVMTI_ERROR_INVALID_LOCATION, "One or more of the library paths supplied to jdwp, "
+ "likely by sun.boot.library.path, is too long.");
+ } else if (access(buffer, F_OK) == 0) {
break;
}
*buffer = '\0';
path = strtok_r(NULL, PATH_SEPARATOR, &next_token);
}
- free(paths_copy);
+ jvmtiDeallocate(paths_copy);
}
/*
@@ -89,13 +95,11 @@
{
const int pnamelen = pname ? strlen(pname) : 0;
- *holder = '\0';
- // Quietly truncate on buffer overflow. Should be an error.
- if (pnamelen + (int)strlen(fname) + 10 > holderlen) {
- return;
- }
-
if (pnamelen == 0) {
+ if (pnamelen + (int)strlen(fname) + 10 > holderlen) {
+ EXIT_ERROR(JVMTI_ERROR_INVALID_LOCATION, "One or more of the library paths supplied to jdwp, "
+ "likely by sun.boot.library.path, is too long.");
+ }
(void)snprintf(holder, holderlen, "lib%s." LIB_SUFFIX, fname);
} else {
dll_build_name(holder, holderlen, pname, fname);
--- a/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.jdwp.agent/windows/native/libjdwp/linker_md.c Thu Sep 12 15:04:00 2019 +0200
@@ -37,13 +37,16 @@
#include "sys.h"
+#include "util.h"
#include "path_md.h"
static void dll_build_name(char* buffer, size_t buflen,
const char* paths, const char* fname) {
char *path, *paths_copy, *next_token;
+ *buffer = '\0';
- paths_copy = strdup(paths);
+ paths_copy = jvmtiAllocate((int)strlen(paths) + 1);
+ strcpy(paths_copy, paths);
if (paths_copy == NULL) {
return;
}
@@ -52,15 +55,18 @@
path = strtok_s(paths_copy, PATH_SEPARATOR, &next_token);
while (path != NULL) {
- _snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
- if (_access(buffer, 0) == 0) {
+ size_t result_len = (size_t)_snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
+ if (result_len >= buflen) {
+ EXIT_ERROR(JVMTI_ERROR_INVALID_LOCATION, "One or more of the library paths supplied to jdwp, "
+ "likely by sun.boot.library.path, is too long.");
+ } else if (_access(buffer, 0) == 0) {
break;
}
*buffer = '\0';
path = strtok_s(NULL, PATH_SEPARATOR, &next_token);
}
- free(paths_copy);
+ jvmtiDeallocate(paths_copy);
}
/*
@@ -107,13 +113,11 @@
{
const int pnamelen = pname ? (int)strlen(pname) : 0;
- *holder = '\0';
- /* Quietly truncates on buffer overflow. Should be an error. */
- if (pnamelen + (int)strlen(fname) + 10 > holderlen) {
- return;
- }
-
if (pnamelen == 0) {
+ if (pnamelen + (int)strlen(fname) + 10 > holderlen) {
+ EXIT_ERROR(JVMTI_ERROR_INVALID_LOCATION, "One or more of the library paths supplied to jdwp, "
+ "likely by sun.boot.library.path, is too long.");
+ }
sprintf(holder, "%s.dll", fname);
} else {
dll_build_name(holder, holderlen, pname, fname);
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java Thu Sep 12 07:57:00 2019 +0200
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/ir/LexicalContext.java Thu Sep 12 15:04:00 2019 +0200
@@ -697,7 +697,7 @@
* @return {@code true} if in unprotected switch statement.
*/
public boolean inUnprotectedSwitchContext() {
- for (int i = sp; i > 0; i--) {
+ for (int i = sp - 1; i > 0; i--) {
final LexicalContextNode next = stack[i];
if (next instanceof Block) {
return stack[i - 1] instanceof SwitchNode;
--- a/test/hotspot/gtest/gc/g1/test_g1FreeIdSet.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/test/hotspot/gtest/gc/g1/test_g1FreeIdSet.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -145,7 +145,7 @@
tty->print_cr("Stressing G1FreeIdSet for %u ms", milliseconds_to_run);
{
ThreadInVMfromNative invm(this_thread);
- os::sleep(this_thread, milliseconds_to_run);
+ this_thread->sleep(milliseconds_to_run);
}
OrderAccess::release_store(&continue_running, false);
for (uint i = 0; i < nthreads; ++i) {
--- a/test/hotspot/gtest/gc/shared/test_ptrQueueBufferAllocator.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/test/hotspot/gtest/gc/shared/test_ptrQueueBufferAllocator.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -224,7 +224,7 @@
tty->print_cr("Stressing allocator for %u ms", milliseconds_to_run);
{
ThreadInVMfromNative invm(this_thread);
- os::sleep(this_thread, milliseconds_to_run);
+ this_thread->sleep(milliseconds_to_run);
}
OrderAccess::release_store(&allocator_running, false);
for (uint i = 0; i < nthreads; ++i) {
--- a/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp Thu Sep 12 07:57:00 2019 +0200
+++ b/test/hotspot/gtest/utilities/test_singleWriterSynchronizer.cpp Thu Sep 12 15:04:00 2019 +0200
@@ -136,7 +136,7 @@
JavaThread* cur = JavaThread::current();
{
ThreadInVMfromNative invm(cur);
- os::sleep(cur, milliseconds_to_run);
+ cur->sleep(milliseconds_to_run);
}
continue_running = 0;
for (uint i = 0; i < nreaders + 1; ++i) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/compiler/c2/aarch64/ConvI2LWideningAssertTooStrong.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019, Red Hat, Inc. 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8229701
+ * @summary C2 OSR compilation fails with "shouldn't process one node several times" in final graph reshaping
+ *
+ * @run main/othervm ConvI2LWideningAssertTooStrong
+ *
+ */
+
+public class ConvI2LWideningAssertTooStrong {
+
+ public static final int N = 400;
+
+ public static long instanceCount=708L;
+ public static volatile int iFld1=30517;
+ public static int iArrFld[]=new int[N];
+
+ public static void vMeth(short s) {
+ int i9=29117, i11=-6;
+
+ for (i9 = 11; i9 < 377; i9++) {
+ switch ((i9 % 8) + 22) {
+ case 24:
+ instanceCount = i9;
+ instanceCount += instanceCount;
+ break;
+ case 25:
+ try {
+ i11 = (20705 % i11);
+ iArrFld[i9 - 1] = (55094 / iFld1);
+ } catch (ArithmeticException a_e) {}
+ break;
+ default:
+ }
+ }
+ }
+
+ public static void main(String[] strArr) {
+ ConvI2LWideningAssertTooStrong _instance = new ConvI2LWideningAssertTooStrong();
+ for (int i = 0; i < 10 * 202 * 8; i++ ) {
+ _instance.vMeth((short)20806);
+ }
+ }
+}
--- a/test/hotspot/jtreg/compiler/loopopts/superword/TestFuzzPreLoop.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/hotspot/jtreg/compiler/loopopts/superword/TestFuzzPreLoop.java Thu Sep 12 15:04:00 2019 +0200
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8134739
+ * @bug 8134739 8010500
* @summary SEGV in SuperWord::get_pre_loop_end
* @run main/othervm compiler.loopopts.superword.TestFuzzPreLoop
*/
--- a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/ArchiveConsistency.java Thu Sep 12 15:04:00 2019 +0200
@@ -114,7 +114,7 @@
bbuf.put((byte)0);
}
- int baseArchiveCRCOffset = wb.getOffsetForName("DynamicArchiveHeader::_base_archive_crc");
+ int baseArchiveCRCOffset = wb.getOffsetForName("DynamicArchiveHeader::_base_region_crc");
int crc = 0;
System.out.printf("%-12s%-12s\n", "Space name", "CRC");
for (int i = 0; i < 4; i++) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * @test
+ *
+ * @summary JDB problem running monitor command
+ * VM Testbase keywords: [jpda, jdb]
+ * VM Testbase readme:
+ * DESCRIPTION
+ * Make sure 'monitor unmonitor 1' does not cause ConcurrentModificationException
+ * in the debugger.
+ * The jdb sets up line breakpoint at the debugged application. Then one command
+ * 'monitor unmonitor 1' is set. After resuming the debuggee stops at the breakpoint.
+ * The test passes if correct reply for "unmonitor 1" commanda is found in jdb stdout
+ * stream.
+ * The test consists of two program:
+ * monitor002.java - launches jdb and debuggee, writes commands to jdb, reads the jdb output,
+ * monitor002a.java - the debugged application.
+ *
+ * @library /vmTestbase
+ * /test/lib
+ * @run driver jdk.test.lib.FileInstaller . .
+ * @build nsk.jdb.monitor.monitor002.monitor002
+ * nsk.jdb.monitor.monitor002.monitor002a
+ * @run main/othervm PropertyResolvingWrapper nsk.jdb.monitor.monitor002.monitor002
+ * -arch=${os.family}-${os.simpleArch}
+ * -waittime=5
+ * -debugee.vmkind=java
+ * -transport.address=dynamic
+ * -jdb=${test.jdk}/bin/jdb
+ * -java.options="${test.vm.opts} ${test.java.opts}"
+ * -workdir=.
+ * -debugee.vmkeys="${test.vm.opts} ${test.java.opts}"
+ */
+
+package nsk.jdb.monitor.monitor002;
+
+import nsk.share.*;
+import nsk.share.jdb.*;
+
+import java.io.*;
+import java.util.*;
+
+public class monitor002 extends JdbTest {
+
+ public static void main (String argv[]) {
+ System.exit(run(argv, System.out) + JCK_STATUS_BASE);
+ }
+
+ public static int run(String argv[], PrintStream out) {
+ debuggeeClass = DEBUGGEE_CLASS;
+ firstBreak = FIRST_BREAK;
+ lastBreak = LAST_BREAK;
+ return new monitor002().runTest(argv, out);
+ }
+
+ static final String PACKAGE_NAME = "nsk.jdb.monitor.monitor002";
+ static final String TEST_CLASS = PACKAGE_NAME + ".monitor002";
+ static final String DEBUGGEE_CLASS = TEST_CLASS + "a";
+ static final String FIRST_BREAK = DEBUGGEE_CLASS + ".main";
+ static final String LAST_BREAK = DEBUGGEE_CLASS + ".lastBreak";
+ static final int LINE_NUMBER = 47;
+
+ static final String[] CHECKED_COMMANDS = {
+ JdbCommand.unmonitor + "1"
+ };
+
+ protected void runCases() {
+ String[] reply;
+ Paragrep grep;
+ int count;
+ Vector v;
+ String found;
+
+ reply = jdb.receiveReplyFor(JdbCommand.stop_at + DEBUGGEE_CLASS + ":" + LINE_NUMBER);
+
+ for (int i = 0; i < CHECKED_COMMANDS.length; i++) {
+ reply = jdb.receiveReplyFor(JdbCommand.monitor + CHECKED_COMMANDS[i]);
+ }
+
+ int repliesCount = CHECKED_COMMANDS.length + 1;
+ reply = jdb.receiveReplyFor(JdbCommand.cont, true, repliesCount);
+
+ reply = jdb.receiveReplyFor(JdbCommand.monitor);
+ if (reply.length != 1) {
+ log.complain("Expected no active monitors after exectuting monitored command: " + CHECKED_COMMANDS[0]);
+ success = false;
+ }
+
+ jdb.contToExit(1);
+
+ reply = jdb.getTotalReply();
+
+ if (!checkCommands(reply)) {
+ success = false;
+ }
+ }
+
+ private boolean checkCommands(String[] reply) {
+ Paragrep grep;
+ boolean result = true;
+ int count;
+
+ grep = new Paragrep(reply);
+
+ if ((count = grep.find("Unmonitoring 1: unmonitor 1")) != 1) {
+ log.complain("Wrong number of execution of monitored command: " + CHECKED_COMMANDS[0]);
+ log.complain(" Expected: 1; found: " + count);
+ result = false;
+ }
+
+ return result;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdb/monitor/monitor002/monitor002a.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package nsk.jdb.monitor.monitor002;
+
+import nsk.share.*;
+import nsk.share.jpda.*;
+import nsk.share.jdb.*;
+
+import java.io.*;
+
+// THIS TEST IS LINE NUMBER SENSITIVE
+
+/* This is debuggee aplication */
+public class monitor002a {
+ static monitor002a _monitor002a = new monitor002a();
+
+ public static void main(String args[]) {
+ System.exit(monitor002.JCK_STATUS_BASE + _monitor002a.runIt(args, System.out));
+ }
+
+ static void lastBreak () {}
+
+ public int runIt(String args[], PrintStream out) {
+ JdbArgumentHandler argumentHandler = new JdbArgumentHandler(args);
+ Log log = new Log(out, argumentHandler);
+ int localInt = 0; // monitor002.LINE_NUMBER
+ localInt++; // dummy breakpoint
+ log.display("Debuggee PASSED");
+ return monitor002.PASSED;
+ }
+}
--- a/test/jdk/com/sun/jdi/BadHandshakeTest.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/com/sun/jdi/BadHandshakeTest.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -21,6 +21,7 @@
* questions.
*/
+import java.net.ConnectException;
import java.net.Socket;
import com.sun.jdi.Bootstrap;
@@ -34,10 +35,8 @@
import java.util.List;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.ProcessTools;
+import lib.jdb.Debuggee;
/* @test
* @bug 6306165 6432567
@@ -46,7 +45,7 @@
*
* @modules java.management
* jdk.jdi
- * @build VMConnection BadHandshakeTest Exit0
+ * @build BadHandshakeTest Exit0
* @run driver BadHandshakeTest
*/
public class BadHandshakeTest {
@@ -58,7 +57,7 @@
List<Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
Iterator<Connector> iter = connectors.iterator();
while (iter.hasNext()) {
- Connector connector = (Connector)iter.next();
+ Connector connector = iter.next();
if (connector.name().equals(name)) {
return connector;
}
@@ -66,121 +65,76 @@
return null;
}
- /*
- * Launch a server debuggee with the given address
- */
- private static LaunchResult launch(String address, String class_name) throws Exception {
- String[] args = VMConnection.insertDebuggeeVMOptions(new String[] {
- "-agentlib:jdwp=transport=dt_socket" +
- ",server=y" + ",suspend=y" + ",address=" + address,
- class_name
- });
-
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(args);
-
- final AtomicBoolean success = new AtomicBoolean();
- final AtomicBoolean bindFailed = new AtomicBoolean();
- Process p = ProcessTools.startProcess(
- class_name,
- pb,
- (line) -> {
- // 'Listening for transport dt_socket at address: xxxxx'
- // indicates the debuggee is ready to accept connections
- if (line.contains("Listening for transport dt_socket at address:")) {
- success.set(true);
- return true;
- }
- // 'Address already in use' indicates
- // the debuggee has failed to start due to busy port.
- if (line.contains("Address already in use")) {
- bindFailed.set(true);
- return true;
- }
- return false;
- },
- Integer.MAX_VALUE,
- TimeUnit.MILLISECONDS
- );
-
- return new LaunchResult(success.get() ? p : null,
- bindFailed.get());
+ private static void log(Object s) {
+ System.out.println(String.valueOf(s));
}
- /*
- * - pick a TCP port
- * - Launch a server debuggee: server=y,suspend=y,address=${port}
- * - run it to VM death
- * - verify we saw no error
- */
public static void main(String args[]) throws Exception {
- // Launch the server debuggee
- int port = 0;
- Process process = null;
- while (process == null) {
- port = Utils.getFreePort();
- String address = String.valueOf(port);
- LaunchResult launchResult = launch(address, "Exit0");
- process = launchResult.getProcess();
- if (launchResult.isBindFailed()) {
- System.out.println("Port " + port + " already in use. Trying to restart debuggee with a new one...");
- Thread.sleep(100);
- } else if (process == null ) {
- throw new RuntimeException("Unable to start debugee");
- }
- }
+ // Launch the server debugee
+ log("Starting debuggee...");
+ try (Debuggee debuggee = Debuggee.launcher("Exit0").launch()) {
+ log("Debuggee started.");
+ int port = Integer.parseInt(debuggee.getAddress());
+ log("Debuggee port: " + port);
- // Connect to the debuggee and handshake with garbage
- Socket s = new Socket("localhost", port);
- s.getOutputStream().write("Here's a poke in the eye".getBytes("UTF-8"));
- s.close();
-
- // Re-connect and to a partial handshake - don't disconnect
- s = new Socket("localhost", port);
- s.getOutputStream().write("JDWP-".getBytes("UTF-8"));
-
+ log("testcase 1...");
+ // Connect to the debuggee and handshake with garbage
+ Socket s = new Socket("localhost", port);
+ s.getOutputStream().write("Here's a poke in the eye".getBytes("UTF-8"));
+ s.close();
- // Attach to server debuggee and resume it so it can exit
- AttachingConnector conn = (AttachingConnector)findConnector("com.sun.jdi.SocketAttach");
- Map<String, Argument> conn_args = conn.defaultArguments();
- Connector.IntegerArgument port_arg =
- (Connector.IntegerArgument)conn_args.get("port");
- port_arg.setValue(port);
- VirtualMachine vm = conn.attach(conn_args);
+ log("testcase 2...");
+ // Re-connect and do a partial handshake - don't disconnect
+ // Re-connect just after disconnect may cause "connection refused" error (see JDK-8192057)
+ Exception error = null;
+ long retryDelay = 20;
+ for (int retry = 0; retry < 5; retry++) {
+ if (error != null) {
+ try {
+ Thread.sleep(retryDelay);
+ } catch (InterruptedException ex) {
+ // ignore
+ }
+ retryDelay *= 2;
+ error = null;
+ }
+ try {
+ log("retry: " + retry);
+ s = new Socket("localhost", port);
+ s.getOutputStream().write("JDWP-".getBytes("UTF-8"));
+ break;
+ } catch (ConnectException ex) {
+ log("got exception: " + ex.toString());
+ error = ex;
+ }
+ }
+ if (error != null) {
+ throw error;
+ }
- // The first event is always a VMStartEvent, and it is always in
- // an EventSet by itself. Wait for it.
- EventSet evtSet = vm.eventQueue().remove();
- for (Event event: evtSet) {
- if (event instanceof VMStartEvent) {
- break;
+ log("cleaning...");
+ // Attach to server debuggee and resume it so it can exit
+ AttachingConnector conn = (AttachingConnector)findConnector("com.sun.jdi.SocketAttach");
+ Map<String, Argument> conn_args = conn.defaultArguments();
+ Connector.IntegerArgument port_arg =
+ (Connector.IntegerArgument)conn_args.get("port");
+ port_arg.setValue(port);
+ VirtualMachine vm = conn.attach(conn_args);
+
+ // The first event is always a VMStartEvent, and it is always in
+ // an EventSet by itself. Wait for it.
+ EventSet evtSet = vm.eventQueue().remove();
+ for (Event event : evtSet) {
+ if (event instanceof VMStartEvent) {
+ break;
+ }
+ throw new RuntimeException("Test failed - debuggee did not start properly");
}
- throw new RuntimeException("Test failed - debuggee did not start properly");
- }
- vm.eventRequestManager().deleteAllBreakpoints();
- vm.resume();
+ vm.eventRequestManager().deleteAllBreakpoints();
+ vm.resume();
- process.waitFor();
+ debuggee.waitFor(10, TimeUnit.SECONDS);
+ }
}
-
- private static class LaunchResult {
-
- private final Process p;
- private final boolean bindFailed;
-
- public LaunchResult(Process p, boolean bindFailed) {
- this.p = p;
- this.bindFailed = bindFailed;
- }
-
- public Process getProcess() {
- return p;
- }
-
- public boolean isBindFailed() {
- return bindFailed;
- }
-
- }
-
}
--- a/test/jdk/java/io/LineNumberReader/Read.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/java/io/LineNumberReader/Read.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -22,16 +22,24 @@
*/
/* @test
- @bug 4074875 4063511
+ @bug 4074875 4063511 8230342
@summary Make sure LineNumberReader.read(char, int , int) will increase
the linenumber correctly.
*/
-import java.io.*;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.StringReader;
+import java.util.function.Consumer;
public class Read {
public static void main(String[] args) throws Exception {
+ testReadChars();
+ testEofs();
+ }
+
+ private static void testReadChars() throws Exception {
String s = "aaaa\nbbb\n";
char[] buf = new char[5];
int n = 0;
@@ -49,4 +57,49 @@
throw new Exception("Failed test: Expected line number: 2, got "
+ line);
}
+
+ private static void testEofs() throws Exception {
+ String string = "first \n second";
+
+ Consumer<LineNumberReader> c = (LineNumberReader r) -> {
+ try {
+ while (r.read() != -1)
+ continue;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ };
+ testEof(c, string, 1);
+
+ c = (LineNumberReader r) -> {
+ try {
+ char[] buf = new char[128];
+ while (r.read(buf) != -1)
+ continue;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ };
+ testEof(c, string, 1);
+
+ c = (LineNumberReader r) -> {
+ try {
+ while (r.readLine() != null)
+ continue;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ };
+ testEof(c, string, 1);
+ }
+
+ private static void testEof(Consumer<LineNumberReader> c, String s, int n)
+ throws Exception {
+ LineNumberReader r = new LineNumberReader(new StringReader(s));
+ c.accept(r);
+ int line;
+ if ((line = r.getLineNumber()) != n)
+ throw new Exception("Failed test: Expected line number: " + n +
+ " , got " + line);
+ }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/constant/methodTypeDesc/ResolveConstantDesc.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8229785
+ * @library /test/lib
+ * @build jdk.unsupported/*
+ * @summary MethodTypeDesc::resolveConstantDesc with security manager
+ * @run main/othervm/policy=test.policy ResolveConstantDesc
+ */
+
+import java.lang.constant.MethodTypeDesc;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+import java.lang.invoke.MethodType;
+import java.security.AccessControlException;;
+import java.security.Permission;;
+
+import static jdk.test.lib.Asserts.*;
+
+/*
+ * MethodTypeDesc::resolveConstantDec may get security exception depending
+ * on the access of Lookup object
+ */
+public class ResolveConstantDesc {
+ private static final String DESCRIPTOR = "()Ljdk/internal/misc/VM;";
+
+ public static void main(String... args) throws Exception {
+ // private Lookup object has access to classes exported from another module
+ Lookup lookup = sun.misc.Test.LOOKUP;
+ Module m = lookup.lookupClass().getModule();
+
+ MethodType mtype = MethodType.fromMethodDescriptorString(DESCRIPTOR, ClassLoader.getPlatformClassLoader());
+ Class<?> target = mtype.returnType();
+ Module javaBase = target.getModule();
+ assertTrue(javaBase.isExported(target.getPackageName(), m));
+
+ // MethodType that references java.base internal class
+ MethodTypeDesc mtd = MethodTypeDesc.ofDescriptor(DESCRIPTOR);
+ testInaccessibleClass(mtd);
+
+ // Lookup has no access to JDK internal API; IAE
+ throwIAE(MethodHandles.lookup(), mtd);
+
+ // resolve successfully if Lookup has access to sun.misc and security permission
+ MethodTypeDesc.ofDescriptor("()Lsun/misc/Unsafe;")
+ .resolveConstantDesc(MethodHandles.lookup());
+ }
+
+ /*
+ * Test Lookup with different access
+ */
+ private static void testInaccessibleClass(MethodTypeDesc mtd) throws Exception {
+ Lookup lookup = sun.misc.Test.LOOKUP;
+ // full power lookup can resolve MethodTypeDesc of java.base internal types
+ mtd.resolveConstantDesc(lookup);
+
+ // drop PRIVATE access; fail package access check
+ throwACC(lookup.dropLookupMode(Lookup.PRIVATE), mtd);
+
+ // jdk.internal.access is not accessible by jdk.unsupported
+ MethodTypeDesc mtd1 = MethodTypeDesc.ofDescriptor("()Ljdk/internal/access/SharedSecrets;");
+ throwIAE(lookup, mtd1);
+ }
+
+ // IAE thrown when resolving MethodType using the given Lookup object
+ private static void throwIAE(Lookup lookup, MethodTypeDesc mtd) throws Exception {
+ try {
+ MethodType mtype = (MethodType)mtd.resolveConstantDesc(lookup);
+ throw new RuntimeException("unexpected IAE not thrown");
+ } catch (IllegalAccessException e) { }
+ }
+
+ private static void throwACC(Lookup lookup, MethodTypeDesc mtd) throws Exception {
+ try {
+ MethodType mtype = (MethodType)mtd.resolveConstantDesc(lookup);
+ throw new RuntimeException("unexpected IAE not thrown");
+ } catch (AccessControlException e) {
+ Permission perm = e.getPermission();
+ if (!(perm instanceof RuntimePermission &&
+ "accessClassInPackage.jdk.internal.misc".equals(perm.getName()))) {
+ throw e;
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/constant/methodTypeDesc/jdk.unsupported/sun/misc/Test.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package sun.misc;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodHandles.Lookup;
+
+public class Test {
+ public static final Lookup LOOKUP = MethodHandles.lookup();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/constant/methodTypeDesc/test.policy Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,6 @@
+// security policy for ResolveConstantDesc test
+grant {
+ permission java.lang.RuntimePermission "getClassLoader";
+ permission "java.lang.RuntimePermission" "accessClassInPackage.sun.misc";
+};
+
--- a/test/jdk/java/lang/invoke/FindClassSecurityManager.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/java/lang/invoke/FindClassSecurityManager.java Thu Sep 12 15:04:00 2019 +0200
@@ -25,7 +25,7 @@
/* @test
* @bug 8139885
- * @run main/othervm/policy=findclass.security.policy/secure=java.lang.SecurityManager -ea -esa test.java.lang.invoke.FindClassSecurityManager
+ * @run main/othervm/policy=getclassloader.policy/secure=java.lang.SecurityManager -ea -esa test.java.lang.invoke.FindClassSecurityManager
*/
package test.java.lang.invoke;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/invoke/MethodTypeSecurityManager.java Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8229785
+ * @summary Test MethodType.fromMethodDescriptorString with security manager
+ * @run main/othervm test.java.lang.invoke.MethodTypeSecurityManager
+ * @run main/othervm/policy=getclassloader.policy test.java.lang.invoke.MethodTypeSecurityManager access
+ */
+
+package test.java.lang.invoke;
+
+import java.lang.invoke.MethodType;
+import java.security.AccessControlException;
+import java.security.Permission;
+
+public class MethodTypeSecurityManager {
+ private static boolean hasClassLoaderAccess;
+ public static void main(String... args) throws Throwable {
+ ClassLoader platformLoader = ClassLoader.getPlatformClassLoader();
+ ClassLoader appLoader = ClassLoader.getSystemClassLoader();
+ hasClassLoaderAccess = args.length == 1 && "access".equals(args[0]);
+
+ assert hasClassLoaderAccess || System.getSecurityManager() == null;
+ if (!hasClassLoaderAccess) {
+ System.setSecurityManager(new SecurityManager());
+ }
+
+ // require getClassLoader permission
+ throwACC("()Ljdk/internal/misc/VM;", null);
+ // package access check when app class loader loads the class
+ throwACC("()Ljdk/internal/misc/VM;", appLoader);
+
+ // if using the platform class loader, no package access check
+ MethodType.fromMethodDescriptorString("()Ljdk/internal/misc/VM;", platformLoader);
+ }
+
+ private static void throwACC(String desc, ClassLoader loader) {
+ try {
+ MethodType.fromMethodDescriptorString(desc, loader);
+ throw new RuntimeException("should never leak JDK internal class");
+ } catch (AccessControlException e) {
+ System.out.println(e.getMessage());
+ Permission perm = e.getPermission();
+ if (!(perm instanceof RuntimePermission)) throw e;
+ // ACC thrown either no "getClassLoader" permission or no package access
+ switch (perm.getName()) {
+ case "getClassLoader":
+ if (!hasClassLoaderAccess) break;
+ case "accessClassInPackage.jdk.internal.misc":
+ break;
+ default:
+ throw e;
+ }
+ }
+ }
+}
--- a/test/jdk/java/lang/invoke/findclass.security.policy Thu Sep 12 07:57:00 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-/*
- * Security policy used by the FindClassSecurityManager test.
- * Must allow file reads so that jtreg itself can run, and getting class loaders.
- */
-
-grant {
- permission java.io.FilePermission "*", "read";
- permission java.lang.RuntimePermission "getClassLoader";
-};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/invoke/getclassloader.policy Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,10 @@
+/*
+ * Security policy used by the FindClassSecurityManager and
+ * MethodTypeSecurityManager test.
+ * Must allow file reads so that jtreg itself can run, and getting class loaders.
+ */
+
+grant {
+ permission java.io.FilePermission "*", "read";
+ permission java.lang.RuntimePermission "getClassLoader";
+};
--- a/test/jdk/java/nio/charset/coders/Check.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/java/nio/charset/coders/Check.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2019 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
@@ -22,13 +22,12 @@
*/
/* @test
- * @bug 4712786
+ * @bug 4712786 8229960
* @summary Check charsets against reference files
* @modules jdk.charsets
*
* @build Util
* @run main Check shift_jis ref.shift_jis
- * @run main/othervm -Dsun.nio.cs.map=Windows-31J/Shift_JIS Check shift_jis ref.windows-31j
*/
import java.io.*;
--- a/test/jdk/java/nio/charset/coders/SJISMappingPropTest.java Thu Sep 12 07:57:00 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * @test
- * @bug 4879123
- * @summary Verify that sun.nio.cs.map property interpreted in ja multibyte locales
- * @requires (os.family != "windows")
- * @modules jdk.charsets
- * @library /test/lib
- * @build jdk.test.lib.Utils
- * jdk.test.lib.Asserts
- * jdk.test.lib.JDKToolFinder
- * jdk.test.lib.JDKToolLauncher
- * jdk.test.lib.Platform
- * jdk.test.lib.process.*
- * SJISPropTest
- * @run testng SJISMappingPropTest
- */
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.assertEquals;
-
-public class SJISMappingPropTest {
-
- @DataProvider
- public static Iterator<Object[]> locales() {
- List<Object[]> data = new ArrayList<>();
- data.add(new String[]{"ja"});
- data.add(new String[]{"ja_JP.PCK"});
- data.add(new String[]{"ja_JP.eucJP"});
- return data.iterator();
- }
-
- @Test(dataProvider = "locales")
- public void testWithProperty(String locale) throws Exception {
- // with property set, shift_jis should map to windows-31J charset
- runTest(locale,
- "-Dsun.nio.cs.map=Windows-31J/Shift_JIS",
- SJISPropTest.class.getName(),
- "MS932");
- }
-
- @Test(dataProvider = "locales")
- public void testWithoutProperty(String locale) throws Exception {
- // without property set - "shift_jis" follows IANA conventions
- // and should map to the sun.nio.cs.ext.Shift_JIS charset
- runTest(locale,
- SJISPropTest.class.getName(),
- "Shift_JIS");
- }
-
- private void runTest(String locale, String... cmd) throws Exception {
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, cmd);
- Map<String, String> env = pb.environment();
- env.put("LC_ALL", locale);
- OutputAnalyzer out = ProcessTools.executeProcess(pb)
- .outputTo(System.out)
- .errorTo(System.err);
- assertEquals(out.getExitValue(), 0);
- }
-}
--- a/test/jdk/java/nio/charset/coders/SJISPropTest.java Thu Sep 12 07:57:00 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2010, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*
- * Regression test class run by SJISMappingPropTest.java to verify
- * that sun.nio.cs.map property is correctly interpreted in
- * multibyte Japanese locales
- */
-
-public class SJISPropTest {
- public static void main(String[] args) throws Exception {
- boolean sjisIsMS932 = false;
-
- if (args[0].equals("MS932"))
- sjisIsMS932 = true;
- byte[] testBytes = { (byte)0x81, (byte)0x60 };
-
- // JIS X based Shift_JIS and Windows-31J differ
- // in a number of mappings including this one.
-
- String expectedMS932 = new String("\uFF5E");
- String expectedSJIS = new String("\u301C");
-
- // Alias "shift_jis" will map to Windows-31J
- // if the sun.nio.cs.map system property is defined as
- // "Windows-31J/Shift_JIS". This should work in all
- // multibyte (especially Japanese) locales.
-
- String s = new String(testBytes, "shift_jis");
-
- if (sjisIsMS932 && !s.equals(expectedMS932))
- throw new Exception("not MS932");
- else if (!sjisIsMS932 && !s.equals(expectedSJIS))
- throw new Exception("not SJIS");
- }
-}
--- a/test/jdk/java/nio/charset/coders/ref.windows-31j Thu Sep 12 07:57:00 2019 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9409 +0,0 @@
-0 00
-1 01
-2 02
-3 03
-4 04
-5 05
-6 06
-7 07
-8 08
-9 09
-a 0a
-b 0b
-c 0c
-d 0d
-e 0e
-f 0f
-10 10
-11 11
-12 12
-13 13
-14 14
-15 15
-16 16
-17 17
-18 18
-19 19
-1a 1a
-1b 1b
-1c 1c
-1d 1d
-1e 1e
-1f 1f
-20 20
-21 21
-22 22
-23 23
-24 24
-25 25
-26 26
-27 27
-28 28
-29 29
-2a 2a
-2b 2b
-2c 2c
-2d 2d
-2e 2e
-2f 2f
-30 30
-31 31
-32 32
-33 33
-34 34
-35 35
-36 36
-37 37
-38 38
-39 39
-3a 3a
-3b 3b
-3c 3c
-3d 3d
-3e 3e
-3f 3f
-40 40
-41 41
-42 42
-43 43
-44 44
-45 45
-46 46
-47 47
-48 48
-49 49
-4a 4a
-4b 4b
-4c 4c
-4d 4d
-4e 4e
-4f 4f
-50 50
-51 51
-52 52
-53 53
-54 54
-55 55
-56 56
-57 57
-58 58
-59 59
-5a 5a
-5b 5b
-5c 5c
-5d 5d
-5e 5e
-5f 5f
-60 60
-61 61
-62 62
-63 63
-64 64
-65 65
-66 66
-67 67
-68 68
-69 69
-6a 6a
-6b 6b
-6c 6c
-6d 6d
-6e 6e
-6f 6f
-70 70
-71 71
-72 72
-73 73
-74 74
-75 75
-76 76
-77 77
-78 78
-79 79
-7a 7a
-7b 7b
-7c 7c
-7d 7d
-7e 7e
-7f 7f
-#a2 8191
-#a3 8192
-#a5 5c
-a7 8198
-a8 814e
-#ab 81e1
-#ac 81ca
-#af 8150
-b0 818b
-b1 817d
-b4 814c
-#b5 83ca
-b6 81f7
-#b7 8145
-#b8 8143
-#bb 81e2
-d7 817e
-f7 8180
-391 839f
-392 83a0
-393 83a1
-394 83a2
-395 83a3
-396 83a4
-397 83a5
-398 83a6
-399 83a7
-39a 83a8
-39b 83a9
-39c 83aa
-39d 83ab
-39e 83ac
-39f 83ad
-3a0 83ae
-3a1 83af
-3a3 83b0
-3a4 83b1
-3a5 83b2
-3a6 83b3
-3a7 83b4
-3a8 83b5
-3a9 83b6
-3b1 83bf
-3b2 83c0
-3b3 83c1
-3b4 83c2
-3b5 83c3
-3b6 83c4
-3b7 83c5
-3b8 83c6
-3b9 83c7
-3ba 83c8
-3bb 83c9
-3bc 83ca
-3bd 83cb
-3be 83cc
-3bf 83cd
-3c0 83ce
-3c1 83cf
-3c3 83d0
-3c4 83d1
-3c5 83d2
-3c6 83d3
-3c7 83d4
-3c8 83d5
-3c9 83d6
-401 8446
-410 8440
-411 8441
-412 8442
-413 8443
-414 8444
-415 8445
-416 8447
-417 8448
-418 8449
-419 844a
-41a 844b
-41b 844c
-41c 844d
-41d 844e
-41e 844f
-41f 8450
-420 8451
-421 8452
-422 8453
-423 8454
-424 8455
-425 8456
-426 8457
-427 8458
-428 8459
-429 845a
-42a 845b
-42b 845c
-42c 845d
-42d 845e
-42e 845f
-42f 8460
-430 8470
-431 8471
-432 8472
-433 8473
-434 8474
-435 8475
-436 8477
-437 8478
-438 8479
-439 847a
-43a 847b
-43b 847c
-43c 847d
-43d 847e
-43e 8480
-43f 8481
-440 8482
-441 8483
-442 8484
-443 8485
-444 8486
-445 8487
-446 8488
-447 8489
-448 848a
-449 848b
-44a 848c
-44b 848d
-44c 848e
-44d 848f
-44e 8490
-44f 8491
-451 8476
-2010 815d
-2015 815c
-2018 8165
-2019 8166
-201c 8167
-201d 8168
-2020 81f5
-2021 81f6
-2025 8164
-2026 8163
-2030 81f1
-2032 818c
-2033 818d
-203b 81a6
-#203e 7e
-2103 818e
-2116 8782
-2121 8784
-212b 81f0
-2160 8754
-2161 8755
-2162 8756
-2163 8757
-2164 8758
-2165 8759
-2166 875a
-2167 875b
-2168 875c
-2169 875d
-2170 fa40
-2171 fa41
-2172 fa42
-2173 fa43
-2174 fa44
-2175 fa45
-2176 fa46
-2177 fa47
-2178 fa48
-2179 fa49
-2190 81a9
-2191 81aa
-2192 81a8
-2193 81ab
-21d2 81cb
-21d4 81cc
-2200 81cd
-2202 81dd
-2203 81ce
-2207 81de
-2208 81b8
-220b 81b9
-2211 8794
-221a 81e3
-221d 81e5
-221e 8187
-221f 8798
-2220 81da
-2225 8161
-2227 81c8
-2228 81c9
-2229 81bf
-222a 81be
-222b 81e7
-222c 81e8
-222e 8793
-2234 8188
-2235 81e6
-223d 81e4
-2252 81e0
-2260 8182
-2261 81df
-2266 8185
-2267 8186
-226a 81e1
-226b 81e2
-2282 81bc
-2283 81bd
-2286 81ba
-2287 81bb
-22a5 81db
-22bf 8799
-2312 81dc
-2460 8740
-2461 8741
-2462 8742
-2463 8743
-2464 8744
-2465 8745
-2466 8746
-2467 8747
-2468 8748
-2469 8749
-246a 874a
-246b 874b
-246c 874c
-246d 874d
-246e 874e
-246f 874f
-2470 8750
-2471 8751
-2472 8752
-2473 8753
-2500 849f
-2501 84aa
-2502 84a0
-2503 84ab
-250c 84a1
-250f 84ac
-2510 84a2
-2513 84ad
-2514 84a4
-2517 84af
-2518 84a3
-251b 84ae
-251c 84a5
-251d 84ba
-2520 84b5
-2523 84b0
-2524 84a7
-2525 84bc
-2528 84b7
-252b 84b2
-252c 84a6
-252f 84b6
-2530 84bb
-2533 84b1
-2534 84a8
-2537 84b8
-2538 84bd
-253b 84b3
-253c 84a9
-253f 84b9
-2542 84be
-254b 84b4
-25a0 81a1
-25a1 81a0
-25b2 81a3
-25b3 81a2
-25bc 81a5
-25bd 81a4
-25c6 819f
-25c7 819e
-25cb 819b
-25ce 819d
-25cf 819c
-25ef 81fc
-2605 819a
-2606 8199
-2640 818a
-2642 8189
-266a 81f4
-266d 81f3
-266f 81f2
-3000 8140
-3001 8141
-3002 8142
-3003 8156
-3005 8158
-3006 8159
-3007 815a
-3008 8171
-3009 8172
-300a 8173
-300b 8174
-300c 8175
-300d 8176
-300e 8177
-300f 8178
-3010 8179
-3011 817a
-3012 81a7
-3013 81ac
-3014 816b
-3015 816c
-301d 8780
-301f 8781
-3041 829f
-3042 82a0
-3043 82a1
-3044 82a2
-3045 82a3
-3046 82a4
-3047 82a5
-3048 82a6
-3049 82a7
-304a 82a8
-304b 82a9
-304c 82aa
-304d 82ab
-304e 82ac
-304f 82ad
-3050 82ae
-3051 82af
-3052 82b0
-3053 82b1
-3054 82b2
-3055 82b3
-3056 82b4
-3057 82b5
-3058 82b6
-3059 82b7
-305a 82b8
-305b 82b9
-305c 82ba
-305d 82bb
-305e 82bc
-305f 82bd
-3060 82be
-3061 82bf
-3062 82c0
-3063 82c1
-3064 82c2
-3065 82c3
-3066 82c4
-3067 82c5
-3068 82c6
-3069 82c7
-306a 82c8
-306b 82c9
-306c 82ca
-306d 82cb
-306e 82cc
-306f 82cd
-3070 82ce
-3071 82cf
-3072 82d0
-3073 82d1
-3074 82d2
-3075 82d3
-3076 82d4
-3077 82d5
-3078 82d6
-3079 82d7
-307a 82d8
-307b 82d9
-307c 82da
-307d 82db
-307e 82dc
-307f 82dd
-3080 82de
-3081 82df
-3082 82e0
-3083 82e1
-3084 82e2
-3085 82e3
-3086 82e4
-3087 82e5
-3088 82e6
-3089 82e7
-308a 82e8
-308b 82e9
-308c 82ea
-308d 82eb
-308e 82ec
-308f 82ed
-3090 82ee
-3091 82ef
-3092 82f0
-3093 82f1
-#3094 8394
-309b 814a
-309c 814b
-309d 8154
-309e 8155
-30a1 8340
-30a2 8341
-30a3 8342
-30a4 8343
-30a5 8344
-30a6 8345
-30a7 8346
-30a8 8347
-30a9 8348
-30aa 8349
-30ab 834a
-30ac 834b
-30ad 834c
-30ae 834d
-30af 834e
-30b0 834f
-30b1 8350
-30b2 8351
-30b3 8352
-30b4 8353
-30b5 8354
-30b6 8355
-30b7 8356
-30b8 8357
-30b9 8358
-30ba 8359
-30bb 835a
-30bc 835b
-30bd 835c
-30be 835d
-30bf 835e
-30c0 835f
-30c1 8360
-30c2 8361
-30c3 8362
-30c4 8363
-30c5 8364
-30c6 8365
-30c7 8366
-30c8 8367
-30c9 8368
-30ca 8369
-30cb 836a
-30cc 836b
-30cd 836c
-30ce 836d
-30cf 836e
-30d0 836f
-30d1 8370
-30d2 8371
-30d3 8372
-30d4 8373
-30d5 8374
-30d6 8375
-30d7 8376
-30d8 8377
-30d9 8378
-30da 8379
-30db 837a
-30dc 837b
-30dd 837c
-30de 837d
-30df 837e
-30e0 8380
-30e1 8381
-30e2 8382
-30e3 8383
-30e4 8384
-30e5 8385
-30e6 8386
-30e7 8387
-30e8 8388
-30e9 8389
-30ea 838a
-30eb 838b
-30ec 838c
-30ed 838d
-30ee 838e
-30ef 838f
-30f0 8390
-30f1 8391
-30f2 8392
-30f3 8393
-30f4 8394
-30f5 8395
-30f6 8396
-30fb 8145
-30fc 815b
-30fd 8152
-30fe 8153
-3231 878a
-3232 878b
-3239 878c
-32a4 8785
-32a5 8786
-32a6 8787
-32a7 8788
-32a8 8789
-3303 8765
-330d 8769
-3314 8760
-3318 8763
-3322 8761
-3323 876b
-3326 876a
-3327 8764
-332b 876c
-3336 8766
-333b 876e
-3349 875f
-334a 876d
-334d 8762
-3351 8767
-3357 8768
-337b 877e
-337c 878f
-337d 878e
-337e 878d
-338e 8772
-338f 8773
-339c 876f
-339d 8770
-339e 8771
-33a1 8775
-33c4 8774
-33cd 8783
-4e00 88ea
-4e01 929a
-4e03 8eb5
-4e07 969c
-4e08 8fe4
-4e09 8e4f
-4e0a 8fe3
-4e0b 89ba
-4e0d 9573
-4e0e 975e
-4e10 98a0
-4e11 894e
-4e14 8a8e
-4e15 98a1
-4e16 90a2
-4e17 99c0
-4e18 8b75
-4e19 95b8
-4e1e 8fe5
-4e21 97bc
-4e26 95c0
-4e28 fa68
-4e2a 98a2
-4e2d 9286
-4e31 98a3
-4e32 8bf8
-4e36 98a4
-4e38 8adb
-4e39 924f
-4e3b 8ee5
-4e3c 98a5
-4e3f 98a6
-4e42 98a7
-4e43 9454
-4e45 8b76
-4e4b 9456
-4e4d 93e1
-4e4e 8cc1
-4e4f 9652
-4e55 e568
-4e56 98a8
-4e57 8fe6
-4e58 98a9
-4e59 89b3
-4e5d 8be3
-4e5e 8cee
-4e5f 96e7
-4e62 9ba4
-4e71 9790
-4e73 93fb
-4e7e 8aa3
-4e80 8b54
-4e82 98aa
-4e85 98ab
-4e86 97b9
-4e88 975c
-4e89 9188
-4e8a 98ad
-4e8b 8e96
-4e8c 93f1
-4e8e 98b0
-4e91 895d
-4e92 8cdd
-4e94 8cdc
-4e95 88e4
-4e98 986a
-4e99 9869
-4e9b 8db1
-4e9c 889f
-4e9e 98b1
-4e9f 98b2
-4ea0 98b3
-4ea1 9653
-4ea2 98b4
-4ea4 8cf0
-4ea5 88e5
-4ea6 9692
-4ea8 8b9c
-4eab 8b9d
-4eac 8b9e
-4ead 92e0
-4eae 97ba
-4eb0 98b5
-4eb3 98b6
-4eb6 98b7
-4eba 906c
-4ec0 8f59
-4ec1 906d
-4ec2 98bc
-4ec4 98ba
-4ec6 98bb
-4ec7 8b77
-4eca 8da1
-4ecb 89ee
-4ecd 98b9
-4ece 98b8
-4ecf 95a7
-4ed4 8e65
-4ed5 8e64
-4ed6 91bc
-4ed7 98bd
-4ed8 9574
-4ed9 90e5
-4edd 8157
-4ede 98be
-4edf 98c0
-4ee1 fa69
-4ee3 91e3
-4ee4 97df
-4ee5 88c8
-4eed 98bf
-4eee 89bc
-4ef0 8bc2
-4ef2 9287
-4ef6 8c8f
-4ef7 98c1
-4efb 9443
-4efc fa6a
-4f00 fa6b
-4f01 8ae9
-4f03 fa6c
-4f09 98c2
-4f0a 88c9
-4f0d 8cde
-4f0e 8aea
-4f0f 959a
-4f10 94b0
-4f11 8b78
-4f1a 89ef
-4f1c 98e5
-4f1d 9360
-4f2f 948c
-4f30 98c4
-4f34 94ba
-4f36 97e0
-4f38 904c
-4f39 fa6d
-4f3a 8e66
-4f3c 8e97
-4f3d 89be
-4f43 92cf
-4f46 9241
-4f47 98c8
-4f4d 88ca
-4f4e 92e1
-4f4f 8f5a
-4f50 8db2
-4f51 9743
-4f53 91cc
-4f55 89bd
-4f56 fa6e
-4f57 98c7
-4f59 975d
-4f5a 98c3
-4f5b 98c5
-4f5c 8dec
-4f5d 98c6
-4f5e 9b43
-4f69 98ce
-4f6f 98d1
-4f70 98cf
-4f73 89c0
-4f75 95b9
-4f76 98c9
-4f7b 98cd
-4f7c 8cf1
-4f7f 8e67
-4f83 8aa4
-4f86 98d2
-4f88 98ca
-4f8a fa70
-4f8b 97e1
-4f8d 8e98
-4f8f 98cb
-4f91 98d0
-4f92 fa6f
-4f94 fa72
-4f96 98d3
-4f98 98cc
-4f9a fa71
-4f9b 8b9f
-4f9d 88cb
-4fa0 8ba0
-4fa1 89bf
-4fab 9b44
-4fad 9699
-4fae 958e
-4faf 8cf2
-4fb5 904e
-4fb6 97b5
-4fbf 95d6
-4fc2 8c57
-4fc3 91a3
-4fc4 89e2
-4fc9 fa61
-4fca 8f72
-4fcd fa73
-4fce 98d7
-4fd0 98dc
-4fd1 98da
-4fd4 98d5
-4fd7 91ad
-4fd8 98d8
-4fda 98db
-4fdb 98d9
-4fdd 95db
-4fdf 98d6
-4fe1 904d
-4fe3 9693
-4fe4 98dd
-4fe5 98de
-4fee 8f43
-4fef 98eb
-4ff3 946f
-4ff5 9555
-4ff6 98e6
-4ff8 95ee
-4ffa 89b4
-4ffe 98ea
-4fff fa76
-5005 98e4
-5006 98ed
-5009 9171
-500b 8cc2
-500d 947b
-500f e0c5
-5011 98ec
-5012 937c
-5014 98e1
-5016 8cf4
-5019 8cf3
-501a 98df
-501e fa77
-501f 8ed8
-5021 98e7
-5022 fa75
-5023 95ed
-5024 926c
-5025 98e3
-5026 8c91
-5028 98e0
-5029 98e8
-502a 98e2
-502b 97cf
-502c 98e9
-502d 9860
-5036 8be4
-5039 8c90
-5040 fa74
-5042 fa7a
-5043 98ee
-5046 fa78
-5047 98ef
-5048 98f3
-5049 88cc
-504f 95ce
-5050 98f2
-5055 98f1
-5056 98f5
-505a 98f4
-505c 92e2
-5065 8c92
-506c 98f6
-5070 fa79
-5072 8ec3
-5074 91a4
-5075 92e3
-5076 8bf4
-5078 98f7
-507d 8b55
-5080 98f8
-5085 98fa
-508d 9654
-5091 8c86
-5094 fa7b
-5098 8e50
-5099 94f5
-509a 98f9
-50ac 8dc3
-50ad 9762
-50b2 98fc
-50b3 9942
-50b4 98fb
-50b5 8dc2
-50b7 8f9d
-50be 8c58
-50c2 9943
-50c5 8bcd
-50c9 9940
-50ca 9941
-50cd 93ad
-50cf 919c
-50d1 8ba1
-50d5 966c
-50d6 9944
-50d8 fa7d
-50da 97bb
-50de 9945
-50e3 9948
-50e5 9946
-50e7 916d
-50ed 9947
-50ee 9949
-50f4 fa7c
-50f5 994b
-50f9 994a
-50fb 95c6
-5100 8b56
-5101 994d
-5102 994e
-5104 89ad
-5109 994c
-5112 8ef2
-5114 9951
-5115 9950
-5116 994f
-5118 98d4
-511a 9952
-511f 8f9e
-5121 9953
-512a 9744
-5132 96d7
-5137 9955
-513a 9954
-513b 9957
-513c 9956
-513f 9958
-5140 9959
-5141 88f2
-5143 8cb3
-5144 8c5a
-5145 8f5b
-5146 929b
-5147 8ba2
-5148 90e6
-5149 8cf5
-514a fa7e
-514b 8d8e
-514c 995b
-514d 96c6
-514e 9365
-5150 8e99
-5152 995a
-5154 995c
-515a 937d
-515c 8a95
-5162 995d
-5164 fa80
-5165 93fc
-5168 9153
-5169 995f
-516a 9960
-516b 94aa
-516c 8cf6
-516d 985a
-516e 9961
-5171 8ba4
-5175 95ba
-5176 91b4
-5177 8bef
-5178 9354
-517c 8c93
-5180 9962
-5182 9963
-5185 93e0
-5186 897e
-5189 9966
-518a 8dfb
-518c 9965
-518d 8dc4
-518f 9967
-5190 e3ec
-5191 9968
-5192 9660
-5193 9969
-5195 996a
-5196 996b
-5197 8fe7
-5199 8eca
-519d fa81
-51a0 8aa5
-51a2 996e
-51a4 996c
-51a5 96bb
-51a6 996d
-51a8 9579
-51a9 996f
-51aa 9970
-51ab 9971
-51ac 937e
-51b0 9975
-51b1 9973
-51b2 9974
-51b3 9972
-51b4 8de1
-51b5 9976
-51b6 96e8
-51b7 97e2
-51bd 9977
-51be fa82
-51c4 90a6
-51c5 9978
-51c6 8f79
-51c9 9979
-51cb 929c
-51cc 97bd
-51cd 9380
-51d6 99c3
-51db 997a
-51dc eaa3
-51dd 8bc3
-51e0 997b
-51e1 967d
-51e6 8f88
-51e7 91fa
-51e9 997d
-51ea 93e2
-51ec fa83
-51ed 997e
-51f0 9980
-51f1 8a4d
-51f5 9981
-51f6 8ba5
-51f8 93ca
-51f9 899a
-51fa 8f6f
-51fd 949f
-51fe 9982
-5200 9381
-5203 906e
-5204 9983
-5206 95aa
-5207 90d8
-5208 8aa0
-520a 8aa7
-520b 9984
-520e 9986
-5211 8c59
-5214 9985
-5215 fa84
-5217 97f1
-521d 8f89
-5224 94bb
-5225 95ca
-5227 9987
-5229 9798
-522a 9988
-522e 9989
-5230 939e
-5233 998a
-5236 90a7
-5237 8dfc
-5238 8c94
-5239 998b
-523a 8e68
-523b 8d8f
-5243 92e4
-5244 998d
-5247 91a5
-524a 8ded
-524b 998e
-524c 998f
-524d 914f
-524f 998c
-5254 9991
-5256 9655
-525b 8d84
-525e 9990
-5263 8c95
-5264 8ddc
-5265 948d
-5269 9994
-526a 9992
-526f 959b
-5270 8fe8
-5271 999b
-5272 8a84
-5273 9995
-5274 9993
-5275 916e
-527d 9997
-527f 9996
-5283 8a63
-5287 8c80
-5288 999c
-5289 97ab
-528d 9998
-5291 999d
-5292 999a
-5294 9999
-529b 97cd
-529c fa85
-529f 8cf7
-52a0 89c1
-52a3 97f2
-52a6 fa86
-52a9 8f95
-52aa 9377
-52ab 8d85
-52ac 99a0
-52ad 99a1
-52af fb77
-52b1 97e3
-52b4 984a
-52b5 99a3
-52b9 8cf8
-52bc 99a2
-52be 8a4e
-52c0 fa87
-52c1 99a4
-52c3 9675
-52c5 92ba
-52c7 9745
-52c9 95d7
-52cd 99a5
-52d2 e8d3
-52d5 93ae
-52d7 99a6
-52d8 8aa8
-52d9 96b1
-52db fa88
-52dd 8f9f
-52de 99a7
-52df 95e5
-52e0 99ab
-52e2 90a8
-52e3 99a8
-52e4 8bce
-52e6 99a9
-52e7 8aa9
-52f2 8c4d
-52f3 99ac
-52f5 99ad
-52f8 99ae
-52f9 99af
-52fa 8ed9
-52fe 8cf9
-52ff 96dc
-5300 fa89
-5301 96e6
-5302 93f5
-5305 95ef
-5306 99b0
-5307 fa8a
-5308 99b1
-530d 99b3
-530f 99b5
-5310 99b4
-5315 99b6
-5316 89bb
-5317 966b
-5319 8dfa
-531a 99b7
-531d 9178
-5320 8fa0
-5321 8ba7
-5323 99b8
-5324 fa8b
-532a 94d9
-532f 99b9
-5331 99ba
-5333 99bb
-5338 99bc
-5339 9543
-533a 8be6
-533b 88e3
-533f 93bd
-5340 99bd
-5341 8f5c
-5343 90e7
-5345 99bf
-5346 99be
-5347 8fa1
-5348 8cdf
-5349 99c1
-534a 94bc
-534d 99c2
-5351 94da
-5352 91b2
-5353 91ec
-5354 8ba6
-5357 93ec
-5358 9250
-535a 948e
-535c 966d
-535e 99c4
-5360 90e8
-5366 8c54
-5369 99c5
-536e 99c6
-536f 894b
-5370 88f3
-5371 8aeb
-5372 fa8c
-5373 91a6
-5374 8b70
-5375 9791
-5377 99c9
-5378 89b5
-537b 99c8
-537f 8ba8
-5382 99ca
-5384 96ef
-5393 fa8d
-5396 99cb
-5398 97d0
-539a 8cfa
-539f 8cb4
-53a0 99cc
-53a5 99ce
-53a6 99cd
-53a8 907e
-53a9 8958
-53ad 897d
-53ae 99cf
-53b0 99d0
-53b2 fa8e
-53b3 8cb5
-53b6 99d1
-53bb 8b8e
-53c2 8e51
-53c3 99d2
-53c8 9694
-53c9 8db3
-53ca 8b79
-53cb 9746
-53cc 916f
-53cd 94bd
-53ce 8efb
-53d4 8f66
-53d6 8ee6
-53d7 8ef3
-53d9 8f96
-53db 94be
-53dd fa8f
-53df 99d5
-53e1 8962
-53e2 9170
-53e3 8cfb
-53e4 8cc3
-53e5 8be5
-53e8 99d9
-53e9 9240
-53ea 91fc
-53eb 8ba9
-53ec 8fa2
-53ed 99da
-53ee 99d8
-53ef 89c2
-53f0 91e4
-53f1 8eb6
-53f2 8e6a
-53f3 8945
-53f6 8a90
-53f7 8d86
-53f8 8e69
-53fa 99db
-5401 99dc
-5403 8b68
-5404 8a65
-5408 8d87
-5409 8b67
-540a 92dd
-540b 8944
-540c 93af
-540d 96bc
-540e 8d40
-540f 9799
-5410 9366
-5411 8cfc
-541b 8c4e
-541d 99e5
-541f 8be1
-5420 9669
-5426 94db
-5429 99e4
-542b 8adc
-542c 99df
-542d 99e0
-542e 99e2
-5436 99e3
-5438 8b7a
-5439 9081
-543b 95ab
-543c 99e1
-543d 99dd
-543e 8ce1
-5440 99de
-5442 9843
-5446 95f0
-5448 92e6
-5449 8ce0
-544a 8d90
-544e 99e6
-5451 93db
-545f 99ea
-5468 8efc
-546a 8ef4
-5470 99ed
-5471 99eb
-5473 96a1
-5475 99e8
-5476 99f1
-5477 99ec
-547b 99ef
-547c 8cc4
-547d 96bd
-5480 99f0
-5484 99f2
-5486 99f4
-548a fa92
-548b 8dee
-548c 9861
-548e 99e9
-548f 99e7
-5490 99f3
-5492 99ee
-549c fa91
-54a2 99f6
-54a4 9a42
-54a5 99f8
-54a8 99fc
-54a9 fa93
-54ab 9a40
-54ac 99f9
-54af 9a5d
-54b2 8de7
-54b3 8a50
-54b8 99f7
-54bc 9a44
-54bd 88f4
-54be 9a43
-54c0 88a3
-54c1 9569
-54c2 9a41
-54c4 99fa
-54c7 99f5
-54c8 99fb
-54c9 8dc6
-54d8 9a45
-54e1 88f5
-54e2 9a4e
-54e5 9a46
-54e6 9a47
-54e8 8fa3
-54e9 9689
-54ed 9a4c
-54ee 9a4b
-54f2 934e
-54fa 9a4d
-54fd 9a4a
-54ff fa94
-5504 8953
-5506 8db4
-5507 904f
-550f 9a48
-5510 9382
-5514 9a49
-5516 88a0
-552e 9a53
-552f 9742
-5531 8fa5
-5533 9a59
-5538 9a58
-5539 9a4f
-553e 91c1
-5540 9a50
-5544 91ed
-5545 9a55
-5546 8fa4
-554c 9a52
-554f 96e2
-5553 8c5b
-5556 9a56
-5557 9a57
-555c 9a54
-555d 9a5a
-5563 9a51
-557b 9a60
-557c 9a65
-557e 9a61
-5580 9a5c
-5583 9a66
-5584 9150
-5586 fa95
-5587 9a68
-5589 8d41
-558a 9a5e
-558b 929d
-5598 9a62
-5599 9a5b
-559a 8aab
-559c 8aec
-559d 8a85
-559e 9a63
-559f 9a5f
-55a7 8c96
-55a8 9a69
-55a9 9a67
-55aa 9172
-55ab 8b69
-55ac 8baa
-55ae 9a64
-55b0 8bf2
-55b6 8963
-55c4 9a6d
-55c5 9a6b
-55c7 9aa5
-55d4 9a70
-55da 9a6a
-55dc 9a6e
-55df 9a6c
-55e3 8e6b
-55e4 9a6f
-55f7 9a72
-55f9 9a77
-55fd 9a75
-55fe 9a74
-5606 9251
-5609 89c3
-5614 9a71
-5616 9a73
-5617 8fa6
-5618 8952
-561b 9a76
-5629 89dc
-562f 9a82
-5631 8ffa
-5632 9a7d
-5634 9a7b
-5636 9a7c
-5638 9a7e
-5642 895c
-564c 9158
-564e 9a78
-5650 9a79
-565b 8a9a
-5664 9a81
-5668 8aed
-566a 9a84
-566b 9a80
-566c 9a83
-5674 95ac
-5678 93d3
-567a 94b6
-5680 9a86
-5686 9a85
-5687 8a64
-568a 9a87
-568f 9a8a
-5694 9a89
-56a0 9a88
-56a2 9458
-56a5 9a8b
-56ae 9a8c
-56b4 9a8e
-56b6 9a8d
-56bc 9a90
-56c0 9a93
-56c1 9a91
-56c2 9a8f
-56c3 9a92
-56c8 9a94
-56ce 9a95
-56d1 9a96
-56d3 9a97
-56d7 9a98
-56d8 9964
-56da 8efa
-56db 8e6c
-56de 89f1
-56e0 88f6
-56e3 9263
-56ee 9a99
-56f0 8da2
-56f2 88cd
-56f3 907d
-56f9 9a9a
-56fa 8cc5
-56fd 8d91
-56ff 9a9c
-5700 9a9b
-5703 95de
-5704 9a9d
-5708 9a9f
-5709 9a9e
-570b 9aa0
-570d 9aa1
-570f 8c97
-5712 8980
-5713 9aa2
-5716 9aa4
-5718 9aa3
-571c 9aa6
-571f 9379
-5726 9aa7
-5727 88b3
-5728 8ddd
-572d 8c5c
-5730 926e
-5737 9aa8
-5738 9aa9
-573b 9aab
-5740 9aac
-5742 8de2
-5747 8bcf
-574a 9656
-574e 9aaa
-574f 9aad
-5750 8dbf
-5751 8d42
-5759 fa96
-5761 9ab1
-5764 8da3
-5765 fa97
-5766 9252
-5769 9aae
-576a 92d8
-577f 9ab2
-5782 9082
-5788 9ab0
-5789 9ab3
-578b 8c5e
-5793 9ab4
-57a0 9ab5
-57a2 8d43
-57a3 8a5f
-57a4 9ab7
-57aa 9ab8
-57ac fa98
-57b0 9ab9
-57b3 9ab6
-57c0 9aaf
-57c3 9aba
-57c6 9abb
-57c7 fa9a
-57c8 fa99
-57cb 9684
-57ce 8fe9
-57d2 9abd
-57d3 9abe
-57d4 9abc
-57d6 9ac0
-57dc 9457
-57df 88e6
-57e0 9575
-57e3 9ac1
-57f4 8ffb
-57f7 8eb7
-57f9 947c
-57fa 8aee
-57fc 8de9
-5800 9678
-5802 93b0
-5805 8c98
-5806 91cd
-580a 9abf
-580b 9ac2
-5815 91c2
-5819 9ac3
-581d 9ac4
-5821 9ac6
-5824 92e7
-582a 8aac
-582f ea9f
-5830 8981
-5831 95f1
-5834 8fea
-5835 9367
-583a 8de4
-583d 9acc
-5840 95bb
-5841 97db
-584a 89f2
-584b 9ac8
-5851 9159
-5852 9acb
-5854 9383
-5857 9368
-5858 9384
-5859 94b7
-585a 92cb
-585e 8dc7
-5862 9ac7
-5869 8996
-586b 9355
-5870 9ac9
-5872 9ac5
-5875 906f
-5879 9acd
-587e 8f6d
-5883 8bab
-5885 9ace
-5893 95e6
-5897 919d
-589c 92c4
-589e fa9d
-589f 9ad0
-58a8 966e
-58ab 9ad1
-58ae 9ad6
-58b2 fa9e
-58b3 95ad
-58b8 9ad5
-58b9 9acf
-58ba 9ad2
-58bb 9ad4
-58be 8da4
-58c1 95c7
-58c5 9ad7
-58c7 9264
-58ca 89f3
-58cc 8feb
-58d1 9ad9
-58d3 9ad8
-58d5 8d88
-58d7 9ada
-58d8 9adc
-58d9 9adb
-58dc 9ade
-58de 9ad3
-58df 9ae0
-58e4 9adf
-58e5 9add
-58eb 8e6d
-58ec 9070
-58ee 9173
-58ef 9ae1
-58f0 90ba
-58f1 88eb
-58f2 9484
-58f7 92d9
-58f9 9ae3
-58fa 9ae2
-58fb 9ae4
-58fc 9ae5
-58fd 9ae6
-5902 9ae7
-5909 95cf
-590a 9ae8
-590b fa9f
-590f 89c4
-5910 9ae9
-5915 975b
-5916 8a4f
-5918 99c7
-5919 8f67
-591a 91bd
-591b 9aea
-591c 96e9
-5922 96b2
-5925 9aec
-5927 91e5
-5929 9356
-592a 91be
-592b 9576
-592c 9aed
-592d 9aee
-592e 899b
-5931 8eb8
-5932 9aef
-5937 88ce
-5938 9af0
-593e 9af1
-5944 8982
-5947 8aef
-5948 93de
-5949 95f2
-594e 9af5
-594f 9174
-5950 9af4
-5951 8c5f
-5953 faa0
-5954 967a
-5955 9af3
-5957 9385
-5958 9af7
-595a 9af6
-595b faa1
-595d faa2
-5960 9af9
-5962 9af8
-5963 faa3
-5965 899c
-5967 9afa
-5968 8fa7
-5969 9afc
-596a 9244
-596c 9afb
-596e 95b1
-5973 8f97
-5974 937a
-5978 9b40
-597d 8d44
-5981 9b41
-5982 9440
-5983 94dc
-5984 96cf
-598a 9444
-598d 9b4a
-5993 8b57
-5996 9764
-5999 96ad
-599b 9baa
-599d 9b42
-59a3 9b45
-59a4 faa4
-59a5 91c3
-59a8 9657
-59ac 9369
-59b2 9b46
-59b9 9685
-59ba faa5
-59bb 8dc8
-59be 8fa8
-59c6 9b47
-59c9 8e6f
-59cb 8e6e
-59d0 88b7
-59d1 8cc6
-59d3 90a9
-59d4 88cf
-59d9 9b4b
-59da 9b4c
-59dc 9b49
-59e5 8957
-59e6 8aad
-59e8 9b48
-59ea 96c3
-59eb 9550
-59f6 88a6
-59fb 88f7
-59ff 8e70
-5a01 88d0
-5a03 88a1
-5a09 9b51
-5a11 9b4f
-5a18 96ba
-5a1a 9b52
-5a1c 9b50
-5a1f 9b4e
-5a20 9050
-5a25 9b4d
-5a29 95d8
-5a2f 8ce2
-5a35 9b56
-5a36 9b57
-5a3c 8fa9
-5a40 9b53
-5a41 984b
-5a46 946b
-5a49 9b55
-5a5a 8da5
-5a62 9b58
-5a66 9577
-5a6a 9b59
-5a6c 9b54
-5a7f 96b9
-5a92 947d
-5a9a 9b5a
-5a9b 9551
-5abc 9b5b
-5abd 9b5f
-5abe 9b5c
-5ac1 89c5
-5ac2 9b5e
-5ac9 8eb9
-5acb 9b5d
-5acc 8c99
-5ad0 9b6b
-5ad6 9b64
-5ad7 9b61
-5ae1 9284
-5ae3 9b60
-5ae6 9b62
-5ae9 9b63
-5afa 9b65
-5afb 9b66
-5b09 8af0
-5b0b 9b68
-5b0c 9b67
-5b16 9b69
-5b22 8fec
-5b2a 9b6c
-5b2c 92da
-5b30 8964
-5b32 9b6a
-5b36 9b6d
-5b3e 9b6e
-5b40 9b71
-5b43 9b6f
-5b45 9b70
-5b50 8e71
-5b51 9b72
-5b54 8d45
-5b55 9b73
-5b56 faa6
-5b57 8e9a
-5b58 91b6
-5b5a 9b74
-5b5b 9b75
-5b5c 8e79
-5b5d 8d46
-5b5f 96d0
-5b63 8b47
-5b64 8cc7
-5b65 9b76
-5b66 8a77
-5b69 9b77
-5b6b 91b7
-5b70 9b78
-5b71 9ba1
-5b73 9b79
-5b75 9b7a
-5b78 9b7b
-5b7a 9b7d
-5b80 9b7e
-5b83 9b80
-5b85 91ee
-5b87 8946
-5b88 8ee7
-5b89 88c0
-5b8b 9176
-5b8c 8aae
-5b8d 8eb3
-5b8f 8d47
-5b95 9386
-5b97 8f40
-5b98 8aaf
-5b99 9288
-5b9a 92e8
-5b9b 88b6
-5b9c 8b58
-5b9d 95f3
-5b9f 8ec0
-5ba2 8b71
-5ba3 90e9
-5ba4 8eba
-5ba5 9747
-5ba6 9b81
-5bae 8b7b
-5bb0 8dc9
-5bb3 8a51
-5bb4 8983
-5bb5 8faa
-5bb6 89c6
-5bb8 9b82
-5bb9 9765
-5bbf 8f68
-5bc0 faa7
-5bc2 8ee2
-5bc3 9b83
-5bc4 8af1
-5bc5 93d0
-5bc6 96a7
-5bc7 9b84
-5bc9 9b85
-5bcc 9578
-5bd0 9b87
-5bd2 8aa6
-5bd3 8bf5
-5bd4 9b86
-5bd8 faa9
-5bdb 8ab0
-5bdd 9051
-5bde 9b8b
-5bdf 8e40
-5be1 89c7
-5be2 9b8a
-5be4 9b88
-5be5 9b8c
-5be6 9b89
-5be7 944a
-5be8 9ecb
-5be9 9052
-5beb 9b8d
-5bec faaa
-5bee 97be
-5bf0 9b8e
-5bf3 9b90
-5bf5 929e
-5bf6 9b8f
-5bf8 90a1
-5bfa 8e9b
-5bfe 91ce
-5bff 8ef5
-5c01 9595
-5c02 90ea
-5c04 8ecb
-5c05 9b91
-5c06 8fab
-5c07 9b92
-5c08 9b93
-5c09 88d1
-5c0a 91b8
-5c0b 9071
-5c0d 9b94
-5c0e 93b1
-5c0f 8fac
-5c11 8fad
-5c13 9b95
-5c16 90eb
-5c1a 8fae
-5c1e faab
-5c20 9b96
-5c22 9b97
-5c24 96de
-5c28 9b98
-5c2d 8bc4
-5c31 8f41
-5c38 9b99
-5c39 9b9a
-5c3a 8eda
-5c3b 904b
-5c3c 93f2
-5c3d 9073
-5c3e 94f6
-5c3f 9441
-5c40 8bc7
-5c41 9b9b
-5c45 8b8f
-5c46 9b9c
-5c48 8bfc
-5c4a 93cd
-5c4b 89ae
-5c4d 8e72
-5c4e 9b9d
-5c4f 9ba0
-5c50 9b9f
-5c51 8bfb
-5c53 9b9e
-5c55 9357
-5c5e 91ae
-5c60 936a
-5c61 8ec6
-5c64 9177
-5c65 979a
-5c6c 9ba2
-5c6e 9ba3
-5c6f 93d4
-5c71 8e52
-5c76 9ba5
-5c79 9ba6
-5c8c 9ba7
-5c90 8af2
-5c91 9ba8
-5c94 9ba9
-5ca1 89aa
-5ca6 faac
-5ca8 915a
-5ca9 8ae2
-5cab 9bab
-5cac 96a6
-5cb1 91d0
-5cb3 8a78
-5cb6 9bad
-5cb7 9baf
-5cb8 8add
-5cba faad
-5cbb 9bac
-5cbc 9bae
-5cbe 9bb1
-5cc5 9bb0
-5cc7 9bb2
-5cd9 9bb3
-5ce0 93bb
-5ce1 8bac
-5ce8 89e3
-5ce9 9bb4
-5cea 9bb9
-5ced 9bb7
-5cef 95f5
-5cf0 95f4
-5cf5 faae
-5cf6 9387
-5cfa 9bb6
-5cfb 8f73
-5cfd 9bb5
-5d07 9092
-5d0b 9bba
-5d0e 8de8
-5d11 9bc0
-5d14 9bc1
-5d15 9bbb
-5d16 8a52
-5d17 9bbc
-5d18 9bc5
-5d19 9bc4
-5d1a 9bc3
-5d1b 9bbf
-5d1f 9bbe
-5d22 9bc2
-5d27 faaf
-5d29 95f6
-5d42 fab2
-5d4b 9bc9
-5d4c 9bc6
-5d4e 9bc8
-5d50 9792
-5d52 9bc7
-5d53 fab0
-5d5c 9bbd
-5d69 9093
-5d6c 9bca
-5d6d fab3
-5d6f 8db5
-5d73 9bcb
-5d76 9bcc
-5d82 9bcf
-5d84 9bce
-5d87 9bcd
-5d8b 9388
-5d8c 9bb8
-5d90 9bd5
-5d9d 9bd1
-5da2 9bd0
-5dac 9bd2
-5dae 9bd3
-5db7 9bd6
-5db8 fab4
-5db9 fab5
-5dba 97e4
-5dbc 9bd7
-5dbd 9bd4
-5dc9 9bd8
-5dcc 8ade
-5dcd 9bd9
-5dd0 fab6
-5dd2 9bdb
-5dd3 9bda
-5dd6 9bdc
-5ddb 9bdd
-5ddd 90ec
-5dde 8f42
-5de1 8f84
-5de3 9183
-5de5 8d48
-5de6 8db6
-5de7 8d49
-5de8 8b90
-5deb 9bde
-5dee 8db7
-5df1 8cc8
-5df2 9bdf
-5df3 96a4
-5df4 9462
-5df5 9be0
-5df7 8d4a
-5dfb 8aaa
-5dfd 9246
-5dfe 8bd0
-5e02 8e73
-5e03 957a
-5e06 94bf
-5e0b 9be1
-5e0c 8af3
-5e11 9be4
-5e16 929f
-5e19 9be3
-5e1a 9be2
-5e1b 9be5
-5e1d 92e9
-5e25 9083
-5e2b 8e74
-5e2d 90c8
-5e2f 91d1
-5e30 8b41
-5e33 92a0
-5e36 9be6
-5e37 9be7
-5e38 8fed
-5e3d 9658
-5e40 9bea
-5e43 9be9
-5e44 9be8
-5e45 959d
-5e47 9bf1
-5e4c 9679
-5e4e 9beb
-5e54 9bed
-5e55 968b
-5e57 9bec
-5e5f 9bee
-5e61 94a6
-5e62 9bef
-5e63 95bc
-5e64 9bf0
-5e72 8ab1
-5e73 95bd
-5e74 944e
-5e75 9bf2
-5e76 9bf3
-5e78 8d4b
-5e79 8ab2
-5e7a 9bf4
-5e7b 8cb6
-5e7c 9763
-5e7d 9748
-5e7e 8af4
-5e7f 9bf6
-5e81 92a1
-5e83 8d4c
-5e84 8faf
-5e87 94dd
-5e8a 8fb0
-5e8f 8f98
-5e95 92ea
-5e96 95f7
-5e97 9358
-5e9a 8d4d
-5e9c 957b
-5ea0 9bf7
-5ea6 9378
-5ea7 8dc0
-5eab 8cc9
-5ead 92eb
-5eb5 88c1
-5eb6 8f8e
-5eb7 8d4e
-5eb8 9766
-5ec1 9bf8
-5ec2 9bf9
-5ec3 9470
-5ec8 9bfa
-5ec9 97f5
-5eca 984c
-5ecf 9bfc
-5ed0 9bfb
-5ed3 8a66
-5ed6 9c40
-5eda 9c43
-5edb 9c44
-5edd 9c42
-5edf 955f
-5ee0 8fb1
-5ee1 9c46
-5ee2 9c45
-5ee3 9c41
-5ee8 9c47
-5ee9 9c48
-5eec 9c49
-5ef0 9c4c
-5ef1 9c4a
-5ef3 9c4b
-5ef4 9c4d
-5ef6 8984
-5ef7 92ec
-5ef8 9c4e
-5efa 8c9a
-5efb 89f4
-5efc 9455
-5efe 9c4f
-5eff 93f9
-5f01 95d9
-5f03 9c50
-5f04 984d
-5f09 9c51
-5f0a 95be
-5f0b 9c54
-5f0c 989f
-5f0d 98af
-5f0f 8eae
-5f10 93f3
-5f11 9c55
-5f13 8b7c
-5f14 92a2
-5f15 88f8
-5f16 9c56
-5f17 95a4
-5f18 8d4f
-5f1b 926f
-5f1f 92ed
-5f21 fab7
-5f25 96ed
-5f26 8cb7
-5f27 8cca
-5f29 9c57
-5f2d 9c58
-5f2f 9c5e
-5f31 8ee3
-5f34 fab8
-5f35 92a3
-5f37 8bad
-5f38 9c59
-5f3c 954a
-5f3e 9265
-5f41 9c5a
-5f45 fa67
-5f48 9c5b
-5f4a 8bae
-5f4c 9c5c
-5f4e 9c5d
-5f51 9c5f
-5f53 9396
-5f56 9c60
-5f57 9c61
-5f59 9c62
-5f5c 9c53
-5f5d 9c52
-5f61 9c63
-5f62 8c60
-5f66 9546
-5f67 fab9
-5f69 8dca
-5f6a 9556
-5f6b 92a4
-5f6c 956a
-5f6d 9c64
-5f70 8fb2
-5f71 8965
-5f73 9c65
-5f77 9c66
-5f79 96f0
-5f7c 94de
-5f7f 9c69
-5f80 899d
-5f81 90aa
-5f82 9c68
-5f83 9c67
-5f84 8c61
-5f85 91d2
-5f87 9c6d
-5f88 9c6b
-5f8a 9c6a
-5f8b 97a5
-5f8c 8ce3
-5f90 8f99
-5f91 9c6c
-5f92 936b
-5f93 8f5d
-5f97 93be
-5f98 9c70
-5f99 9c6f
-5f9e 9c6e
-5fa0 9c71
-5fa1 8ce4
-5fa8 9c72
-5fa9 959c
-5faa 8f7a
-5fad 9c73
-5fae 94f7
-5fb3 93bf
-5fb4 92a5
-5fb7 faba
-5fb9 934f
-5fbc 9c74
-5fbd 8b4a
-5fc3 9053
-5fc5 954b
-5fcc 8af5
-5fcd 9445
-5fd6 9c75
-5fd7 8e75
-5fd8 9659
-5fd9 965a
-5fdc 899e
-5fdd 9c7a
-5fde fabb
-5fe0 9289
-5fe4 9c77
-5feb 89f5
-5ff0 9cab
-5ff1 9c79
-5ff5 944f
-5ff8 9c78
-5ffb 9c76
-5ffd 8d9a
-5fff 9c7c
-600e 9c83
-600f 9c89
-6010 9c81
-6012 937b
-6015 9c86
-6016 957c
-6019 9c80
-601b 9c85
-601c 97e5
-601d 8e76
-6020 91d3
-6021 9c7d
-6025 8b7d
-6026 9c88
-6027 90ab
-6028 8985
-6029 9c82
-602a 89f6
-602b 9c87
-602f 8baf
-6031 9c84
-603a 9c8a
-6041 9c8c
-6042 9c96
-6043 9c94
-6046 9c91
-604a 9c90
-604b 97f6
-604d 9c92
-6050 8bb0
-6052 8d50
-6055 8f9a
-6059 9c99
-605a 9c8b
-605d fabc
-605f 9c8f
-6060 9c7e
-6062 89f8
-6063 9c93
-6064 9c95
-6065 9270
-6068 8da6
-6069 89b6
-606a 9c8d
-606b 9c98
-606c 9c97
-606d 8bb1
-606f 91a7
-6070 8a86
-6075 8c62
-6077 9c8e
-6081 9c9a
-6083 9c9d
-6084 9c9f
-6085 fabd
-6089 8ebb
-608a fabe
-608b 9ca5
-608c 92ee
-608d 9c9b
-6092 9ca3
-6094 89f7
-6096 9ca1
-6097 9ca2
-609a 9c9e
-609b 9ca0
-609f 8ce5
-60a0 9749
-60a3 8ab3
-60a6 8978
-60a7 9ca4
-60a9 9459
-60aa 88ab
-60b2 94df
-60b3 9c7b
-60b4 9caa
-60b5 9cae
-60b6 96e3
-60b8 9ca7
-60bc 9389
-60bd 9cac
-60c5 8fee
-60c6 9cad
-60c7 93d5
-60d1 9866
-60d3 9ca9
-60d5 fac0
-60d8 9caf
-60da 8d9b
-60dc 90c9
-60de fabf
-60df 88d2
-60e0 9ca8
-60e1 9ca6
-60e3 9179
-60e7 9c9c
-60e8 8e53
-60f0 91c4
-60f1 9cbb
-60f2 fac2
-60f3 917a
-60f4 9cb6
-60f6 9cb3
-60f7 9cb4
-60f9 8ee4
-60fa 9cb7
-60fb 9cba
-6100 9cb5
-6101 8f44
-6103 9cb8
-6106 9cb2
-6108 96fa
-6109 96f9
-610d 9cbc
-610e 9cbd
-610f 88d3
-6111 fac3
-6115 9cb1
-611a 8bf0
-611b 88a4
-611f 8ab4
-6120 fac1
-6121 9cb9
-6127 9cc1
-6128 9cc0
-612c 9cc5
-6130 fac5
-6134 9cc6
-6137 fac4
-613c 9cc4
-613d 9cc7
-613e 9cbf
-613f 9cc3
-6142 9cc8
-6144 9cc9
-6147 9cbe
-6148 8e9c
-614a 9cc2
-614b 91d4
-614c 8d51
-614d 9cb0
-614e 9054
-6153 9cd6
-6155 95e7
-6158 9ccc
-6159 9ccd
-615a 9cce
-615d 9cd5
-615f 9cd4
-6162 969d
-6163 8ab5
-6165 9cd2
-6167 8c64
-6168 8a53
-616b 9ccf
-616e 97b6
-616f 9cd1
-6170 88d4
-6171 9cd3
-6173 9cca
-6174 9cd0
-6175 9cd7
-6176 8c63
-6177 9ccb
-617e 977c
-6182 974a
-6187 9cda
-618a 9cde
-618e 919e
-6190 97f7
-6191 9cdf
-6194 9cdc
-6196 9cd9
-6198 fac6
-6199 9cd8
-619a 9cdd
-61a4 95ae
-61a7 93b2
-61a9 8c65
-61ab 9ce0
-61ac 9cdb
-61ae 9ce1
-61b2 8c9b
-61b6 89af
-61ba 9ce9
-61be 8ab6
-61c3 9ce7
-61c6 9ce8
-61c7 8da7
-61c8 9ce6
-61c9 9ce4
-61ca 9ce3
-61cb 9cea
-61cc 9ce2
-61cd 9cec
-61d0 89f9
-61e3 9cee
-61e6 9ced
-61f2 92a6
-61f4 9cf1
-61f6 9cef
-61f7 9ce5
-61f8 8c9c
-61fa 9cf0
-61fc 9cf4
-61fd 9cf3
-61fe 9cf5
-61ff 9cf2
-6200 9cf6
-6208 9cf7
-6209 9cf8
-620a 95e8
-620c 9cfa
-620d 9cf9
-620e 8f5e
-6210 90ac
-6211 89e4
-6212 89fa
-6213 fac7
-6214 9cfb
-6216 88bd
-621a 90ca
-621b 9cfc
-621d e6c1
-621e 9d40
-621f 8c81
-6221 9d41
-6226 90ed
-622a 9d42
-622e 9d43
-622f 8b59
-6230 9d44
-6232 9d45
-6233 9d46
-6234 91d5
-6238 8ccb
-623b 96df
-623f 965b
-6240 8f8a
-6241 9d47
-6247 90ee
-6248 e7bb
-6249 94e0
-624b 8ee8
-624d 8dcb
-624e 9d48
-6253 91c5
-6255 95a5
-6258 91ef
-625b 9d4b
-625e 9d49
-6260 9d4c
-6263 9d4a
-6268 9d4d
-626e 95af
-6271 88b5
-6276 957d
-6279 94e1
-627c 9d4e
-627e 9d51
-627f 8fb3
-6280 8b5a
-6282 9d4f
-6283 9d56
-6284 8fb4
-6289 9d50
-628a 9463
-6291 977d
-6292 9d52
-6293 9d53
-6294 9d57
-6295 938a
-6296 9d54
-6297 8d52
-6298 90dc
-629b 9d65
-629c 94b2
-629e 91f0
-62a6 fac8
-62ab 94e2
-62ac 9dab
-62b1 95f8
-62b5 92ef
-62b9 9695
-62bb 9d5a
-62bc 899f
-62bd 928a
-62c2 9d63
-62c5 9253
-62c6 9d5d
-62c7 9d64
-62c8 9d5f
-62c9 9d66
-62ca 9d62
-62cc 9d61
-62cd 948f
-62cf 9d5b
-62d0 89fb
-62d1 9d59
-62d2 8b91
-62d3 91f1
-62d4 9d55
-62d7 9d58
-62d8 8d53
-62d9 90d9
-62db 8fb5
-62dc 9d60
-62dd 9471
-62e0 8b92
-62e1 8a67
-62ec 8a87
-62ed 9040
-62ee 9d68
-62ef 9d6d
-62f1 9d69
-62f3 8c9d
-62f5 9d6e
-62f6 8e41
-62f7 8d89
-62fe 8f45
-62ff 9d5c
-6301 8e9d
-6302 9d6b
-6307 8e77
-6308 9d6c
-6309 88c2
-630c 9d67
-6311 92a7
-6319 8b93
-631f 8bb2
-6327 9d6a
-6328 88a5
-632b 8dc1
-632f 9055
-633a 92f0
-633d 94d2
-633e 9d70
-633f 917d
-6349 91a8
-634c 8e4a
-634d 9d71
-634f 9d73
-6350 9d6f
-6355 95df
-6357 92bb
-635c 917b
-6367 95f9
-6368 8ecc
-6369 9d80
-636b 9d7e
-636e 9098
-6372 8c9e
-6376 9d78
-6377 8fb7
-637a 93e6
-637b 9450
-6380 9d76
-6383 917c
-6388 8ef6
-6389 9d7b
-638c 8fb6
-638e 9d75
-638f 9d7a
-6392 9472
-6396 9d74
-6398 8c40
-639b 8a7c
-639f 9d7c
-63a0 97a9
-63a1 8dcc
-63a2 9254
-63a3 9d79
-63a5 90da
-63a7 8d54
-63a8 9084
-63a9 8986
-63aa 915b
-63ab 9d77
-63ac 8b64
-63b2 8c66
-63b4 92cd
-63b5 9d7d
-63bb 917e
-63be 9d81
-63c0 9d83
-63c3 91b5
-63c4 9d89
-63c6 9d84
-63c9 9d86
-63cf 9560
-63d0 92f1
-63d2 9d87
-63d6 974b
-63da 9767
-63db 8ab7
-63e1 88ac
-63e3 9d85
-63e9 9d82
-63ee 8af6
-63f4 8987
-63f5 fac9
-63f6 9d88
-63fa 9768
-6406 9d8c
-640d 91b9
-640f 9d93
-6413 9d8d
-6416 9d8a
-6417 9d91
-641c 9d72
-6426 9d8e
-6428 9d92
-642c 94c0
-642d 938b
-6434 9d8b
-6436 9d8f
-643a 8c67
-643e 8def
-6442 90db
-644e 9d97
-6458 9345
-6460 faca
-6467 9d94
-6469 9680
-646f 9d95
-6476 9d96
-6478 96cc
-647a 90a0
-6483 8c82
-6488 9d9d
-6492 8e54
-6493 9d9a
-6495 9d99
-649a 9451
-649d facb
-649e 93b3
-64a4 9350
-64a5 9d9b
-64a9 9d9c
-64ab 958f
-64ad 9464
-64ae 8e42
-64b0 90ef
-64b2 966f
-64b9 8a68
-64bb 9da3
-64bc 9d9e
-64c1 9769
-64c2 9da5
-64c5 9da1
-64c7 9da2
-64cd 9180
-64ce facc
-64d2 9da0
-64d4 9d5e
-64d8 9da4
-64da 9d9f
-64e0 9da9
-64e1 9daa
-64e2 9346
-64e3 9dac
-64e6 8e43
-64e7 9da7
-64ec 8b5b
-64ef 9dad
-64f1 9da6
-64f2 9db1
-64f4 9db0
-64f6 9daf
-64fa 9db2
-64fd 9db4
-64fe 8fef
-6500 9db3
-6505 9db7
-6518 9db5
-651c 9db6
-651d 9d90
-6523 9db9
-6524 9db8
-652a 9d98
-652b 9dba
-652c 9dae
-652f 8e78
-6534 9dbb
-6535 9dbc
-6536 9dbe
-6537 9dbd
-6538 9dbf
-6539 89fc
-653b 8d55
-653e 95fa
-653f 90ad
-6545 8ccc
-6548 9dc1
-654d 9dc4
-654e facd
-654f 9571
-6551 8b7e
-6555 9dc3
-6556 9dc2
-6557 9473
-6558 9dc5
-6559 8bb3
-655d 9dc7
-655e 9dc6
-6562 8ab8
-6563 8e55
-6566 93d6
-656c 8c68
-6570 9094
-6572 9dc8
-6574 90ae
-6575 9347
-6577 957e
-6578 9dc9
-6582 9dca
-6583 9dcb
-6587 95b6
-6588 9b7c
-6589 90c4
-658c 956b
-658e 8dd6
-6590 94e3
-6591 94c1
-6597 936c
-6599 97bf
-659b 9dcd
-659c 8ece
-659f 9dce
-65a1 88b4
-65a4 8bd2
-65a5 90cb
-65a7 9580
-65ab 9dcf
-65ac 8e61
-65ad 9266
-65af 8e7a
-65b0 9056
-65b7 9dd0
-65b9 95fb
-65bc 8997
-65bd 8e7b
-65c1 9dd3
-65c3 9dd1
-65c4 9dd4
-65c5 97b7
-65c6 9dd2
-65cb 90f9
-65cc 9dd5
-65cf 91b0
-65d2 9dd6
-65d7 8af8
-65d9 9dd8
-65db 9dd7
-65e0 9dd9
-65e1 9dda
-65e2 8af9
-65e5 93fa
-65e6 9255
-65e7 8b8c
-65e8 8e7c
-65e9 9181
-65ec 8f7b
-65ed 88ae
-65f1 9ddb
-65fa 89a0
-65fb 9ddf
-6600 face
-6602 8d56
-6603 9dde
-6606 8da9
-6607 8fb8
-6609 fad1
-660a 9ddd
-660c 8fb9
-660e 96be
-660f 8da8
-6613 88d5
-6614 90cc
-6615 facf
-661c 9de4
-661e fad3
-661f 90af
-6620 8966
-6624 fad4
-6625 8f74
-6627 9686
-6628 8df0
-662d 8fba
-662e fad2
-662f 90a5
-6631 fa63
-6634 9de3
-6635 9de1
-6636 9de2
-663b fad0
-663c 928b
-663f 9e45
-6641 9de8
-6642 8e9e
-6643 8d57
-6644 9de6
-6649 9de7
-664b 9057
-664f 9de5
-6652 8e4e
-6657 fad6
-6659 fad7
-665d 9dea
-665e 9de9
-665f 9dee
-6662 9def
-6664 9deb
-6665 fad5
-6666 8a41
-6667 9dec
-6668 9ded
-6669 94d3
-666e 9581
-666f 8c69
-6670 9df0
-6673 fad9
-6674 90b0
-6676 8fbb
-667a 9271
-6681 8bc5
-6683 9df1
-6684 9df5
-6687 89c9
-6688 9df2
-6689 9df4
-668e 9df3
-6691 8f8b
-6696 9267
-6697 88c3
-6698 9df6
-6699 fada
-669d 9df7
-66a0 fadb
-66a2 92a8
-66a6 97ef
-66ab 8e62
-66ae 95e9
-66b2 fadc
-66b4 965c
-66b8 9e41
-66b9 9df9
-66bc 9dfc
-66be 9dfb
-66bf fadd
-66c1 9df8
-66c4 9e40
-66c7 93dc
-66c9 9dfa
-66d6 9e42
-66d9 8f8c
-66da 9e43
-66dc 976a
-66dd 9498
-66e0 9e44
-66e6 9e46
-66e9 9e47
-66f0 9e48
-66f2 8bc8
-66f3 8967
-66f4 8d58
-66f5 9e49
-66f7 9e4a
-66f8 8f91
-66f9 9182
-66fa fade
-66fb fa66
-66fc 99d6
-66fd 915d
-66fe 915c
-66ff 91d6
-6700 8dc5
-6703 98f0
-6708 8c8e
-6709 974c
-670b 95fc
-670d 959e
-670e fadf
-670f 9e4b
-6714 8df1
-6715 92bd
-6716 9e4c
-6717 984e
-671b 965d
-671d 92a9
-671e 9e4d
-671f 8afa
-6726 9e4e
-6727 9e4f
-6728 96d8
-672a 96a2
-672b 9696
-672c 967b
-672d 8e44
-672e 9e51
-6731 8ee9
-6734 9670
-6736 9e53
-6737 9e56
-6738 9e55
-673a 8af7
-673d 8b80
-673f 9e52
-6741 9e54
-6746 9e57
-6749 9099
-674e 979b
-674f 88c7
-6750 8dde
-6751 91ba
-6753 8edb
-6756 8ff1
-6759 9e5a
-675c 936d
-675e 9e58
-675f 91a9
-6760 9e59
-6761 8ff0
-6762 96db
-6763 9e5b
-6764 9e5c
-6765 9788
-6766 fae1
-676a 9e61
-676d 8d59
-676f 9474
-6770 9e5e
-6771 938c
-6772 9ddc
-6773 9de0
-6775 8b6e
-6777 9466
-677c 9e60
-677e 8fbc
-677f 94c2
-6785 9e66
-6787 94f8
-6789 9e5d
-678b 9e63
-678c 9e62
-6790 90cd
-6795 968d
-6797 97d1
-679a 9687
-679c 89ca
-679d 8e7d
-67a0 9867
-67a1 9e65
-67a2 9095
-67a6 9e64
-67a9 9e5f
-67af 8ccd
-67b3 9e6b
-67b4 9e69
-67b6 89cb
-67b7 9e67
-67b8 9e6d
-67b9 9e73
-67bb fae2
-67c0 fae4
-67c1 91c6
-67c4 95bf
-67c6 9e75
-67ca 9541
-67ce 9e74
-67cf 9490
-67d0 965e
-67d1 8ab9
-67d3 90f5
-67d4 8f5f
-67d8 92d1
-67da 974d
-67dd 9e70
-67de 9e6f
-67e2 9e71
-67e4 9e6e
-67e7 9e76
-67e9 9e6c
-67ec 9e6a
-67ee 9e72
-67ef 9e68
-67f1 928c
-67f3 96f6
-67f4 8ec4
-67f5 8df2
-67fb 8db8
-67fe 968f
-67ff 8a60
-6801 fae5
-6802 92cc
-6803 93c8
-6804 8968
-6813 90f0
-6816 90b2
-6817 8c49
-681e 9e78
-6821 8d5a
-6822 8a9c
-6829 9e7a
-682a 8a94
-682b 9e81
-6832 9e7d
-6834 90f1
-6838 8a6a
-6839 8daa
-683c 8a69
-683d 8dcd
-6840 9e7b
-6841 8c85
-6842 8c6a
-6843 938d
-6844 fae6
-6846 9e79
-6848 88c4
-684d 9e7c
-684e 9e7e
-6850 8bcb
-6851 8c4b
-6852 fae3
-6853 8aba
-6854 8b6a
-6859 9e82
-685c 8df7
-685d 9691
-685f 8e56
-6863 9e83
-6867 954f
-6874 9e8f
-6876 89b1
-6877 9e84
-687e 9e95
-687f 9e85
-6881 97c0
-6883 9e8c
-6885 947e
-688d 9e94
-688f 9e87
-6893 88b2
-6894 9e89
-6897 8d5b
-689b 9e8b
-689d 9e8a
-689f 9e86
-68a0 9e91
-68a2 8fbd
-68a6 9aeb
-68a7 8ce6
-68a8 979c
-68ad 9e88
-68af 92f2
-68b0 8a42
-68b1 8dab
-68b3 9e80
-68b5 9e90
-68b6 8a81
-68b9 9e8e
-68ba 9e92
-68bc 938e
-68c4 8afc
-68c6 9eb0
-68c8 fa64
-68c9 96c7
-68ca 9e97
-68cb 8afb
-68cd 9e9e
-68cf fae7
-68d2 965f
-68d4 9e9f
-68d5 9ea1
-68d7 9ea5
-68d8 9e99
-68da 9249
-68df 938f
-68e0 9ea9
-68e1 9e9c
-68e3 9ea6
-68e7 9ea0
-68ee 9058
-68ef 9eaa
-68f2 90b1
-68f9 9ea8
-68fa 8abb
-6900 986f
-6901 9e96
-6904 9ea4
-6905 88d6
-6908 9e98
-690b 96b8
-690c 9e9d
-690d 9041
-690e 92c5
-690f 9e93
-6912 9ea3
-6919 909a
-691a 9ead
-691b 8a91
-691c 8c9f
-6921 9eaf
-6922 9e9a
-6923 9eae
-6925 9ea7
-6926 9e9b
-6928 9eab
-692a 9eac
-6930 9ebd
-6934 93cc
-6936 9ea2
-6939 9eb9
-693d 9ebb
-693f 92d6
-694a 976b
-6953 9596
-6954 9eb6
-6955 91c8
-6959 9ebc
-695a 915e
-695c 9eb3
-695d 9ec0
-695e 9ebf
-6960 93ed
-6961 9ebe
-6962 93e8
-6968 fae9
-696a 9ec2
-696b 9eb5
-696d 8bc6
-696e 9eb8
-696f 8f7c
-6973 9480
-6974 9eba
-6975 8bc9
-6977 9eb2
-6978 9eb4
-6979 9eb1
-697c 984f
-697d 8a79
-697e 9eb7
-6981 9ec1
-6982 8a54
-698a 8de5
-698e 897c
-6991 9ed2
-6994 9850
-6995 9ed5
-6998 faeb
-699b 9059
-699c 9ed4
-69a0 9ed3
-69a7 9ed0
-69ae 9ec4
-69b1 9ee1
-69b2 9ec3
-69b4 9ed6
-69bb 9ece
-69be 9ec9
-69bf 9ec6
-69c1 9ec7
-69c3 9ecf
-69c7 eaa0
-69ca 9ecc
-69cb 8d5c
-69cc 92c6
-69cd 9184
-69ce 9eca
-69d0 9ec5
-69d3 9ec8
-69d8 976c
-69d9 968a
-69dd 9ecd
-69de 9ed7
-69e2 faec
-69e7 9edf
-69e8 9ed8
-69eb 9ee5
-69ed 9ee3
-69f2 9ede
-69f9 9edd
-69fb 92ce
-69fd 9185
-69ff 9edb
-6a02 9ed9
-6a05 9ee0
-6a0a 9ee6
-6a0b 94f3
-6a0c 9eec
-6a12 9ee7
-6a13 9eea
-6a14 9ee4
-6a17 9294
-6a19 9557
-6a1b 9eda
-6a1e 9ee2
-6a1f 8fbe
-6a21 96cd
-6a22 9ef6
-6a23 9ee9
-6a29 8ca0
-6a2a 89a1
-6a2b 8a7e
-6a2e 9ed1
-6a30 faed
-6a35 8fbf
-6a36 9eee
-6a38 9ef5
-6a39 8ef7
-6a3a 8a92
-6a3d 924d
-6a44 9eeb
-6a46 faef
-6a47 9ef0
-6a48 9ef4
-6a4b 8bb4
-6a58 8b6b
-6a59 9ef2
-6a5f 8b40
-6a61 93c9
-6a62 9ef1
-6a66 9ef3
-6a6b faee
-6a72 9eed
-6a73 faf0
-6a78 9eef
-6a7e faf1
-6a7f 8a80
-6a80 9268
-6a84 9efa
-6a8d 9ef8
-6a8e 8ce7
-6a90 9ef7
-6a97 9f40
-6a9c 9e77
-6aa0 9ef9
-6aa2 9efb
-6aa3 9efc
-6aaa 9f4b
-6aac 9f47
-6aae 9e8d
-6ab3 9f46
-6ab8 9f45
-6abb 9f42
-6ac1 9ee8
-6ac2 9f44
-6ac3 9f43
-6ad1 9f49
-6ad3 9845
-6ada 9f4c
-6adb 8bf9
-6ade 9f48
-6adf 9f4a
-6ae2 faf2
-6ae4 faf3
-6ae8 94a5
-6aea 9f4d
-6afa 9f51
-6afb 9f4e
-6b04 9793
-6b05 9f4f
-6b0a 9edc
-6b12 9f52
-6b16 9f53
-6b1d 8954
-6b1f 9f55
-6b20 8c87
-6b21 8e9f
-6b23 8bd3
-6b27 89a2
-6b32 977e
-6b37 9f57
-6b38 9f56
-6b39 9f59
-6b3a 8b5c
-6b3d 8bd4
-6b3e 8abc
-6b43 9f5c
-6b47 9f5b
-6b49 9f5d
-6b4c 89cc
-6b4e 9256
-6b50 9f5e
-6b53 8abd
-6b54 9f60
-6b59 9f5f
-6b5b 9f61
-6b5f 9f62
-6b61 9f63
-6b62 8e7e
-6b63 90b3
-6b64 8d9f
-6b66 9590
-6b69 95e0
-6b6a 9863
-6b6f 8e95
-6b73 8dce
-6b74 97f0
-6b78 9f64
-6b79 9f65
-6b7b 8e80
-6b7f 9f66
-6b80 9f67
-6b83 9f69
-6b84 9f68
-6b86 9677
-6b89 8f7d
-6b8a 8eea
-6b8b 8e63
-6b8d 9f6a
-6b95 9f6c
-6b96 9042
-6b98 9f6b
-6b9e 9f6d
-6ba4 9f6e
-6baa 9f6f
-6bab 9f70
-6baf 9f71
-6bb1 9f73
-6bb2 9f72
-6bb3 9f74
-6bb4 89a3
-6bb5 9269
-6bb7 9f75
-6bba 8e45
-6bbb 8a6b
-6bbc 9f76
-6bbf 9361
-6bc0 9aca
-6bc5 8b42
-6bc6 9f77
-6bcb 9f78
-6bcd 95ea
-6bce 9688
-6bd2 93c5
-6bd3 9f79
-6bd4 94e4
-6bd6 faf4
-6bd8 94f9
-6bdb 96d1
-6bdf 9f7a
-6beb 9f7c
-6bec 9f7b
-6bef 9f7e
-6bf3 9f7d
-6c08 9f81
-6c0f 8e81
-6c11 96af
-6c13 9f82
-6c14 9f83
-6c17 8b43
-6c1b 9f84
-6c23 9f86
-6c24 9f85
-6c34 9085
-6c37 9558
-6c38 8969
-6c3e 94c3
-6c3f faf5
-6c40 92f3
-6c41 8f60
-6c42 8b81
-6c4e 94c4
-6c50 8eac
-6c55 9f88
-6c57 8abe
-6c5a 8998
-6c5c faf6
-6c5d 93f0
-6c5e 9f87
-6c5f 8d5d
-6c60 9272
-6c62 9f89
-6c68 9f91
-6c6a 9f8a
-6c6f faf8
-6c70 91bf
-6c72 8b82
-6c73 9f92
-6c7a 8c88
-6c7d 8b44
-6c7e 9f90
-6c81 9f8e
-6c82 9f8b
-6c83 9780
-6c86 faf7
-6c88 92be
-6c8c 93d7
-6c8d 9f8c
-6c90 9f94
-6c92 9f93
-6c93 8c42
-6c96 89ab
-6c99 8db9
-6c9a 9f8d
-6c9b 9f8f
-6ca1 9676
-6ca2 91f2
-6cab 9697
-6cae 9f9c
-6cb1 9f9d
-6cb3 89cd
-6cb8 95a6
-6cb9 96fb
-6cba 9f9f
-6cbb 8ea1
-6cbc 8fc0
-6cbd 9f98
-6cbe 9f9e
-6cbf 8988
-6cc1 8bb5
-6cc4 9f95
-6cc5 9f9a
-6cc9 90f2
-6cca 9491
-6ccc 94e5
-6cd3 9f97
-6cd5 9640
-6cd7 9f99
-6cd9 9fa2
-6cda faf9
-6cdb 9fa0
-6cdd 9f9b
-6ce1 9641
-6ce2 9467
-6ce3 8b83
-6ce5 9344
-6ce8 928d
-6cea 9fa3
-6cef 9fa1
-6cf0 91d7
-6cf1 9f96
-6cf3 896a
-6d04 fafa
-6d0b 976d
-6d0c 9fae
-6d12 9fad
-6d17 90f4
-6d19 9faa
-6d1b 978c
-6d1e 93b4
-6d1f 9fa4
-6d25 92c3
-6d29 896b
-6d2a 8d5e
-6d2b 9fa7
-6d32 8f46
-6d33 9fac
-6d35 9fab
-6d36 9fa6
-6d38 9fa9
-6d3b 8a88
-6d3d 9fa8
-6d3e 9468
-6d41 97ac
-6d44 8ff2
-6d45 90f3
-6d59 9fb4
-6d5a 9fb2
-6d5c 956c
-6d63 9faf
-6d64 9fb1
-6d66 8959
-6d69 8d5f
-6d6a 9851
-6d6c 8a5c
-6d6e 9582
-6d6f fafc
-6d74 9781
-6d77 8a43
-6d78 905a
-6d79 9fb3
-6d85 9fb8
-6d87 fafb
-6d88 8fc1
-6d8c 974f
-6d8e 9fb5
-6d93 9fb0
-6d95 9fb6
-6d96 fb40
-6d99 97dc
-6d9b 9393
-6d9c 93c0
-6dac fb41
-6daf 8a55
-6db2 8974
-6db5 9fbc
-6db8 9fbf
-6dbc 97c1
-6dc0 9784
-6dc5 9fc6
-6dc6 9fc0
-6dc7 9fbd
-6dcb 97d2
-6dcc 9fc3
-6dcf fb42
-6dd1 8f69
-6dd2 9fc5
-6dd5 9fca
-6dd8 9391
-6dd9 9fc8
-6dde 9fc2
-6de1 9257
-6de4 9fc9
-6de6 9fbe
-6de8 9fc4
-6dea 9fcb
-6deb 88fa
-6dec 9fc1
-6dee 9fcc
-6df1 905b
-6df2 fb44
-6df3 8f7e
-6df5 95a3
-6df7 8dac
-6df8 fb43
-6df9 9fb9
-6dfa 9fc7
-6dfb 9359
-6dfc fb45
-6e05 90b4
-6e07 8a89
-6e08 8dcf
-6e09 8fc2
-6e0a 9fbb
-6e0b 8f61
-6e13 8c6b
-6e15 9fba
-6e19 9fd0
-6e1a 8f8d
-6e1b 8cb8
-6e1d 9fdf
-6e1f 9fd9
-6e20 8b94
-6e21 936e
-6e23 9fd4
-6e24 9fdd
-6e25 88ad
-6e26 8951
-6e27 fb48
-6e29 89b7
-6e2b 9fd6
-6e2c 91aa
-6e2d 9fcd
-6e2e 9fcf
-6e2f 8d60
-6e38 9fe0
-6e39 fb46
-6e3a 9fdb
-6e3c fb49
-6e3e 9fd3
-6e43 9fda
-6e4a 96a9
-6e4d 9fd8
-6e4e 9fdc
-6e56 8cce
-6e58 8fc3
-6e5b 9258
-6e5c fb47
-6e5f 9fd2
-6e67 974e
-6e6b 9fd5
-6e6e 9fce
-6e6f 9392
-6e72 9fd1
-6e76 9fd7
-6e7e 9870
-6e7f 8ebc
-6e80 969e
-6e82 9fe1
-6e8c 94ac
-6e8f 9fed
-6e90 8cb9
-6e96 8f80
-6e98 9fe3
-6e9c 97ad
-6e9d 8d61
-6e9f 9ff0
-6ea2 88ec
-6ea5 9fee
-6eaa 9fe2
-6eaf 9fe8
-6eb2 9fea
-6eb6 976e
-6eb7 9fe5
-6eba 934d
-6ebd 9fe7
-6ebf fb4a
-6ec2 9fef
-6ec4 9fe9
-6ec5 96c5
-6ec9 9fe4
-6ecb 8ea0
-6ecc 9ffc
-6ed1 8a8a
-6ed3 9fe6
-6ed4 9feb
-6ed5 9fec
-6edd 91ea
-6ede 91d8
-6eec 9ff4
-6eef 9ffa
-6ef2 9ff8
-6ef4 9348
-6ef7 e042
-6ef8 9ff5
-6efe 9ff6
-6eff 9fde
-6f01 8b99
-6f02 9559
-6f06 8ebd
-6f09 8d97
-6f0f 9852
-6f11 9ff2
-6f13 e041
-6f14 8989
-6f15 9186
-6f20 9499
-6f22 8abf
-6f23 97f8
-6f2b 969f
-6f2c 92d0
-6f31 9ff9
-6f32 9ffb
-6f38 9151
-6f3e e040
-6f3f 9ff7
-6f41 9ff1
-6f45 8ac1
-6f54 8c89
-6f58 e04e
-6f5b e049
-6f5c 90f6
-6f5f 8a83
-6f64 8f81
-6f66 e052
-6f6d e04b
-6f6e 92aa
-6f6f e048
-6f70 92d7
-6f74 e06b
-6f78 e045
-6f7a e044
-6f7c e04d
-6f80 e047
-6f81 e046
-6f82 e04c
-6f84 909f
-6f86 e043
-6f88 fb4b
-6f8e e04f
-6f91 e050
-6f97 8ac0
-6fa1 e055
-6fa3 e054
-6fa4 e056
-6faa e059
-6fb1 9362
-6fb3 e053
-6fb5 fb4c
-6fb9 e057
-6fc0 8c83
-6fc1 91f7
-6fc2 e051
-6fc3 945a
-6fc6 e058
-6fd4 e05d
-6fd5 e05b
-6fd8 e05e
-6fdb e061
-6fdf e05a
-6fe0 8d8a
-6fe1 9447
-6fe4 9fb7
-6feb 9794
-6fec e05c
-6fee e060
-6fef 91f3
-6ff1 e05f
-6ff3 e04a
-6ff5 fb4d
-6ff6 e889
-6ffa e064
-6ffe e068
-7001 e066
-7005 fb4e
-7007 fb4f
-7009 e062
-700b e063
-700f e067
-7011 e065
-7015 956d
-7018 e06d
-701a e06a
-701b e069
-701d e06c
-701e 93d2
-701f e06e
-7026 9295
-7027 91eb
-7028 fb50
-702c 90a3
-7030 e06f
-7032 e071
-703e e070
-704c 9ff3
-7051 e072
-7058 93e5
-7063 e073
-706b 89ce
-706f 9394
-7070 8a44
-7078 8b84
-707c 8edc
-707d 8dd0
-7085 fb51
-7089 9846
-708a 9086
-708e 898a
-7092 e075
-7099 e074
-70ab fb52
-70ac e078
-70ad 9259
-70ae e07b
-70af e076
-70b3 e07a
-70b8 e079
-70b9 935f
-70ba 88d7
-70bb fa62
-70c8 97f3
-70cb e07d
-70cf 8947
-70d9 e080
-70dd e07e
-70df e07c
-70f1 e077
-70f9 9642
-70fd e082
-7104 fb54
-7109 e081
-710f fb53
-7114 898b
-7119 e084
-711a 95b0
-711c e083
-7121 96b3
-7126 8fc5
-7136 9152
-713c 8fc4
-7146 fb56
-7147 fb57
-7149 97f9
-714c e08a
-714e 90f7
-7155 e086
-7156 e08b
-7159 898c
-715c fb55
-7162 e089
-7164 9481
-7165 e085
-7166 e088
-7167 8fc6
-7169 94cf
-716c e08c
-716e 8ecf
-717d 90f8
-7184 e08f
-7188 e087
-718a 8c46
-718f e08d
-7194 976f
-7195 e090
-7199 eaa4
-719f 8f6e
-71a8 e091
-71ac e092
-71b1 944d
-71b9 e094
-71be e095
-71c1 fb59
-71c3 9452
-71c8 9395
-71c9 e097
-71ce e099
-71d0 97d3
-71d2 e096
-71d4 e098
-71d5 898d
-71d7 e093
-71df 9a7a
-71e0 e09a
-71e5 9187
-71e6 8e57
-71e7 e09c
-71ec e09b
-71ed 9043
-71ee 99d7
-71f5 e09d
-71f9 e09f
-71fb e08e
-71fc e09e
-71fe fb5a
-71ff e0a0
-7206 949a
-720d e0a1
-7210 e0a2
-721b e0a3
-7228 e0a4
-722a 92dc
-722c e0a6
-722d e0a5
-7230 e0a7
-7232 e0a8
-7235 8edd
-7236 9583
-723a 96ea
-723b e0a9
-723c e0aa
-723d 9175
-723e 8ea2
-723f e0ab
-7240 e0ac
-7246 e0ad
-7247 95d0
-7248 94c5
-724b e0ae
-724c 9476
-7252 92ab
-7258 e0af
-7259 89e5
-725b 8b8d
-725d 96c4
-725f 96b4
-7261 89b2
-7262 9853
-7267 9671
-7269 95a8
-7272 90b5
-7274 e0b0
-7279 93c1
-727d 8ca1
-727e e0b1
-7280 8dd2
-7281 e0b3
-7282 e0b2
-7287 e0b4
-7292 e0b5
-7296 e0b6
-72a0 8b5d
-72a2 e0b7
-72a7 e0b8
-72ac 8ca2
-72af 94c6
-72b1 fb5b
-72b2 e0ba
-72b6 8ff3
-72b9 e0b9
-72be fb5c
-72c2 8bb6
-72c3 e0bb
-72c4 e0bd
-72c6 e0bc
-72ce e0be
-72d0 8ccf
-72d2 e0bf
-72d7 8be7
-72d9 915f
-72db 8d9d
-72e0 e0c1
-72e1 e0c2
-72e2 e0c0
-72e9 8eeb
-72ec 93c6
-72ed 8bb7
-72f7 e0c4
-72f8 924b
-72f9 e0c3
-72fc 9854
-72fd 9482
-730a e0c7
-7316 e0c9
-7317 e0c6
-731b 96d2
-731c e0c8
-731d e0ca
-731f 97c2
-7324 fb5d
-7325 e0ce
-7329 e0cd
-732a 9296
-732b 944c
-732e 8ca3
-732f e0cc
-7334 e0cb
-7336 9750
-7337 9751
-733e e0cf
-733f 898e
-7344 8d96
-7345 8e82
-734e e0d0
-734f e0d1
-7357 e0d3
-7363 8f62
-7368 e0d5
-736a e0d4
-7370 e0d6
-7372 8a6c
-7375 e0d8
-7377 fb5f
-7378 e0d7
-737a e0da
-737b e0d9
-7384 8cba
-7387 97a6
-7389 8bca
-738b 89a4
-7396 8be8
-73a9 8adf
-73b2 97e6
-73b3 e0dc
-73bb e0de
-73bd fb60
-73c0 e0df
-73c2 89cf
-73c8 e0db
-73c9 fb61
-73ca 8e58
-73cd 92bf
-73ce e0dd
-73d2 fb64
-73d6 fb62
-73de e0e2
-73e0 8eec
-73e3 fb63
-73e5 e0e0
-73ea 8c5d
-73ed 94c7
-73ee e0e1
-73f1 e0fc
-73f5 fb66
-73f8 e0e7
-73fe 8cbb
-7403 8b85
-7405 e0e4
-7406 979d
-7407 fb65
-7409 97ae
-7422 91f4
-7425 e0e6
-7426 fb67
-7429 fb69
-742a fb68
-742e fb6a
-7432 e0e8
-7433 97d4
-7434 8bd5
-7435 94fa
-7436 9469
-743a e0e9
-743f e0eb
-7441 e0ee
-7455 e0ea
-7459 e0ed
-745a 8ce8
-745b 896c
-745c e0ef
-745e 9090
-745f e0ec
-7460 97da
-7462 fb6b
-7463 e0f2
-7464 eaa2
-7469 e0f0
-746a e0f3
-746f e0e5
-7470 e0f1
-7473 8dba
-7476 e0f4
-747e e0f5
-7483 979e
-7489 fb6c
-748b e0f6
-749e e0f7
-749f fb6d
-74a2 e0e3
-74a7 e0f8
-74b0 8ac2
-74bd 8ea3
-74ca e0f9
-74cf e0fa
-74d4 e0fb
-74dc 895a
-74e0 e140
-74e2 955a
-74e3 e141
-74e6 8aa2
-74e7 e142
-74e9 e143
-74ee e144
-74f0 e146
-74f1 e147
-74f2 e145
-74f6 9572
-74f7 e149
-74f8 e148
-7501 fb6e
-7503 e14b
-7504 e14a
-7505 e14c
-750c e14d
-750d e14f
-750e e14e
-7511 8d99
-7513 e151
-7515 e150
-7518 8ac3
-751a 9072
-751c 935b
-751e e152
-751f 90b6
-7523 8e59
-7525 8999
-7526 e153
-7528 9770
-752b 95e1
-752c e154
-752f faa8
-7530 9363
-7531 9752
-7532 8d62
-7533 905c
-7537 926a
-7538 99b2
-753a 92ac
-753b 89e6
-753c e155
-7544 e156
-7546 e15b
-7549 e159
-754a e158
-754b 9dc0
-754c 8a45
-754d e157
-754f 88d8
-7551 94a8
-7554 94c8
-7559 97af
-755a e15c
-755b e15a
-755c 927b
-755d 90a4
-7560 94a9
-7562 954c
-7564 e15e
-7565 97aa
-7566 8c6c
-7567 e15f
-7569 e15d
-756a 94d4
-756b e160
-756d e161
-756f fb6f
-7570 88d9
-7573 8ff4
-7574 e166
-7576 e163
-7577 93eb
-7578 e162
-757f 8b45
-7582 e169
-7586 e164
-7587 e165
-7589 e168
-758a e167
-758b 9544
-758e 9161
-758f 9160
-7591 8b5e
-7594 e16a
-759a e16b
-759d e16c
-75a3 e16e
-75a5 e16d
-75ab 8975
-75b1 e176
-75b2 94e6
-75b3 e170
-75b5 e172
-75b8 e174
-75b9 905d
-75bc e175
-75bd e173
-75be 8ebe
-75c2 e16f
-75c3 e171
-75c5 9561
-75c7 8fc7
-75ca e178
-75cd e177
-75d2 e179
-75d4 8ea4
-75d5 8dad
-75d8 9397
-75d9 e17a
-75db 92c9
-75de e17c
-75e2 979f
-75e3 e17b
-75e9 9189
-75f0 e182
-75f2 e184
-75f3 e185
-75f4 9273
-75fa e183
-75fc e180
-75fe e17d
-75ff e17e
-7601 e181
-7609 e188
-760b e186
-760d e187
-761f e189
-7620 e18b
-7621 e18c
-7622 e18d
-7624 e18e
-7627 e18a
-7630 e190
-7634 e18f
-763b e191
-7642 97c3
-7646 e194
-7647 e192
-7648 e193
-764c 8ae0
-7652 96fc
-7656 95c8
-7658 e196
-765c e195
-7661 e197
-7662 e198
-7667 e19c
-7668 e199
-7669 e19a
-766a e19b
-766c e19d
-7670 e19e
-7672 e19f
-7676 e1a0
-7678 e1a1
-767a 94ad
-767b 936f
-767c e1a2
-767d 9492
-767e 9553
-7680 e1a3
-7682 fb70
-7683 e1a4
-7684 9349
-7686 8a46
-7687 8d63
-7688 e1a5
-768b e1a6
-768e e1a7
-7690 8e48
-7693 e1a9
-7696 e1a8
-7699 e1aa
-769a e1ab
-769b fb73
-769c fb71
-769e fb72
-76a6 fb74
-76ae 94e7
-76b0 e1ac
-76b4 e1ad
-76b7 ea89
-76b8 e1ae
-76b9 e1af
-76ba e1b0
-76bf 8e4d
-76c2 e1b1
-76c3 9475
-76c6 967e
-76c8 896d
-76ca 8976
-76cd e1b2
-76d2 e1b4
-76d6 e1b3
-76d7 9390
-76db 90b7
-76dc 9f58
-76de e1b5
-76df 96bf
-76e1 e1b6
-76e3 8ac4
-76e4 94d5
-76e5 e1b7
-76e7 e1b8
-76ea e1b9
-76ee 96da
-76f2 96d3
-76f4 92bc
-76f8 918a
-76fb e1bb
-76fe 8f82
-7701 8fc8
-7704 e1be
-7707 e1bd
-7708 e1bc
-7709 94fb
-770b 8ac5
-770c 8ca7
-771b e1c4
-771e e1c1
-771f 905e
-7720 96b0
-7724 e1c0
-7725 e1c2
-7726 e1c3
-7729 e1bf
-7737 e1c5
-7738 e1c6
-773a 92ad
-773c 8ae1
-7740 9285
-7746 fb76
-7747 e1c7
-775a e1c8
-775b e1cb
-7761 9087
-7763 93c2
-7765 e1cc
-7766 9672
-7768 e1c9
-776b e1ca
-7779 e1cf
-777e e1ce
-777f e1cd
-778b e1d1
-778e e1d0
-7791 e1d2
-779e e1d4
-77a0 e1d3
-77a5 95cb
-77ac 8f75
-77ad 97c4
-77b0 e1d5
-77b3 93b5
-77b6 e1d6
-77b9 e1d7
-77bb e1db
-77bc e1d9
-77bd e1da
-77bf e1d8
-77c7 e1dc
-77cd e1dd
-77d7 e1de
-77da e1df
-77db 96b5
-77dc e1e0
-77e2 96ee
-77e3 e1e1
-77e5 926d
-77e7 948a
-77e9 8be9
-77ed 925a
-77ee e1e2
-77ef 8bb8
-77f3 90ce
-77fc e1e3
-7802 8dbb
-780c e1e4
-7812 e1e5
-7814 8ca4
-7815 8dd3
-7820 e1e7
-7821 fb78
-7825 9375
-7826 8dd4
-7827 8b6d
-7832 9643
-7834 946a
-783a 9376
-783f 8d7b
-7845 e1e9
-784e fb79
-785d 8fc9
-7864 fb7a
-786b 97b0
-786c 8d64
-786f 8ca5
-7872 94a1
-7874 e1eb
-787a fb7b
-787c e1ed
-7881 8ce9
-7886 e1ec
-7887 92f4
-788c e1ef
-788d 8a56
-788e e1ea
-7891 94e8
-7893 894f
-7895 8dea
-7897 9871
-789a e1ee
-78a3 e1f0
-78a7 95c9
-78a9 90d7
-78aa e1f2
-78af e1f3
-78b5 e1f1
-78ba 8a6d
-78bc e1f9
-78be e1f8
-78c1 8ea5
-78c5 e1fa
-78c6 e1f5
-78ca e1fb
-78cb e1f6
-78d0 94d6
-78d1 e1f4
-78d4 e1f7
-78da e241
-78e7 e240
-78e8 9681
-78ec e1fc
-78ef 88e9
-78f4 e243
-78fd e242
-7901 8fca
-7907 e244
-790e 9162
-7911 e246
-7912 e245
-7919 e247
-7926 e1e6
-792a e1e8
-792b e249
-792c e248
-7930 fb7c
-793a 8ea6
-793c 97e7
-793e 8ed0
-7940 e24a
-7941 8c56
-7947 8b5f
-7948 8b46
-7949 8e83
-7950 9753
-7953 e250
-7955 e24f
-7956 9163
-7957 e24c
-795a e24e
-795d 8f6a
-795e 905f
-795f e24d
-7960 e24b
-7962 9449
-7965 8fcb
-7968 955b
-796d 8dd5
-7977 9398
-797a e251
-797f e252
-7980 e268
-7981 8bd6
-7984 985c
-7985 9154
-798a e253
-798d 89d0
-798e 92f5
-798f 959f
-7994 fb81
-799b fb83
-799d e254
-79a6 8b9a
-79a7 e255
-79aa e257
-79ae e258
-79b0 9448
-79b3 e259
-79b9 e25a
-79ba e25b
-79bd 8bd7
-79be 89d1
-79bf 93c3
-79c0 8f47
-79c1 8e84
-79c9 e25c
-79cb 8f48
-79d1 89c8
-79d2 9562
-79d5 e25d
-79d8 94e9
-79df 9164
-79e1 e260
-79e3 e261
-79e4 9489
-79e6 9060
-79e7 e25e
-79e9 9281
-79ec e25f
-79f0 8fcc
-79fb 88da
-7a00 8b48
-7a08 e262
-7a0b 92f6
-7a0d e263
-7a0e 90c5
-7a14 96ab
-7a17 9542
-7a18 e264
-7a19 e265
-7a1a 9274
-7a1c 97c5
-7a1f e267
-7a20 e266
-7a2e 8eed
-7a31 e269
-7a32 88ee
-7a37 e26c
-7a3b e26a
-7a3c 89d2
-7a3d 8c6d
-7a3e e26b
-7a3f 8d65
-7a40 8d92
-7a42 95e4
-7a43 e26d
-7a46 9673
-7a49 e26f
-7a4d 90cf
-7a4e 896e
-7a4f 89b8
-7a50 88aa
-7a57 e26e
-7a61 e270
-7a62 e271
-7a63 8ff5
-7a69 e272
-7a6b 8a6e
-7a70 e274
-7a74 8c8a
-7a76 8b86
-7a79 e275
-7a7a 8bf3
-7a7d e276
-7a7f 90fa
-7a81 93cb
-7a83 90de
-7a84 8df3
-7a88 e277
-7a92 9282
-7a93 918b
-7a95 e279
-7a96 e27b
-7a97 e278
-7a98 e27a
-7a9f 8c41
-7aa9 e27c
-7aaa 8c45
-7aae 8b87
-7aaf 9771
-7ab0 e27e
-7ab6 e280
-7aba 894d
-7abf e283
-7ac3 8a96
-7ac4 e282
-7ac5 e281
-7ac7 e285
-7ac8 e27d
-7aca e286
-7acb 97a7
-7acd e287
-7acf e288
-7ad1 fb84
-7ad2 9af2
-7ad3 e28a
-7ad5 e289
-7ad9 e28b
-7ada e28c
-7adc 97b3
-7add e28d
-7adf e8ed
-7ae0 8fcd
-7ae1 e28e
-7ae2 e28f
-7ae3 8f76
-7ae5 93b6
-7ae6 e290
-7ae7 fb85
-7aea 9247
-7aeb fb87
-7aed e291
-7aef 925b
-7af0 e292
-7af6 8ba3
-7af8 995e
-7af9 927c
-7afa 8eb1
-7aff 8ac6
-7b02 e293
-7b04 e2a0
-7b06 e296
-7b08 8b88
-7b0a e295
-7b0b e2a2
-7b0f e294
-7b11 8fce
-7b18 e298
-7b19 e299
-7b1b 934a
-7b1e e29a
-7b20 8a7d
-7b25 9079
-7b26 9584
-7b28 e29c
-7b2c 91e6
-7b33 e297
-7b35 e29b
-7b36 e29d
-7b39 8df9
-7b45 e2a4
-7b46 954d
-7b48 94a4
-7b49 9399
-7b4b 8bd8
-7b4c e2a3
-7b4d e2a1
-7b4f 94b3
-7b50 e29e
-7b51 927d
-7b52 939b
-7b54 939a
-7b56 8df4
-7b5d e2b6
-7b65 e2a6
-7b67 e2a8
-7b6c e2ab
-7b6e e2ac
-7b70 e2a9
-7b71 e2aa
-7b74 e2a7
-7b75 e2a5
-7b7a e29f
-7b86 95cd
-7b87 89d3
-7b8b e2b3
-7b8d e2b0
-7b8f e2b5
-7b92 e2b4
-7b94 9493
-7b95 96a5
-7b97 8e5a
-7b98 e2ae
-7b99 e2b7
-7b9a e2b2
-7b9c e2b1
-7b9d e2ad
-7b9e fb88
-7b9f e2af
-7ba1 8ac7
-7baa 925c
-7bad 90fb
-7bb1 94a0
-7bb4 e2bc
-7bb8 94a2
-7bc0 90df
-7bc1 e2b9
-7bc4 94cd
-7bc6 e2bd
-7bc7 95d1
-7bc9 927a
-7bcb e2b8
-7bcc e2ba
-7bcf e2bb
-7bdd e2be
-7be0 8ec2
-7be4 93c4
-7be5 e2c3
-7be6 e2c2
-7be9 e2bf
-7bed 9855
-7bf3 e2c8
-7bf6 e2cc
-7bf7 e2c9
-7c00 e2c5
-7c07 e2c6
-7c0d e2cb
-7c11 e2c0
-7c12 99d3
-7c13 e2c7
-7c14 e2c1
-7c17 e2ca
-7c1f e2d0
-7c21 8ac8
-7c23 e2cd
-7c27 e2ce
-7c2a e2cf
-7c2b e2d2
-7c37 e2d1
-7c38 94f4
-7c3d e2d3
-7c3e 97fa
-7c3f 95eb
-7c40 e2d8
-7c43 e2d5
-7c4c e2d4
-7c4d 90d0
-7c4f e2d7
-7c50 e2d9
-7c54 e2d6
-7c56 e2dd
-7c58 e2da
-7c5f e2db
-7c60 e2c4
-7c64 e2dc
-7c65 e2de
-7c6c e2df
-7c73 95c4
-7c75 e2e0
-7c7e 96e0
-7c81 8bcc
-7c82 8c48
-7c83 e2e1
-7c89 95b2
-7c8b 9088
-7c8d 96ae
-7c90 e2e2
-7c92 97b1
-7c95 9494
-7c97 9165
-7c98 9453
-7c9b 8f6c
-7c9f 88be
-7ca1 e2e7
-7ca2 e2e5
-7ca4 e2e3
-7ca5 8a9f
-7ca7 8fcf
-7ca8 e2e8
-7cab e2e6
-7cad e2e4
-7cae e2ec
-7cb1 e2eb
-7cb2 e2ea
-7cb3 e2e9
-7cb9 e2ed
-7cbd e2ee
-7cbe 90b8
-7cc0 e2ef
-7cc2 e2f1
-7cc5 e2f0
-7cca 8cd0
-7cce 9157
-7cd2 e2f3
-7cd6 939c
-7cd8 e2f2
-7cdc e2f4
-7cde 95b3
-7cdf 918c
-7ce0 8d66
-7ce2 e2f5
-7ce7 97c6
-7cef e2f7
-7cf2 e2f8
-7cf4 e2f9
-7cf6 e2fa
-7cf8 8e85
-7cfa e2fb
-7cfb 8c6e
-7cfe 8b8a
-7d00 8b49
-7d02 e340
-7d04 96f1
-7d05 8d67
-7d06 e2fc
-7d0a e343
-7d0b 96e4
-7d0d 945b
-7d10 9552
-7d14 8f83
-7d15 e342
-7d17 8ed1
-7d18 8d68
-7d19 8e86
-7d1a 8b89
-7d1b 95b4
-7d1c e341
-7d20 9166
-7d21 9661
-7d22 8df5
-7d2b 8e87
-7d2c 92db
-7d2e e346
-7d2f 97dd
-7d30 8dd7
-7d32 e347
-7d33 9061
-7d35 e349
-7d39 8fd0
-7d3a 8dae
-7d3f e348
-7d42 8f49
-7d43 8cbc
-7d44 9167
-7d45 e344
-7d46 e34a
-7d48 fb8a
-7d4b e345
-7d4c 8c6f
-7d4e e34d
-7d4f e351
-7d50 8c8b
-7d56 e34c
-7d5b e355
-7d5c fb8b
-7d5e 8d69
-7d61 978d
-7d62 88ba
-7d63 e352
-7d66 8b8b
-7d68 e34f
-7d6e e350
-7d71 939d
-7d72 e34e
-7d73 e34b
-7d75 8a47
-7d76 90e2
-7d79 8ca6
-7d7d e357
-7d89 e354
-7d8f e356
-7d93 e353
-7d99 8c70
-7d9a 91b1
-7d9b e358
-7d9c 918e
-7d9f e365
-7da0 fb8d
-7da2 e361
-7da3 e35b
-7dab e35f
-7dac 8ef8
-7dad 88db
-7dae e35a
-7daf e362
-7db0 e366
-7db1 8d6a
-7db2 96d4
-7db4 92d4
-7db5 e35c
-7db7 fb8c
-7db8 e364
-7dba e359
-7dbb 925d
-7dbd e35e
-7dbe 88bb
-7dbf 96c8
-7dc7 e35d
-7dca 8bd9
-7dcb 94ea
-7dcf 918d
-7dd1 97ce
-7dd2 8f8f
-7dd5 e38e
-7dd6 fb8e
-7dd8 e367
-7dda 90fc
-7ddc e363
-7ddd e368
-7dde e36a
-7de0 92f7
-7de1 e36d
-7de4 e369
-7de8 95d2
-7de9 8ac9
-7dec 96c9
-7def 88dc
-7df2 e36c
-7df4 97fb
-7dfb e36b
-7e01 898f
-7e04 93ea
-7e05 e36e
-7e09 e375
-7e0a e36f
-7e0b e376
-7e12 e372
-7e1b 949b
-7e1e 8ec8
-7e1f e374
-7e21 e371
-7e22 e377
-7e23 e370
-7e26 8f63
-7e2b 9644
-7e2e 8f6b
-7e31 e373
-7e32 e380
-7e35 e37b
-7e37 e37e
-7e39 e37c
-7e3a e381
-7e3b e37a
-7e3d e360
-7e3e 90d1
-7e41 94c9
-7e43 e37d
-7e46 e378
-7e4a 9140
-7e4b 8c71
-7e4d 8f4a
-7e52 fb8f
-7e54 9044
-7e55 9155
-7e56 e384
-7e59 e386
-7e5a e387
-7e5d e383
-7e5e e385
-7e66 e379
-7e67 e382
-7e69 e38a
-7e6a e389
-7e6d 969a
-7e70 8c4a
-7e79 e388
-7e7b e38c
-7e7c e38b
-7e7d e38f
-7e7f e391
-7e82 8e5b
-7e83 e38d
-7e88 e392
-7e89 e393
-7e8a fa5c
-7e8c e394
-7e8e e39a
-7e8f 935a
-7e90 e396
-7e92 e395
-7e93 e397
-7e94 e398
-7e96 e399
-7e9b e39b
-7e9c e39c
-7f36 8aca
-7f38 e39d
-7f3a e39e
-7f45 e39f
-7f47 fb90
-7f4c e3a0
-7f4d e3a1
-7f4e e3a2
-7f50 e3a3
-7f51 e3a4
-7f54 e3a6
-7f55 e3a5
-7f58 e3a7
-7f5f e3a8
-7f60 e3a9
-7f67 e3ac
-7f68 e3aa
-7f69 e3ab
-7f6a 8ddf
-7f6b 8c72
-7f6e 9275
-7f70 94b1
-7f72 8f90
-7f75 946c
-7f77 94eb
-7f78 e3ad
-7f79 9ceb
-7f82 e3ae
-7f83 e3b0
-7f85 9785
-7f86 e3af
-7f87 e3b2
-7f88 e3b1
-7f8a 9772
-7f8c e3b3
-7f8e 94fc
-7f94 e3b4
-7f9a e3b7
-7f9d e3b6
-7f9e e3b5
-7fa1 fb91
-7fa3 e3b8
-7fa4 8c51
-7fa8 9141
-7fa9 8b60
-7fae e3bc
-7faf e3b9
-7fb2 e3ba
-7fb6 e3bd
-7fb8 e3be
-7fb9 e3bb
-7fbd 8948
-7fc1 89a5
-7fc5 e3c0
-7fc6 e3c1
-7fca e3c2
-7fcc 9782
-7fd2 8f4b
-7fd4 e3c4
-7fd5 e3c3
-7fe0 9089
-7fe1 e3c5
-7fe6 e3c6
-7fe9 e3c7
-7feb 8ae3
-7ff0 8acb
-7ff3 e3c8
-7ff9 e3c9
-7ffb 967c
-7ffc 9783
-8000 9773
-8001 9856
-8003 8d6c
-8004 e3cc
-8005 8ed2
-8006 e3cb
-800b e3cd
-800c 8ea7
-8010 91cf
-8012 e3ce
-8015 8d6b
-8017 96d5
-8018 e3cf
-8019 e3d0
-801c e3d1
-8021 e3d2
-8028 e3d3
-8033 8ea8
-8036 96eb
-803b e3d5
-803d 925e
-803f e3d4
-8046 e3d7
-804a e3d6
-8052 e3d8
-8056 90b9
-8058 e3d9
-805a e3da
-805e 95b7
-805f e3db
-8061 918f
-8062 e3dc
-8068 e3dd
-806f 97fc
-8070 e3e0
-8072 e3df
-8073 e3de
-8074 92ae
-8076 e3e1
-8077 9045
-8079 e3e2
-807d e3e3
-807e 9857
-807f e3e4
-8084 e3e5
-8085 e3e7
-8086 e3e6
-8087 94a3
-8089 93f7
-808b 985d
-808c 94a7
-8093 e3e9
-8096 8fd1
-8098 9549
-809a e3ea
-809b e3e8
-809d 8acc
-80a1 8cd2
-80a2 8e88
-80a5 94ec
-80a9 8ca8
-80aa 9662
-80ac e3ed
-80ad e3eb
-80af 8d6d
-80b1 8d6e
-80b2 88e7
-80b4 8de6
-80ba 9478
-80c3 88dd
-80c4 e3f2
-80c6 925f
-80cc 9477
-80ce 91d9
-80d6 e3f4
-80d9 e3f0
-80da e3f3
-80db e3ee
-80dd e3f1
-80de 9645
-80e1 8cd3
-80e4 88fb
-80e5 e3ef
-80ef e3f6
-80f1 e3f7
-80f4 93b7
-80f8 8bb9
-80fc e445
-80fd 945c
-8102 8e89
-8105 8bba
-8106 90c6
-8107 9865
-8108 96ac
-8109 e3f5
-810a 90d2
-811a 8b72
-811b e3f8
-8123 e3fa
-8129 e3f9
-812f e3fb
-8131 9245
-8133 945d
-8139 92af
-813e e442
-8146 e441
-814b e3fc
-814e 9074
-8150 9585
-8151 e444
-8153 e443
-8154 8d6f
-8155 9872
-815f e454
-8165 e448
-8166 e449
-816b 8eee
-816e e447
-8170 8d98
-8171 e446
-8174 e44a
-8178 92b0
-8179 95a0
-817a 9142
-817f 91da
-8180 e44e
-8182 e44f
-8183 e44b
-8188 e44c
-818a e44d
-818f 8d70
-8193 e455
-8195 e451
-819a 9586
-819c 968c
-819d 9547
-81a0 e450
-81a3 e453
-81a4 e452
-81a8 9663
-81a9 e456
-81b0 e457
-81b3 9156
-81b5 e458
-81b8 e45a
-81ba e45e
-81bd e45b
-81be e459
-81bf 945e
-81c0 e45c
-81c2 e45d
-81c6 89b0
-81c8 e464
-81c9 e45f
-81cd e460
-81d1 e461
-81d3 919f
-81d8 e463
-81d9 e462
-81da e465
-81df e466
-81e0 e467
-81e3 9062
-81e5 89e7
-81e7 e468
-81e8 97d5
-81ea 8ea9
-81ed 8f4c
-81f3 8e8a
-81f4 9276
-81fa e469
-81fb e46a
-81fc 8950
-81fe e46b
-8201 e46c
-8202 e46d
-8205 e46e
-8207 e46f
-8208 8bbb
-8209 9da8
-820a e470
-820c 90e3
-820d e471
-820e 8ec9
-8210 e472
-8212 98ae
-8216 e473
-8217 95dc
-8218 8ada
-821b 9143
-821c 8f77
-821e 9591
-821f 8f4d
-8229 e474
-822a 8d71
-822b e475
-822c 94ca
-822e e484
-8233 e477
-8235 91c7
-8236 9495
-8237 8cbd
-8238 e476
-8239 9144
-8240 e478
-8247 92f8
-8258 e47a
-8259 e479
-825a e47c
-825d e47b
-825f e47d
-8262 e480
-8264 e47e
-8266 8acd
-8268 e481
-826a e482
-826b e483
-826e 8daf
-826f 97c7
-8271 e485
-8272 9046
-8276 8990
-8277 e486
-8278 e487
-827e e488
-828b 88f0
-828d e489
-8292 e48a
-8299 9587
-829d 8ec5
-829f e48c
-82a5 8a48
-82a6 88b0
-82ab e48b
-82ac e48e
-82ad 946d
-82af 9063
-82b1 89d4
-82b3 9646
-82b8 8c7c
-82b9 8bda
-82bb e48d
-82bd 89e8
-82c5 8aa1
-82d1 8991
-82d2 e492
-82d3 97e8
-82d4 91db
-82d7 9563
-82d9 e49e
-82db 89d5
-82dc e49c
-82de e49a
-82df e491
-82e1 e48f
-82e3 e490
-82e5 8ee1
-82e6 8bea
-82e7 9297
-82eb 93cf
-82f1 8970
-82f3 e494
-82f4 e493
-82f9 e499
-82fa e495
-82fb e498
-8301 fb93
-8302 96ce
-8303 e497
-8304 89d6
-8305 8a9d
-8306 e49b
-8309 e49d
-830e 8c73
-8316 e4a1
-8317 e4aa
-8318 e4ab
-831c 88a9
-8323 e4b2
-8328 88ef
-832b e4a9
-832f e4a8
-8331 e4a3
-8332 e4a2
-8334 e4a0
-8335 e49f
-8336 9283
-8338 91f9
-8339 e4a5
-8340 e4a4
-8345 e4a7
-8349 9190
-834a 8c74
-834f 8960
-8350 e4a6
-8352 8d72
-8358 9191
-8362 fb94
-8373 e4b8
-8375 e4b9
-8377 89d7
-837b 89ac
-837c e4b6
-837f fb95
-8385 e4ac
-8387 e4b4
-8389 e4bb
-838a e4b5
-838e e4b3
-8393 e496
-8396 e4b1
-839a e4ad
-839e 8ace
-839f e4af
-83a0 e4ba
-83a2 e4b0
-83a8 e4bc
-83aa e4ae
-83ab 949c
-83b1 9789
-83b5 e4b7
-83bd e4cd
-83c1 e4c5
-83c5 909b
-83c7 fb96
-83ca 8b65
-83cc 8bdb
-83ce e4c0
-83d3 89d9
-83d6 8fd2
-83d8 e4c3
-83dc 8dd8
-83df 9370
-83e0 e4c8
-83e9 95ec
-83eb e4bf
-83ef 89d8
-83f0 8cd4
-83f1 9548
-83f2 e4c9
-83f4 e4bd
-83f6 fb97
-83f7 e4c6
-83fb e4d0
-83fd e4c1
-8403 e4c2
-8404 93b8
-8407 e4c7
-840b e4c4
-840c 9647
-840d e4ca
-840e 88de
-8413 e4be
-8420 e4cc
-8422 e4cb
-8429 948b
-842a e4d2
-842c e4dd
-8431 8a9e
-8435 e4e0
-8438 e4ce
-843c e4d3
-843d 978e
-8446 e4dc
-8448 fb98
-8449 9774
-844e 97a8
-8457 9298
-845b 8a8b
-8461 9592
-8462 e4e2
-8463 939f
-8466 88af
-8469 e4db
-846b e4d7
-846c 9192
-846d e4d1
-846e e4d9
-846f e4de
-8471 944b
-8475 88a8
-8477 e4d6
-8479 e4df
-847a 9598
-8482 e4da
-8484 e4d5
-848b 8fd3
-8490 8f4e
-8494 8eaa
-8499 96d6
-849c 9566
-849f e4e5
-84a1 e4ee
-84ad e4d8
-84b2 8a97
-84b4 fb99
-84b8 8ff6
-84b9 e4e3
-84bb e4e8
-84bc 9193
-84bf e4e4
-84c1 e4eb
-84c4 927e
-84c6 e4ec
-84c9 9775
-84ca e4e1
-84cb 8a57
-84cd e4e7
-84d0 e4ea
-84d1 96aa
-84d6 e4ed
-84d9 e4e6
-84da e4e9
-84dc fa60
-84ec 9648
-84ee 9840
-84f4 e4f1
-84fc e4f8
-84ff e4f0
-8500 8ec1
-8506 e4cf
-8511 95cc
-8513 96a0
-8514 e4f7
-8515 e4f6
-8517 e4f2
-8518 e4f3
-851a 8955
-851f e4f5
-8521 e4ef
-8526 92d3
-852c e4f4
-852d 88fc
-8535 91a0
-853d 95c1
-8540 e4f9
-8541 e540
-8543 94d7
-8548 e4fc
-8549 8fd4
-854a 8ec7
-854b e542
-854e 8bbc
-8553 fb9a
-8555 e543
-8557 9599
-8558 e4fb
-8559 fb9b
-855a e4d4
-8563 e4fa
-8568 986e
-8569 93a0
-856a 9593
-856b fb9c
-856d e54a
-8577 e550
-857e e551
-8580 e544
-8584 9496
-8587 e54e
-8588 e546
-858a e548
-8590 e552
-8591 e547
-8594 e54b
-8597 8992
-8599 93e3
-859b e54c
-859c e54f
-85a4 e545
-85a6 9145
-85a8 e549
-85a9 8e46
-85aa 9064
-85ab 8c4f
-85ac 96f2
-85ae 96f7
-85af 8f92
-85b0 fb9e
-85b9 e556
-85ba e554
-85c1 986d
-85c9 e553
-85cd 9795
-85cf e555
-85d0 e557
-85d5 e558
-85dc e55b
-85dd e559
-85e4 93a1
-85e5 e55a
-85e9 94cb
-85ea e54d
-85f7 8f93
-85f9 e55c
-85fa e561
-85fb 9194
-85fe e560
-8602 e541
-8606 e562
-8607 9168
-860a e55d
-860b e55f
-8613 e55e
-8616 9f50
-8617 9f41
-861a e564
-8622 e563
-862d 9796
-862f e1ba
-8630 e565
-863f e566
-864d e567
-864e 8cd5
-8650 8b73
-8654 e569
-8655 997c
-865a 8b95
-865c 97b8
-865e 8bf1
-865f e56a
-8667 e56b
-866b 928e
-8671 e56c
-8679 93f8
-867b 88b8
-868a 89e1
-868b e571
-868c e572
-8693 e56d
-8695 8e5c
-86a3 e56e
-86a4 9461
-86a9 e56f
-86aa e570
-86ab e57a
-86af e574
-86b0 e577
-86b6 e573
-86c4 e575
-86c6 e576
-86c7 8ed6
-86c9 e578
-86cb 9260
-86cd 8c75
-86ce 8a61
-86d4 e57b
-86d9 8a5e
-86db e581
-86de e57c
-86df e580
-86e4 94b8
-86e9 e57d
-86ec e57e
-86ed 9567
-86ee 94d8
-86ef e582
-86f8 91fb
-86f9 e58c
-86fb e588
-86fe 89e9
-8700 e586
-8702 9649
-8703 e587
-8706 e584
-8708 e585
-8709 e58a
-870a e58d
-870d e58b
-8711 e589
-8712 e583
-8718 9277
-871a e594
-871c 96a8
-8725 e592
-8729 e593
-8734 e58e
-8737 e590
-873b e591
-873f e58f
-8749 90e4
-874b 9858
-874c e598
-874e e599
-8753 e59f
-8755 9049
-8757 e59b
-8759 e59e
-875f e596
-8760 e595
-8763 e5a0
-8766 89da
-8768 e59c
-876a e5a1
-876e e59d
-8774 e59a
-8776 92b1
-8778 e597
-877f 9488
-8782 e5a5
-878d 975a
-879f e5a4
-87a2 e5a3
-87ab e5ac
-87af e5a6
-87b3 e5ae
-87ba 9786
-87bb e5b1
-87bd e5a8
-87c0 e5a9
-87c4 e5ad
-87c6 e5b0
-87c7 e5af
-87cb e5a7
-87d0 e5aa
-87d2 e5bb
-87e0 e5b4
-87ef e5b2
-87f2 e5b3
-87f6 e5b8
-87f7 e5b9
-87f9 8a49
-87fb 8b61
-87fe e5b7
-8805 e5a2
-8807 fba1
-880d e5b6
-880e e5ba
-880f e5b5
-8811 e5bc
-8815 e5be
-8816 e5bd
-8821 e5c0
-8822 e5bf
-8823 e579
-8827 e5c4
-8831 e5c1
-8836 e5c2
-8839 e5c3
-883b e5c5
-8840 8c8c
-8842 e5c7
-8844 e5c6
-8846 8f4f
-884c 8d73
-884d 9fa5
-8852 e5c8
-8853 8f70
-8857 8a58
-8859 e5c9
-885b 8971
-885d 8fd5
-885e e5ca
-8861 8d74
-8862 e5cb
-8863 88df
-8868 955c
-886b e5cc
-8870 908a
-8872 e5d3
-8875 e5d0
-8877 928f
-887d e5d1
-887e e5ce
-887f 8bdc
-8881 e5cd
-8882 e5d4
-8888 8c55
-888b 91dc
-888d e5da
-8892 e5d6
-8896 91b3
-8897 e5d5
-8899 e5d8
-889e e5cf
-88a2 e5d9
-88a4 e5db
-88ab 94ed
-88ae e5d7
-88b0 e5dc
-88b1 e5de
-88b4 8cd1
-88b5 e5d2
-88b7 88bf
-88bf e5dd
-88c1 8dd9
-88c2 97f4
-88c3 e5df
-88c4 e5e0
-88c5 9195
-88cf 97a0
-88d4 e5e1
-88d5 9754
-88d8 e5e2
-88d9 e5e3
-88dc 95e2
-88dd e5e4
-88df 8dbe
-88e1 97a1
-88e8 e5e9
-88f2 e5ea
-88f3 8fd6
-88f4 e5e8
-88f5 fba2
-88f8 9787
-88f9 e5e5
-88fc e5e7
-88fd 90bb
-88fe 909e
-8902 e5e6
-8904 e5eb
-8907 95a1
-890a e5ed
-890c e5ec
-8910 8a8c
-8912 964a
-8913 e5ee
-891c fa5d
-891d e5fa
-891e e5f0
-8925 e5f1
-892a e5f2
-892b e5f3
-8936 e5f7
-8938 e5f8
-893b e5f6
-8941 e5f4
-8943 e5ef
-8944 e5f5
-894c e5f9
-894d e8b5
-8956 89a6
-895e e5fc
-895f 8bdd
-8960 e5fb
-8964 e641
-8966 e640
-896a e643
-896d e642
-896f e644
-8972 8f50
-8974 e645
-8977 e646
-897e e647
-897f 90bc
-8981 9776
-8983 e648
-8986 95a2
-8987 9465
-8988 e649
-898a e64a
-898b 8ca9
-898f 8b4b
-8993 e64b
-8996 8e8b
-8997 9460
-8998 e64c
-899a 8a6f
-89a1 e64d
-89a6 e64f
-89a7 9797
-89a9 e64e
-89aa 9065
-89ac e650
-89af e651
-89b2 e652
-89b3 8acf
-89ba e653
-89bd e654
-89bf e655
-89c0 e656
-89d2 8a70
-89da e657
-89dc e658
-89dd e659
-89e3 89f0
-89e6 9047
-89e7 e65a
-89f4 e65b
-89f8 e65c
-8a00 8cbe
-8a02 92f9
-8a03 e65d
-8a08 8c76
-8a0a 9075
-8a0c e660
-8a0e 93a2
-8a10 e65f
-8a12 fba3
-8a13 8c50
-8a16 e65e
-8a17 91f5
-8a18 8b4c
-8a1b e661
-8a1d e662
-8a1f 8fd7
-8a23 8c8d
-8a25 e663
-8a2a 964b
-8a2d 90dd
-8a31 8b96
-8a33 96f3
-8a34 9169
-8a36 e664
-8a37 fba4
-8a3a 9066
-8a3b 9290
-8a3c 8fd8
-8a41 e665
-8a46 e668
-8a48 e669
-8a50 8dbc
-8a51 91c0
-8a52 e667
-8a54 8fd9
-8a55 955d
-8a5b e666
-8a5e 8e8c
-8a60 8972
-8a62 e66d
-8a63 8c77
-8a66 8e8e
-8a69 8e8d
-8a6b 986c
-8a6c e66c
-8a6d e66b
-8a6e 9146
-8a70 8b6c
-8a71 9862
-8a72 8a59
-8a73 8fda
-8a79 fba5
-8a7c e66a
-8a82 e66f
-8a84 e670
-8a85 e66e
-8a87 8cd6
-8a89 975f
-8a8c 8e8f
-8a8d 9446
-8a91 e673
-8a93 90be
-8a95 9261
-8a98 9755
-8a9a e676
-8a9e 8cea
-8aa0 90bd
-8aa1 e672
-8aa3 e677
-8aa4 8ceb
-8aa5 e674
-8aa6 e675
-8aa7 fba6
-8aa8 e671
-8aac 90e0
-8aad 93c7
-8ab0 924e
-8ab2 89db
-8ab9 94ee
-8abc 8b62
-8abe fba7
-8abf 92b2
-8ac2 e67a
-8ac4 e678
-8ac7 926b
-8acb 90bf
-8acc 8ad0
-8acd e679
-8acf 907a
-8ad2 97c8
-8ad6 985f
-8ada e67b
-8adb e687
-8adc 92b3
-8ade e686
-8adf fba8
-8ae0 e683
-8ae1 e68b
-8ae2 e684
-8ae4 e680
-8ae6 92fa
-8ae7 e67e
-8aeb e67c
-8aed 9740
-8aee 8e90
-8af1 e681
-8af3 e67d
-8af6 fbaa
-8af7 e685
-8af8 8f94
-8afa 8cbf
-8afe 91f8
-8b00 9664
-8b01 8979
-8b02 88e0
-8b04 93a3
-8b07 e689
-8b0c e688
-8b0e 93e4
-8b10 e68d
-8b14 e682
-8b16 e68c
-8b17 e68e
-8b19 8caa
-8b1a e68a
-8b1b 8d75
-8b1d 8ed3
-8b20 e68f
-8b21 9777
-8b26 e692
-8b28 e695
-8b2b e693
-8b2c 9554
-8b33 e690
-8b39 8bde
-8b3e e694
-8b41 e696
-8b49 e69a
-8b4c e697
-8b4e e699
-8b4f e698
-8b53 fbab
-8b56 e69b
-8b58 8eaf
-8b5a e69d
-8b5b e69c
-8b5c 9588
-8b5f e69f
-8b66 8c78
-8b6b e69e
-8b6c e6a0
-8b6f e6a1
-8b70 8b63
-8b71 e3bf
-8b72 8ff7
-8b74 e6a2
-8b77 8cec
-8b7d e6a3
-8b7f fbac
-8b80 e6a4
-8b83 8e5d
-8b8a 9dcc
-8b8c e6a5
-8b8e e6a6
-8b90 8f51
-8b92 e6a7
-8b93 e6a8
-8b96 e6a9
-8b99 e6aa
-8b9a e6ab
-8c37 924a
-8c3a e6ac
-8c3f e6ae
-8c41 e6ad
-8c46 93a4
-8c48 e6af
-8c4a 964c
-8c4c e6b0
-8c4e e6b1
-8c50 e6b2
-8c55 e6b3
-8c5a 93d8
-8c61 8fdb
-8c62 e6b4
-8c6a 8d8b
-8c6b 98ac
-8c6c e6b5
-8c78 e6b6
-8c79 955e
-8c7a e6b7
-8c7c e6bf
-8c82 e6b8
-8c85 e6ba
-8c89 e6b9
-8c8a e6bb
-8c8c 9665
-8c8d e6bc
-8c8e e6bd
-8c94 e6be
-8c98 e6c0
-8c9d 8a4c
-8c9e 92e5
-8ca0 9589
-8ca1 8de0
-8ca2 8d76
-8ca7 956e
-8ca8 89dd
-8ca9 94cc
-8caa e6c3
-8cab 8ad1
-8cac 90d3
-8cad e6c2
-8cae e6c7
-8caf 9299
-8cb0 96e1
-8cb2 e6c5
-8cb3 e6c6
-8cb4 8b4d
-8cb6 e6c8
-8cb7 9483
-8cb8 91dd
-8cbb 94ef
-8cbc 935c
-8cbd e6c4
-8cbf 9666
-8cc0 89ea
-8cc1 e6ca
-8cc2 9847
-8cc3 92c0
-8cc4 9864
-8cc7 8e91
-8cc8 e6c9
-8cca 91af
-8ccd e6da
-8cce 9147
-8cd1 93f6
-8cd3 956f
-8cda e6cd
-8cdb 8e5e
-8cdc 8e92
-8cde 8fdc
-8ce0 9485
-8ce2 8cab
-8ce3 e6cc
-8ce4 e6cb
-8ce6 958a
-8cea 8ebf
-8ced 9371
-8cf0 fbad
-8cf4 fbae
-8cfa e6cf
-8cfb e6d0
-8cfc 8d77
-8cfd e6ce
-8d04 e6d1
-8d05 e6d2
-8d07 e6d4
-8d08 91a1
-8d0a e6d3
-8d0b 8ae4
-8d0d e6d6
-8d0f e6d5
-8d10 e6d7
-8d12 fbaf
-8d13 e6d9
-8d14 e6db
-8d16 e6dc
-8d64 90d4
-8d66 8ecd
-8d67 e6dd
-8d6b 8a71
-8d6d e6de
-8d70 9196
-8d71 e6df
-8d73 e6e0
-8d74 958b
-8d76 fbb0
-8d77 8b4e
-8d81 e6e1
-8d85 92b4
-8d8a 897a
-8d99 e6e2
-8da3 8eef
-8da8 9096
-8db3 91ab
-8dba e6e5
-8dbe e6e4
-8dc2 e6e3
-8dcb e6eb
-8dcc e6e9
-8dcf e6e6
-8dd6 e6e8
-8dda e6e7
-8ddb e6ea
-8ddd 8b97
-8ddf e6ee
-8de1 90d5
-8de3 e6ef
-8de8 8cd7
-8dea e6ec
-8deb e6ed
-8def 9848
-8df3 92b5
-8df5 9148
-8dfc e6f0
-8dff e6f3
-8e08 e6f1
-8e09 e6f2
-8e0a 9778
-8e0f 93a5
-8e10 e6f6
-8e1d e6f4
-8e1e e6f5
-8e1f e6f7
-8e2a e748
-8e30 e6fa
-8e34 e6fb
-8e35 e6f9
-8e42 e6f8
-8e44 92fb
-8e47 e740
-8e48 e744
-8e49 e741
-8e4a e6fc
-8e4c e742
-8e50 e743
-8e55 e74a
-8e59 e745
-8e5f 90d6
-8e60 e747
-8e63 e749
-8e64 e746
-8e72 e74c
-8e74 8f52
-8e76 e74b
-8e7c e74d
-8e81 e74e
-8e84 e751
-8e85 e750
-8e87 e74f
-8e8a e753
-8e8b e752
-8e8d 96f4
-8e91 e755
-8e93 e754
-8e94 e756
-8e99 e757
-8ea1 e759
-8eaa e758
-8eab 9067
-8eac e75a
-8eaf 8beb
-8eb0 e75b
-8eb1 e75d
-8ebe e75e
-8ec5 e75f
-8ec6 e75c
-8ec8 e760
-8eca 8ed4
-8ecb e761
-8ecc 8b4f
-8ecd 8c52
-8ecf fbb2
-8ed2 8cac
-8edb e762
-8edf 93ee
-8ee2 935d
-8ee3 e763
-8eeb e766
-8ef8 8eb2
-8efb e765
-8efc e764
-8efd 8c79
-8efe e767
-8f03 8a72
-8f05 e769
-8f09 8dda
-8f0a e768
-8f0c e771
-8f12 e76b
-8f13 e76d
-8f14 95e3
-8f15 e76a
-8f19 e76c
-8f1b e770
-8f1c e76e
-8f1d 8b50
-8f1f e76f
-8f26 e772
-8f29 9479
-8f2a 97d6
-8f2f 8f53
-8f33 e773
-8f38 9741
-8f39 e775
-8f3b e774
-8f3e e778
-8f3f 9760
-8f42 e777
-8f44 8a8d
-8f45 e776
-8f46 e77b
-8f49 e77a
-8f4c e779
-8f4d 9351
-8f4e e77c
-8f57 e77d
-8f5c e77e
-8f5f 8d8c
-8f61 8c44
-8f62 e780
-8f63 e781
-8f64 e782
-8f9b 9068
-8f9c e783
-8f9e 8eab
-8f9f e784
-8fa3 e785
-8fa7 999f
-8fa8 999e
-8fad e786
-8fae e390
-8faf e787
-8fb0 9243
-8fb1 904a
-8fb2 945f
-8fb7 e788
-8fba 95d3
-8fbb 92d2
-8fbc 8d9e
-8fbf 9248
-8fc2 8949
-8fc4 9698
-8fc5 9076
-8fce 8c7d
-8fd1 8bdf
-8fd4 95d4
-8fda e789
-8fe2 e78b
-8fe5 e78a
-8fe6 89de
-8fe9 93f4
-8fea e78c
-8feb 9497
-8fed 9352
-8fef e78d
-8ff0 8f71
-8ff4 e78f
-8ff7 96c0
-8ff8 e79e
-8ff9 e791
-8ffa e792
-8ffd 92c7
-9000 91de
-9001 9197
-9003 93a6
-9005 e790
-9006 8b74
-900b e799
-900d e796
-900e e7a3
-900f 93a7
-9010 9280
-9011 e793
-9013 92fc
-9014 9372
-9015 e794
-9016 e798
-9017 9080
-9019 9487
-901a 92ca
-901d 90c0
-901e e797
-901f 91ac
-9020 91a2
-9021 e795
-9022 88a7
-9023 9841
-9027 e79a
-902e 91df
-9031 8f54
-9032 9069
-9035 e79c
-9036 e79b
-9038 88ed
-9039 e79d
-903c 954e
-903e e7a5
-9041 93d9
-9042 908b
-9045 9278
-9047 8bf6
-9049 e7a4
-904a 9756
-904b 895e
-904d 95d5
-904e 89df
-904f e79f
-9050 e7a0
-9051 e7a1
-9052 e7a2
-9053 93b9
-9054 9242
-9055 88e1
-9056 e7a6
-9058 e7a7
-9059 eaa1
-905c 91bb
-905e e7a8
-9060 8993
-9061 916b
-9063 8cad
-9065 9779
-9067 fbb5
-9068 e7a9
-9069 934b
-906d 9198
-906e 8ed5
-906f e7aa
-9072 e7ad
-9075 8f85
-9076 e7ab
-9077 914a
-9078 9149
-907a 88e2
-907c 97c9
-907d e7af
-907f 94f0
-9080 e7b1
-9081 e7b0
-9082 e7ae
-9083 e284
-9084 8ad2
-9087 e78e
-9089 e7b3
-908a e7b2
-908f e7b4
-9091 9757
-90a3 93df
-90a6 964d
-90a8 e7b5
-90aa 8ed7
-90af e7b6
-90b1 e7b7
-90b5 e7b8
-90b8 9340
-90c1 88e8
-90ca 8d78
-90ce 9859
-90db e7bc
-90de fbb6
-90e1 8c53
-90e2 e7b9
-90e4 e7ba
-90e8 9594
-90ed 8a73
-90f5 9758
-90f7 8bbd
-90fd 9373
-9102 e7bd
-9112 e7be
-9115 fbb8
-9119 e7bf
-9127 fbb9
-912d 9341
-9130 e7c1
-9132 e7c0
-9149 93d1
-914a e7c2
-914b 8f55
-914c 8ede
-914d 947a
-914e 9291
-9152 8ef0
-9154 908c
-9156 e7c3
-9158 e7c4
-9162 907c
-9163 e7c5
-9165 e7c6
-9169 e7c7
-916a 978f
-916c 8f56
-9172 e7c9
-9173 e7c8
-9175 8d79
-9177 8d93
-9178 8e5f
-9182 e7cc
-9187 8f86
-9189 e7cb
-918b e7ca
-918d 91e7
-9190 8ced
-9192 90c1
-9197 94ae
-919c 8f58
-91a2 e7cd
-91a4 8fdd
-91aa e7d0
-91ab e7ce
-91af e7cf
-91b4 e7d2
-91b5 e7d1
-91b8 8ff8
-91ba e7d3
-91c0 e7d4
-91c1 e7d5
-91c6 94ce
-91c7 8dd1
-91c8 8edf
-91c9 e7d6
-91cb e7d7
-91cc 97a2
-91cd 8f64
-91ce 96ec
-91cf 97ca
-91d0 e7d8
-91d1 8be0
-91d6 e7d9
-91d7 fbbb
-91d8 9342
-91da fbba
-91db e7dc
-91dc 8a98
-91dd 906a
-91de fbbc
-91df e7da
-91e1 e7db
-91e3 92de
-91e4 fbbf
-91e5 fbc0
-91e6 9674
-91e7 8bfa
-91ed fbbd
-91ee fbbe
-91f5 e7de
-91f6 e7df
-91fc e7dd
-91ff e7e1
-9206 fbc1
-920a fbc3
-920d 93dd
-920e 8a62
-9210 fbc2
-9211 e7e5
-9214 e7e2
-9215 e7e4
-921e e7e0
-9229 e86e
-922c e7e3
-9234 97e9
-9237 8cd8
-9239 fbca
-923a fbc4
-923c fbc6
-923f e7ed
-9240 fbc5
-9244 9353
-9245 e7e8
-9248 e7eb
-9249 e7e9
-924b e7ee
-924e fbc7
-9250 e7ef
-9251 fbc9
-9257 e7e7
-9259 fbc8
-925a e7f4
-925b 8994
-925e e7e6
-9262 94ab
-9264 e7ea
-9266 8fde
-9267 fbcb
-9271 8d7a
-9277 fbcd
-9278 fbce
-927e 9667
-9280 8be2
-9283 8f65
-9285 93ba
-9288 fa5f
-9291 914c
-9293 e7f2
-9295 e7ec
-9296 e7f1
-9298 96c1
-929a 92b6
-929b e7f3
-929c e7f0
-92a7 fbcc
-92ad 914b
-92b7 e7f7
-92b9 e7f6
-92cf e7f5
-92d0 fbd2
-92d2 964e
-92d3 fbd6
-92d5 fbd4
-92d7 fbd0
-92d9 fbd1
-92e0 fbd5
-92e4 8f9b
-92e7 fbcf
-92e9 e7f8
-92ea 95dd
-92ed 8973
-92f2 9565
-92f3 9292
-92f8 8b98
-92f9 fa65
-92fa e7fa
-92fb fbd9
-92fc 8d7c
-92ff fbdc
-9302 fbde
-9306 8e4b
-930f e7f9
-9310 908d
-9318 908e
-9319 e840
-931a e842
-931d fbdd
-931e fbdb
-9320 8ff9
-9321 fbd8
-9322 e841
-9323 e843
-9325 fbd7
-9326 8bd1
-9328 9564
-932b 8ee0
-932c 9842
-932e e7fc
-932f 8df6
-9332 985e
-9335 e845
-933a e844
-933b e846
-9344 e7fb
-9348 fa5e
-934b 93e7
-934d 9374
-9354 92d5
-9356 e84b
-9357 fbe0
-935b 9262
-935c e847
-9360 e848
-936c 8c4c
-936e e84a
-9370 fbdf
-9375 8cae
-937c e849
-937e 8fdf
-938c 8a99
-9394 e84f
-9396 8dbd
-9397 9199
-939a 92c8
-93a4 fbe1
-93a7 8a5a
-93ac e84d
-93ad e84e
-93ae 92c1
-93b0 e84c
-93b9 e850
-93c3 e856
-93c6 fbe2
-93c8 e859
-93d0 e858
-93d1 934c
-93d6 e851
-93d7 e852
-93d8 e855
-93dd e857
-93de fbe3
-93e1 8bbe
-93e4 e85a
-93e5 e854
-93e8 e853
-93f8 fbe4
-9403 e85e
-9407 e85f
-9410 e860
-9413 e85d
-9414 e85c
-9418 8fe0
-9419 93a8
-941a e85b
-9421 e864
-942b e862
-9431 fbe5
-9435 e863
-9436 e861
-9438 91f6
-943a e865
-9441 e866
-9444 e868
-9445 fbe6
-9448 fbe7
-9451 8ad3
-9452 e867
-9453 96f8
-945a e873
-945b e869
-945e e86c
-9460 e86a
-9462 e86b
-946a e86d
-9470 e86f
-9475 e870
-9477 e871
-947c e874
-947d e872
-947e e875
-947f e877
-9481 e876
-9577 92b7
-9580 96e5
-9582 e878
-9583 914d
-9587 e879
-9589 95c2
-958a e87a
-958b 8a4a
-958f 895b
-9591 8ad5
-9592 fbe8
-9593 8ad4
-9594 e87b
-9596 e87c
-9598 e87d
-9599 e87e
-95a0 e880
-95a2 8ad6
-95a3 8a74
-95a4 8d7d
-95a5 94b4
-95a7 e882
-95a8 e881
-95ad e883
-95b2 897b
-95b9 e886
-95bb e885
-95bc e884
-95be e887
-95c3 e88a
-95c7 88c5
-95ca e888
-95cc e88c
-95cd e88b
-95d4 e88e
-95d5 e88d
-95d6 e88f
-95d8 93ac
-95dc e890
-95e1 e891
-95e2 e893
-95e5 e892
-961c 958c
-9621 e894
-9628 e895
-962a 8de3
-962e e896
-962f e897
-9632 9668
-963b 916a
-963f 88a2
-9640 91c9
-9642 e898
-9644 958d
-964b e89b
-964c e899
-964d 8d7e
-964f e89a
-9650 8cc0
-965b 95c3
-965c e89d
-965d e89f
-965e e89e
-965f e8a0
-9662 8940
-9663 9077
-9664 8f9c
-9665 8ad7
-9666 e8a1
-966a 9486
-966c e8a3
-9670 8941
-9672 e8a2
-9673 92c2
-9675 97cb
-9676 93a9
-9677 e89c
-9678 97a4
-967a 8caf
-967d 977a
-9685 8bf7
-9686 97b2
-9688 8c47
-968a 91e0
-968b e440
-968d e8a4
-968e 8a4b
-968f 908f
-9694 8a75
-9695 e8a6
-9697 e8a7
-9698 e8a5
-9699 8c84
-969b 8ddb
-969c 8fe1
-969d fbeb
-96a0 8942
-96a3 97d7
-96a7 e8a9
-96a8 e7ac
-96aa e8a8
-96af fbec
-96b0 e8ac
-96b1 e8aa
-96b2 e8ab
-96b4 e8ad
-96b6 e8ae
-96b7 97ea
-96b8 e8af
-96b9 e8b0
-96bb 90c7
-96bc 94b9
-96c0 909d
-96c1 8ae5
-96c4 9759
-96c5 89eb
-96c6 8f57
-96c7 8cd9
-96c9 e8b3
-96cb e8b2
-96cc 8e93
-96cd e8b4
-96ce e8b1
-96d1 8e47
-96d5 e8b8
-96d6 e5ab
-96d9 99d4
-96db 9097
-96dc e8b6
-96e2 97a3
-96e3 93ef
-96e8 894a
-96ea 90e1
-96eb 8eb4
-96f0 95b5
-96f2 895f
-96f6 97eb
-96f7 978b
-96f9 e8b9
-96fb 9364
-9700 8ef9
-9704 e8ba
-9706 e8bb
-9707 906b
-9708 e8bc
-970a 97ec
-970d e8b7
-970e e8be
-970f e8c0
-9711 e8bf
-9713 e8bd
-9716 e8c1
-9719 e8c2
-971c 919a
-971e 89e0
-9724 e8c3
-9727 96b6
-972a e8c4
-9730 e8c5
-9732 9849
-9733 fbed
-9738 9e50
-9739 e8c6
-973b fbee
-973d e8c7
-973e e8c8
-9742 e8cc
-9743 fbef
-9744 e8c9
-9746 e8ca
-9748 e8cb
-9749 e8cd
-974d fbf0
-974f fbf1
-9751 fbf2
-9752 90c2
-9755 fbf3
-9756 96f5
-9759 90c3
-975c e8ce
-975e 94f1
-9760 e8cf
-9761 ea72
-9762 96ca
-9764 e8d0
-9766 e8d1
-9768 e8d2
-9769 8a76
-976b e8d4
-976d 9078
-9771 e8d5
-9774 8c43
-9779 e8d6
-977a e8da
-977c e8d8
-9781 e8d9
-9784 8a93
-9785 e8d7
-9786 e8db
-978b e8dc
-978d 88c6
-978f e8dd
-9790 e8de
-9798 8fe2
-979c e8df
-97a0 8b66
-97a3 e8e2
-97a6 e8e1
-97a8 e8e0
-97ab e691
-97ad 95da
-97b3 e8e3
-97b4 e8e4
-97c3 e8e5
-97c6 e8e6
-97c8 e8e7
-97cb e8e8
-97d3 8ad8
-97dc e8e9
-97ed e8ea
-97ee 9442
-97f2 e8ec
-97f3 89b9
-97f5 e8ef
-97f6 e8ee
-97fb 8943
-97ff 8bbf
-9801 95c5
-9802 92b8
-9803 8da0
-9805 8d80
-9806 8f87
-9808 907b
-980c e8f1
-980f e8f0
-9810 9761
-9811 8ae6
-9812 94d0
-9813 93da
-9817 909c
-9818 97cc
-981a 8c7a
-9821 e8f4
-9824 e8f3
-982c 966a
-982d 93aa
-9834 896f
-9837 e8f5
-9838 e8f2
-983b 9570
-983c 978a
-983d e8f6
-9846 e8f7
-984b e8f9
-984c 91e8
-984d 8a7a
-984e 8a7b
-984f e8f8
-9854 8ae7
-9855 8cb0
-9857 fbf4
-9858 8ae8
-985b 935e
-985e 97de
-9865 fbf5
-9867 8cda
-986b e8fa
-986f e8fb
-9870 e8fc
-9871 e940
-9873 e942
-9874 e941
-98a8 9597
-98aa e943
-98af e944
-98b1 e945
-98b6 e946
-98c3 e948
-98c4 e947
-98c6 e949
-98db 94f2
-98dc e3ca
-98df 9048
-98e2 8b51
-98e9 e94a
-98eb e94b
-98ed 99aa
-98ee 9f5a
-98ef 94d1
-98f2 88f9
-98f4 88b9
-98fc 8e94
-98fd 964f
-98fe 8ffc
-9903 e94c
-9905 96dd
-9909 e94d
-990a 977b
-990c 8961
-9910 8e60
-9912 e94e
-9913 89ec
-9914 e94f
-9918 e950
-991d e952
-991e e953
-9920 e955
-9921 e951
-9924 e954
-9927 fbf8
-9928 8ad9
-992c e956
-992e e957
-993d e958
-993e e959
-9942 e95a
-9945 e95c
-9949 e95b
-994b e95e
-994c e961
-9950 e95d
-9951 e95f
-9952 e960
-9955 e962
-9957 8bc0
-9996 8ef1
-9997 e963
-9998 e964
-9999 8d81
-999e fbfa
-99a5 e965
-99a8 8a5d
-99ac 946e
-99ad e966
-99ae e967
-99b3 9279
-99b4 93e9
-99bc e968
-99c1 949d
-99c4 91ca
-99c5 8977
-99c6 8bec
-99c8 8bed
-99d0 9293
-99d1 e96d
-99d2 8bee
-99d5 89ed
-99d8 e96c
-99db e96a
-99dd e96b
-99df e969
-99e2 e977
-99ed e96e
-99ee e96f
-99f1 e970
-99f2 e971
-99f8 e973
-99fb e972
-99ff 8f78
-9a01 e974
-9a05 e976
-9a0e 8b52
-9a0f e975
-9a12 919b
-9a13 8cb1
-9a19 e978
-9a28 91cb
-9a2b e979
-9a30 93ab
-9a37 e97a
-9a3e e980
-9a40 e97d
-9a42 e97c
-9a43 e97e
-9a45 e97b
-9a4d e982
-9a4e fbfb
-9a55 e981
-9a57 e984
-9a5a 8bc1
-9a5b e983
-9a5f e985
-9a62 e986
-9a64 e988
-9a65 e987
-9a69 e989
-9a6a e98b
-9a6b e98a
-9aa8 8d9c
-9aad e98c
-9ab0 e98d
-9ab8 8a5b
-9abc e98e
-9ac0 e98f
-9ac4 9091
-9acf e990
-9ad1 e991
-9ad3 e992
-9ad4 e993
-9ad8 8d82
-9ad9 fbfc
-9adc fc40
-9ade e994
-9adf e995
-9ae2 e996
-9ae3 e997
-9ae6 e998
-9aea 94af
-9aeb e99a
-9aed 9545
-9aee e99b
-9aef e999
-9af1 e99d
-9af4 e99c
-9af7 e99e
-9afb e99f
-9b06 e9a0
-9b18 e9a1
-9b1a e9a2
-9b1f e9a3
-9b22 e9a4
-9b23 e9a5
-9b25 e9a6
-9b27 e9a7
-9b28 e9a8
-9b29 e9a9
-9b2a e9aa
-9b2e e9ab
-9b2f e9ac
-9b31 9f54
-9b32 e9ad
-9b3b e2f6
-9b3c 8b53
-9b41 8a40
-9b42 8db0
-9b43 e9af
-9b44 e9ae
-9b45 96a3
-9b4d e9b1
-9b4e e9b2
-9b4f e9b0
-9b51 e9b3
-9b54 9682
-9b58 e9b4
-9b5a 8b9b
-9b6f 9844
-9b72 fc42
-9b74 e9b5
-9b75 fc41
-9b83 e9b7
-9b8e 88bc
-9b8f fc43
-9b91 e9b8
-9b92 95a9
-9b93 e9b6
-9b96 e9b9
-9b97 e9ba
-9b9f e9bb
-9ba0 e9bc
-9ba8 e9bd
-9baa 968e
-9bab 8e4c
-9bad 8df8
-9bae 914e
-9bb1 fc44
-9bb4 e9be
-9bb9 e9c1
-9bbb fc45
-9bc0 e9bf
-9bc6 e9c2
-9bc9 8cef
-9bca e9c0
-9bcf e9c3
-9bd1 e9c4
-9bd2 e9c5
-9bd4 e9c9
-9bd6 8e49
-9bdb 91e2
-9be1 e9ca
-9be2 e9c7
-9be3 e9c6
-9be4 e9c8
-9be8 8c7e
-9bf0 e9ce
-9bf1 e9cd
-9bf2 e9cc
-9bf5 88b1
-9c00 fc46
-9c04 e9d8
-9c06 e9d4
-9c08 e9d5
-9c09 e9d1
-9c0a e9d7
-9c0c e9d3
-9c0d 8a82
-9c10 986b
-9c12 e9d6
-9c13 e9d2
-9c14 e9d0
-9c15 e9cf
-9c1b e9da
-9c21 e9dd
-9c24 e9dc
-9c25 e9db
-9c2d 9568
-9c2e e9d9
-9c2f 88f1
-9c30 e9de
-9c32 e9e0
-9c39 8a8f
-9c3a e9cb
-9c3b 8956
-9c3e e9e2
-9c46 e9e1
-9c47 e9df
-9c48 924c
-9c52 9690
-9c57 97d8
-9c5a e9e3
-9c60 e9e4
-9c67 e9e5
-9c76 e9e6
-9c78 e9e7
-9ce5 92b9
-9ce7 e9e8
-9ce9 94b5
-9ceb e9ed
-9cec e9e9
-9cf0 e9ea
-9cf3 9650
-9cf4 96c2
-9cf6 93ce
-9d03 e9ee
-9d06 e9ef
-9d07 93bc
-9d08 e9ec
-9d09 e9eb
-9d0e 89a8
-9d12 e9f7
-9d15 e9f6
-9d1b 8995
-9d1f e9f4
-9d23 e9f3
-9d26 e9f1
-9d28 8a9b
-9d2a e9f0
-9d2b 8eb0
-9d2c 89a7
-9d3b 8d83
-9d3e e9fa
-9d3f e9f9
-9d41 e9f8
-9d44 e9f5
-9d46 e9fb
-9d48 e9fc
-9d50 ea44
-9d51 ea43
-9d59 ea45
-9d5c 894c
-9d5d ea40
-9d5e ea41
-9d60 8d94
-9d61 96b7
-9d64 ea42
-9d6b fc48
-9d6c 9651
-9d6f ea4a
-9d70 fc47
-9d72 ea46
-9d7a ea4b
-9d87 ea48
-9d89 ea47
-9d8f 8c7b
-9d9a ea4c
-9da4 ea4d
-9da9 ea4e
-9dab ea49
-9daf e9f2
-9db2 ea4f
-9db4 92df
-9db8 ea53
-9dba ea54
-9dbb ea52
-9dc1 ea51
-9dc2 ea57
-9dc4 ea50
-9dc6 ea55
-9dcf ea56
-9dd3 ea59
-9dd9 ea58
-9de6 ea5b
-9ded ea5c
-9def ea5d
-9df2 9868
-9df8 ea5a
-9df9 91e9
-9dfa 8deb
-9dfd ea5e
-9e19 fc4a
-9e1a ea5f
-9e1b ea60
-9e1e ea61
-9e75 ea62
-9e78 8cb2
-9e79 ea63
-9e7d ea64
-9e7f 8ead
-9e81 ea65
-9e88 ea66
-9e8b ea67
-9e8c ea68
-9e91 ea6b
-9e92 ea69
-9e93 985b
-9e95 ea6a
-9e97 97ed
-9e9d ea6c
-9e9f 97d9
-9ea5 ea6d
-9ea6 949e
-9ea9 ea6e
-9eaa ea70
-9ead ea71
-9eb8 ea6f
-9eb9 8d8d
-9eba 96cb
-9ebb 9683
-9ebc 9bf5
-9ebe 9f80
-9ebf 969b
-9ec4 89a9
-9ecc ea73
-9ecd 8b6f
-9ece ea74
-9ecf ea75
-9ed0 ea76
-9ed1 fc4b
-9ed2 8d95
-9ed4 ea77
-9ed8 e0d2
-9ed9 96d9
-9edb 91e1
-9edc ea78
-9edd ea7a
-9ede ea79
-9ee0 ea7b
-9ee5 ea7c
-9ee8 ea7d
-9eef ea7e
-9ef4 ea80
-9ef6 ea81
-9ef7 ea82
-9ef9 ea83
-9efb ea84
-9efc ea85
-9efd ea86
-9f07 ea87
-9f08 ea88
-9f0e 9343
-9f13 8cdb
-9f15 ea8a
-9f20 916c
-9f21 ea8b
-9f2c ea8c
-9f3b 9540
-9f3e ea8d
-9f4a ea8e
-9f4b e256
-9f4e e6d8
-9f4f e8eb
-9f52 ea8f
-9f54 ea90
-9f5f ea92
-9f60 ea93
-9f61 ea94
-9f62 97ee
-9f63 ea91
-9f66 ea95
-9f67 ea96
-9f6a ea98
-9f6c ea97
-9f72 ea9a
-9f76 ea9b
-9f77 ea99
-9f8d 97b4
-9f95 ea9c
-9f9c ea9d
-9f9d e273
-9fa0 ea9e
-e000 f040
-e001 f041
-e002 f042
-e003 f043
-e004 f044
-e005 f045
-e006 f046
-e007 f047
-e008 f048
-e009 f049
-e00a f04a
-e00b f04b
-e00c f04c
-e00d f04d
-e00e f04e
-e00f f04f
-e010 f050
-e011 f051
-e012 f052
-e013 f053
-e014 f054
-e015 f055
-e016 f056
-e017 f057
-e018 f058
-e019 f059
-e01a f05a
-e01b f05b
-e01c f05c
-e01d f05d
-e01e f05e
-e01f f05f
-e020 f060
-e021 f061
-e022 f062
-e023 f063
-e024 f064
-e025 f065
-e026 f066
-e027 f067
-e028 f068
-e029 f069
-e02a f06a
-e02b f06b
-e02c f06c
-e02d f06d
-e02e f06e
-e02f f06f
-e030 f070
-e031 f071
-e032 f072
-e033 f073
-e034 f074
-e035 f075
-e036 f076
-e037 f077
-e038 f078
-e039 f079
-e03a f07a
-e03b f07b
-e03c f07c
-e03d f07d
-e03e f07e
-e03f f080
-e040 f081
-e041 f082
-e042 f083
-e043 f084
-e044 f085
-e045 f086
-e046 f087
-e047 f088
-e048 f089
-e049 f08a
-e04a f08b
-e04b f08c
-e04c f08d
-e04d f08e
-e04e f08f
-e04f f090
-e050 f091
-e051 f092
-e052 f093
-e053 f094
-e054 f095
-e055 f096
-e056 f097
-e057 f098
-e058 f099
-e059 f09a
-e05a f09b
-e05b f09c
-e05c f09d
-e05d f09e
-e05e f09f
-e05f f0a0
-e060 f0a1
-e061 f0a2
-e062 f0a3
-e063 f0a4
-e064 f0a5
-e065 f0a6
-e066 f0a7
-e067 f0a8
-e068 f0a9
-e069 f0aa
-e06a f0ab
-e06b f0ac
-e06c f0ad
-e06d f0ae
-e06e f0af
-e06f f0b0
-e070 f0b1
-e071 f0b2
-e072 f0b3
-e073 f0b4
-e074 f0b5
-e075 f0b6
-e076 f0b7
-e077 f0b8
-e078 f0b9
-e079 f0ba
-e07a f0bb
-e07b f0bc
-e07c f0bd
-e07d f0be
-e07e f0bf
-e07f f0c0
-e080 f0c1
-e081 f0c2
-e082 f0c3
-e083 f0c4
-e084 f0c5
-e085 f0c6
-e086 f0c7
-e087 f0c8
-e088 f0c9
-e089 f0ca
-e08a f0cb
-e08b f0cc
-e08c f0cd
-e08d f0ce
-e08e f0cf
-e08f f0d0
-e090 f0d1
-e091 f0d2
-e092 f0d3
-e093 f0d4
-e094 f0d5
-e095 f0d6
-e096 f0d7
-e097 f0d8
-e098 f0d9
-e099 f0da
-e09a f0db
-e09b f0dc
-e09c f0dd
-e09d f0de
-e09e f0df
-e09f f0e0
-e0a0 f0e1
-e0a1 f0e2
-e0a2 f0e3
-e0a3 f0e4
-e0a4 f0e5
-e0a5 f0e6
-e0a6 f0e7
-e0a7 f0e8
-e0a8 f0e9
-e0a9 f0ea
-e0aa f0eb
-e0ab f0ec
-e0ac f0ed
-e0ad f0ee
-e0ae f0ef
-e0af f0f0
-e0b0 f0f1
-e0b1 f0f2
-e0b2 f0f3
-e0b3 f0f4
-e0b4 f0f5
-e0b5 f0f6
-e0b6 f0f7
-e0b7 f0f8
-e0b8 f0f9
-e0b9 f0fa
-e0ba f0fb
-e0bb f0fc
-e0bc f140
-e0bd f141
-e0be f142
-e0bf f143
-e0c0 f144
-e0c1 f145
-e0c2 f146
-e0c3 f147
-e0c4 f148
-e0c5 f149
-e0c6 f14a
-e0c7 f14b
-e0c8 f14c
-e0c9 f14d
-e0ca f14e
-e0cb f14f
-e0cc f150
-e0cd f151
-e0ce f152
-e0cf f153
-e0d0 f154
-e0d1 f155
-e0d2 f156
-e0d3 f157
-e0d4 f158
-e0d5 f159
-e0d6 f15a
-e0d7 f15b
-e0d8 f15c
-e0d9 f15d
-e0da f15e
-e0db f15f
-e0dc f160
-e0dd f161
-e0de f162
-e0df f163
-e0e0 f164
-e0e1 f165
-e0e2 f166
-e0e3 f167
-e0e4 f168
-e0e5 f169
-e0e6 f16a
-e0e7 f16b
-e0e8 f16c
-e0e9 f16d
-e0ea f16e
-e0eb f16f
-e0ec f170
-e0ed f171
-e0ee f172
-e0ef f173
-e0f0 f174
-e0f1 f175
-e0f2 f176
-e0f3 f177
-e0f4 f178
-e0f5 f179
-e0f6 f17a
-e0f7 f17b
-e0f8 f17c
-e0f9 f17d
-e0fa f17e
-e0fb f180
-e0fc f181
-e0fd f182
-e0fe f183
-e0ff f184
-e100 f185
-e101 f186
-e102 f187
-e103 f188
-e104 f189
-e105 f18a
-e106 f18b
-e107 f18c
-e108 f18d
-e109 f18e
-e10a f18f
-e10b f190
-e10c f191
-e10d f192
-e10e f193
-e10f f194
-e110 f195
-e111 f196
-e112 f197
-e113 f198
-e114 f199
-e115 f19a
-e116 f19b
-e117 f19c
-e118 f19d
-e119 f19e
-e11a f19f
-e11b f1a0
-e11c f1a1
-e11d f1a2
-e11e f1a3
-e11f f1a4
-e120 f1a5
-e121 f1a6
-e122 f1a7
-e123 f1a8
-e124 f1a9
-e125 f1aa
-e126 f1ab
-e127 f1ac
-e128 f1ad
-e129 f1ae
-e12a f1af
-e12b f1b0
-e12c f1b1
-e12d f1b2
-e12e f1b3
-e12f f1b4
-e130 f1b5
-e131 f1b6
-e132 f1b7
-e133 f1b8
-e134 f1b9
-e135 f1ba
-e136 f1bb
-e137 f1bc
-e138 f1bd
-e139 f1be
-e13a f1bf
-e13b f1c0
-e13c f1c1
-e13d f1c2
-e13e f1c3
-e13f f1c4
-e140 f1c5
-e141 f1c6
-e142 f1c7
-e143 f1c8
-e144 f1c9
-e145 f1ca
-e146 f1cb
-e147 f1cc
-e148 f1cd
-e149 f1ce
-e14a f1cf
-e14b f1d0
-e14c f1d1
-e14d f1d2
-e14e f1d3
-e14f f1d4
-e150 f1d5
-e151 f1d6
-e152 f1d7
-e153 f1d8
-e154 f1d9
-e155 f1da
-e156 f1db
-e157 f1dc
-e158 f1dd
-e159 f1de
-e15a f1df
-e15b f1e0
-e15c f1e1
-e15d f1e2
-e15e f1e3
-e15f f1e4
-e160 f1e5
-e161 f1e6
-e162 f1e7
-e163 f1e8
-e164 f1e9
-e165 f1ea
-e166 f1eb
-e167 f1ec
-e168 f1ed
-e169 f1ee
-e16a f1ef
-e16b f1f0
-e16c f1f1
-e16d f1f2
-e16e f1f3
-e16f f1f4
-e170 f1f5
-e171 f1f6
-e172 f1f7
-e173 f1f8
-e174 f1f9
-e175 f1fa
-e176 f1fb
-e177 f1fc
-e178 f240
-e179 f241
-e17a f242
-e17b f243
-e17c f244
-e17d f245
-e17e f246
-e17f f247
-e180 f248
-e181 f249
-e182 f24a
-e183 f24b
-e184 f24c
-e185 f24d
-e186 f24e
-e187 f24f
-e188 f250
-e189 f251
-e18a f252
-e18b f253
-e18c f254
-e18d f255
-e18e f256
-e18f f257
-e190 f258
-e191 f259
-e192 f25a
-e193 f25b
-e194 f25c
-e195 f25d
-e196 f25e
-e197 f25f
-e198 f260
-e199 f261
-e19a f262
-e19b f263
-e19c f264
-e19d f265
-e19e f266
-e19f f267
-e1a0 f268
-e1a1 f269
-e1a2 f26a
-e1a3 f26b
-e1a4 f26c
-e1a5 f26d
-e1a6 f26e
-e1a7 f26f
-e1a8 f270
-e1a9 f271
-e1aa f272
-e1ab f273
-e1ac f274
-e1ad f275
-e1ae f276
-e1af f277
-e1b0 f278
-e1b1 f279
-e1b2 f27a
-e1b3 f27b
-e1b4 f27c
-e1b5 f27d
-e1b6 f27e
-e1b7 f280
-e1b8 f281
-e1b9 f282
-e1ba f283
-e1bb f284
-e1bc f285
-e1bd f286
-e1be f287
-e1bf f288
-e1c0 f289
-e1c1 f28a
-e1c2 f28b
-e1c3 f28c
-e1c4 f28d
-e1c5 f28e
-e1c6 f28f
-e1c7 f290
-e1c8 f291
-e1c9 f292
-e1ca f293
-e1cb f294
-e1cc f295
-e1cd f296
-e1ce f297
-e1cf f298
-e1d0 f299
-e1d1 f29a
-e1d2 f29b
-e1d3 f29c
-e1d4 f29d
-e1d5 f29e
-e1d6 f29f
-e1d7 f2a0
-e1d8 f2a1
-e1d9 f2a2
-e1da f2a3
-e1db f2a4
-e1dc f2a5
-e1dd f2a6
-e1de f2a7
-e1df f2a8
-e1e0 f2a9
-e1e1 f2aa
-e1e2 f2ab
-e1e3 f2ac
-e1e4 f2ad
-e1e5 f2ae
-e1e6 f2af
-e1e7 f2b0
-e1e8 f2b1
-e1e9 f2b2
-e1ea f2b3
-e1eb f2b4
-e1ec f2b5
-e1ed f2b6
-e1ee f2b7
-e1ef f2b8
-e1f0 f2b9
-e1f1 f2ba
-e1f2 f2bb
-e1f3 f2bc
-e1f4 f2bd
-e1f5 f2be
-e1f6 f2bf
-e1f7 f2c0
-e1f8 f2c1
-e1f9 f2c2
-e1fa f2c3
-e1fb f2c4
-e1fc f2c5
-e1fd f2c6
-e1fe f2c7
-e1ff f2c8
-e200 f2c9
-e201 f2ca
-e202 f2cb
-e203 f2cc
-e204 f2cd
-e205 f2ce
-e206 f2cf
-e207 f2d0
-e208 f2d1
-e209 f2d2
-e20a f2d3
-e20b f2d4
-e20c f2d5
-e20d f2d6
-e20e f2d7
-e20f f2d8
-e210 f2d9
-e211 f2da
-e212 f2db
-e213 f2dc
-e214 f2dd
-e215 f2de
-e216 f2df
-e217 f2e0
-e218 f2e1
-e219 f2e2
-e21a f2e3
-e21b f2e4
-e21c f2e5
-e21d f2e6
-e21e f2e7
-e21f f2e8
-e220 f2e9
-e221 f2ea
-e222 f2eb
-e223 f2ec
-e224 f2ed
-e225 f2ee
-e226 f2ef
-e227 f2f0
-e228 f2f1
-e229 f2f2
-e22a f2f3
-e22b f2f4
-e22c f2f5
-e22d f2f6
-e22e f2f7
-e22f f2f8
-e230 f2f9
-e231 f2fa
-e232 f2fb
-e233 f2fc
-e234 f340
-e235 f341
-e236 f342
-e237 f343
-e238 f344
-e239 f345
-e23a f346
-e23b f347
-e23c f348
-e23d f349
-e23e f34a
-e23f f34b
-e240 f34c
-e241 f34d
-e242 f34e
-e243 f34f
-e244 f350
-e245 f351
-e246 f352
-e247 f353
-e248 f354
-e249 f355
-e24a f356
-e24b f357
-e24c f358
-e24d f359
-e24e f35a
-e24f f35b
-e250 f35c
-e251 f35d
-e252 f35e
-e253 f35f
-e254 f360
-e255 f361
-e256 f362
-e257 f363
-e258 f364
-e259 f365
-e25a f366
-e25b f367
-e25c f368
-e25d f369
-e25e f36a
-e25f f36b
-e260 f36c
-e261 f36d
-e262 f36e
-e263 f36f
-e264 f370
-e265 f371
-e266 f372
-e267 f373
-e268 f374
-e269 f375
-e26a f376
-e26b f377
-e26c f378
-e26d f379
-e26e f37a
-e26f f37b
-e270 f37c
-e271 f37d
-e272 f37e
-e273 f380
-e274 f381
-e275 f382
-e276 f383
-e277 f384
-e278 f385
-e279 f386
-e27a f387
-e27b f388
-e27c f389
-e27d f38a
-e27e f38b
-e27f f38c
-e280 f38d
-e281 f38e
-e282 f38f
-e283 f390
-e284 f391
-e285 f392
-e286 f393
-e287 f394
-e288 f395
-e289 f396
-e28a f397
-e28b f398
-e28c f399
-e28d f39a
-e28e f39b
-e28f f39c
-e290 f39d
-e291 f39e
-e292 f39f
-e293 f3a0
-e294 f3a1
-e295 f3a2
-e296 f3a3
-e297 f3a4
-e298 f3a5
-e299 f3a6
-e29a f3a7
-e29b f3a8
-e29c f3a9
-e29d f3aa
-e29e f3ab
-e29f f3ac
-e2a0 f3ad
-e2a1 f3ae
-e2a2 f3af
-e2a3 f3b0
-e2a4 f3b1
-e2a5 f3b2
-e2a6 f3b3
-e2a7 f3b4
-e2a8 f3b5
-e2a9 f3b6
-e2aa f3b7
-e2ab f3b8
-e2ac f3b9
-e2ad f3ba
-e2ae f3bb
-e2af f3bc
-e2b0 f3bd
-e2b1 f3be
-e2b2 f3bf
-e2b3 f3c0
-e2b4 f3c1
-e2b5 f3c2
-e2b6 f3c3
-e2b7 f3c4
-e2b8 f3c5
-e2b9 f3c6
-e2ba f3c7
-e2bb f3c8
-e2bc f3c9
-e2bd f3ca
-e2be f3cb
-e2bf f3cc
-e2c0 f3cd
-e2c1 f3ce
-e2c2 f3cf
-e2c3 f3d0
-e2c4 f3d1
-e2c5 f3d2
-e2c6 f3d3
-e2c7 f3d4
-e2c8 f3d5
-e2c9 f3d6
-e2ca f3d7
-e2cb f3d8
-e2cc f3d9
-e2cd f3da
-e2ce f3db
-e2cf f3dc
-e2d0 f3dd
-e2d1 f3de
-e2d2 f3df
-e2d3 f3e0
-e2d4 f3e1
-e2d5 f3e2
-e2d6 f3e3
-e2d7 f3e4
-e2d8 f3e5
-e2d9 f3e6
-e2da f3e7
-e2db f3e8
-e2dc f3e9
-e2dd f3ea
-e2de f3eb
-e2df f3ec
-e2e0 f3ed
-e2e1 f3ee
-e2e2 f3ef
-e2e3 f3f0
-e2e4 f3f1
-e2e5 f3f2
-e2e6 f3f3
-e2e7 f3f4
-e2e8 f3f5
-e2e9 f3f6
-e2ea f3f7
-e2eb f3f8
-e2ec f3f9
-e2ed f3fa
-e2ee f3fb
-e2ef f3fc
-e2f0 f440
-e2f1 f441
-e2f2 f442
-e2f3 f443
-e2f4 f444
-e2f5 f445
-e2f6 f446
-e2f7 f447
-e2f8 f448
-e2f9 f449
-e2fa f44a
-e2fb f44b
-e2fc f44c
-e2fd f44d
-e2fe f44e
-e2ff f44f
-e300 f450
-e301 f451
-e302 f452
-e303 f453
-e304 f454
-e305 f455
-e306 f456
-e307 f457
-e308 f458
-e309 f459
-e30a f45a
-e30b f45b
-e30c f45c
-e30d f45d
-e30e f45e
-e30f f45f
-e310 f460
-e311 f461
-e312 f462
-e313 f463
-e314 f464
-e315 f465
-e316 f466
-e317 f467
-e318 f468
-e319 f469
-e31a f46a
-e31b f46b
-e31c f46c
-e31d f46d
-e31e f46e
-e31f f46f
-e320 f470
-e321 f471
-e322 f472
-e323 f473
-e324 f474
-e325 f475
-e326 f476
-e327 f477
-e328 f478
-e329 f479
-e32a f47a
-e32b f47b
-e32c f47c
-e32d f47d
-e32e f47e
-e32f f480
-e330 f481
-e331 f482
-e332 f483
-e333 f484
-e334 f485
-e335 f486
-e336 f487
-e337 f488
-e338 f489
-e339 f48a
-e33a f48b
-e33b f48c
-e33c f48d
-e33d f48e
-e33e f48f
-e33f f490
-e340 f491
-e341 f492
-e342 f493
-e343 f494
-e344 f495
-e345 f496
-e346 f497
-e347 f498
-e348 f499
-e349 f49a
-e34a f49b
-e34b f49c
-e34c f49d
-e34d f49e
-e34e f49f
-e34f f4a0
-e350 f4a1
-e351 f4a2
-e352 f4a3
-e353 f4a4
-e354 f4a5
-e355 f4a6
-e356 f4a7
-e357 f4a8
-e358 f4a9
-e359 f4aa
-e35a f4ab
-e35b f4ac
-e35c f4ad
-e35d f4ae
-e35e f4af
-e35f f4b0
-e360 f4b1
-e361 f4b2
-e362 f4b3
-e363 f4b4
-e364 f4b5
-e365 f4b6
-e366 f4b7
-e367 f4b8
-e368 f4b9
-e369 f4ba
-e36a f4bb
-e36b f4bc
-e36c f4bd
-e36d f4be
-e36e f4bf
-e36f f4c0
-e370 f4c1
-e371 f4c2
-e372 f4c3
-e373 f4c4
-e374 f4c5
-e375 f4c6
-e376 f4c7
-e377 f4c8
-e378 f4c9
-e379 f4ca
-e37a f4cb
-e37b f4cc
-e37c f4cd
-e37d f4ce
-e37e f4cf
-e37f f4d0
-e380 f4d1
-e381 f4d2
-e382 f4d3
-e383 f4d4
-e384 f4d5
-e385 f4d6
-e386 f4d7
-e387 f4d8
-e388 f4d9
-e389 f4da
-e38a f4db
-e38b f4dc
-e38c f4dd
-e38d f4de
-e38e f4df
-e38f f4e0
-e390 f4e1
-e391 f4e2
-e392 f4e3
-e393 f4e4
-e394 f4e5
-e395 f4e6
-e396 f4e7
-e397 f4e8
-e398 f4e9
-e399 f4ea
-e39a f4eb
-e39b f4ec
-e39c f4ed
-e39d f4ee
-e39e f4ef
-e39f f4f0
-e3a0 f4f1
-e3a1 f4f2
-e3a2 f4f3
-e3a3 f4f4
-e3a4 f4f5
-e3a5 f4f6
-e3a6 f4f7
-e3a7 f4f8
-e3a8 f4f9
-e3a9 f4fa
-e3aa f4fb
-e3ab f4fc
-e3ac f540
-e3ad f541
-e3ae f542
-e3af f543
-e3b0 f544
-e3b1 f545
-e3b2 f546
-e3b3 f547
-e3b4 f548
-e3b5 f549
-e3b6 f54a
-e3b7 f54b
-e3b8 f54c
-e3b9 f54d
-e3ba f54e
-e3bb f54f
-e3bc f550
-e3bd f551
-e3be f552
-e3bf f553
-e3c0 f554
-e3c1 f555
-e3c2 f556
-e3c3 f557
-e3c4 f558
-e3c5 f559
-e3c6 f55a
-e3c7 f55b
-e3c8 f55c
-e3c9 f55d
-e3ca f55e
-e3cb f55f
-e3cc f560
-e3cd f561
-e3ce f562
-e3cf f563
-e3d0 f564
-e3d1 f565
-e3d2 f566
-e3d3 f567
-e3d4 f568
-e3d5 f569
-e3d6 f56a
-e3d7 f56b
-e3d8 f56c
-e3d9 f56d
-e3da f56e
-e3db f56f
-e3dc f570
-e3dd f571
-e3de f572
-e3df f573
-e3e0 f574
-e3e1 f575
-e3e2 f576
-e3e3 f577
-e3e4 f578
-e3e5 f579
-e3e6 f57a
-e3e7 f57b
-e3e8 f57c
-e3e9 f57d
-e3ea f57e
-e3eb f580
-e3ec f581
-e3ed f582
-e3ee f583
-e3ef f584
-e3f0 f585
-e3f1 f586
-e3f2 f587
-e3f3 f588
-e3f4 f589
-e3f5 f58a
-e3f6 f58b
-e3f7 f58c
-e3f8 f58d
-e3f9 f58e
-e3fa f58f
-e3fb f590
-e3fc f591
-e3fd f592
-e3fe f593
-e3ff f594
-e400 f595
-e401 f596
-e402 f597
-e403 f598
-e404 f599
-e405 f59a
-e406 f59b
-e407 f59c
-e408 f59d
-e409 f59e
-e40a f59f
-e40b f5a0
-e40c f5a1
-e40d f5a2
-e40e f5a3
-e40f f5a4
-e410 f5a5
-e411 f5a6
-e412 f5a7
-e413 f5a8
-e414 f5a9
-e415 f5aa
-e416 f5ab
-e417 f5ac
-e418 f5ad
-e419 f5ae
-e41a f5af
-e41b f5b0
-e41c f5b1
-e41d f5b2
-e41e f5b3
-e41f f5b4
-e420 f5b5
-e421 f5b6
-e422 f5b7
-e423 f5b8
-e424 f5b9
-e425 f5ba
-e426 f5bb
-e427 f5bc
-e428 f5bd
-e429 f5be
-e42a f5bf
-e42b f5c0
-e42c f5c1
-e42d f5c2
-e42e f5c3
-e42f f5c4
-e430 f5c5
-e431 f5c6
-e432 f5c7
-e433 f5c8
-e434 f5c9
-e435 f5ca
-e436 f5cb
-e437 f5cc
-e438 f5cd
-e439 f5ce
-e43a f5cf
-e43b f5d0
-e43c f5d1
-e43d f5d2
-e43e f5d3
-e43f f5d4
-e440 f5d5
-e441 f5d6
-e442 f5d7
-e443 f5d8
-e444 f5d9
-e445 f5da
-e446 f5db
-e447 f5dc
-e448 f5dd
-e449 f5de
-e44a f5df
-e44b f5e0
-e44c f5e1
-e44d f5e2
-e44e f5e3
-e44f f5e4
-e450 f5e5
-e451 f5e6
-e452 f5e7
-e453 f5e8
-e454 f5e9
-e455 f5ea
-e456 f5eb
-e457 f5ec
-e458 f5ed
-e459 f5ee
-e45a f5ef
-e45b f5f0
-e45c f5f1
-e45d f5f2
-e45e f5f3
-e45f f5f4
-e460 f5f5
-e461 f5f6
-e462 f5f7
-e463 f5f8
-e464 f5f9
-e465 f5fa
-e466 f5fb
-e467 f5fc
-e468 f640
-e469 f641
-e46a f642
-e46b f643
-e46c f644
-e46d f645
-e46e f646
-e46f f647
-e470 f648
-e471 f649
-e472 f64a
-e473 f64b
-e474 f64c
-e475 f64d
-e476 f64e
-e477 f64f
-e478 f650
-e479 f651
-e47a f652
-e47b f653
-e47c f654
-e47d f655
-e47e f656
-e47f f657
-e480 f658
-e481 f659
-e482 f65a
-e483 f65b
-e484 f65c
-e485 f65d
-e486 f65e
-e487 f65f
-e488 f660
-e489 f661
-e48a f662
-e48b f663
-e48c f664
-e48d f665
-e48e f666
-e48f f667
-e490 f668
-e491 f669
-e492 f66a
-e493 f66b
-e494 f66c
-e495 f66d
-e496 f66e
-e497 f66f
-e498 f670
-e499 f671
-e49a f672
-e49b f673
-e49c f674
-e49d f675
-e49e f676
-e49f f677
-e4a0 f678
-e4a1 f679
-e4a2 f67a
-e4a3 f67b
-e4a4 f67c
-e4a5 f67d
-e4a6 f67e
-e4a7 f680
-e4a8 f681
-e4a9 f682
-e4aa f683
-e4ab f684
-e4ac f685
-e4ad f686
-e4ae f687
-e4af f688
-e4b0 f689
-e4b1 f68a
-e4b2 f68b
-e4b3 f68c
-e4b4 f68d
-e4b5 f68e
-e4b6 f68f
-e4b7 f690
-e4b8 f691
-e4b9 f692
-e4ba f693
-e4bb f694
-e4bc f695
-e4bd f696
-e4be f697
-e4bf f698
-e4c0 f699
-e4c1 f69a
-e4c2 f69b
-e4c3 f69c
-e4c4 f69d
-e4c5 f69e
-e4c6 f69f
-e4c7 f6a0
-e4c8 f6a1
-e4c9 f6a2
-e4ca f6a3
-e4cb f6a4
-e4cc f6a5
-e4cd f6a6
-e4ce f6a7
-e4cf f6a8
-e4d0 f6a9
-e4d1 f6aa
-e4d2 f6ab
-e4d3 f6ac
-e4d4 f6ad
-e4d5 f6ae
-e4d6 f6af
-e4d7 f6b0
-e4d8 f6b1
-e4d9 f6b2
-e4da f6b3
-e4db f6b4
-e4dc f6b5
-e4dd f6b6
-e4de f6b7
-e4df f6b8
-e4e0 f6b9
-e4e1 f6ba
-e4e2 f6bb
-e4e3 f6bc
-e4e4 f6bd
-e4e5 f6be
-e4e6 f6bf
-e4e7 f6c0
-e4e8 f6c1
-e4e9 f6c2
-e4ea f6c3
-e4eb f6c4
-e4ec f6c5
-e4ed f6c6
-e4ee f6c7
-e4ef f6c8
-e4f0 f6c9
-e4f1 f6ca
-e4f2 f6cb
-e4f3 f6cc
-e4f4 f6cd
-e4f5 f6ce
-e4f6 f6cf
-e4f7 f6d0
-e4f8 f6d1
-e4f9 f6d2
-e4fa f6d3
-e4fb f6d4
-e4fc f6d5
-e4fd f6d6
-e4fe f6d7
-e4ff f6d8
-e500 f6d9
-e501 f6da
-e502 f6db
-e503 f6dc
-e504 f6dd
-e505 f6de
-e506 f6df
-e507 f6e0
-e508 f6e1
-e509 f6e2
-e50a f6e3
-e50b f6e4
-e50c f6e5
-e50d f6e6
-e50e f6e7
-e50f f6e8
-e510 f6e9
-e511 f6ea
-e512 f6eb
-e513 f6ec
-e514 f6ed
-e515 f6ee
-e516 f6ef
-e517 f6f0
-e518 f6f1
-e519 f6f2
-e51a f6f3
-e51b f6f4
-e51c f6f5
-e51d f6f6
-e51e f6f7
-e51f f6f8
-e520 f6f9
-e521 f6fa
-e522 f6fb
-e523 f6fc
-e524 f740
-e525 f741
-e526 f742
-e527 f743
-e528 f744
-e529 f745
-e52a f746
-e52b f747
-e52c f748
-e52d f749
-e52e f74a
-e52f f74b
-e530 f74c
-e531 f74d
-e532 f74e
-e533 f74f
-e534 f750
-e535 f751
-e536 f752
-e537 f753
-e538 f754
-e539 f755
-e53a f756
-e53b f757
-e53c f758
-e53d f759
-e53e f75a
-e53f f75b
-e540 f75c
-e541 f75d
-e542 f75e
-e543 f75f
-e544 f760
-e545 f761
-e546 f762
-e547 f763
-e548 f764
-e549 f765
-e54a f766
-e54b f767
-e54c f768
-e54d f769
-e54e f76a
-e54f f76b
-e550 f76c
-e551 f76d
-e552 f76e
-e553 f76f
-e554 f770
-e555 f771
-e556 f772
-e557 f773
-e558 f774
-e559 f775
-e55a f776
-e55b f777
-e55c f778
-e55d f779
-e55e f77a
-e55f f77b
-e560 f77c
-e561 f77d
-e562 f77e
-e563 f780
-e564 f781
-e565 f782
-e566 f783
-e567 f784
-e568 f785
-e569 f786
-e56a f787
-e56b f788
-e56c f789
-e56d f78a
-e56e f78b
-e56f f78c
-e570 f78d
-e571 f78e
-e572 f78f
-e573 f790
-e574 f791
-e575 f792
-e576 f793
-e577 f794
-e578 f795
-e579 f796
-e57a f797
-e57b f798
-e57c f799
-e57d f79a
-e57e f79b
-e57f f79c
-e580 f79d
-e581 f79e
-e582 f79f
-e583 f7a0
-e584 f7a1
-e585 f7a2
-e586 f7a3
-e587 f7a4
-e588 f7a5
-e589 f7a6
-e58a f7a7
-e58b f7a8
-e58c f7a9
-e58d f7aa
-e58e f7ab
-e58f f7ac
-e590 f7ad
-e591 f7ae
-e592 f7af
-e593 f7b0
-e594 f7b1
-e595 f7b2
-e596 f7b3
-e597 f7b4
-e598 f7b5
-e599 f7b6
-e59a f7b7
-e59b f7b8
-e59c f7b9
-e59d f7ba
-e59e f7bb
-e59f f7bc
-e5a0 f7bd
-e5a1 f7be
-e5a2 f7bf
-e5a3 f7c0
-e5a4 f7c1
-e5a5 f7c2
-e5a6 f7c3
-e5a7 f7c4
-e5a8 f7c5
-e5a9 f7c6
-e5aa f7c7
-e5ab f7c8
-e5ac f7c9
-e5ad f7ca
-e5ae f7cb
-e5af f7cc
-e5b0 f7cd
-e5b1 f7ce
-e5b2 f7cf
-e5b3 f7d0
-e5b4 f7d1
-e5b5 f7d2
-e5b6 f7d3
-e5b7 f7d4
-e5b8 f7d5
-e5b9 f7d6
-e5ba f7d7
-e5bb f7d8
-e5bc f7d9
-e5bd f7da
-e5be f7db
-e5bf f7dc
-e5c0 f7dd
-e5c1 f7de
-e5c2 f7df
-e5c3 f7e0
-e5c4 f7e1
-e5c5 f7e2
-e5c6 f7e3
-e5c7 f7e4
-e5c8 f7e5
-e5c9 f7e6
-e5ca f7e7
-e5cb f7e8
-e5cc f7e9
-e5cd f7ea
-e5ce f7eb
-e5cf f7ec
-e5d0 f7ed
-e5d1 f7ee
-e5d2 f7ef
-e5d3 f7f0
-e5d4 f7f1
-e5d5 f7f2
-e5d6 f7f3
-e5d7 f7f4
-e5d8 f7f5
-e5d9 f7f6
-e5da f7f7
-e5db f7f8
-e5dc f7f9
-e5dd f7fa
-e5de f7fb
-e5df f7fc
-e5e0 f840
-e5e1 f841
-e5e2 f842
-e5e3 f843
-e5e4 f844
-e5e5 f845
-e5e6 f846
-e5e7 f847
-e5e8 f848
-e5e9 f849
-e5ea f84a
-e5eb f84b
-e5ec f84c
-e5ed f84d
-e5ee f84e
-e5ef f84f
-e5f0 f850
-e5f1 f851
-e5f2 f852
-e5f3 f853
-e5f4 f854
-e5f5 f855
-e5f6 f856
-e5f7 f857
-e5f8 f858
-e5f9 f859
-e5fa f85a
-e5fb f85b
-e5fc f85c
-e5fd f85d
-e5fe f85e
-e5ff f85f
-e600 f860
-e601 f861
-e602 f862
-e603 f863
-e604 f864
-e605 f865
-e606 f866
-e607 f867
-e608 f868
-e609 f869
-e60a f86a
-e60b f86b
-e60c f86c
-e60d f86d
-e60e f86e
-e60f f86f
-e610 f870
-e611 f871
-e612 f872
-e613 f873
-e614 f874
-e615 f875
-e616 f876
-e617 f877
-e618 f878
-e619 f879
-e61a f87a
-e61b f87b
-e61c f87c
-e61d f87d
-e61e f87e
-e61f f880
-e620 f881
-e621 f882
-e622 f883
-e623 f884
-e624 f885
-e625 f886
-e626 f887
-e627 f888
-e628 f889
-e629 f88a
-e62a f88b
-e62b f88c
-e62c f88d
-e62d f88e
-e62e f88f
-e62f f890
-e630 f891
-e631 f892
-e632 f893
-e633 f894
-e634 f895
-e635 f896
-e636 f897
-e637 f898
-e638 f899
-e639 f89a
-e63a f89b
-e63b f89c
-e63c f89d
-e63d f89e
-e63e f89f
-e63f f8a0
-e640 f8a1
-e641 f8a2
-e642 f8a3
-e643 f8a4
-e644 f8a5
-e645 f8a6
-e646 f8a7
-e647 f8a8
-e648 f8a9
-e649 f8aa
-e64a f8ab
-e64b f8ac
-e64c f8ad
-e64d f8ae
-e64e f8af
-e64f f8b0
-e650 f8b1
-e651 f8b2
-e652 f8b3
-e653 f8b4
-e654 f8b5
-e655 f8b6
-e656 f8b7
-e657 f8b8
-e658 f8b9
-e659 f8ba
-e65a f8bb
-e65b f8bc
-e65c f8bd
-e65d f8be
-e65e f8bf
-e65f f8c0
-e660 f8c1
-e661 f8c2
-e662 f8c3
-e663 f8c4
-e664 f8c5
-e665 f8c6
-e666 f8c7
-e667 f8c8
-e668 f8c9
-e669 f8ca
-e66a f8cb
-e66b f8cc
-e66c f8cd
-e66d f8ce
-e66e f8cf
-e66f f8d0
-e670 f8d1
-e671 f8d2
-e672 f8d3
-e673 f8d4
-e674 f8d5
-e675 f8d6
-e676 f8d7
-e677 f8d8
-e678 f8d9
-e679 f8da
-e67a f8db
-e67b f8dc
-e67c f8dd
-e67d f8de
-e67e f8df
-e67f f8e0
-e680 f8e1
-e681 f8e2
-e682 f8e3
-e683 f8e4
-e684 f8e5
-e685 f8e6
-e686 f8e7
-e687 f8e8
-e688 f8e9
-e689 f8ea
-e68a f8eb
-e68b f8ec
-e68c f8ed
-e68d f8ee
-e68e f8ef
-e68f f8f0
-e690 f8f1
-e691 f8f2
-e692 f8f3
-e693 f8f4
-e694 f8f5
-e695 f8f6
-e696 f8f7
-e697 f8f8
-e698 f8f9
-e699 f8fa
-e69a f8fb
-e69b f8fc
-e69c f940
-e69d f941
-e69e f942
-e69f f943
-e6a0 f944
-e6a1 f945
-e6a2 f946
-e6a3 f947
-e6a4 f948
-e6a5 f949
-e6a6 f94a
-e6a7 f94b
-e6a8 f94c
-e6a9 f94d
-e6aa f94e
-e6ab f94f
-e6ac f950
-e6ad f951
-e6ae f952
-e6af f953
-e6b0 f954
-e6b1 f955
-e6b2 f956
-e6b3 f957
-e6b4 f958
-e6b5 f959
-e6b6 f95a
-e6b7 f95b
-e6b8 f95c
-e6b9 f95d
-e6ba f95e
-e6bb f95f
-e6bc f960
-e6bd f961
-e6be f962
-e6bf f963
-e6c0 f964
-e6c1 f965
-e6c2 f966
-e6c3 f967
-e6c4 f968
-e6c5 f969
-e6c6 f96a
-e6c7 f96b
-e6c8 f96c
-e6c9 f96d
-e6ca f96e
-e6cb f96f
-e6cc f970
-e6cd f971
-e6ce f972
-e6cf f973
-e6d0 f974
-e6d1 f975
-e6d2 f976
-e6d3 f977
-e6d4 f978
-e6d5 f979
-e6d6 f97a
-e6d7 f97b
-e6d8 f97c
-e6d9 f97d
-e6da f97e
-e6db f980
-e6dc f981
-e6dd f982
-e6de f983
-e6df f984
-e6e0 f985
-e6e1 f986
-e6e2 f987
-e6e3 f988
-e6e4 f989
-e6e5 f98a
-e6e6 f98b
-e6e7 f98c
-e6e8 f98d
-e6e9 f98e
-e6ea f98f
-e6eb f990
-e6ec f991
-e6ed f992
-e6ee f993
-e6ef f994
-e6f0 f995
-e6f1 f996
-e6f2 f997
-e6f3 f998
-e6f4 f999
-e6f5 f99a
-e6f6 f99b
-e6f7 f99c
-e6f8 f99d
-e6f9 f99e
-e6fa f99f
-e6fb f9a0
-e6fc f9a1
-e6fd f9a2
-e6fe f9a3
-e6ff f9a4
-e700 f9a5
-e701 f9a6
-e702 f9a7
-e703 f9a8
-e704 f9a9
-e705 f9aa
-e706 f9ab
-e707 f9ac
-e708 f9ad
-e709 f9ae
-e70a f9af
-e70b f9b0
-e70c f9b1
-e70d f9b2
-e70e f9b3
-e70f f9b4
-e710 f9b5
-e711 f9b6
-e712 f9b7
-e713 f9b8
-e714 f9b9
-e715 f9ba
-e716 f9bb
-e717 f9bc
-e718 f9bd
-e719 f9be
-e71a f9bf
-e71b f9c0
-e71c f9c1
-e71d f9c2
-e71e f9c3
-e71f f9c4
-e720 f9c5
-e721 f9c6
-e722 f9c7
-e723 f9c8
-e724 f9c9
-e725 f9ca
-e726 f9cb
-e727 f9cc
-e728 f9cd
-e729 f9ce
-e72a f9cf
-e72b f9d0
-e72c f9d1
-e72d f9d2
-e72e f9d3
-e72f f9d4
-e730 f9d5
-e731 f9d6
-e732 f9d7
-e733 f9d8
-e734 f9d9
-e735 f9da
-e736 f9db
-e737 f9dc
-e738 f9dd
-e739 f9de
-e73a f9df
-e73b f9e0
-e73c f9e1
-e73d f9e2
-e73e f9e3
-e73f f9e4
-e740 f9e5
-e741 f9e6
-e742 f9e7
-e743 f9e8
-e744 f9e9
-e745 f9ea
-e746 f9eb
-e747 f9ec
-e748 f9ed
-e749 f9ee
-e74a f9ef
-e74b f9f0
-e74c f9f1
-e74d f9f2
-e74e f9f3
-e74f f9f4
-e750 f9f5
-e751 f9f6
-e752 f9f7
-e753 f9f8
-e754 f9f9
-e755 f9fa
-e756 f9fb
-e757 f9fc
-f929 fae0
-f9dc fbe9
-fa0e fa90
-fa0f fa9b
-fa10 fa9c
-fa11 fab1
-fa12 fad8
-fa13 fae8
-fa14 faea
-fa15 fb58
-fa16 fb5e
-fa17 fb75
-fa18 fb7d
-fa19 fb7e
-fa1a fb80
-fa1b fb82
-fa1c fb86
-fa1d fb89
-fa1e fb92
-fa1f fb9d
-fa20 fb9f
-fa21 fba0
-fa22 fba9
-fa23 fbb1
-fa24 fbb3
-fa25 fbb4
-fa26 fbb7
-fa27 fbd3
-fa28 fbda
-fa29 fbea
-fa2a fbf6
-fa2b fbf7
-fa2c fbf9
-fa2d fc49
-ff01 8149
-ff02 fa57
-ff03 8194
-ff04 8190
-ff05 8193
-ff06 8195
-ff07 fa56
-ff08 8169
-ff09 816a
-ff0a 8196
-ff0b 817b
-ff0c 8143
-ff0d 817c
-ff0e 8144
-ff0f 815e
-ff10 824f
-ff11 8250
-ff12 8251
-ff13 8252
-ff14 8253
-ff15 8254
-ff16 8255
-ff17 8256
-ff18 8257
-ff19 8258
-ff1a 8146
-ff1b 8147
-ff1c 8183
-ff1d 8181
-ff1e 8184
-ff1f 8148
-ff20 8197
-ff21 8260
-ff22 8261
-ff23 8262
-ff24 8263
-ff25 8264
-ff26 8265
-ff27 8266
-ff28 8267
-ff29 8268
-ff2a 8269
-ff2b 826a
-ff2c 826b
-ff2d 826c
-ff2e 826d
-ff2f 826e
-ff30 826f
-ff31 8270
-ff32 8271
-ff33 8272
-ff34 8273
-ff35 8274
-ff36 8275
-ff37 8276
-ff38 8277
-ff39 8278
-ff3a 8279
-ff3b 816d
-ff3c 815f
-ff3d 816e
-ff3e 814f
-ff3f 8151
-ff40 814d
-ff41 8281
-ff42 8282
-ff43 8283
-ff44 8284
-ff45 8285
-ff46 8286
-ff47 8287
-ff48 8288
-ff49 8289
-ff4a 828a
-ff4b 828b
-ff4c 828c
-ff4d 828d
-ff4e 828e
-ff4f 828f
-ff50 8290
-ff51 8291
-ff52 8292
-ff53 8293
-ff54 8294
-ff55 8295
-ff56 8296
-ff57 8297
-ff58 8298
-ff59 8299
-ff5a 829a
-ff5b 816f
-ff5c 8162
-ff5d 8170
-ff5e 8160
-ff61 a1
-ff62 a2
-ff63 a3
-ff64 a4
-ff65 a5
-ff66 a6
-ff67 a7
-ff68 a8
-ff69 a9
-ff6a aa
-ff6b ab
-ff6c ac
-ff6d ad
-ff6e ae
-ff6f af
-ff70 b0
-ff71 b1
-ff72 b2
-ff73 b3
-ff74 b4
-ff75 b5
-ff76 b6
-ff77 b7
-ff78 b8
-ff79 b9
-ff7a ba
-ff7b bb
-ff7c bc
-ff7d bd
-ff7e be
-ff7f bf
-ff80 c0
-ff81 c1
-ff82 c2
-ff83 c3
-ff84 c4
-ff85 c5
-ff86 c6
-ff87 c7
-ff88 c8
-ff89 c9
-ff8a ca
-ff8b cb
-ff8c cc
-ff8d cd
-ff8e ce
-ff8f cf
-ff90 d0
-ff91 d1
-ff92 d2
-ff93 d3
-ff94 d4
-ff95 d5
-ff96 d6
-ff97 d7
-ff98 d8
-ff99 d9
-ff9a da
-ff9b db
-ff9c dc
-ff9d dd
-ff9e de
-ff9f df
-ffe0 8191
-ffe1 8192
-ffe2 81ca
-ffe3 8150
-ffe4 fa55
-ffe5 818f
--- a/test/jdk/java/nio/charset/spi/default-pol Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/java/nio/charset/spi/default-pol Thu Sep 12 15:04:00 2019 +0200
@@ -1,7 +1,6 @@
grant codeBase "jrt:/jdk.charsets" {
permission java.io.FilePermission "${java.home}/-", "read";
permission java.util.PropertyPermission "os.name", "read";
- permission java.util.PropertyPermission "sun.nio.cs.map", "read";
permission java.lang.RuntimePermission "charsetProvider";
permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.misc";
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.cs";
--- a/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/java/time/test/java/time/format/TestFractionPrinterParser.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2019, 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,6 +59,7 @@
*/
package test.java.time.format;
+import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
import static java.time.temporal.ChronoField.NANO_OF_SECOND;
import static java.time.temporal.ChronoField.SECOND_OF_MINUTE;
import static org.testng.Assert.assertEquals;
@@ -77,6 +78,8 @@
/**
* Test FractionPrinterParser.
+ *
+ * @bug 8230136
*/
@Test
public class TestFractionPrinterParser extends AbstractTestPrinterParser {
@@ -331,6 +334,24 @@
assertEquals(parsed, null);
}
+ @DataProvider(name="ParseMinWidth")
+ Object[][] provider_parseMinWidth() {
+ return new Object[][] {
+ {MILLI_OF_SECOND, 3, 3, true, ".1x"},
+ {MILLI_OF_SECOND, 3, 3, true, ".12x"},
+ {MILLI_OF_SECOND, 3, 3, true, ".1234x"},
+ };
+ }
+
+ @Test(dataProvider="ParseMinWidth", expectedExceptions=DateTimeException.class)
+ public void test_parse_minWidth(TemporalField field, int min, int max, boolean decimalPoint, String text) throws Exception {
+ builder
+ .appendFraction(field, min, max, decimalPoint)
+ .appendLiteral("x")
+ .toFormatter(locale)
+ .parse(text);
+ }
+
//-----------------------------------------------------------------------
public void test_toString() throws Exception {
assertEquals(getFormatter(NANO_OF_SECOND, 3, 6, true).toString(), "Fraction(NanoOfSecond,3,6,DecimalPoint)");
--- a/test/jdk/sun/nio/cs/TestMS5022X.java Thu Sep 12 07:57:00 2019 +0200
+++ b/test/jdk/sun/nio/cs/TestMS5022X.java Thu Sep 12 15:04:00 2019 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, 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
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 6173388 6319716
+ * @bug 6173388 6319716 8229960
* @summary Check full coverage encode/decode for Microsoft
* ISO2022_JP variants MS50220, MS50221 and MSISO2022JP
* @modules jdk.charsets
@@ -666,23 +666,6 @@
}
public static void main(String[] args) throws Exception {
- String map = System.getProperty("sun.nio.cs.map");
- if (map != null) {
- map = map.toLowerCase(java.util.Locale.US);
- Charset cs = Charset.forName("ISO-2022-JP");
- if (map.indexOf("x-windows-50221/ISO-2022-jp") != -1 &&
- !"x-windows-50220".equals(cs.name()) ||
- map.indexOf("x-windows-50220/ISO-2022-jp") != -1 &&
- !"x-windows-50220".equals(cs.name()) ||
- map.indexOf("x-windows-iso2022jp/ISO-2022-jp") != -1 &&
- !"x-windows-iso2022jp".equals(cs.name())) {
- throw new Exception("Error: sun.nio.cs.map=" + map +
- ", ISO-2022-JP=" + cs.name());
- } else {
- System.out.printf("ISO-2022-JP=%s\n", cs.name());
- }
- }
-
String testStr = US_ASCII +
JISX0208SUBSET +
JISX0201KATAKANA +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/nashorn/script/basic/es6/JDK-8230709.js Thu Sep 12 15:04:00 2019 +0200
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * JDK-8230709: Array index out of bounds in ES6 mode
+ *
+ * @test
+ * @run
+ * @option --language=es6
+ */
+
+{{{{{{{{{{{{{{{ let x; }}}}}}}}}}}}}}}
--- a/test/nashorn/script/basic/javaexceptions.js.EXPECTED Thu Sep 12 07:57:00 2019 +0200
+++ b/test/nashorn/script/basic/javaexceptions.js.EXPECTED Thu Sep 12 15:04:00 2019 +0200
@@ -2,6 +2,6 @@
true
java.net.MalformedURLException: no protocol: invalid_url
true
-java.lang.IllegalMonitorStateException
+java.lang.IllegalMonitorStateException: current thread is not owner
true
java.io.IOException: I/O failed