comparison src/share/vm/memory/universe.cpp @ 9062:8be1318fbe77

Merge
author dcubed
date Fri, 05 Apr 2013 10:38:08 -0700
parents 24ef5fb05e0f cc32ccaaf47f
children 89e4d67fdd2a b06ac540229e b295e132102d
comparison
equal deleted inserted replaced
9055:dcdeb150988c 9062:8be1318fbe77
1324 1324
1325 static uintptr_t _verify_oop_data[2] = {0, (uintptr_t)-1}; 1325 static uintptr_t _verify_oop_data[2] = {0, (uintptr_t)-1};
1326 static uintptr_t _verify_klass_data[2] = {0, (uintptr_t)-1}; 1326 static uintptr_t _verify_klass_data[2] = {0, (uintptr_t)-1};
1327 1327
1328 1328
1329 #ifndef PRODUCT
1330
1329 static void calculate_verify_data(uintptr_t verify_data[2], 1331 static void calculate_verify_data(uintptr_t verify_data[2],
1330 HeapWord* low_boundary, 1332 HeapWord* low_boundary,
1331 HeapWord* high_boundary) { 1333 HeapWord* high_boundary) {
1332 assert(low_boundary < high_boundary, "bad interval"); 1334 assert(low_boundary < high_boundary, "bad interval");
1333 1335
1358 } 1360 }
1359 verify_data[0] = mask; 1361 verify_data[0] = mask;
1360 verify_data[1] = bits; 1362 verify_data[1] = bits;
1361 } 1363 }
1362 1364
1363
1364 // Oop verification (see MacroAssembler::verify_oop) 1365 // Oop verification (see MacroAssembler::verify_oop)
1365 #ifndef PRODUCT
1366 1366
1367 uintptr_t Universe::verify_oop_mask() { 1367 uintptr_t Universe::verify_oop_mask() {
1368 MemRegion m = heap()->reserved_region(); 1368 MemRegion m = heap()->reserved_region();
1369 calculate_verify_data(_verify_oop_data, 1369 calculate_verify_data(_verify_oop_data,
1370 m.start(), 1370 m.start(),