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

     1.1 --- a/src/share/vm/runtime/deoptimization.cpp	Wed Oct 16 10:52:41 2013 +0200
     1.2 +++ b/src/share/vm/runtime/deoptimization.cpp	Tue Nov 05 17:38:04 2013 -0800
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 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 @@ -237,7 +237,7 @@
    1.11          assert(Universe::heap()->is_in_or_null(result), "must be heap pointer");
    1.12          if (TraceDeoptimization) {
    1.13            ttyLocker ttyl;
    1.14 -          tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, result, thread);
    1.15 +          tty->print_cr("SAVED OOP RESULT " INTPTR_FORMAT " in thread " INTPTR_FORMAT, (void *)result, thread);
    1.16          }
    1.17        }
    1.18        bool reallocated = false;
    1.19 @@ -281,7 +281,7 @@
    1.20                    first = false;
    1.21                    tty->print_cr("RELOCK OBJECTS in thread " INTPTR_FORMAT, thread);
    1.22                  }
    1.23 -                tty->print_cr("     object <" INTPTR_FORMAT "> locked", mi->owner());
    1.24 +                tty->print_cr("     object <" INTPTR_FORMAT "> locked", (void *)mi->owner());
    1.25                }
    1.26              }
    1.27            }
    1.28 @@ -980,7 +980,7 @@
    1.29      KlassHandle k(java_lang_Class::as_Klass(sv->klass()->as_ConstantOopReadValue()->value()()));
    1.30      Handle obj = sv->value();
    1.31  
    1.32 -    tty->print("     object <" INTPTR_FORMAT "> of type ", sv->value()());
    1.33 +    tty->print("     object <" INTPTR_FORMAT "> of type ", (void *)sv->value()());
    1.34      k->print_value();
    1.35      tty->print(" allocated (%d bytes)", obj->size() * HeapWordSize);
    1.36      tty->cr();
    1.37 @@ -1754,7 +1754,7 @@
    1.38    else    return trap_state & ~DS_RECOMPILE_BIT;
    1.39  }
    1.40  //---------------------------format_trap_state---------------------------------
    1.41 -// This is used for debugging and diagnostics, including hotspot.log output.
    1.42 +// This is used for debugging and diagnostics, including LogFile output.
    1.43  const char* Deoptimization::format_trap_state(char* buf, size_t buflen,
    1.44                                                int trap_state) {
    1.45    DeoptReason reason      = trap_state_reason(trap_state);
    1.46 @@ -1831,7 +1831,7 @@
    1.47    return buf;
    1.48  }
    1.49  
    1.50 -// This is used for debugging and diagnostics, including hotspot.log output.
    1.51 +// This is used for debugging and diagnostics, including LogFile output.
    1.52  const char* Deoptimization::format_trap_request(char* buf, size_t buflen,
    1.53                                                  int trap_request) {
    1.54    jint unloaded_class_index = trap_request_index(trap_request);