Mercurial > hg > truffle
annotate src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp @ 17833:bfdf528be8e8
8038498: Fix includes and C inlining after 8035330
Summary: Change 8035330: Remove G1ParScanPartialArrayClosure and G1ParScanHeapEvacClosure broke the debug build on AIX. The method do_oop_partial_array() is added in a header, but requires the inline function par_write_ref() through several inlined calls. In some cpp files, like arguments.cpp, par_write_ref() is not defined as the corresponding inline header and is not included. The AIX debug VM does not start because of the missing symbol. This change solves this by cleaning up include dependencies.
Reviewed-by: tschatzl, stefank
author | tschatzl |
---|---|
date | Fri, 04 Apr 2014 10:43:56 +0200 |
parents | 63e54c37ac64 |
children |
rev | line source |
---|---|
0 | 1 /* |
8675
63e54c37ac64
8008959: Fix non-PCH build on Linux, Windows and MacOS X
simonis
parents:
2140
diff
changeset
|
2 * Copyright (c) 2003, 2013, 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:
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 | 22 * |
23 */ | |
24 | |
1972 | 25 #ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP |
26 #define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP | |
27 | |
8675
63e54c37ac64
8008959: Fix non-PCH build on Linux, Windows and MacOS X
simonis
parents:
2140
diff
changeset
|
28 #include "runtime/atomic.inline.hpp" |
1972 | 29 #include "runtime/orderAccess.hpp" |
30 #include "vm_version_sparc.hpp" | |
31 | |
0 | 32 // Implementation of class OrderAccess. |
33 | |
34 // Assume TSO. | |
35 | |
36 // In solaris_sparc.il | |
37 extern "C" void _OrderAccess_acquire(); | |
38 extern "C" void _OrderAccess_fence(); | |
39 | |
40 inline void OrderAccess::loadload() { acquire(); } | |
41 inline void OrderAccess::storestore() { release(); } | |
42 inline void OrderAccess::loadstore() { acquire(); } | |
43 inline void OrderAccess::storeload() { fence(); } | |
44 | |
45 #ifdef _GNU_SOURCE | |
46 | |
47 inline void OrderAccess::acquire() { | |
48 __asm__ volatile ("nop" : : :); | |
49 } | |
50 | |
51 inline void OrderAccess::release() { | |
1711
a6bff45449bc
6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging
ysr
parents:
1552
diff
changeset
|
52 jint* local_dummy = (jint*)&local_dummy; |
a6bff45449bc
6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging
ysr
parents:
1552
diff
changeset
|
53 __asm__ volatile("stw %%g0, [%0]" : : "r" (local_dummy) : "memory"); |
0 | 54 } |
55 | |
56 inline void OrderAccess::fence() { | |
57 __asm__ volatile ("membar #StoreLoad" : : :); | |
58 } | |
59 | |
60 #else // _GNU_SOURCE | |
61 | |
62 inline void OrderAccess::acquire() { | |
63 _OrderAccess_acquire(); | |
64 } | |
65 | |
66 inline void OrderAccess::release() { | |
1711
a6bff45449bc
6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging
ysr
parents:
1552
diff
changeset
|
67 // Avoid hitting the same cache-line from |
a6bff45449bc
6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging
ysr
parents:
1552
diff
changeset
|
68 // different threads. |
a6bff45449bc
6973570: OrderAccess::storestore() scales poorly on multi-socket x64 and sparc: cache-line ping-ponging
ysr
parents:
1552
diff
changeset
|
69 volatile jint local_dummy = 0; |
0 | 70 } |
71 | |
72 inline void OrderAccess::fence() { | |
73 _OrderAccess_fence(); | |
74 } | |
75 | |
76 #endif // _GNU_SOURCE | |
77 | |
78 inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; } | |
79 inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; } | |
80 inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
81 inline jlong OrderAccess::load_acquire(volatile jlong* p) { return Atomic::load(p); } |
0 | 82 inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; } |
83 inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; } | |
84 inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
85 inline julong OrderAccess::load_acquire(volatile julong* p) { return Atomic::load((volatile jlong*)p); } |
0 | 86 inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; } |
87 inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; } | |
88 | |
89 inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; } | |
90 inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; } | |
91 inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; } | |
92 | |
93 inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; } | |
94 inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; } | |
95 inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
96 inline void OrderAccess::release_store(volatile jlong* p, jlong v) { Atomic::store(v, p); } |
0 | 97 inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; } |
98 inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; } | |
99 inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
100 inline void OrderAccess::release_store(volatile julong* p, julong v) { Atomic::store((jlong)v, (volatile jlong*)p); } |
0 | 101 inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; } |
102 inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; } | |
103 | |
104 inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; } | |
105 inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; } | |
106 | |
107 inline void OrderAccess::store_fence(jbyte* p, jbyte v) { *p = v; fence(); } | |
108 inline void OrderAccess::store_fence(jshort* p, jshort v) { *p = v; fence(); } | |
109 inline void OrderAccess::store_fence(jint* p, jint v) { *p = v; fence(); } | |
110 inline void OrderAccess::store_fence(jlong* p, jlong v) { *p = v; fence(); } | |
111 inline void OrderAccess::store_fence(jubyte* p, jubyte v) { *p = v; fence(); } | |
112 inline void OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); } | |
113 inline void OrderAccess::store_fence(juint* p, juint v) { *p = v; fence(); } | |
114 inline void OrderAccess::store_fence(julong* p, julong v) { *p = v; fence(); } | |
115 inline void OrderAccess::store_fence(jfloat* p, jfloat v) { *p = v; fence(); } | |
116 inline void OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); } | |
117 | |
118 inline void OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); } | |
119 inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); } | |
120 | |
121 inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { *p = v; fence(); } | |
122 inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { *p = v; fence(); } | |
123 inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { *p = v; fence(); } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
124 inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { release_store(p, v); fence(); } |
0 | 125 inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { *p = v; fence(); } |
126 inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); } | |
127 inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { *p = v; fence(); } | |
2140
85c73c0edb06
7012965: Fix failed on sparc for 7009756: volatile variables could be broken throw reflection API
kvn
parents:
1972
diff
changeset
|
128 inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store(p, v); fence(); } |
0 | 129 inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); } |
130 inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); } | |
131 | |
132 inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } | |
133 inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } | |
1972 | 134 |
135 #endif // OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP |