Tue, 11 May 2010 14:35:43 -0700
6931180: Migration to recent versions of MS Platform SDK
6951582: Build problems on win64
Summary: Changes to enable building JDK7 with Microsoft Visual Studio 2010
Reviewed-by: ohair, art, ccheung, dcubed
duke@435 | 1 | /* |
xdono@631 | 2 | * Copyright 2001-2008 Sun Microsystems, Inc. All Rights Reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
duke@435 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
duke@435 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
duke@435 | 21 | * have any questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | // Inline functions of BarrierSet, which de-virtualize certain |
ysr@1280 | 26 | // performance-critical calls when the barrier is the most common |
duke@435 | 27 | // card-table kind. |
duke@435 | 28 | |
ysr@1280 | 29 | template <class T> void BarrierSet::write_ref_field_pre(T* field, oop new_val) { |
ysr@777 | 30 | if (kind() == CardTableModRef) { |
ysr@777 | 31 | ((CardTableModRefBS*)this)->inline_write_ref_field_pre(field, new_val); |
ysr@777 | 32 | } else { |
ysr@777 | 33 | write_ref_field_pre_work(field, new_val); |
ysr@777 | 34 | } |
ysr@777 | 35 | } |
ysr@777 | 36 | |
coleenp@548 | 37 | void BarrierSet::write_ref_field(void* field, oop new_val) { |
duke@435 | 38 | if (kind() == CardTableModRef) { |
duke@435 | 39 | ((CardTableModRefBS*)this)->inline_write_ref_field(field, new_val); |
duke@435 | 40 | } else { |
duke@435 | 41 | write_ref_field_work(field, new_val); |
duke@435 | 42 | } |
duke@435 | 43 | } |
duke@435 | 44 | |
ysr@1526 | 45 | // count is number of array elements being written |
ysr@1526 | 46 | void BarrierSet::write_ref_array(HeapWord* start, size_t count) { |
ysr@1526 | 47 | assert(count <= (size_t)max_intx, "count too large"); |
ysr@1526 | 48 | HeapWord* end = (HeapWord*)((char*)start + (count*heapOopSize)); |
ysr@1526 | 49 | // In the case of compressed oops, start and end may potentially be misaligned; |
ysr@1526 | 50 | // so we need to conservatively align the first downward (this is not |
ysr@1526 | 51 | // strictly necessary for current uses, but a case of good hygiene and, |
ysr@1526 | 52 | // if you will, aesthetics) and the second upward (this is essential for |
ysr@1526 | 53 | // current uses) to a HeapWord boundary, so we mark all cards overlapping |
ysr@1680 | 54 | // this write. If this evolves in the future to calling a |
ysr@1526 | 55 | // logging barrier of narrow oop granularity, like the pre-barrier for G1 |
ysr@1526 | 56 | // (mentioned here merely by way of example), we will need to change this |
ysr@1680 | 57 | // interface, so it is "exactly precise" (if i may be allowed the adverbial |
ysr@1680 | 58 | // redundancy for emphasis) and does not include narrow oop slots not |
ysr@1680 | 59 | // included in the original write interval. |
ysr@1526 | 60 | HeapWord* aligned_start = (HeapWord*)align_size_down((uintptr_t)start, HeapWordSize); |
ysr@1526 | 61 | HeapWord* aligned_end = (HeapWord*)align_size_up ((uintptr_t)end, HeapWordSize); |
ysr@1526 | 62 | // If compressed oops were not being used, these should already be aligned |
ysr@1526 | 63 | assert(UseCompressedOops || (aligned_start == start && aligned_end == end), |
ysr@1526 | 64 | "Expected heap word alignment of start and end"); |
ysr@1526 | 65 | #if 0 |
ysr@1526 | 66 | warning("Post:\t" INTPTR_FORMAT "[" SIZE_FORMAT "] : [" INTPTR_FORMAT","INTPTR_FORMAT")\t", |
ysr@1526 | 67 | start, count, aligned_start, aligned_end); |
ysr@1526 | 68 | #endif |
ysr@1526 | 69 | write_ref_array_work(MemRegion(aligned_start, aligned_end)); |
ysr@1526 | 70 | } |
ysr@1526 | 71 | |
ysr@1526 | 72 | |
duke@435 | 73 | void BarrierSet::write_region(MemRegion mr) { |
duke@435 | 74 | if (kind() == CardTableModRef) { |
duke@435 | 75 | ((CardTableModRefBS*)this)->inline_write_region(mr); |
duke@435 | 76 | } else { |
duke@435 | 77 | write_region_work(mr); |
duke@435 | 78 | } |
duke@435 | 79 | } |