Mercurial > hg > graal-jvmci-8
annotate src/share/vm/memory/barrierSet.inline.hpp @ 1721:413ad0331a0c
6977924: Changes for 6975078 produce build error with certain gcc versions
Summary: The changes introduced for 6975078 assign badHeapOopVal to the _allocation field in the ResourceObj class. In 32 bit linux builds with certain versions of gcc this assignment will be flagged as an error while compiling allocation.cpp. In 32 bit builds the constant value badHeapOopVal (which is cast to an intptr_t) is negative. The _allocation field is typed as an unsigned intptr_t and gcc catches this as an error.
Reviewed-by: jcoomes, ysr, phh
author | johnc |
---|---|
date | Wed, 18 Aug 2010 10:59:06 -0700 |
parents | c18cbe5936b8 |
children | f95d63e2154a |
rev | line source |
---|---|
0 | 1 /* |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1245
diff
changeset
|
2 * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1245
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1245
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:
1245
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
25 // Inline functions of BarrierSet, which de-virtualize certain | |
845
df6caf649ff7
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
356
diff
changeset
|
26 // performance-critical calls when the barrier is the most common |
0 | 27 // card-table kind. |
28 | |
845
df6caf649ff7
6700789: G1: Enable use of compressed oops with G1 heaps
ysr
parents:
356
diff
changeset
|
29 template <class T> void BarrierSet::write_ref_field_pre(T* field, oop new_val) { |
342
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
30 if (kind() == CardTableModRef) { |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
31 ((CardTableModRefBS*)this)->inline_write_ref_field_pre(field, new_val); |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
32 } else { |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
33 write_ref_field_pre_work(field, new_val); |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
34 } |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
35 } |
37f87013dfd8
6711316: Open source the Garbage-First garbage collector
ysr
parents:
113
diff
changeset
|
36 |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
0
diff
changeset
|
37 void BarrierSet::write_ref_field(void* field, oop new_val) { |
0 | 38 if (kind() == CardTableModRef) { |
39 ((CardTableModRefBS*)this)->inline_write_ref_field(field, new_val); | |
40 } else { | |
41 write_ref_field_work(field, new_val); | |
42 } | |
43 } | |
44 | |
1091
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
45 // count is number of array elements being written |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
46 void BarrierSet::write_ref_array(HeapWord* start, size_t count) { |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
47 assert(count <= (size_t)max_intx, "count too large"); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
48 HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize)); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
49 // In the case of compressed oops, start and end may potentially be misaligned; |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
50 // so we need to conservatively align the first downward (this is not |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
51 // strictly necessary for current uses, but a case of good hygiene and, |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
52 // if you will, aesthetics) and the second upward (this is essential for |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
53 // current uses) to a HeapWord boundary, so we mark all cards overlapping |
1245
6484c4ee11cb
6904516: More object array barrier fixes, following up on 6906727
ysr
parents:
1091
diff
changeset
|
54 // this write. If this evolves in the future to calling a |
1091
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
55 // logging barrier of narrow oop granularity, like the pre-barrier for G1 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
56 // (mentioned here merely by way of example), we will need to change this |
1245
6484c4ee11cb
6904516: More object array barrier fixes, following up on 6906727
ysr
parents:
1091
diff
changeset
|
57 // interface, so it is "exactly precise" (if i may be allowed the adverbial |
6484c4ee11cb
6904516: More object array barrier fixes, following up on 6906727
ysr
parents:
1091
diff
changeset
|
58 // redundancy for emphasis) and does not include narrow oop slots not |
6484c4ee11cb
6904516: More object array barrier fixes, following up on 6906727
ysr
parents:
1091
diff
changeset
|
59 // included in the original write interval. |
1091
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
60 HeapWord* aligned_start = (HeapWord*)align_size_down((uintptr_t)start, HeapWordSize); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
61 HeapWord* aligned_end = (HeapWord*)align_size_up ((uintptr_t)end, HeapWordSize); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
62 // If compressed oops were not being used, these should already be aligned |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
63 assert(UseCompressedOops || (aligned_start == start && aligned_end == end), |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
64 "Expected heap word alignment of start and end"); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
65 #if 0 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
66 warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t", |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
67 start, count, aligned_start, aligned_end); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
68 #endif |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
69 write_ref_array_work(MemRegion(aligned_start, aligned_end)); |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
70 } |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
71 |
6aa7255741f3
6906727: UseCompressedOops: some card-marking fixes related to object arrays
ysr
parents:
845
diff
changeset
|
72 |
0 | 73 void BarrierSet::write_region(MemRegion mr) { |
74 if (kind() == CardTableModRef) { | |
75 ((CardTableModRefBS*)this)->inline_write_region(mr); | |
76 } else { | |
77 write_region_work(mr); | |
78 } | |
79 } |