comparison src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp @ 2114:4fc084dac61e

7009756: volatile variables could be broken throw reflection API Summary: Use Atomic::load() and Atomic::store() to access a volatile long. Reviewed-by: iveresov, jrose, dholmes, never
author kvn
date Fri, 07 Jan 2011 10:16:57 -0800
parents f95d63e2154a
children cd3d6a6b95d9
comparison
equal deleted inserted replaced
2113:0e52ef6e94d3 2114:4fc084dac61e
1 /* 1 /*
2 * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 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 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
23 */ 23 */
24 24
25 #ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP 25 #ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
26 #define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP 26 #define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
27 27
28 #include "runtime/atomic.hpp"
28 #include "runtime/orderAccess.hpp" 29 #include "runtime/orderAccess.hpp"
29 #include "vm_version_x86.hpp" 30 #include "vm_version_x86.hpp"
30 31
31 // Implementation of class OrderAccess. 32 // Implementation of class OrderAccess.
32 33
78 #endif // GNU_SOURCE 79 #endif // GNU_SOURCE
79 80
80 inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; } 81 inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; }
81 inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; } 82 inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; }
82 inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; } 83 inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; }
83 inline jlong OrderAccess::load_acquire(volatile jlong* p) { return *p; } 84 inline jlong OrderAccess::load_acquire(volatile jlong* p) { return Atomic::load(p); }
84 inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; } 85 inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; }
85 inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; } 86 inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; }
86 inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; } 87 inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; }
87 inline julong OrderAccess::load_acquire(volatile julong* p) { return *p; } 88 inline julong OrderAccess::load_acquire(volatile julong* p) { return Atomic::load((volatile jlong*)p); }
88 inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; } 89 inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; }
89 inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; } 90 inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; }
90 91
91 inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; } 92 inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; }
92 inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; } 93 inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; }
93 inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; } 94 inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; }
94 95
95 inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; } 96 inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; }
96 inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; } 97 inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; }
97 inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; } 98 inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; }
98 inline void OrderAccess::release_store(volatile jlong* p, jlong v) { *p = v; } 99 inline void OrderAccess::release_store(volatile jlong* p, jlong v) { Atomic::store(v, p); }
99 inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; } 100 inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; }
100 inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; } 101 inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; }
101 inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; } 102 inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; }
102 inline void OrderAccess::release_store(volatile julong* p, julong v) { *p = v; } 103 inline void OrderAccess::release_store(volatile julong* p, julong v) { Atomic::store((jlong)v, (volatile jlong*)p); }
103 inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; } 104 inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; }
104 inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; } 105 inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; }
105 106
106 inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; } 107 inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; }
107 inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; } 108 inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; }
121 inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); } 122 inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); }
122 123
123 inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { *p = v; fence(); } 124 inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { *p = v; fence(); }
124 inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { *p = v; fence(); } 125 inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { *p = v; fence(); }
125 inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { *p = v; fence(); } 126 inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { *p = v; fence(); }
126 inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { *p = v; fence(); } 127 inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { release_store(p, v); fence(); }
127 inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { *p = v; fence(); } 128 inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { *p = v; fence(); }
128 inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); } 129 inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); }
129 inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { *p = v; fence(); } 130 inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { *p = v; fence(); }
130 inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { *p = v; fence(); } 131 inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store(p, v); fence(); }
131 inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); } 132 inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); }
132 inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); } 133 inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); }
133 134
134 inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); } 135 inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
135 inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); } 136 inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }