Mercurial > hg > truffle

annotate src/cpu/zero/vm/icBuffer_zero.cpp @ 1359:23b1b27ac76c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6909756: G1: guarantee(G1CollectedHeap::heap()->mark_in_progress(),"Precondition.") Summary: Make sure that two marking cycles do not overlap, i.e., a new one can only start after the concurrent marking thread finishes all its work. In the fix I piggy-back a couple of minor extra fixes: some general code reformatting for consistency (only around the code I modified), the removal of a field (G1CollectorPolicy::_should_initiate_conc_mark) which doesn't seem to be used at all (it's only set but never read), as well as moving the "is GC locker active" test earlier into the G1 pause / Full GC and using a more appropriate method for it. Reviewed-by: johnc, jmasa, jcoomes, ysr
author tonyp
date Tue, 06 Apr 2010 10:59:45 -0400
parents 354d3184f6b2
children c18cbe5936b8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1010
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
1 /*
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
2 * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
3 * Copyright 2007 Red Hat, Inc.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
4 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
5 *
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
6 * This code is free software; you can redistribute it and/or modify it
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
7 * under the terms of the GNU General Public License version 2 only, as
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
8 * published by the Free Software Foundation.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
9 *
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
10 * This code is distributed in the hope that it will be useful, but WITHOUT
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
11 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
12 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
13 * version 2 for more details (a copy is included in the LICENSE file that
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
14 * accompanied this code).
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
15 *
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
16 * You should have received a copy of the GNU General Public License version
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
17 * 2 along with this work; if not, write to the Free Software Foundation,
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
18 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
19 *
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
20 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
21 * CA 95054 USA or visit www.sun.com if you need additional information or
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
22 * have any questions.
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
23 *
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
24 */
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
25
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
26 #include "incls/_precompiled.incl"
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
27 #include "incls/_icBuffer_zero.cpp.incl"
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
28
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
29 int InlineCacheBuffer::ic_stub_code_size() {
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
30 // NB set this once the functions below are implemented
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
31 return 4;
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
32 }
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
33
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
34 void InlineCacheBuffer::assemble_ic_buffer_code(address code_begin,
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
35 oop cached_oop,
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
36 address entry_point) {
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
37 // NB ic_stub_code_size() must return the size of the code we generate
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
38 ShouldNotCallThis();
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
39 }
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
40
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
41 address InlineCacheBuffer::ic_buffer_entry_point(address code_begin) {
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
42 // NB ic_stub_code_size() must return the size of the code we generate
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
43 ShouldNotCallThis();
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
44 }
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
45
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
46 oop InlineCacheBuffer::ic_buffer_cached_oop(address code_begin) {
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
47 // NB ic_stub_code_size() must return the size of the code we generate
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
48 ShouldNotCallThis();
354d3184f6b2 6890308: integrate zero assembler hotspot changes
never
parents:
diff changeset
49 }