1 |
diff -up jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 openjdk/hotspot/src/share/vm/utilities/bitMap.inline.hpp |
2 |
--- jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp.s390 2012-02-10 08:30:46.378435291 -0500 |
3 |
+++ jdk8/hotspot/src/share/vm/utilities/bitMap.inline.hpp 2012-02-10 08:47:27.478427892 -0500 |
4 |
@@ -52,16 +52,16 @@ inline void BitMap::clear_bit(idx_t bit) |
5 |
|
6 |
inline bool BitMap::par_set_bit(idx_t bit) { |
7 |
verify_index(bit); |
8 |
- volatile idx_t* const addr = word_addr(bit); |
9 |
- const idx_t mask = bit_mask(bit); |
10 |
- idx_t old_val = *addr; |
11 |
+ volatile bm_word_t* const addr = word_addr(bit); |
12 |
+ const bm_word_t mask = bit_mask(bit); |
13 |
+ bm_word_t old_val = *addr; |
14 |
|
15 |
do { |
16 |
- const idx_t new_val = old_val | mask; |
17 |
+ const bm_word_t new_val = old_val | mask; |
18 |
if (new_val == old_val) { |
19 |
return false; // Someone else beat us to it. |
20 |
} |
21 |
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val, |
22 |
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val, |
23 |
(volatile void*) addr, |
24 |
(void*) old_val); |
25 |
if (cur_val == old_val) { |
26 |
@@ -73,16 +73,16 @@ inline bool BitMap::par_set_bit(idx_t bi |
27 |
|
28 |
inline bool BitMap::par_clear_bit(idx_t bit) { |
29 |
verify_index(bit); |
30 |
- volatile idx_t* const addr = word_addr(bit); |
31 |
- const idx_t mask = ~bit_mask(bit); |
32 |
- idx_t old_val = *addr; |
33 |
+ volatile bm_word_t* const addr = word_addr(bit); |
34 |
+ const bm_word_t mask = ~bit_mask(bit); |
35 |
+ bm_word_t old_val = *addr; |
36 |
|
37 |
do { |
38 |
- const idx_t new_val = old_val & mask; |
39 |
+ const bm_word_t new_val = old_val & mask; |
40 |
if (new_val == old_val) { |
41 |
return false; // Someone else beat us to it. |
42 |
} |
43 |
- const idx_t cur_val = (idx_t) Atomic::cmpxchg_ptr((void*) new_val, |
44 |
+ const bm_word_t cur_val = (bm_word_t) Atomic::cmpxchg_ptr((void*) new_val, |
45 |
(volatile void*) addr, |
46 |
(void*) old_val); |
47 |
if (cur_val == old_val) { |