annotate src/share/vm/runtime/virtualspace.cpp @ 2607:008adfd6d850

Fixed the stateBefore of invokes and monitorenter instructions to include the arguments of the instruction. This is necessary to ensure correct continuation in the interpreter when the stateBefore is used as a deoptimization point.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Fri, 06 May 2011 17:47:17 +0200
parents f95d63e2154a
children 6aa4feb8a366
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
a61af66fc99e Initial load
duke
parents:
diff changeset
1 /*
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
2 * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
a61af66fc99e Initial load
duke
parents:
diff changeset
4 *
a61af66fc99e Initial load
duke
parents:
diff changeset
5 * This code is free software; you can redistribute it and/or modify it
a61af66fc99e Initial load
duke
parents:
diff changeset
6 * under the terms of the GNU General Public License version 2 only, as
a61af66fc99e Initial load
duke
parents:
diff changeset
7 * published by the Free Software Foundation.
a61af66fc99e Initial load
duke
parents:
diff changeset
8 *
a61af66fc99e Initial load
duke
parents:
diff changeset
9 * This code is distributed in the hope that it will be useful, but WITHOUT
a61af66fc99e Initial load
duke
parents:
diff changeset
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a61af66fc99e Initial load
duke
parents:
diff changeset
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a61af66fc99e Initial load
duke
parents:
diff changeset
12 * version 2 for more details (a copy is included in the LICENSE file that
a61af66fc99e Initial load
duke
parents:
diff changeset
13 * accompanied this code).
a61af66fc99e Initial load
duke
parents:
diff changeset
14 *
a61af66fc99e Initial load
duke
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License version
a61af66fc99e Initial load
duke
parents:
diff changeset
16 * 2 along with this work; if not, write to the Free Software Foundation,
a61af66fc99e Initial load
duke
parents:
diff changeset
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
a61af66fc99e Initial load
duke
parents:
diff changeset
18 *
1552
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 844
diff changeset
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 844
diff changeset
20 * or visit www.oracle.com if you need additional information or have any
c18cbe5936b8 6941466: Oracle rebranding changes for Hotspot repositories
trims
parents: 844
diff changeset
21 * questions.
0
a61af66fc99e Initial load
duke
parents:
diff changeset
22 *
a61af66fc99e Initial load
duke
parents:
diff changeset
23 */
a61af66fc99e Initial load
duke
parents:
diff changeset
24
1972
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
25 #include "precompiled.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
26 #include "oops/markOop.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
27 #include "oops/oop.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
28 #include "runtime/virtualspace.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
29 #ifdef TARGET_OS_FAMILY_linux
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
30 # include "os_linux.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
31 #endif
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
32 #ifdef TARGET_OS_FAMILY_solaris
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
33 # include "os_solaris.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
34 #endif
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
35 #ifdef TARGET_OS_FAMILY_windows
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
36 # include "os_windows.inline.hpp"
f95d63e2154a 6989984: Use standard include model for Hospot
stefank
parents: 1618
diff changeset
37 #endif
0
a61af66fc99e Initial load
duke
parents:
diff changeset
38
a61af66fc99e Initial load
duke
parents:
diff changeset
39
a61af66fc99e Initial load
duke
parents:
diff changeset
40 // ReservedSpace
a61af66fc99e Initial load
duke
parents:
diff changeset
41 ReservedSpace::ReservedSpace(size_t size) {
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
42 initialize(size, 0, false, NULL, 0, false);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
43 }
a61af66fc99e Initial load
duke
parents:
diff changeset
44
a61af66fc99e Initial load
duke
parents:
diff changeset
45 ReservedSpace::ReservedSpace(size_t size, size_t alignment,
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
46 bool large,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
47 char* requested_address,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
48 const size_t noaccess_prefix) {
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
49 initialize(size+noaccess_prefix, alignment, large, requested_address,
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
50 noaccess_prefix, false);
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
51 }
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
52
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
53 ReservedSpace::ReservedSpace(size_t size, size_t alignment,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
54 bool large,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
55 bool executable) {
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
56 initialize(size, alignment, large, NULL, 0, executable);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
57 }
a61af66fc99e Initial load
duke
parents:
diff changeset
58
a61af66fc99e Initial load
duke
parents:
diff changeset
59 char *
a61af66fc99e Initial load
duke
parents:
diff changeset
60 ReservedSpace::align_reserved_region(char* addr, const size_t len,
a61af66fc99e Initial load
duke
parents:
diff changeset
61 const size_t prefix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
62 const size_t prefix_align,
a61af66fc99e Initial load
duke
parents:
diff changeset
63 const size_t suffix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
64 const size_t suffix_align)
a61af66fc99e Initial load
duke
parents:
diff changeset
65 {
a61af66fc99e Initial load
duke
parents:
diff changeset
66 assert(addr != NULL, "sanity");
a61af66fc99e Initial load
duke
parents:
diff changeset
67 const size_t required_size = prefix_size + suffix_size;
a61af66fc99e Initial load
duke
parents:
diff changeset
68 assert(len >= required_size, "len too small");
a61af66fc99e Initial load
duke
parents:
diff changeset
69
a61af66fc99e Initial load
duke
parents:
diff changeset
70 const size_t s = size_t(addr);
a61af66fc99e Initial load
duke
parents:
diff changeset
71 const size_t beg_ofs = s + prefix_size & suffix_align - 1;
a61af66fc99e Initial load
duke
parents:
diff changeset
72 const size_t beg_delta = beg_ofs == 0 ? 0 : suffix_align - beg_ofs;
a61af66fc99e Initial load
duke
parents:
diff changeset
73
a61af66fc99e Initial load
duke
parents:
diff changeset
74 if (len < beg_delta + required_size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
75 return NULL; // Cannot do proper alignment.
a61af66fc99e Initial load
duke
parents:
diff changeset
76 }
a61af66fc99e Initial load
duke
parents:
diff changeset
77 const size_t end_delta = len - (beg_delta + required_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
78
a61af66fc99e Initial load
duke
parents:
diff changeset
79 if (beg_delta != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
80 os::release_memory(addr, beg_delta);
a61af66fc99e Initial load
duke
parents:
diff changeset
81 }
a61af66fc99e Initial load
duke
parents:
diff changeset
82
a61af66fc99e Initial load
duke
parents:
diff changeset
83 if (end_delta != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
84 char* release_addr = (char*) (s + beg_delta + required_size);
a61af66fc99e Initial load
duke
parents:
diff changeset
85 os::release_memory(release_addr, end_delta);
a61af66fc99e Initial load
duke
parents:
diff changeset
86 }
a61af66fc99e Initial load
duke
parents:
diff changeset
87
a61af66fc99e Initial load
duke
parents:
diff changeset
88 return (char*) (s + beg_delta);
a61af66fc99e Initial load
duke
parents:
diff changeset
89 }
a61af66fc99e Initial load
duke
parents:
diff changeset
90
a61af66fc99e Initial load
duke
parents:
diff changeset
91 char* ReservedSpace::reserve_and_align(const size_t reserve_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
92 const size_t prefix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
93 const size_t prefix_align,
a61af66fc99e Initial load
duke
parents:
diff changeset
94 const size_t suffix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
95 const size_t suffix_align)
a61af66fc99e Initial load
duke
parents:
diff changeset
96 {
a61af66fc99e Initial load
duke
parents:
diff changeset
97 assert(reserve_size > prefix_size + suffix_size, "should not be here");
a61af66fc99e Initial load
duke
parents:
diff changeset
98
a61af66fc99e Initial load
duke
parents:
diff changeset
99 char* raw_addr = os::reserve_memory(reserve_size, NULL, prefix_align);
a61af66fc99e Initial load
duke
parents:
diff changeset
100 if (raw_addr == NULL) return NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
101
a61af66fc99e Initial load
duke
parents:
diff changeset
102 char* result = align_reserved_region(raw_addr, reserve_size, prefix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
103 prefix_align, suffix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
104 suffix_align);
a61af66fc99e Initial load
duke
parents:
diff changeset
105 if (result == NULL && !os::release_memory(raw_addr, reserve_size)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
106 fatal("os::release_memory failed");
a61af66fc99e Initial load
duke
parents:
diff changeset
107 }
a61af66fc99e Initial load
duke
parents:
diff changeset
108
a61af66fc99e Initial load
duke
parents:
diff changeset
109 #ifdef ASSERT
a61af66fc99e Initial load
duke
parents:
diff changeset
110 if (result != NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
111 const size_t raw = size_t(raw_addr);
a61af66fc99e Initial load
duke
parents:
diff changeset
112 const size_t res = size_t(result);
a61af66fc99e Initial load
duke
parents:
diff changeset
113 assert(res >= raw, "alignment decreased start addr");
a61af66fc99e Initial load
duke
parents:
diff changeset
114 assert(res + prefix_size + suffix_size <= raw + reserve_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
115 "alignment increased end addr");
a61af66fc99e Initial load
duke
parents:
diff changeset
116 assert((res & prefix_align - 1) == 0, "bad alignment of prefix");
a61af66fc99e Initial load
duke
parents:
diff changeset
117 assert((res + prefix_size & suffix_align - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
118 "bad alignment of suffix");
a61af66fc99e Initial load
duke
parents:
diff changeset
119 }
a61af66fc99e Initial load
duke
parents:
diff changeset
120 #endif
a61af66fc99e Initial load
duke
parents:
diff changeset
121
a61af66fc99e Initial load
duke
parents:
diff changeset
122 return result;
a61af66fc99e Initial load
duke
parents:
diff changeset
123 }
a61af66fc99e Initial load
duke
parents:
diff changeset
124
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
125 // Helper method.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
126 static bool failed_to_reserve_as_requested(char* base, char* requested_address,
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
127 const size_t size, bool special)
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
128 {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
129 if (base == requested_address || requested_address == NULL)
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
130 return false; // did not fail
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
131
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
132 if (base != NULL) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
133 // Different reserve address may be acceptable in other cases
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
134 // but for compressed oops heap should be at requested address.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
135 assert(UseCompressedOops, "currently requested address used only for compressed oops");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
136 if (PrintCompressedOopsMode) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
137 tty->cr();
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
138 tty->print_cr("Reserved memory at not requested address: " PTR_FORMAT " vs " PTR_FORMAT, base, requested_address);
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
139 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
140 // OS ignored requested address. Try different address.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
141 if (special) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
142 if (!os::release_memory_special(base, size)) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
143 fatal("os::release_memory_special failed");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
144 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
145 } else {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
146 if (!os::release_memory(base, size)) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
147 fatal("os::release_memory failed");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
148 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
149 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
150 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
151 return true;
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
152 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
153
0
a61af66fc99e Initial load
duke
parents:
diff changeset
154 ReservedSpace::ReservedSpace(const size_t prefix_size,
a61af66fc99e Initial load
duke
parents:
diff changeset
155 const size_t prefix_align,
a61af66fc99e Initial load
duke
parents:
diff changeset
156 const size_t suffix_size,
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
157 const size_t suffix_align,
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
158 char* requested_address,
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
159 const size_t noaccess_prefix)
0
a61af66fc99e Initial load
duke
parents:
diff changeset
160 {
a61af66fc99e Initial load
duke
parents:
diff changeset
161 assert(prefix_size != 0, "sanity");
a61af66fc99e Initial load
duke
parents:
diff changeset
162 assert(prefix_align != 0, "sanity");
a61af66fc99e Initial load
duke
parents:
diff changeset
163 assert(suffix_size != 0, "sanity");
a61af66fc99e Initial load
duke
parents:
diff changeset
164 assert(suffix_align != 0, "sanity");
a61af66fc99e Initial load
duke
parents:
diff changeset
165 assert((prefix_size & prefix_align - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
166 "prefix_size not divisible by prefix_align");
a61af66fc99e Initial load
duke
parents:
diff changeset
167 assert((suffix_size & suffix_align - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
168 "suffix_size not divisible by suffix_align");
a61af66fc99e Initial load
duke
parents:
diff changeset
169 assert((suffix_align & prefix_align - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
170 "suffix_align not divisible by prefix_align");
a61af66fc99e Initial load
duke
parents:
diff changeset
171
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
172 // Assert that if noaccess_prefix is used, it is the same as prefix_align.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
173 assert(noaccess_prefix == 0 ||
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
174 noaccess_prefix == prefix_align, "noaccess prefix wrong");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
175
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
176 // Add in noaccess_prefix to prefix_size;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
177 const size_t adjusted_prefix_size = prefix_size + noaccess_prefix;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
178 const size_t size = adjusted_prefix_size + suffix_size;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
179
0
a61af66fc99e Initial load
duke
parents:
diff changeset
180 // On systems where the entire region has to be reserved and committed up
a61af66fc99e Initial load
duke
parents:
diff changeset
181 // front, the compound alignment normally done by this method is unnecessary.
a61af66fc99e Initial load
duke
parents:
diff changeset
182 const bool try_reserve_special = UseLargePages &&
a61af66fc99e Initial load
duke
parents:
diff changeset
183 prefix_align == os::large_page_size();
a61af66fc99e Initial load
duke
parents:
diff changeset
184 if (!os::can_commit_large_page_memory() && try_reserve_special) {
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
185 initialize(size, prefix_align, true, requested_address, noaccess_prefix,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
186 false);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
187 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
188 }
a61af66fc99e Initial load
duke
parents:
diff changeset
189
a61af66fc99e Initial load
duke
parents:
diff changeset
190 _base = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
191 _size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
192 _alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
193 _special = false;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
194 _noaccess_prefix = 0;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
195 _executable = false;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
196
0
a61af66fc99e Initial load
duke
parents:
diff changeset
197 // Optimistically try to reserve the exact size needed.
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
198 char* addr;
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
199 if (requested_address != 0) {
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
200 requested_address -= noaccess_prefix; // adjust address
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
201 assert(requested_address != NULL, "huge noaccess prefix?");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
202 addr = os::attempt_reserve_memory_at(size, requested_address);
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
203 if (failed_to_reserve_as_requested(addr, requested_address, size, false)) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
204 // OS ignored requested address. Try different address.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
205 addr = NULL;
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
206 }
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
207 } else {
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
208 addr = os::reserve_memory(size, NULL, prefix_align);
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
209 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
210 if (addr == NULL) return;
a61af66fc99e Initial load
duke
parents:
diff changeset
211
a61af66fc99e Initial load
duke
parents:
diff changeset
212 // Check whether the result has the needed alignment (unlikely unless
a61af66fc99e Initial load
duke
parents:
diff changeset
213 // prefix_align == suffix_align).
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
214 const size_t ofs = size_t(addr) + adjusted_prefix_size & suffix_align - 1;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
215 if (ofs != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
216 // Wrong alignment. Release, allocate more space and do manual alignment.
a61af66fc99e Initial load
duke
parents:
diff changeset
217 //
a61af66fc99e Initial load
duke
parents:
diff changeset
218 // On most operating systems, another allocation with a somewhat larger size
a61af66fc99e Initial load
duke
parents:
diff changeset
219 // will return an address "close to" that of the previous allocation. The
a61af66fc99e Initial load
duke
parents:
diff changeset
220 // result is often the same address (if the kernel hands out virtual
a61af66fc99e Initial load
duke
parents:
diff changeset
221 // addresses from low to high), or an address that is offset by the increase
a61af66fc99e Initial load
duke
parents:
diff changeset
222 // in size. Exploit that to minimize the amount of extra space requested.
a61af66fc99e Initial load
duke
parents:
diff changeset
223 if (!os::release_memory(addr, size)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
224 fatal("os::release_memory failed");
a61af66fc99e Initial load
duke
parents:
diff changeset
225 }
a61af66fc99e Initial load
duke
parents:
diff changeset
226
a61af66fc99e Initial load
duke
parents:
diff changeset
227 const size_t extra = MAX2(ofs, suffix_align - ofs);
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
228 addr = reserve_and_align(size + extra, adjusted_prefix_size, prefix_align,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
229 suffix_size, suffix_align);
a61af66fc99e Initial load
duke
parents:
diff changeset
230 if (addr == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
231 // Try an even larger region. If this fails, address space is exhausted.
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
232 addr = reserve_and_align(size + suffix_align, adjusted_prefix_size,
0
a61af66fc99e Initial load
duke
parents:
diff changeset
233 prefix_align, suffix_size, suffix_align);
a61af66fc99e Initial load
duke
parents:
diff changeset
234 }
a61af66fc99e Initial load
duke
parents:
diff changeset
235 }
a61af66fc99e Initial load
duke
parents:
diff changeset
236
a61af66fc99e Initial load
duke
parents:
diff changeset
237 _base = addr;
a61af66fc99e Initial load
duke
parents:
diff changeset
238 _size = size;
a61af66fc99e Initial load
duke
parents:
diff changeset
239 _alignment = prefix_align;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
240 _noaccess_prefix = noaccess_prefix;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
241 }
a61af66fc99e Initial load
duke
parents:
diff changeset
242
a61af66fc99e Initial load
duke
parents:
diff changeset
243 void ReservedSpace::initialize(size_t size, size_t alignment, bool large,
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
244 char* requested_address,
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
245 const size_t noaccess_prefix,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
246 bool executable) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
247 const size_t granularity = os::vm_allocation_granularity();
a61af66fc99e Initial load
duke
parents:
diff changeset
248 assert((size & granularity - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
249 "size not aligned to os::vm_allocation_granularity()");
a61af66fc99e Initial load
duke
parents:
diff changeset
250 assert((alignment & granularity - 1) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
251 "alignment not aligned to os::vm_allocation_granularity()");
a61af66fc99e Initial load
duke
parents:
diff changeset
252 assert(alignment == 0 || is_power_of_2((intptr_t)alignment),
a61af66fc99e Initial load
duke
parents:
diff changeset
253 "not a power of 2");
a61af66fc99e Initial load
duke
parents:
diff changeset
254
a61af66fc99e Initial load
duke
parents:
diff changeset
255 _base = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
256 _size = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
257 _special = false;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
258 _executable = executable;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
259 _alignment = 0;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
260 _noaccess_prefix = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
261 if (size == 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
262 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
263 }
a61af66fc99e Initial load
duke
parents:
diff changeset
264
a61af66fc99e Initial load
duke
parents:
diff changeset
265 // If OS doesn't support demand paging for large page memory, we need
a61af66fc99e Initial load
duke
parents:
diff changeset
266 // to use reserve_memory_special() to reserve and pin the entire region.
a61af66fc99e Initial load
duke
parents:
diff changeset
267 bool special = large && !os::can_commit_large_page_memory();
a61af66fc99e Initial load
duke
parents:
diff changeset
268 char* base = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
269
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
270 if (requested_address != 0) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
271 requested_address -= noaccess_prefix; // adjust requested address
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
272 assert(requested_address != NULL, "huge noaccess prefix?");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
273 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
274
0
a61af66fc99e Initial load
duke
parents:
diff changeset
275 if (special) {
a61af66fc99e Initial load
duke
parents:
diff changeset
276
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
277 base = os::reserve_memory_special(size, requested_address, executable);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
278
a61af66fc99e Initial load
duke
parents:
diff changeset
279 if (base != NULL) {
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
280 if (failed_to_reserve_as_requested(base, requested_address, size, true)) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
281 // OS ignored requested address. Try different address.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
282 return;
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
283 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
284 // Check alignment constraints
a61af66fc99e Initial load
duke
parents:
diff changeset
285 if (alignment > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
286 assert((uintptr_t) base % alignment == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
287 "Large pages returned a non-aligned address");
a61af66fc99e Initial load
duke
parents:
diff changeset
288 }
a61af66fc99e Initial load
duke
parents:
diff changeset
289 _special = true;
a61af66fc99e Initial load
duke
parents:
diff changeset
290 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
291 // failed; try to reserve regular memory below
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
292 if (UseLargePages && (!FLAG_IS_DEFAULT(UseLargePages) ||
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
293 !FLAG_IS_DEFAULT(LargePageSizeInBytes))) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
294 if (PrintCompressedOopsMode) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
295 tty->cr();
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
296 tty->print_cr("Reserve regular memory without large pages.");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
297 }
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
298 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
299 }
a61af66fc99e Initial load
duke
parents:
diff changeset
300 }
a61af66fc99e Initial load
duke
parents:
diff changeset
301
a61af66fc99e Initial load
duke
parents:
diff changeset
302 if (base == NULL) {
a61af66fc99e Initial load
duke
parents:
diff changeset
303 // Optimistically assume that the OSes returns an aligned base pointer.
a61af66fc99e Initial load
duke
parents:
diff changeset
304 // When reserving a large address range, most OSes seem to align to at
a61af66fc99e Initial load
duke
parents:
diff changeset
305 // least 64K.
a61af66fc99e Initial load
duke
parents:
diff changeset
306
a61af66fc99e Initial load
duke
parents:
diff changeset
307 // If the memory was requested at a particular address, use
a61af66fc99e Initial load
duke
parents:
diff changeset
308 // os::attempt_reserve_memory_at() to avoid over mapping something
a61af66fc99e Initial load
duke
parents:
diff changeset
309 // important. If available space is not detected, return NULL.
a61af66fc99e Initial load
duke
parents:
diff changeset
310
a61af66fc99e Initial load
duke
parents:
diff changeset
311 if (requested_address != 0) {
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
312 base = os::attempt_reserve_memory_at(size, requested_address);
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
313 if (failed_to_reserve_as_requested(base, requested_address, size, false)) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
314 // OS ignored requested address. Try different address.
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
315 base = NULL;
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
316 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
317 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
318 base = os::reserve_memory(size, NULL, alignment);
a61af66fc99e Initial load
duke
parents:
diff changeset
319 }
a61af66fc99e Initial load
duke
parents:
diff changeset
320
a61af66fc99e Initial load
duke
parents:
diff changeset
321 if (base == NULL) return;
a61af66fc99e Initial load
duke
parents:
diff changeset
322
a61af66fc99e Initial load
duke
parents:
diff changeset
323 // Check alignment constraints
a61af66fc99e Initial load
duke
parents:
diff changeset
324 if (alignment > 0 && ((size_t)base & alignment - 1) != 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
325 // Base not aligned, retry
a61af66fc99e Initial load
duke
parents:
diff changeset
326 if (!os::release_memory(base, size)) fatal("os::release_memory failed");
a61af66fc99e Initial load
duke
parents:
diff changeset
327 // Reserve size large enough to do manual alignment and
a61af66fc99e Initial load
duke
parents:
diff changeset
328 // increase size to a multiple of the desired alignment
a61af66fc99e Initial load
duke
parents:
diff changeset
329 size = align_size_up(size, alignment);
a61af66fc99e Initial load
duke
parents:
diff changeset
330 size_t extra_size = size + alignment;
342
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
331 do {
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
332 char* extra_base = os::reserve_memory(extra_size, NULL, alignment);
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
333 if (extra_base == NULL) return;
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
334 // Do manual alignement
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
335 base = (char*) align_size_up((uintptr_t) extra_base, alignment);
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
336 assert(base >= extra_base, "just checking");
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
337 // Re-reserve the region at the aligned base address.
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
338 os::release_memory(extra_base, extra_size);
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
339 base = os::reserve_memory(size, base);
37f87013dfd8 6711316: Open source the Garbage-First garbage collector
ysr
parents: 0
diff changeset
340 } while (base == NULL);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
341 }
a61af66fc99e Initial load
duke
parents:
diff changeset
342 }
a61af66fc99e Initial load
duke
parents:
diff changeset
343 // Done
a61af66fc99e Initial load
duke
parents:
diff changeset
344 _base = base;
a61af66fc99e Initial load
duke
parents:
diff changeset
345 _size = size;
a61af66fc99e Initial load
duke
parents:
diff changeset
346 _alignment = MAX2(alignment, (size_t) os::vm_page_size());
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
347 _noaccess_prefix = noaccess_prefix;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
348
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
349 // Assert that if noaccess_prefix is used, it is the same as alignment.
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
350 assert(noaccess_prefix == 0 ||
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
351 noaccess_prefix == _alignment, "noaccess prefix wrong");
0
a61af66fc99e Initial load
duke
parents:
diff changeset
352
a61af66fc99e Initial load
duke
parents:
diff changeset
353 assert(markOopDesc::encode_pointer_as_mark(_base)->decode_pointer() == _base,
a61af66fc99e Initial load
duke
parents:
diff changeset
354 "area must be distinguisable from marks for mark-sweep");
a61af66fc99e Initial load
duke
parents:
diff changeset
355 assert(markOopDesc::encode_pointer_as_mark(&_base[size])->decode_pointer() == &_base[size],
a61af66fc99e Initial load
duke
parents:
diff changeset
356 "area must be distinguisable from marks for mark-sweep");
a61af66fc99e Initial load
duke
parents:
diff changeset
357 }
a61af66fc99e Initial load
duke
parents:
diff changeset
358
a61af66fc99e Initial load
duke
parents:
diff changeset
359
a61af66fc99e Initial load
duke
parents:
diff changeset
360 ReservedSpace::ReservedSpace(char* base, size_t size, size_t alignment,
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
361 bool special, bool executable) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
362 assert((size % os::vm_allocation_granularity()) == 0,
a61af66fc99e Initial load
duke
parents:
diff changeset
363 "size not allocation aligned");
a61af66fc99e Initial load
duke
parents:
diff changeset
364 _base = base;
a61af66fc99e Initial load
duke
parents:
diff changeset
365 _size = size;
a61af66fc99e Initial load
duke
parents:
diff changeset
366 _alignment = alignment;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
367 _noaccess_prefix = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
368 _special = special;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
369 _executable = executable;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
370 }
a61af66fc99e Initial load
duke
parents:
diff changeset
371
a61af66fc99e Initial load
duke
parents:
diff changeset
372
a61af66fc99e Initial load
duke
parents:
diff changeset
373 ReservedSpace ReservedSpace::first_part(size_t partition_size, size_t alignment,
a61af66fc99e Initial load
duke
parents:
diff changeset
374 bool split, bool realloc) {
a61af66fc99e Initial load
duke
parents:
diff changeset
375 assert(partition_size <= size(), "partition failed");
a61af66fc99e Initial load
duke
parents:
diff changeset
376 if (split) {
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
377 os::split_reserved_memory(base(), size(), partition_size, realloc);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
378 }
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
379 ReservedSpace result(base(), partition_size, alignment, special(),
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
380 executable());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
381 return result;
a61af66fc99e Initial load
duke
parents:
diff changeset
382 }
a61af66fc99e Initial load
duke
parents:
diff changeset
383
a61af66fc99e Initial load
duke
parents:
diff changeset
384
a61af66fc99e Initial load
duke
parents:
diff changeset
385 ReservedSpace
a61af66fc99e Initial load
duke
parents:
diff changeset
386 ReservedSpace::last_part(size_t partition_size, size_t alignment) {
a61af66fc99e Initial load
duke
parents:
diff changeset
387 assert(partition_size <= size(), "partition failed");
a61af66fc99e Initial load
duke
parents:
diff changeset
388 ReservedSpace result(base() + partition_size, size() - partition_size,
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
389 alignment, special(), executable());
0
a61af66fc99e Initial load
duke
parents:
diff changeset
390 return result;
a61af66fc99e Initial load
duke
parents:
diff changeset
391 }
a61af66fc99e Initial load
duke
parents:
diff changeset
392
a61af66fc99e Initial load
duke
parents:
diff changeset
393
a61af66fc99e Initial load
duke
parents:
diff changeset
394 size_t ReservedSpace::page_align_size_up(size_t size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
395 return align_size_up(size, os::vm_page_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
396 }
a61af66fc99e Initial load
duke
parents:
diff changeset
397
a61af66fc99e Initial load
duke
parents:
diff changeset
398
a61af66fc99e Initial load
duke
parents:
diff changeset
399 size_t ReservedSpace::page_align_size_down(size_t size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
400 return align_size_down(size, os::vm_page_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
401 }
a61af66fc99e Initial load
duke
parents:
diff changeset
402
a61af66fc99e Initial load
duke
parents:
diff changeset
403
a61af66fc99e Initial load
duke
parents:
diff changeset
404 size_t ReservedSpace::allocation_align_size_up(size_t size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
405 return align_size_up(size, os::vm_allocation_granularity());
a61af66fc99e Initial load
duke
parents:
diff changeset
406 }
a61af66fc99e Initial load
duke
parents:
diff changeset
407
a61af66fc99e Initial load
duke
parents:
diff changeset
408
a61af66fc99e Initial load
duke
parents:
diff changeset
409 size_t ReservedSpace::allocation_align_size_down(size_t size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
410 return align_size_down(size, os::vm_allocation_granularity());
a61af66fc99e Initial load
duke
parents:
diff changeset
411 }
a61af66fc99e Initial load
duke
parents:
diff changeset
412
a61af66fc99e Initial load
duke
parents:
diff changeset
413
a61af66fc99e Initial load
duke
parents:
diff changeset
414 void ReservedSpace::release() {
a61af66fc99e Initial load
duke
parents:
diff changeset
415 if (is_reserved()) {
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
416 char *real_base = _base - _noaccess_prefix;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
417 const size_t real_size = _size + _noaccess_prefix;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
418 if (special()) {
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
419 os::release_memory_special(real_base, real_size);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
420 } else{
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
421 os::release_memory(real_base, real_size);
0
a61af66fc99e Initial load
duke
parents:
diff changeset
422 }
a61af66fc99e Initial load
duke
parents:
diff changeset
423 _base = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
424 _size = 0;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
425 _noaccess_prefix = 0;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
426 _special = false;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
427 _executable = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
428 }
a61af66fc99e Initial load
duke
parents:
diff changeset
429 }
a61af66fc99e Initial load
duke
parents:
diff changeset
430
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
431 void ReservedSpace::protect_noaccess_prefix(const size_t size) {
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
432 assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
433 (size_t(_base + _size) > OopEncodingHeapMax) &&
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
434 Universe::narrow_oop_use_implicit_null_checks()),
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
435 "noaccess_prefix should be used only with non zero based compressed oops");
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
436
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
437 // If there is no noaccess prefix, return.
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
438 if (_noaccess_prefix == 0) return;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
439
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
440 assert(_noaccess_prefix >= (size_t)os::vm_page_size(),
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
441 "must be at least page size big");
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
442
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
443 // Protect memory at the base of the allocated region.
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
444 // If special, the page was committed (only matters on windows)
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
445 if (!os::protect_memory(_base, _noaccess_prefix, os::MEM_PROT_NONE,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
446 _special)) {
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
447 fatal("cannot protect protection page");
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
448 }
1618
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
449 if (PrintCompressedOopsMode) {
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
450 tty->cr();
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
451 tty->print_cr("Protected page at the reserved heap base: " PTR_FORMAT " / " INTX_FORMAT " bytes", _base, _noaccess_prefix);
5f249b390094 6947341: JVM Crash running Oracle ATG CRMDemo
kvn
parents: 1552
diff changeset
452 }
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
453
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
454 _base += _noaccess_prefix;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
455 _size -= _noaccess_prefix;
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
456 assert((size == _size) && ((uintptr_t)_base % _alignment == 0),
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
457 "must be exactly of required size and alignment");
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
458 }
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
459
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
460 ReservedHeapSpace::ReservedHeapSpace(size_t size, size_t alignment,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
461 bool large, char* requested_address) :
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
462 ReservedSpace(size, alignment, large,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
463 requested_address,
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
464 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
465 Universe::narrow_oop_use_implicit_null_checks()) ?
325
93befa083681 6741004: UseLargePages + UseCompressedOops breaks implicit null checking guard page
coleenp
parents: 237
diff changeset
466 lcm(os::vm_page_size(), alignment) : 0) {
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
467 // Only reserved space for the java heap should have a noaccess_prefix
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
468 // if using compressed oops.
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
469 protect_noaccess_prefix(size);
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
470 }
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
471
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
472 ReservedHeapSpace::ReservedHeapSpace(const size_t prefix_size,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
473 const size_t prefix_align,
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
474 const size_t suffix_size,
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
475 const size_t suffix_align,
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
476 char* requested_address) :
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
477 ReservedSpace(prefix_size, prefix_align, suffix_size, suffix_align,
642
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
478 requested_address,
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
479 (UseCompressedOops && (Universe::narrow_oop_base() != NULL) &&
660978a2a31a 6791178: Specialize for zero as the compressed oop vm heap base
kvn
parents: 380
diff changeset
480 Universe::narrow_oop_use_implicit_null_checks()) ?
325
93befa083681 6741004: UseLargePages + UseCompressedOops breaks implicit null checking guard page
coleenp
parents: 237
diff changeset
481 lcm(os::vm_page_size(), prefix_align) : 0) {
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
482 protect_noaccess_prefix(prefix_size+suffix_size);
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
483 }
0
a61af66fc99e Initial load
duke
parents:
diff changeset
484
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
485 // Reserve space for code segment. Same as Java heap only we mark this as
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
486 // executable.
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
487 ReservedCodeSpace::ReservedCodeSpace(size_t r_size,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
488 size_t rs_align,
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
489 bool large) :
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
490 ReservedSpace(r_size, rs_align, large, /*executable*/ true) {
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
491 }
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
492
0
a61af66fc99e Initial load
duke
parents:
diff changeset
493 // VirtualSpace
a61af66fc99e Initial load
duke
parents:
diff changeset
494
a61af66fc99e Initial load
duke
parents:
diff changeset
495 VirtualSpace::VirtualSpace() {
a61af66fc99e Initial load
duke
parents:
diff changeset
496 _low_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
497 _high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
498 _low = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
499 _high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
500 _lower_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
501 _middle_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
502 _upper_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
503 _lower_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
504 _middle_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
505 _upper_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
506 _lower_alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
507 _middle_alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
508 _upper_alignment = 0;
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
509 _special = false;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
510 _executable = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
511 }
a61af66fc99e Initial load
duke
parents:
diff changeset
512
a61af66fc99e Initial load
duke
parents:
diff changeset
513
a61af66fc99e Initial load
duke
parents:
diff changeset
514 bool VirtualSpace::initialize(ReservedSpace rs, size_t committed_size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
515 if(!rs.is_reserved()) return false; // allocation failed.
a61af66fc99e Initial load
duke
parents:
diff changeset
516 assert(_low_boundary == NULL, "VirtualSpace already initialized");
a61af66fc99e Initial load
duke
parents:
diff changeset
517 _low_boundary = rs.base();
a61af66fc99e Initial load
duke
parents:
diff changeset
518 _high_boundary = low_boundary() + rs.size();
a61af66fc99e Initial load
duke
parents:
diff changeset
519
a61af66fc99e Initial load
duke
parents:
diff changeset
520 _low = low_boundary();
a61af66fc99e Initial load
duke
parents:
diff changeset
521 _high = low();
a61af66fc99e Initial load
duke
parents:
diff changeset
522
a61af66fc99e Initial load
duke
parents:
diff changeset
523 _special = rs.special();
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
524 _executable = rs.executable();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
525
a61af66fc99e Initial load
duke
parents:
diff changeset
526 // When a VirtualSpace begins life at a large size, make all future expansion
a61af66fc99e Initial load
duke
parents:
diff changeset
527 // and shrinking occur aligned to a granularity of large pages. This avoids
a61af66fc99e Initial load
duke
parents:
diff changeset
528 // fragmentation of physical addresses that inhibits the use of large pages
a61af66fc99e Initial load
duke
parents:
diff changeset
529 // by the OS virtual memory system. Empirically, we see that with a 4MB
a61af66fc99e Initial load
duke
parents:
diff changeset
530 // page size, the only spaces that get handled this way are codecache and
a61af66fc99e Initial load
duke
parents:
diff changeset
531 // the heap itself, both of which provide a substantial performance
a61af66fc99e Initial load
duke
parents:
diff changeset
532 // boost in many benchmarks when covered by large pages.
a61af66fc99e Initial load
duke
parents:
diff changeset
533 //
a61af66fc99e Initial load
duke
parents:
diff changeset
534 // No attempt is made to force large page alignment at the very top and
a61af66fc99e Initial load
duke
parents:
diff changeset
535 // bottom of the space if they are not aligned so already.
a61af66fc99e Initial load
duke
parents:
diff changeset
536 _lower_alignment = os::vm_page_size();
a61af66fc99e Initial load
duke
parents:
diff changeset
537 _middle_alignment = os::page_size_for_region(rs.size(), rs.size(), 1);
a61af66fc99e Initial load
duke
parents:
diff changeset
538 _upper_alignment = os::vm_page_size();
a61af66fc99e Initial load
duke
parents:
diff changeset
539
a61af66fc99e Initial load
duke
parents:
diff changeset
540 // End of each region
a61af66fc99e Initial load
duke
parents:
diff changeset
541 _lower_high_boundary = (char*) round_to((intptr_t) low_boundary(), middle_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
542 _middle_high_boundary = (char*) round_down((intptr_t) high_boundary(), middle_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
543 _upper_high_boundary = high_boundary();
a61af66fc99e Initial load
duke
parents:
diff changeset
544
a61af66fc99e Initial load
duke
parents:
diff changeset
545 // High address of each region
a61af66fc99e Initial load
duke
parents:
diff changeset
546 _lower_high = low_boundary();
a61af66fc99e Initial load
duke
parents:
diff changeset
547 _middle_high = lower_high_boundary();
a61af66fc99e Initial load
duke
parents:
diff changeset
548 _upper_high = middle_high_boundary();
a61af66fc99e Initial load
duke
parents:
diff changeset
549
a61af66fc99e Initial load
duke
parents:
diff changeset
550 // commit to initial size
a61af66fc99e Initial load
duke
parents:
diff changeset
551 if (committed_size > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
552 if (!expand_by(committed_size)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
553 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
554 }
a61af66fc99e Initial load
duke
parents:
diff changeset
555 }
a61af66fc99e Initial load
duke
parents:
diff changeset
556 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
557 }
a61af66fc99e Initial load
duke
parents:
diff changeset
558
a61af66fc99e Initial load
duke
parents:
diff changeset
559
a61af66fc99e Initial load
duke
parents:
diff changeset
560 VirtualSpace::~VirtualSpace() {
a61af66fc99e Initial load
duke
parents:
diff changeset
561 release();
a61af66fc99e Initial load
duke
parents:
diff changeset
562 }
a61af66fc99e Initial load
duke
parents:
diff changeset
563
a61af66fc99e Initial load
duke
parents:
diff changeset
564
a61af66fc99e Initial load
duke
parents:
diff changeset
565 void VirtualSpace::release() {
237
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
566 // This does not release memory it never reserved.
1fdb98a17101 6716785: implicit null checks not triggering with CompressedOops
coleenp
parents: 0
diff changeset
567 // Caller must release via rs.release();
0
a61af66fc99e Initial load
duke
parents:
diff changeset
568 _low_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
569 _high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
570 _low = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
571 _high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
572 _lower_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
573 _middle_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
574 _upper_high = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
575 _lower_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
576 _middle_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
577 _upper_high_boundary = NULL;
a61af66fc99e Initial load
duke
parents:
diff changeset
578 _lower_alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
579 _middle_alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
580 _upper_alignment = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
581 _special = false;
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
582 _executable = false;
0
a61af66fc99e Initial load
duke
parents:
diff changeset
583 }
a61af66fc99e Initial load
duke
parents:
diff changeset
584
a61af66fc99e Initial load
duke
parents:
diff changeset
585
a61af66fc99e Initial load
duke
parents:
diff changeset
586 size_t VirtualSpace::committed_size() const {
a61af66fc99e Initial load
duke
parents:
diff changeset
587 return pointer_delta(high(), low(), sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
588 }
a61af66fc99e Initial load
duke
parents:
diff changeset
589
a61af66fc99e Initial load
duke
parents:
diff changeset
590
a61af66fc99e Initial load
duke
parents:
diff changeset
591 size_t VirtualSpace::reserved_size() const {
a61af66fc99e Initial load
duke
parents:
diff changeset
592 return pointer_delta(high_boundary(), low_boundary(), sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
593 }
a61af66fc99e Initial load
duke
parents:
diff changeset
594
a61af66fc99e Initial load
duke
parents:
diff changeset
595
a61af66fc99e Initial load
duke
parents:
diff changeset
596 size_t VirtualSpace::uncommitted_size() const {
a61af66fc99e Initial load
duke
parents:
diff changeset
597 return reserved_size() - committed_size();
a61af66fc99e Initial load
duke
parents:
diff changeset
598 }
a61af66fc99e Initial load
duke
parents:
diff changeset
599
a61af66fc99e Initial load
duke
parents:
diff changeset
600
a61af66fc99e Initial load
duke
parents:
diff changeset
601 bool VirtualSpace::contains(const void* p) const {
a61af66fc99e Initial load
duke
parents:
diff changeset
602 return low() <= (const char*) p && (const char*) p < high();
a61af66fc99e Initial load
duke
parents:
diff changeset
603 }
a61af66fc99e Initial load
duke
parents:
diff changeset
604
a61af66fc99e Initial load
duke
parents:
diff changeset
605 /*
a61af66fc99e Initial load
duke
parents:
diff changeset
606 First we need to determine if a particular virtual space is using large
a61af66fc99e Initial load
duke
parents:
diff changeset
607 pages. This is done at the initialize function and only virtual spaces
a61af66fc99e Initial load
duke
parents:
diff changeset
608 that are larger than LargePageSizeInBytes use large pages. Once we
a61af66fc99e Initial load
duke
parents:
diff changeset
609 have determined this, all expand_by and shrink_by calls must grow and
a61af66fc99e Initial load
duke
parents:
diff changeset
610 shrink by large page size chunks. If a particular request
a61af66fc99e Initial load
duke
parents:
diff changeset
611 is within the current large page, the call to commit and uncommit memory
a61af66fc99e Initial load
duke
parents:
diff changeset
612 can be ignored. In the case that the low and high boundaries of this
a61af66fc99e Initial load
duke
parents:
diff changeset
613 space is not large page aligned, the pages leading to the first large
a61af66fc99e Initial load
duke
parents:
diff changeset
614 page address and the pages after the last large page address must be
a61af66fc99e Initial load
duke
parents:
diff changeset
615 allocated with default pages.
a61af66fc99e Initial load
duke
parents:
diff changeset
616 */
a61af66fc99e Initial load
duke
parents:
diff changeset
617 bool VirtualSpace::expand_by(size_t bytes, bool pre_touch) {
a61af66fc99e Initial load
duke
parents:
diff changeset
618 if (uncommitted_size() < bytes) return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
619
a61af66fc99e Initial load
duke
parents:
diff changeset
620 if (special()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
621 // don't commit memory if the entire space is pinned in memory
a61af66fc99e Initial load
duke
parents:
diff changeset
622 _high += bytes;
a61af66fc99e Initial load
duke
parents:
diff changeset
623 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
624 }
a61af66fc99e Initial load
duke
parents:
diff changeset
625
a61af66fc99e Initial load
duke
parents:
diff changeset
626 char* previous_high = high();
a61af66fc99e Initial load
duke
parents:
diff changeset
627 char* unaligned_new_high = high() + bytes;
a61af66fc99e Initial load
duke
parents:
diff changeset
628 assert(unaligned_new_high <= high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
629 "cannot expand by more than upper boundary");
a61af66fc99e Initial load
duke
parents:
diff changeset
630
a61af66fc99e Initial load
duke
parents:
diff changeset
631 // Calculate where the new high for each of the regions should be. If
a61af66fc99e Initial load
duke
parents:
diff changeset
632 // the low_boundary() and high_boundary() are LargePageSizeInBytes aligned
a61af66fc99e Initial load
duke
parents:
diff changeset
633 // then the unaligned lower and upper new highs would be the
a61af66fc99e Initial load
duke
parents:
diff changeset
634 // lower_high() and upper_high() respectively.
a61af66fc99e Initial load
duke
parents:
diff changeset
635 char* unaligned_lower_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
636 MIN2(unaligned_new_high, lower_high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
637 char* unaligned_middle_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
638 MIN2(unaligned_new_high, middle_high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
639 char* unaligned_upper_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
640 MIN2(unaligned_new_high, upper_high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
641
a61af66fc99e Initial load
duke
parents:
diff changeset
642 // Align the new highs based on the regions alignment. lower and upper
a61af66fc99e Initial load
duke
parents:
diff changeset
643 // alignment will always be default page size. middle alignment will be
a61af66fc99e Initial load
duke
parents:
diff changeset
644 // LargePageSizeInBytes if the actual size of the virtual space is in
a61af66fc99e Initial load
duke
parents:
diff changeset
645 // fact larger than LargePageSizeInBytes.
a61af66fc99e Initial load
duke
parents:
diff changeset
646 char* aligned_lower_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
647 (char*) round_to((intptr_t) unaligned_lower_new_high, lower_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
648 char* aligned_middle_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
649 (char*) round_to((intptr_t) unaligned_middle_new_high, middle_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
650 char* aligned_upper_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
651 (char*) round_to((intptr_t) unaligned_upper_new_high, upper_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
652
a61af66fc99e Initial load
duke
parents:
diff changeset
653 // Determine which regions need to grow in this expand_by call.
a61af66fc99e Initial load
duke
parents:
diff changeset
654 // If you are growing in the lower region, high() must be in that
a61af66fc99e Initial load
duke
parents:
diff changeset
655 // region so calcuate the size based on high(). For the middle and
a61af66fc99e Initial load
duke
parents:
diff changeset
656 // upper regions, determine the starting point of growth based on the
a61af66fc99e Initial load
duke
parents:
diff changeset
657 // location of high(). By getting the MAX of the region's low address
a61af66fc99e Initial load
duke
parents:
diff changeset
658 // (or the prevoius region's high address) and high(), we can tell if it
a61af66fc99e Initial load
duke
parents:
diff changeset
659 // is an intra or inter region growth.
a61af66fc99e Initial load
duke
parents:
diff changeset
660 size_t lower_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
661 if (aligned_lower_new_high > lower_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
662 lower_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
663 pointer_delta(aligned_lower_new_high, lower_high(), sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
664 }
a61af66fc99e Initial load
duke
parents:
diff changeset
665 size_t middle_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
666 if (aligned_middle_new_high > middle_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
667 middle_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
668 pointer_delta(aligned_middle_new_high, middle_high(), sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
669 }
a61af66fc99e Initial load
duke
parents:
diff changeset
670 size_t upper_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
671 if (aligned_upper_new_high > upper_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
672 upper_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
673 pointer_delta(aligned_upper_new_high, upper_high(), sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
674 }
a61af66fc99e Initial load
duke
parents:
diff changeset
675
a61af66fc99e Initial load
duke
parents:
diff changeset
676 // Check contiguity.
a61af66fc99e Initial load
duke
parents:
diff changeset
677 assert(low_boundary() <= lower_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
678 lower_high() <= lower_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
679 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
680 assert(lower_high_boundary() <= middle_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
681 middle_high() <= middle_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
682 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
683 assert(middle_high_boundary() <= upper_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
684 upper_high() <= upper_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
685 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
686
a61af66fc99e Initial load
duke
parents:
diff changeset
687 // Commit regions
a61af66fc99e Initial load
duke
parents:
diff changeset
688 if (lower_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
689 assert(low_boundary() <= lower_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
690 lower_high() + lower_needs <= lower_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
691 "must not expand beyond region");
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
692 if (!os::commit_memory(lower_high(), lower_needs, _executable)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
693 debug_only(warning("os::commit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
694 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
695 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
696 _lower_high += lower_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
697 }
a61af66fc99e Initial load
duke
parents:
diff changeset
698 }
a61af66fc99e Initial load
duke
parents:
diff changeset
699 if (middle_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
700 assert(lower_high_boundary() <= middle_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
701 middle_high() + middle_needs <= middle_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
702 "must not expand beyond region");
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
703 if (!os::commit_memory(middle_high(), middle_needs, middle_alignment(),
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
704 _executable)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
705 debug_only(warning("os::commit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
706 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
707 }
a61af66fc99e Initial load
duke
parents:
diff changeset
708 _middle_high += middle_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
709 }
a61af66fc99e Initial load
duke
parents:
diff changeset
710 if (upper_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
711 assert(middle_high_boundary() <= upper_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
712 upper_high() + upper_needs <= upper_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
713 "must not expand beyond region");
656
6bdd6923ba16 6541756: Reduce executable C-heap
coleenp
parents: 642
diff changeset
714 if (!os::commit_memory(upper_high(), upper_needs, _executable)) {
0
a61af66fc99e Initial load
duke
parents:
diff changeset
715 debug_only(warning("os::commit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
716 return false;
a61af66fc99e Initial load
duke
parents:
diff changeset
717 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
718 _upper_high += upper_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
719 }
a61af66fc99e Initial load
duke
parents:
diff changeset
720 }
a61af66fc99e Initial load
duke
parents:
diff changeset
721
a61af66fc99e Initial load
duke
parents:
diff changeset
722 if (pre_touch || AlwaysPreTouch) {
a61af66fc99e Initial load
duke
parents:
diff changeset
723 int vm_ps = os::vm_page_size();
a61af66fc99e Initial load
duke
parents:
diff changeset
724 for (char* curr = previous_high;
a61af66fc99e Initial load
duke
parents:
diff changeset
725 curr < unaligned_new_high;
a61af66fc99e Initial load
duke
parents:
diff changeset
726 curr += vm_ps) {
a61af66fc99e Initial load
duke
parents:
diff changeset
727 // Note the use of a write here; originally we tried just a read, but
a61af66fc99e Initial load
duke
parents:
diff changeset
728 // since the value read was unused, the optimizer removed the read.
a61af66fc99e Initial load
duke
parents:
diff changeset
729 // If we ever have a concurrent touchahead thread, we'll want to use
a61af66fc99e Initial load
duke
parents:
diff changeset
730 // a read, to avoid the potential of overwriting data (if a mutator
a61af66fc99e Initial load
duke
parents:
diff changeset
731 // thread beats the touchahead thread to a page). There are various
a61af66fc99e Initial load
duke
parents:
diff changeset
732 // ways of making sure this read is not optimized away: for example,
a61af66fc99e Initial load
duke
parents:
diff changeset
733 // generating the code for a read procedure at runtime.
a61af66fc99e Initial load
duke
parents:
diff changeset
734 *curr = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
735 }
a61af66fc99e Initial load
duke
parents:
diff changeset
736 }
a61af66fc99e Initial load
duke
parents:
diff changeset
737
a61af66fc99e Initial load
duke
parents:
diff changeset
738 _high += bytes;
a61af66fc99e Initial load
duke
parents:
diff changeset
739 return true;
a61af66fc99e Initial load
duke
parents:
diff changeset
740 }
a61af66fc99e Initial load
duke
parents:
diff changeset
741
a61af66fc99e Initial load
duke
parents:
diff changeset
742 // A page is uncommitted if the contents of the entire page is deemed unusable.
a61af66fc99e Initial load
duke
parents:
diff changeset
743 // Continue to decrement the high() pointer until it reaches a page boundary
a61af66fc99e Initial load
duke
parents:
diff changeset
744 // in which case that particular page can now be uncommitted.
a61af66fc99e Initial load
duke
parents:
diff changeset
745 void VirtualSpace::shrink_by(size_t size) {
a61af66fc99e Initial load
duke
parents:
diff changeset
746 if (committed_size() < size)
a61af66fc99e Initial load
duke
parents:
diff changeset
747 fatal("Cannot shrink virtual space to negative size");
a61af66fc99e Initial load
duke
parents:
diff changeset
748
a61af66fc99e Initial load
duke
parents:
diff changeset
749 if (special()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
750 // don't uncommit if the entire space is pinned in memory
a61af66fc99e Initial load
duke
parents:
diff changeset
751 _high -= size;
a61af66fc99e Initial load
duke
parents:
diff changeset
752 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
753 }
a61af66fc99e Initial load
duke
parents:
diff changeset
754
a61af66fc99e Initial load
duke
parents:
diff changeset
755 char* unaligned_new_high = high() - size;
a61af66fc99e Initial load
duke
parents:
diff changeset
756 assert(unaligned_new_high >= low_boundary(), "cannot shrink past lower boundary");
a61af66fc99e Initial load
duke
parents:
diff changeset
757
a61af66fc99e Initial load
duke
parents:
diff changeset
758 // Calculate new unaligned address
a61af66fc99e Initial load
duke
parents:
diff changeset
759 char* unaligned_upper_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
760 MAX2(unaligned_new_high, middle_high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
761 char* unaligned_middle_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
762 MAX2(unaligned_new_high, lower_high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
763 char* unaligned_lower_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
764 MAX2(unaligned_new_high, low_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
765
a61af66fc99e Initial load
duke
parents:
diff changeset
766 // Align address to region's alignment
a61af66fc99e Initial load
duke
parents:
diff changeset
767 char* aligned_upper_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
768 (char*) round_to((intptr_t) unaligned_upper_new_high, upper_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
769 char* aligned_middle_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
770 (char*) round_to((intptr_t) unaligned_middle_new_high, middle_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
771 char* aligned_lower_new_high =
a61af66fc99e Initial load
duke
parents:
diff changeset
772 (char*) round_to((intptr_t) unaligned_lower_new_high, lower_alignment());
a61af66fc99e Initial load
duke
parents:
diff changeset
773
a61af66fc99e Initial load
duke
parents:
diff changeset
774 // Determine which regions need to shrink
a61af66fc99e Initial load
duke
parents:
diff changeset
775 size_t upper_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
776 if (aligned_upper_new_high < upper_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
777 upper_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
778 pointer_delta(upper_high(), aligned_upper_new_high, sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
779 }
a61af66fc99e Initial load
duke
parents:
diff changeset
780 size_t middle_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
781 if (aligned_middle_new_high < middle_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
782 middle_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
783 pointer_delta(middle_high(), aligned_middle_new_high, sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
784 }
a61af66fc99e Initial load
duke
parents:
diff changeset
785 size_t lower_needs = 0;
a61af66fc99e Initial load
duke
parents:
diff changeset
786 if (aligned_lower_new_high < lower_high()) {
a61af66fc99e Initial load
duke
parents:
diff changeset
787 lower_needs =
a61af66fc99e Initial load
duke
parents:
diff changeset
788 pointer_delta(lower_high(), aligned_lower_new_high, sizeof(char));
a61af66fc99e Initial load
duke
parents:
diff changeset
789 }
a61af66fc99e Initial load
duke
parents:
diff changeset
790
a61af66fc99e Initial load
duke
parents:
diff changeset
791 // Check contiguity.
a61af66fc99e Initial load
duke
parents:
diff changeset
792 assert(middle_high_boundary() <= upper_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
793 upper_high() <= upper_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
794 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
795 assert(lower_high_boundary() <= middle_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
796 middle_high() <= middle_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
797 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
798 assert(low_boundary() <= lower_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
799 lower_high() <= lower_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
800 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
801
a61af66fc99e Initial load
duke
parents:
diff changeset
802 // Uncommit
a61af66fc99e Initial load
duke
parents:
diff changeset
803 if (upper_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
804 assert(middle_high_boundary() <= aligned_upper_new_high &&
a61af66fc99e Initial load
duke
parents:
diff changeset
805 aligned_upper_new_high + upper_needs <= upper_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
806 "must not shrink beyond region");
a61af66fc99e Initial load
duke
parents:
diff changeset
807 if (!os::uncommit_memory(aligned_upper_new_high, upper_needs)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
808 debug_only(warning("os::uncommit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
809 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
810 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
811 _upper_high -= upper_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
812 }
a61af66fc99e Initial load
duke
parents:
diff changeset
813 }
a61af66fc99e Initial load
duke
parents:
diff changeset
814 if (middle_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
815 assert(lower_high_boundary() <= aligned_middle_new_high &&
a61af66fc99e Initial load
duke
parents:
diff changeset
816 aligned_middle_new_high + middle_needs <= middle_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
817 "must not shrink beyond region");
a61af66fc99e Initial load
duke
parents:
diff changeset
818 if (!os::uncommit_memory(aligned_middle_new_high, middle_needs)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
819 debug_only(warning("os::uncommit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
820 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
821 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
822 _middle_high -= middle_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
823 }
a61af66fc99e Initial load
duke
parents:
diff changeset
824 }
a61af66fc99e Initial load
duke
parents:
diff changeset
825 if (lower_needs > 0) {
a61af66fc99e Initial load
duke
parents:
diff changeset
826 assert(low_boundary() <= aligned_lower_new_high &&
a61af66fc99e Initial load
duke
parents:
diff changeset
827 aligned_lower_new_high + lower_needs <= lower_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
828 "must not shrink beyond region");
a61af66fc99e Initial load
duke
parents:
diff changeset
829 if (!os::uncommit_memory(aligned_lower_new_high, lower_needs)) {
a61af66fc99e Initial load
duke
parents:
diff changeset
830 debug_only(warning("os::uncommit_memory failed"));
a61af66fc99e Initial load
duke
parents:
diff changeset
831 return;
a61af66fc99e Initial load
duke
parents:
diff changeset
832 } else {
a61af66fc99e Initial load
duke
parents:
diff changeset
833 _lower_high -= lower_needs;
a61af66fc99e Initial load
duke
parents:
diff changeset
834 }
a61af66fc99e Initial load
duke
parents:
diff changeset
835 }
a61af66fc99e Initial load
duke
parents:
diff changeset
836
a61af66fc99e Initial load
duke
parents:
diff changeset
837 _high -= size;
a61af66fc99e Initial load
duke
parents:
diff changeset
838 }
a61af66fc99e Initial load
duke
parents:
diff changeset
839
a61af66fc99e Initial load
duke
parents:
diff changeset
840 #ifndef PRODUCT
a61af66fc99e Initial load
duke
parents:
diff changeset
841 void VirtualSpace::check_for_contiguity() {
a61af66fc99e Initial load
duke
parents:
diff changeset
842 // Check contiguity.
a61af66fc99e Initial load
duke
parents:
diff changeset
843 assert(low_boundary() <= lower_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
844 lower_high() <= lower_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
845 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
846 assert(lower_high_boundary() <= middle_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
847 middle_high() <= middle_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
848 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
849 assert(middle_high_boundary() <= upper_high() &&
a61af66fc99e Initial load
duke
parents:
diff changeset
850 upper_high() <= upper_high_boundary(),
a61af66fc99e Initial load
duke
parents:
diff changeset
851 "high address must be contained within the region");
a61af66fc99e Initial load
duke
parents:
diff changeset
852 assert(low() >= low_boundary(), "low");
a61af66fc99e Initial load
duke
parents:
diff changeset
853 assert(low_boundary() <= lower_high_boundary(), "lower high boundary");
a61af66fc99e Initial load
duke
parents:
diff changeset
854 assert(upper_high_boundary() <= high_boundary(), "upper high boundary");
a61af66fc99e Initial load
duke
parents:
diff changeset
855 assert(high() <= upper_high(), "upper high");
a61af66fc99e Initial load
duke
parents:
diff changeset
856 }
a61af66fc99e Initial load
duke
parents:
diff changeset
857
a61af66fc99e Initial load
duke
parents:
diff changeset
858 void VirtualSpace::print() {
a61af66fc99e Initial load
duke
parents:
diff changeset
859 tty->print ("Virtual space:");
a61af66fc99e Initial load
duke
parents:
diff changeset
860 if (special()) tty->print(" (pinned in memory)");
a61af66fc99e Initial load
duke
parents:
diff changeset
861 tty->cr();
a61af66fc99e Initial load
duke
parents:
diff changeset
862 tty->print_cr(" - committed: %ld", committed_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
863 tty->print_cr(" - reserved: %ld", reserved_size());
a61af66fc99e Initial load
duke
parents:
diff changeset
864 tty->print_cr(" - [low, high]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low(), high());
a61af66fc99e Initial load
duke
parents:
diff changeset
865 tty->print_cr(" - [low_b, high_b]: [" INTPTR_FORMAT ", " INTPTR_FORMAT "]", low_boundary(), high_boundary());
a61af66fc99e Initial load
duke
parents:
diff changeset
866 }
a61af66fc99e Initial load
duke
parents:
diff changeset
867
a61af66fc99e Initial load
duke
parents:
diff changeset
868 #endif