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

     1.1 --- a/src/share/vm/runtime/biasedLocking.cpp	Wed Sep 25 17:47:51 2013 +0200
     1.2 +++ b/src/share/vm/runtime/biasedLocking.cpp	Thu Sep 26 10:25:02 2013 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2005, 2013, 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 @@ -161,7 +161,7 @@
    1.11    if (TraceBiasedLocking && (Verbose || !is_bulk)) {
    1.12      ResourceMark rm;
    1.13      tty->print_cr("Revoking bias of object " INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s , prototype header " INTPTR_FORMAT " , allow rebias %d , requesting thread " INTPTR_FORMAT,
    1.14 -                  (intptr_t) obj, (intptr_t) mark, obj->klass()->external_name(), (intptr_t) obj->klass()->prototype_header(), (allow_rebias ? 1 : 0), (intptr_t) requesting_thread);
    1.15 +                  (void *)obj, (intptr_t) mark, obj->klass()->external_name(), (intptr_t) obj->klass()->prototype_header(), (allow_rebias ? 1 : 0), (intptr_t) requesting_thread);
    1.16    }
    1.17  
    1.18    JavaThread* biased_thread = mark->biased_locker();
    1.19 @@ -214,8 +214,8 @@
    1.20      if (mon_info->owner() == obj) {
    1.21        if (TraceBiasedLocking && Verbose) {
    1.22          tty->print_cr("   mon_info->owner (" PTR_FORMAT ") == obj (" PTR_FORMAT ")",
    1.23 -                      (intptr_t) mon_info->owner(),
    1.24 -                      (intptr_t) obj);
    1.25 +                      (void *) mon_info->owner(),
    1.26 +                      (void *) obj);
    1.27        }
    1.28        // Assume recursive case and fix up highest lock later
    1.29        markOop mark = markOopDesc::encode((BasicLock*) NULL);
    1.30 @@ -224,8 +224,8 @@
    1.31      } else {
    1.32        if (TraceBiasedLocking && Verbose) {
    1.33          tty->print_cr("   mon_info->owner (" PTR_FORMAT ") != obj (" PTR_FORMAT ")",
    1.34 -                      (intptr_t) mon_info->owner(),
    1.35 -                      (intptr_t) obj);
    1.36 +                      (void *) mon_info->owner(),
    1.37 +                      (void *) obj);
    1.38        }
    1.39      }
    1.40    }
    1.41 @@ -326,7 +326,7 @@
    1.42      tty->print_cr("* Beginning bulk revocation (kind == %s) because of object "
    1.43                    INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s",
    1.44                    (bulk_rebias ? "rebias" : "revoke"),
    1.45 -                  (intptr_t) o, (intptr_t) o->mark(), o->klass()->external_name());
    1.46 +                  (void *) o, (intptr_t) o->mark(), o->klass()->external_name());
    1.47    }
    1.48  
    1.49    jlong cur_time = os::javaTimeMillis();