Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	Thu May 15 18:23:26 2014 -0400
     1.2 +++ b/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp	Thu May 22 15:52:41 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -277,7 +277,7 @@
    1.11    assert(_nextMarkBitMap->isMarked(objAddr), "invariant");
    1.12  
    1.13    if (_cm->verbose_high()) {
    1.14 -    gclog_or_tty->print_cr("[%u] pushing "PTR_FORMAT, _worker_id, (void*) obj);
    1.15 +    gclog_or_tty->print_cr("[%u] pushing " PTR_FORMAT, _worker_id, p2i((void*) obj));
    1.16    }
    1.17  
    1.18    if (!_task_queue->push(obj)) {
    1.19 @@ -317,7 +317,7 @@
    1.20  inline void CMTask::deal_with_reference(oop obj) {
    1.21    if (_cm->verbose_high()) {
    1.22      gclog_or_tty->print_cr("[%u] we're dealing with reference = "PTR_FORMAT,
    1.23 -                           _worker_id, (void*) obj);
    1.24 +                           _worker_id, p2i((void*) obj));
    1.25    }
    1.26  
    1.27    ++_refs_reached;
    1.28 @@ -334,7 +334,7 @@
    1.29        if (!hr->obj_allocated_since_next_marking(obj)) {
    1.30          if (_cm->verbose_high()) {
    1.31            gclog_or_tty->print_cr("[%u] "PTR_FORMAT" is not considered marked",
    1.32 -                                 _worker_id, (void*) obj);
    1.33 +                                 _worker_id, p2i((void*) obj));
    1.34          }
    1.35  
    1.36          // we need to mark it first
    1.37 @@ -349,7 +349,7 @@
    1.38            if (_finger != NULL && objAddr < _finger) {
    1.39              if (_cm->verbose_high()) {
    1.40                gclog_or_tty->print_cr("[%u] below the local finger ("PTR_FORMAT"), "
    1.41 -                                     "pushing it", _worker_id, _finger);
    1.42 +                                     "pushing it", _worker_id, p2i(_finger));
    1.43              }
    1.44              push(obj);
    1.45            } else if (_curr_region != NULL && objAddr < _region_limit) {
    1.46 @@ -367,7 +367,7 @@
    1.47              if (_cm->verbose_high()) {
    1.48                gclog_or_tty->print_cr("[%u] below the global finger "
    1.49                                       "("PTR_FORMAT"), pushing it",
    1.50 -                                     _worker_id, global_finger);
    1.51 +                                     _worker_id, p2i(global_finger));
    1.52              }
    1.53              push(obj);
    1.54            } else {
    1.55 @@ -382,7 +382,7 @@
    1.56              if (_cm->verbose_high()) {
    1.57                gclog_or_tty->print_cr("[%u] below the global finger "
    1.58                                       "("PTR_FORMAT"), pushing it",
    1.59 -                                     _worker_id, global_finger);
    1.60 +                                     _worker_id, p2i(global_finger));
    1.61              }
    1.62              push(obj);
    1.63            }