Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/cpu/ppc/vm/vm_version_ppc.cpp	Thu May 15 18:23:26 2014 -0400
     1.2 +++ b/src/cpu/ppc/vm/vm_version_ppc.cpp	Thu May 22 15:52:41 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * Copyright 2012, 2014 SAP AG. All rights reserved.
     1.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9   *
    1.10 @@ -149,7 +149,7 @@
    1.11  }
    1.12  
    1.13  void VM_Version::print_features() {
    1.14 -  tty->print_cr("Version: %s cache_line_size = %d", cpu_features(), get_cache_line_size());
    1.15 +  tty->print_cr("Version: %s cache_line_size = %d", cpu_features(), (int) get_cache_line_size());
    1.16  }
    1.17  
    1.18  #ifdef COMPILER2

     2.1 --- a/src/cpu/sparc/vm/vm_version_sparc.cpp	Thu May 15 18:23:26 2014 -0400
     2.2 +++ b/src/cpu/sparc/vm/vm_version_sparc.cpp	Thu May 22 15:52:41 2014 -0400
     2.3 @@ -318,22 +318,22 @@
     2.4            tty->print("BIS");
     2.5        }
     2.6        if (AllocatePrefetchLines > 1) {
     2.7 -        tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
     2.8 +        tty->print_cr(" at distance %d, %d lines of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchLines, (int) AllocatePrefetchStepSize);
     2.9        } else {
    2.10 -        tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
    2.11 +        tty->print_cr(" at distance %d, one line of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchStepSize);
    2.12        }
    2.13      }
    2.14      if (PrefetchCopyIntervalInBytes > 0) {
    2.15 -      tty->print_cr("PrefetchCopyIntervalInBytes %d", PrefetchCopyIntervalInBytes);
    2.16 +      tty->print_cr("PrefetchCopyIntervalInBytes %d", (int) PrefetchCopyIntervalInBytes);
    2.17      }
    2.18      if (PrefetchScanIntervalInBytes > 0) {
    2.19 -      tty->print_cr("PrefetchScanIntervalInBytes %d", PrefetchScanIntervalInBytes);
    2.20 +      tty->print_cr("PrefetchScanIntervalInBytes %d", (int) PrefetchScanIntervalInBytes);
    2.21      }
    2.22      if (PrefetchFieldsAhead > 0) {
    2.23 -      tty->print_cr("PrefetchFieldsAhead %d", PrefetchFieldsAhead);
    2.24 +      tty->print_cr("PrefetchFieldsAhead %d", (int) PrefetchFieldsAhead);
    2.25      }
    2.26      if (ContendedPaddingWidth > 0) {
    2.27 -      tty->print_cr("ContendedPaddingWidth %d", ContendedPaddingWidth);
    2.28 +      tty->print_cr("ContendedPaddingWidth %d", (int) ContendedPaddingWidth);
    2.29      }
    2.30    }
    2.31  #endif // PRODUCT

     3.1 --- a/src/cpu/x86/vm/assembler_x86.cpp	Thu May 15 18:23:26 2014 -0400
     3.2 +++ b/src/cpu/x86/vm/assembler_x86.cpp	Thu May 22 15:52:41 2014 -0400
     3.3 @@ -1,5 +1,5 @@
     3.4  /*
     3.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     3.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.8   *
     3.9   * This code is free software; you can redistribute it and/or modify it
    3.10 @@ -522,11 +522,11 @@
    3.11      // these asserts are somewhat nonsensical
    3.12  #ifndef _LP64
    3.13      assert(which == imm_operand || which == disp32_operand,
    3.14 -           err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip));
    3.15 +           err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip)));
    3.16  #else
    3.17      assert((which == call32_operand || which == imm_operand) && is_64bit ||
    3.18             which == narrow_oop_operand && !is_64bit,
    3.19 -           err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, ip));
    3.20 +           err_msg("which %d is_64_bit %d ip " INTPTR_FORMAT, which, is_64bit, p2i(ip)));
    3.21  #endif // _LP64
    3.22      return ip;
    3.23  

     4.1 --- a/src/cpu/x86/vm/c1_LinearScan_x86.cpp	Thu May 15 18:23:26 2014 -0400
     4.2 +++ b/src/cpu/x86/vm/c1_LinearScan_x86.cpp	Thu May 22 15:52:41 2014 -0400
     4.3 @@ -1,5 +1,5 @@
     4.4  /*
     4.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
     4.6 + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
     4.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8   *
     4.9   * This code is free software; you can redistribute it and/or modify it
    4.10 @@ -95,7 +95,7 @@
    4.11  
    4.12  #ifndef PRODUCT
    4.13          if (TraceFPURegisterUsage) {
    4.14 -          tty->print("FPU regs for block %d, LIR instr %d): ", b->block_id(), id); regs.print_on(tty); tty->print_cr("");
    4.15 +          tty->print("FPU regs for block %d, LIR instr %d): ", b->block_id(), id); regs.print_on(tty); tty->cr();
    4.16          }
    4.17  #endif
    4.18        }

     5.1 --- a/src/cpu/x86/vm/compiledIC_x86.cpp	Thu May 15 18:23:26 2014 -0400
     5.2 +++ b/src/cpu/x86/vm/compiledIC_x86.cpp	Thu May 22 15:52:41 2014 -0400
     5.3 @@ -1,5 +1,5 @@
     5.4  /*
     5.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     5.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     5.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     5.8   *
     5.9   * This code is free software; you can redistribute it and/or modify it
    5.10 @@ -122,7 +122,7 @@
    5.11    if (TraceICs) {
    5.12      ResourceMark rm;
    5.13      tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_interpreted %s",
    5.14 -                  instruction_address(),
    5.15 +                  p2i(instruction_address()),
    5.16                    callee->name_and_sig_as_C_string());
    5.17    }
    5.18  

     6.1 --- a/src/cpu/x86/vm/frame_x86.cpp	Thu May 15 18:23:26 2014 -0400
     6.2 +++ b/src/cpu/x86/vm/frame_x86.cpp	Thu May 22 15:52:41 2014 -0400
     6.3 @@ -1,5 +1,5 @@
     6.4  /*
     6.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     6.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     6.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.8   *
     6.9   * This code is free software; you can redistribute it and/or modify it
    6.10 @@ -48,6 +48,7 @@
    6.11  }
    6.12  #endif
    6.13  
    6.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    6.15  
    6.16  // Profiling/safepoint support
    6.17  

     7.1 --- a/src/cpu/x86/vm/interpreter_x86_64.cpp	Thu May 15 18:23:26 2014 -0400
     7.2 +++ b/src/cpu/x86/vm/interpreter_x86_64.cpp	Thu May 22 15:52:41 2014 -0400
     7.3 @@ -1,5 +1,5 @@
     7.4  /*
     7.5 - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
     7.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.8   *
     7.9   * This code is free software; you can redistribute it and/or modify it
    7.10 @@ -51,6 +51,7 @@
    7.11  
    7.12  #define __ _masm->
    7.13  
    7.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    7.15  
    7.16  #ifdef _WIN64
    7.17  address AbstractInterpreterGenerator::generate_slow_signature_handler() {

     8.1 --- a/src/cpu/x86/vm/macroAssembler_x86.cpp	Thu May 15 18:23:26 2014 -0400
     8.2 +++ b/src/cpu/x86/vm/macroAssembler_x86.cpp	Thu May 22 15:52:41 2014 -0400
     8.3 @@ -1,5 +1,5 @@
     8.4  /*
     8.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     8.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     8.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     8.8   *
     8.9   * This code is free software; you can redistribute it and/or modify it
    8.10 @@ -55,6 +55,7 @@
    8.11  
    8.12  #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
    8.13  
    8.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    8.15  
    8.16  #ifdef ASSERT
    8.17  bool AbstractAssembler::pd_check_instruction_mark() { return true; }

     9.1 --- a/src/cpu/x86/vm/methodHandles_x86.cpp	Thu May 15 18:23:26 2014 -0400
     9.2 +++ b/src/cpu/x86/vm/methodHandles_x86.cpp	Thu May 22 15:52:41 2014 -0400
     9.3 @@ -1,5 +1,5 @@
     9.4  /*
     9.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     9.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     9.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     9.8   *
     9.9   * This code is free software; you can redistribute it and/or modify it
    9.10 @@ -29,6 +29,8 @@
    9.11  #include "memory/allocation.inline.hpp"
    9.12  #include "prims/methodHandles.hpp"
    9.13  
    9.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    9.15 +
    9.16  #define __ _masm->
    9.17  
    9.18  #ifdef PRODUCT

    10.1 --- a/src/cpu/x86/vm/nativeInst_x86.cpp	Thu May 15 18:23:26 2014 -0400
    10.2 +++ b/src/cpu/x86/vm/nativeInst_x86.cpp	Thu May 22 15:52:41 2014 -0400
    10.3 @@ -1,5 +1,5 @@
    10.4  /*
    10.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    10.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    10.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.8   *
    10.9   * This code is free software; you can redistribute it and/or modify it
   10.10 @@ -35,6 +35,8 @@
   10.11  #include "c1/c1_Runtime1.hpp"
   10.12  #endif
   10.13  
   10.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   10.15 +
   10.16  void NativeInstruction::wrote(int offset) {
   10.17    ICache::invalidate_word(addr_at(offset));
   10.18  }

    11.1 --- a/src/cpu/x86/vm/vm_version_x86.cpp	Thu May 15 18:23:26 2014 -0400
    11.2 +++ b/src/cpu/x86/vm/vm_version_x86.cpp	Thu May 22 15:52:41 2014 -0400
    11.3 @@ -1,5 +1,5 @@
    11.4  /*
    11.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    11.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    11.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.8   *
    11.9   * This code is free software; you can redistribute it and/or modify it
   11.10 @@ -925,16 +925,16 @@
   11.11    if (PrintMiscellaneous && Verbose) {
   11.12      tty->print_cr("Logical CPUs per core: %u",
   11.13                    logical_processors_per_package());
   11.14 -    tty->print("UseSSE=%d",UseSSE);
   11.15 +    tty->print("UseSSE=%d", (int) UseSSE);
   11.16      if (UseAVX > 0) {
   11.17 -      tty->print("  UseAVX=%d",UseAVX);
   11.18 +      tty->print("  UseAVX=%d", (int) UseAVX);
   11.19      }
   11.20      if (UseAES) {
   11.21        tty->print("  UseAES=1");
   11.22      }
   11.23  #ifdef COMPILER2
   11.24      if (MaxVectorSize > 0) {
   11.25 -      tty->print("  MaxVectorSize=%d", MaxVectorSize);
   11.26 +      tty->print("  MaxVectorSize=%d", (int) MaxVectorSize);
   11.27      }
   11.28  #endif
   11.29      tty->cr();
   11.30 @@ -957,23 +957,23 @@
   11.31          }
   11.32        }
   11.33        if (AllocatePrefetchLines > 1) {
   11.34 -        tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
   11.35 +        tty->print_cr(" at distance %d, %d lines of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchLines, (int) AllocatePrefetchStepSize);
   11.36        } else {
   11.37 -        tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
   11.38 +        tty->print_cr(" at distance %d, one line of %d bytes", (int) AllocatePrefetchDistance, (int) AllocatePrefetchStepSize);
   11.39        }
   11.40      }
   11.41  
   11.42      if (PrefetchCopyIntervalInBytes > 0) {
   11.43 -      tty->print_cr("PrefetchCopyIntervalInBytes %d", PrefetchCopyIntervalInBytes);
   11.44 +      tty->print_cr("PrefetchCopyIntervalInBytes %d", (int) PrefetchCopyIntervalInBytes);
   11.45      }
   11.46      if (PrefetchScanIntervalInBytes > 0) {
   11.47 -      tty->print_cr("PrefetchScanIntervalInBytes %d", PrefetchScanIntervalInBytes);
   11.48 +      tty->print_cr("PrefetchScanIntervalInBytes %d", (int) PrefetchScanIntervalInBytes);
   11.49      }
   11.50      if (PrefetchFieldsAhead > 0) {
   11.51 -      tty->print_cr("PrefetchFieldsAhead %d", PrefetchFieldsAhead);
   11.52 +      tty->print_cr("PrefetchFieldsAhead %d", (int) PrefetchFieldsAhead);
   11.53      }
   11.54      if (ContendedPaddingWidth > 0) {
   11.55 -      tty->print_cr("ContendedPaddingWidth %d", ContendedPaddingWidth);
   11.56 +      tty->print_cr("ContendedPaddingWidth %d", (int) ContendedPaddingWidth);
   11.57      }
   11.58    }
   11.59  #endif // !PRODUCT

    12.1 --- a/src/cpu/x86/vm/vtableStubs_x86_32.cpp	Thu May 15 18:23:26 2014 -0400
    12.2 +++ b/src/cpu/x86/vm/vtableStubs_x86_32.cpp	Thu May 22 15:52:41 2014 -0400
    12.3 @@ -1,5 +1,5 @@
    12.4  /*
    12.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    12.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    12.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.8   *
    12.9   * This code is free software; you can redistribute it and/or modify it
   12.10 @@ -118,7 +118,7 @@
   12.11  
   12.12    if (PrintMiscellaneous && (WizardMode || Verbose)) {
   12.13      tty->print_cr("vtable #%d at "PTR_FORMAT"[%d] left over: %d",
   12.14 -                  vtable_index, s->entry_point(),
   12.15 +                  vtable_index, p2i(s->entry_point()),
   12.16                    (int)(s->code_end() - s->entry_point()),
   12.17                    (int)(s->code_end() - __ pc()));
   12.18    }
   12.19 @@ -199,7 +199,7 @@
   12.20  
   12.21    if (PrintMiscellaneous && (WizardMode || Verbose)) {
   12.22      tty->print_cr("itable #%d at "PTR_FORMAT"[%d] left over: %d",
   12.23 -                  itable_index, s->entry_point(),
   12.24 +                  itable_index, p2i(s->entry_point()),
   12.25                    (int)(s->code_end() - s->entry_point()),
   12.26                    (int)(s->code_end() - __ pc()));
   12.27    }

    13.1 --- a/src/cpu/x86/vm/vtableStubs_x86_64.cpp	Thu May 15 18:23:26 2014 -0400
    13.2 +++ b/src/cpu/x86/vm/vtableStubs_x86_64.cpp	Thu May 22 15:52:41 2014 -0400
    13.3 @@ -1,5 +1,5 @@
    13.4  /*
    13.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    13.6 + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
    13.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.8   *
    13.9   * This code is free software; you can redistribute it and/or modify it
   13.10 @@ -35,6 +35,8 @@
   13.11  #include "opto/runtime.hpp"
   13.12  #endif
   13.13  
   13.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   13.15 +
   13.16  // machine-dependent part of VtableStubs: create VtableStub of correct size and
   13.17  // initialize its code
   13.18  

    14.1 --- a/src/os/bsd/vm/decoder_machO.cpp	Thu May 15 18:23:26 2014 -0400
    14.2 +++ b/src/os/bsd/vm/decoder_machO.cpp	Thu May 22 15:52:41 2014 -0400
    14.3 @@ -1,5 +1,5 @@
    14.4  /*
    14.5 - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    14.6 + * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
    14.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.8   *
    14.9   * This code is free software; you can redistribute it and/or modify it
   14.10 @@ -53,7 +53,7 @@
   14.11    struct symtab_command * symt = (struct symtab_command *)
   14.12      mach_find_command((struct mach_header_64 *)mach_base, LC_SYMTAB);
   14.13    if (symt == NULL) {
   14.14 -    DEBUG_ONLY(tty->print_cr("no symtab in mach file at 0x%lx", mach_base));
   14.15 +    DEBUG_ONLY(tty->print_cr("no symtab in mach file at 0x%lx", p2i(mach_base)));
   14.16      return false;
   14.17    }
   14.18    uint32_t off = symt->symoff;          /* symbol table offset (within this mach file) */

    15.1 --- a/src/os/bsd/vm/os_bsd.cpp	Thu May 15 18:23:26 2014 -0400
    15.2 +++ b/src/os/bsd/vm/os_bsd.cpp	Thu May 22 15:52:41 2014 -0400
    15.3 @@ -1,5 +1,5 @@
    15.4  /*
    15.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    15.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    15.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.8   *
    15.9   * This code is free software; you can redistribute it and/or modify it
   15.10 @@ -123,6 +123,9 @@
   15.11  #define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
   15.12  
   15.13  #define LARGEPAGES_BIT (1 << 6)
   15.14 +
   15.15 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   15.16 +
   15.17  ////////////////////////////////////////////////////////////////////////////////
   15.18  // global variables
   15.19  julong os::Bsd::_physical_memory = 0;
   15.20 @@ -2390,7 +2393,6 @@
   15.21                          (!FLAG_IS_DEFAULT(UseLargePages) ||
   15.22                           !FLAG_IS_DEFAULT(LargePageSizeInBytes)
   15.23                          );
   15.24 -  char msg[128];
   15.25  
   15.26    // Create a large shared memory region to attach to based on size.
   15.27    // Currently, size is the total size of the heap
   15.28 @@ -2411,8 +2413,7 @@
   15.29       //            coalesce into large pages. Try to reserve large pages when
   15.30       //            the system is still "fresh".
   15.31       if (warn_on_failure) {
   15.32 -       jio_snprintf(msg, sizeof(msg), "Failed to reserve shared memory (errno = %d).", errno);
   15.33 -       warning(msg);
   15.34 +       warning("Failed to reserve shared memory (errno = %d).", errno);
   15.35       }
   15.36       return NULL;
   15.37    }
   15.38 @@ -2429,8 +2430,7 @@
   15.39  
   15.40    if ((intptr_t)addr == -1) {
   15.41       if (warn_on_failure) {
   15.42 -       jio_snprintf(msg, sizeof(msg), "Failed to attach shared memory (errno = %d).", err);
   15.43 -       warning(msg);
   15.44 +       warning("Failed to attach shared memory (errno = %d).", err);
   15.45       }
   15.46       return NULL;
   15.47    }
   15.48 @@ -3929,6 +3929,7 @@
   15.49    return true;
   15.50  }
   15.51  
   15.52 +ATTRIBUTE_PRINTF(3, 0)
   15.53  int local_vsnprintf(char* buf, size_t count, const char* format, va_list args) {
   15.54    return ::vsnprintf(buf, count, format, args);
   15.55  }

    16.1 --- a/src/os/bsd/vm/perfMemory_bsd.cpp	Thu May 15 18:23:26 2014 -0400
    16.2 +++ b/src/os/bsd/vm/perfMemory_bsd.cpp	Thu May 22 15:52:41 2014 -0400
    16.3 @@ -1,5 +1,5 @@
    16.4  /*
    16.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
    16.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
    16.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.8   *
    16.9   * This code is free software; you can redistribute it and/or modify it
   16.10 @@ -925,7 +925,7 @@
   16.11  
   16.12    if (PerfTraceMemOps) {
   16.13      tty->print("mapped " SIZE_FORMAT " bytes for vmid %d at "
   16.14 -               INTPTR_FORMAT "\n", size, vmid, (void*)mapAddress);
   16.15 +               INTPTR_FORMAT "\n", size, vmid, p2i((void*)mapAddress));
   16.16    }
   16.17  }
   16.18  

    17.1 --- a/src/os/linux/vm/os_linux.cpp	Thu May 15 18:23:26 2014 -0400
    17.2 +++ b/src/os/linux/vm/os_linux.cpp	Thu May 22 15:52:41 2014 -0400
    17.3 @@ -101,6 +101,8 @@
    17.4  # include <inttypes.h>
    17.5  # include <sys/ioctl.h>
    17.6  
    17.7 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    17.8 +
    17.9  // if RUSAGE_THREAD for getrusage() has not been defined, do it here. The code calling
   17.10  // getrusage() is prepared to handle the associated failure.
   17.11  #ifndef RUSAGE_THREAD
   17.12 @@ -2137,7 +2139,7 @@
   17.13    // Print warning if unsafe chroot environment detected
   17.14    if (unsafe_chroot_detected) {
   17.15      st->print("WARNING!! ");
   17.16 -    st->print_cr(unstable_chroot_error);
   17.17 +    st->print_cr("%s", unstable_chroot_error);
   17.18    }
   17.19  
   17.20    os::Linux::print_libversion_info(st);
   17.21 @@ -2198,8 +2200,8 @@
   17.22  void os::Linux::print_libversion_info(outputStream* st) {
   17.23    // libc, pthread
   17.24    st->print("libc:");
   17.25 -  st->print(os::Linux::glibc_version()); st->print(" ");
   17.26 -  st->print(os::Linux::libpthread_version()); st->print(" ");
   17.27 +  st->print("%s ", os::Linux::glibc_version());
   17.28 +  st->print("%s ", os::Linux::libpthread_version());
   17.29    if (os::Linux::is_LinuxThreads()) {
   17.30       st->print("(%s stack)", os::Linux::is_floating_stack() ? "floating" : "fixed");
   17.31    }
   17.32 @@ -3415,7 +3417,7 @@
   17.33       //            the system is still "fresh".
   17.34       if (warn_on_failure) {
   17.35         jio_snprintf(msg, sizeof(msg), "Failed to reserve shared memory (errno = %d).", errno);
   17.36 -       warning(msg);
   17.37 +       warning("%s", msg);
   17.38       }
   17.39       return NULL;
   17.40    }
   17.41 @@ -3433,7 +3435,7 @@
   17.42    if ((intptr_t)addr == -1) {
   17.43       if (warn_on_failure) {
   17.44         jio_snprintf(msg, sizeof(msg), "Failed to attach shared memory (errno = %d).", err);
   17.45 -       warning(msg);
   17.46 +       warning("%s", msg);
   17.47       }
   17.48       return NULL;
   17.49    }
   17.50 @@ -3453,7 +3455,7 @@
   17.51      char msg[128];
   17.52      jio_snprintf(msg, sizeof(msg), "Failed to reserve large pages memory req_addr: "
   17.53          PTR_FORMAT " bytes: " SIZE_FORMAT " (errno = %d).", req_addr, bytes, error);
   17.54 -    warning(msg);
   17.55 +    warning("%s", msg);
   17.56    }
   17.57  }
   17.58  
   17.59 @@ -5392,6 +5394,8 @@
   17.60  //  -1 on error.
   17.61  //
   17.62  
   17.63 +PRAGMA_DIAG_PUSH
   17.64 +PRAGMA_FORMAT_NONLITERAL_IGNORED
   17.65  static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
   17.66    static bool proc_task_unchecked = true;
   17.67    static const char *proc_stat_path = "/proc/%d/stat";
   17.68 @@ -5453,6 +5457,7 @@
   17.69      return (jlong)user_time * (1000000000 / clock_tics_per_sec);
   17.70    }
   17.71  }
   17.72 +PRAGMA_DIAG_POP
   17.73  
   17.74  void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
   17.75    info_ptr->max_value = ALL_64_BITS;       // will not wrap in less than 64 bits

    18.1 --- a/src/os/linux/vm/perfMemory_linux.cpp	Thu May 15 18:23:26 2014 -0400
    18.2 +++ b/src/os/linux/vm/perfMemory_linux.cpp	Thu May 22 15:52:41 2014 -0400
    18.3 @@ -931,7 +931,7 @@
    18.4  
    18.5    if (PerfTraceMemOps) {
    18.6      tty->print("mapped " SIZE_FORMAT " bytes for vmid %d at "
    18.7 -               INTPTR_FORMAT "\n", size, vmid, (void*)mapAddress);
    18.8 +               INTPTR_FORMAT "\n", size, vmid, p2i((void*)mapAddress));
    18.9    }
   18.10  }
   18.11  

    19.1 --- a/src/os/posix/vm/os_posix.cpp	Thu May 15 18:23:26 2014 -0400
    19.2 +++ b/src/os/posix/vm/os_posix.cpp	Thu May 22 15:52:41 2014 -0400
    19.3 @@ -1,5 +1,5 @@
    19.4  /*
    19.5 -* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    19.6 +* Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    19.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.8   *
    19.9   * This code is free software; you can redistribute it and/or modify it
   19.10 @@ -35,6 +35,8 @@
   19.11  #include <pthread.h>
   19.12  #include <signal.h>
   19.13  
   19.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   19.15 +
   19.16  // Todo: provide a os::get_max_process_id() or similar. Number of processes
   19.17  // may have been configured, can be read more accurately from proc fs etc.
   19.18  #ifndef MAX_PID
   19.19 @@ -191,10 +193,10 @@
   19.20    st->print("uname:");
   19.21    struct utsname name;
   19.22    uname(&name);
   19.23 -  st->print(name.sysname); st->print(" ");
   19.24 -  st->print(name.release); st->print(" ");
   19.25 -  st->print(name.version); st->print(" ");
   19.26 -  st->print(name.machine);
   19.27 +  st->print("%s ", name.sysname);
   19.28 +  st->print("%s ", name.release);
   19.29 +  st->print("%s ", name.version);
   19.30 +  st->print("%s", name.machine);
   19.31    st->cr();
   19.32  }
   19.33  
   19.34 @@ -552,7 +554,7 @@
   19.35  void os::Posix::print_signal_set_short(outputStream* st, const sigset_t* set) {
   19.36    char buf[NUM_IMPORTANT_SIGS + 1];
   19.37    os::Posix::describe_signal_set_short(set, buf, sizeof(buf));
   19.38 -  st->print(buf);
   19.39 +  st->print("%s", buf);
   19.40  }
   19.41  
   19.42  // Writes one-line description of a combination of sigaction.sa_flags into a user
   19.43 @@ -612,7 +614,7 @@
   19.44  void os::Posix::print_sa_flags(outputStream* st, int flags) {
   19.45    char buffer[0x100];
   19.46    os::Posix::describe_sa_flags(flags, buffer, sizeof(buffer));
   19.47 -  st->print(buffer);
   19.48 +  st->print("%s", buffer);
   19.49  }
   19.50  
   19.51  // Helper function for os::Posix::print_siginfo_...():

    20.1 --- a/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu May 15 18:23:26 2014 -0400
    20.2 +++ b/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	Thu May 22 15:52:41 2014 -0400
    20.3 @@ -1,5 +1,5 @@
    20.4  /*
    20.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    20.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    20.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.8   *
    20.9   * This code is free software; you can redistribute it and/or modify it
   20.10 @@ -276,6 +276,8 @@
   20.11  # endif
   20.12  #endif
   20.13  
   20.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   20.15 +
   20.16  address os::current_stack_pointer() {
   20.17  #if defined(__clang__) || defined(__llvm__)
   20.18    register void *esp;

    21.1 --- a/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu May 15 18:23:26 2014 -0400
    21.2 +++ b/src/os_cpu/linux_x86/vm/os_linux_x86.cpp	Thu May 22 15:52:41 2014 -0400
    21.3 @@ -1,5 +1,5 @@
    21.4  /*
    21.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    21.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    21.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.8   *
    21.9   * This code is free software; you can redistribute it and/or modify it
   21.10 @@ -88,6 +88,8 @@
   21.11  #define SPELL_REG_FP "ebp"
   21.12  #endif // AMD64
   21.13  
   21.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   21.15 +
   21.16  address os::current_stack_pointer() {
   21.17  #ifdef SPARC_WORKS
   21.18    register void *esp;

    22.1 --- a/src/share/vm/adlc/formssel.cpp	Thu May 15 18:23:26 2014 -0400
    22.2 +++ b/src/share/vm/adlc/formssel.cpp	Thu May 22 15:52:41 2014 -0400
    22.3 @@ -1,5 +1,5 @@
    22.4  /*
    22.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    22.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    22.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.8   *
    22.9   * This code is free software; you can redistribute it and/or modify it
   22.10 @@ -1322,7 +1322,7 @@
   22.11      OperandForm* oper = form->is_operand();
   22.12      if (oper != NULL && oper->is_bound_register()) {
   22.13        const RegDef* first = oper->get_RegClass()->find_first_elem();
   22.14 -      fprintf(fp, "    st->print(\"%s\");\n", first->_regname);
   22.15 +      fprintf(fp, "    st->print_raw(\"%s\");\n", first->_regname);
   22.16      } else {
   22.17        globalAD->syntax_err(_linenum, "In %s can't find format for %s %s", _ident, opc->_ident, rep_var);
   22.18      }
   22.19 @@ -2530,7 +2530,7 @@
   22.20    case Form::idealP: fprintf(fp,"  if (_c%d) _c%d->dump_on(st);\n", const_index, const_index); break;
   22.21    case Form::idealNKlass:
   22.22    case Form::idealN: fprintf(fp,"  if (_c%d) _c%d->dump_on(st);\n", const_index, const_index); break;
   22.23 -  case Form::idealL: fprintf(fp,"  st->print(\"#%%lld\", _c%d);\n", const_index); break;
   22.24 +  case Form::idealL: fprintf(fp,"  st->print(\"#\" INT64_FORMAT, (int64_t)_c%d);\n", const_index); break;
   22.25    case Form::idealF: fprintf(fp,"  st->print(\"#%%f\", _c%d);\n", const_index); break;
   22.26    case Form::idealD: fprintf(fp,"  st->print(\"#%%f\", _c%d);\n", const_index); break;
   22.27    default:

    23.1 --- a/src/share/vm/adlc/output_h.cpp	Thu May 15 18:23:26 2014 -0400
    23.2 +++ b/src/share/vm/adlc/output_h.cpp	Thu May 22 15:52:41 2014 -0400
    23.3 @@ -1,5 +1,5 @@
    23.4  /*
    23.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    23.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    23.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.8   *
    23.9   * This code is free software; you can redistribute it and/or modify it
   23.10 @@ -386,14 +386,14 @@
   23.11  static void defineCCodeDump(OperandForm* oper, FILE *fp, int i) {
   23.12    assert(oper != NULL, "what");
   23.13    CondInterface* cond = oper->_interface->is_CondInterface();
   23.14 -  fprintf(fp, "       if( _c%d == BoolTest::eq ) st->print(\"%s\");\n",i,cond->_equal_format);
   23.15 -  fprintf(fp, "  else if( _c%d == BoolTest::ne ) st->print(\"%s\");\n",i,cond->_not_equal_format);
   23.16 -  fprintf(fp, "  else if( _c%d == BoolTest::le ) st->print(\"%s\");\n",i,cond->_less_equal_format);
   23.17 -  fprintf(fp, "  else if( _c%d == BoolTest::ge ) st->print(\"%s\");\n",i,cond->_greater_equal_format);
   23.18 -  fprintf(fp, "  else if( _c%d == BoolTest::lt ) st->print(\"%s\");\n",i,cond->_less_format);
   23.19 -  fprintf(fp, "  else if( _c%d == BoolTest::gt ) st->print(\"%s\");\n",i,cond->_greater_format);
   23.20 -  fprintf(fp, "  else if( _c%d == BoolTest::overflow ) st->print(\"%s\");\n",i,cond->_overflow_format);
   23.21 -  fprintf(fp, "  else if( _c%d == BoolTest::no_overflow ) st->print(\"%s\");\n",i,cond->_no_overflow_format);
   23.22 +  fprintf(fp, "       if( _c%d == BoolTest::eq ) st->print_raw(\"%s\");\n",i,cond->_equal_format);
   23.23 +  fprintf(fp, "  else if( _c%d == BoolTest::ne ) st->print_raw(\"%s\");\n",i,cond->_not_equal_format);
   23.24 +  fprintf(fp, "  else if( _c%d == BoolTest::le ) st->print_raw(\"%s\");\n",i,cond->_less_equal_format);
   23.25 +  fprintf(fp, "  else if( _c%d == BoolTest::ge ) st->print_raw(\"%s\");\n",i,cond->_greater_equal_format);
   23.26 +  fprintf(fp, "  else if( _c%d == BoolTest::lt ) st->print_raw(\"%s\");\n",i,cond->_less_format);
   23.27 +  fprintf(fp, "  else if( _c%d == BoolTest::gt ) st->print_raw(\"%s\");\n",i,cond->_greater_format);
   23.28 +  fprintf(fp, "  else if( _c%d == BoolTest::overflow ) st->print_raw(\"%s\");\n",i,cond->_overflow_format);
   23.29 +  fprintf(fp, "  else if( _c%d == BoolTest::no_overflow ) st->print_raw(\"%s\");\n",i,cond->_no_overflow_format);
   23.30  }
   23.31  
   23.32  // Output code that dumps constant values, increment "i" if type is constant
   23.33 @@ -416,8 +416,8 @@
   23.34      ++i;
   23.35    }
   23.36    else if (!strcmp(ideal_type, "ConL")) {
   23.37 -    fprintf(fp,"    st->print(\"#\" INT64_FORMAT, _c%d);\n", i);
   23.38 -    fprintf(fp,"    st->print(\"/\" PTR64_FORMAT, _c%d);\n", i);
   23.39 +    fprintf(fp,"    st->print(\"#\" INT64_FORMAT, (int64_t)_c%d);\n", i);
   23.40 +    fprintf(fp,"    st->print(\"/\" PTR64_FORMAT, (uint64_t)_c%d);\n", i);
   23.41      ++i;
   23.42    }
   23.43    else if (!strcmp(ideal_type, "ConF")) {
   23.44 @@ -429,7 +429,7 @@
   23.45    else if (!strcmp(ideal_type, "ConD")) {
   23.46      fprintf(fp,"    st->print(\"#%%f\", _c%d);\n", i);
   23.47      fprintf(fp,"    jlong _c%dl = JavaValue(_c%d).get_jlong();\n", i, i);
   23.48 -    fprintf(fp,"    st->print(\"/\" PTR64_FORMAT, _c%dl);\n", i);
   23.49 +    fprintf(fp,"    st->print(\"/\" PTR64_FORMAT, (uint64_t)_c%dl);\n", i);
   23.50      ++i;
   23.51    }
   23.52    else if (!strcmp(ideal_type, "Bool")) {
   23.53 @@ -471,7 +471,7 @@
   23.54          if ( string != NameList::_signal ) {
   23.55            // Normal string
   23.56            // Pass through to st->print
   23.57 -          fprintf(fp,"  st->print(\"%s\");\n", string);
   23.58 +          fprintf(fp,"  st->print_raw(\"%s\");\n", string);
   23.59          } else {
   23.60            // Replacement variable
   23.61            const char *rep_var = oper._format->_rep_vars.iter();
   23.62 @@ -542,7 +542,7 @@
   23.63          if ( string != NameList::_signal ) {
   23.64            // Normal string
   23.65            // Pass through to st->print
   23.66 -          fprintf(fp,"  st->print(\"%s\");\n", string);
   23.67 +          fprintf(fp,"  st->print_raw(\"%s\");\n", string);
   23.68          } else {
   23.69            // Replacement variable
   23.70            const char *rep_var = oper._format->_rep_vars.iter();
   23.71 @@ -669,7 +669,7 @@
   23.72        } else if( string == NameList::_signal2 ) // Raw program text
   23.73          fputs(inst._format->_strings.iter(), fp);
   23.74        else
   23.75 -        fprintf(fp,"st->print(\"%s\");\n", string);
   23.76 +        fprintf(fp,"st->print_raw(\"%s\");\n", string);
   23.77      } // Done with all format strings
   23.78    } // Done generating the user-defined portion of the format
   23.79  
   23.80 @@ -696,13 +696,13 @@
   23.81      default:
   23.82        assert(0,"ShouldNotReachHere");
   23.83      }
   23.84 -    fprintf(fp,  "  st->print_cr(\"\");\n" );
   23.85 +    fprintf(fp,  "  st->cr();\n" );
   23.86      fprintf(fp,  "  if (_jvms) _jvms->format(ra, this, st); else st->print_cr(\"        No JVM State Info\");\n" );
   23.87      fprintf(fp,  "  st->print(\"        # \");\n" );
   23.88      fprintf(fp,  "  if( _jvms && _oop_map ) _oop_map->print_on(st);\n");
   23.89    }
   23.90    else if(inst.is_ideal_safepoint()) {
   23.91 -    fprintf(fp,  "  st->print(\"\");\n" );
   23.92 +    fprintf(fp,  "  st->print_raw(\"\");\n" );
   23.93      fprintf(fp,  "  if (_jvms) _jvms->format(ra, this, st); else st->print_cr(\"        No JVM State Info\");\n" );
   23.94      fprintf(fp,  "  st->print(\"        # \");\n" );
   23.95      fprintf(fp,  "  if( _jvms && _oop_map ) _oop_map->print_on(st);\n");

    24.1 --- a/src/share/vm/asm/codeBuffer.cpp	Thu May 15 18:23:26 2014 -0400
    24.2 +++ b/src/share/vm/asm/codeBuffer.cpp	Thu May 22 15:52:41 2014 -0400
    24.3 @@ -1,5 +1,5 @@
    24.4  /*
    24.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    24.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    24.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.8   *
    24.9   * This code is free software; you can redistribute it and/or modify it
   24.10 @@ -987,7 +987,7 @@
   24.11    for (csize_t step; ptr < end(); ptr += step) {
   24.12      step = end() - ptr;
   24.13      if (step > jintSize * 4)  step = jintSize * 4;
   24.14 -    tty->print(PTR_FORMAT ": ", ptr);
   24.15 +    tty->print(INTPTR_FORMAT ": ", p2i(ptr));
   24.16      while (step > 0) {
   24.17        tty->print(" " PTR32_FORMAT, *(jint*)ptr);
   24.18        ptr += jintSize;
   24.19 @@ -1097,7 +1097,7 @@
   24.20      while (c && c->offset() == offset) {
   24.21        stream->bol();
   24.22        stream->print("  ;; ");
   24.23 -      stream->print_cr(c->string());
   24.24 +      stream->print_cr("%s", c->string());
   24.25        c = c->next_comment();
   24.26      }
   24.27    }
   24.28 @@ -1153,10 +1153,10 @@
   24.29  void CodeSection::print(const char* name) {
   24.30    csize_t locs_size = locs_end() - locs_start();
   24.31    tty->print_cr(" %7s.code = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d)%s",
   24.32 -                name, start(), end(), limit(), size(), capacity(),
   24.33 +                name, p2i(start()), p2i(end()), p2i(limit()), size(), capacity(),
   24.34                  is_frozen()? " [frozen]": "");
   24.35    tty->print_cr(" %7s.locs = " PTR_FORMAT " : " PTR_FORMAT " : " PTR_FORMAT " (%d of %d) point=%d",
   24.36 -                name, locs_start(), locs_end(), locs_limit(), locs_size, locs_capacity(), locs_point_off());
   24.37 +                name, p2i(locs_start()), p2i(locs_end()), p2i(locs_limit()), locs_size, locs_capacity(), locs_point_off());
   24.38    if (PrintRelocations) {
   24.39      RelocIterator iter(this);
   24.40      iter.print();

    25.1 --- a/src/share/vm/asm/codeBuffer.hpp	Thu May 15 18:23:26 2014 -0400
    25.2 +++ b/src/share/vm/asm/codeBuffer.hpp	Thu May 22 15:52:41 2014 -0400
    25.3 @@ -1,5 +1,5 @@
    25.4  /*
    25.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    25.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    25.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    25.8   *
    25.9   * This code is free software; you can redistribute it and/or modify it
   25.10 @@ -173,7 +173,7 @@
   25.11    bool allocates(address pc) const  { return pc >= _start && pc <  _limit; }
   25.12    bool allocates2(address pc) const { return pc >= _start && pc <= _limit; }
   25.13  
   25.14 -  void    set_end(address pc)       { assert(allocates2(pc), err_msg("not in CodeBuffer memory: " PTR_FORMAT " <= " PTR_FORMAT " <= " PTR_FORMAT, _start, pc, _limit)); _end = pc; }
   25.15 +  void    set_end(address pc)       { assert(allocates2(pc), err_msg("not in CodeBuffer memory: " PTR_FORMAT " <= " PTR_FORMAT " <= " INTPTR_FORMAT, p2i(_start), p2i(pc), p2i(_limit))); _end = pc; }
   25.16    void    set_mark(address pc)      { assert(contains2(pc), "not in codeBuffer");
   25.17                                        _mark = pc; }
   25.18    void    set_mark_off(int offset)  { assert(contains2(offset+_start),"not in codeBuffer");

    26.1 --- a/src/share/vm/asm/register.hpp	Thu May 15 18:23:26 2014 -0400
    26.2 +++ b/src/share/vm/asm/register.hpp	Thu May 22 15:52:41 2014 -0400
    26.3 @@ -1,5 +1,5 @@
    26.4  /*
    26.5 - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
    26.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    26.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    26.8   *
    26.9   * This code is free software; you can redistribute it and/or modify it
   26.10 @@ -118,8 +118,8 @@
   26.11  ) {
   26.12    assert(
   26.13      a != b,
   26.14 -    err_msg_res("registers must be different: a=%d, b=%d",
   26.15 -                a, b)
   26.16 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT "",
   26.17 +                p2i(a), p2i(b))
   26.18    );
   26.19  }
   26.20  
   26.21 @@ -132,8 +132,9 @@
   26.22    assert(
   26.23      a != b && a != c
   26.24             && b != c,
   26.25 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d",
   26.26 -                a, b, c)
   26.27 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.28 +                ", c=" INTPTR_FORMAT "",
   26.29 +                p2i(a), p2i(b), p2i(c))
   26.30    );
   26.31  }
   26.32  
   26.33 @@ -148,8 +149,9 @@
   26.34      a != b && a != c && a != d
   26.35             && b != c && b != d
   26.36                       && c != d,
   26.37 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d",
   26.38 -                a, b, c, d)
   26.39 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.40 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT "",
   26.41 +                p2i(a), p2i(b), p2i(c), p2i(d))
   26.42    );
   26.43  }
   26.44  
   26.45 @@ -166,8 +168,9 @@
   26.46             && b != c && b != d && b != e
   26.47                       && c != d && c != e
   26.48                                 && d != e,
   26.49 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d",
   26.50 -                a, b, c, d, e)
   26.51 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.52 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT "",
   26.53 +                p2i(a), p2i(b), p2i(c), p2i(d), p2i(e))
   26.54    );
   26.55  }
   26.56  
   26.57 @@ -186,8 +189,10 @@
   26.58                       && c != d && c != e && c != f
   26.59                                 && d != e && d != f
   26.60                                           && e != f,
   26.61 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d",
   26.62 -                a, b, c, d, e, f)
   26.63 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.64 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
   26.65 +                ", f=" INTPTR_FORMAT "",
   26.66 +                p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f))
   26.67    );
   26.68  }
   26.69  
   26.70 @@ -208,8 +213,10 @@
   26.71                                 && d != e && d != f && d != g
   26.72                                           && e != f && e != g
   26.73                                                     && f != g,
   26.74 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d",
   26.75 -                a, b, c, d, e, f, g)
   26.76 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.77 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
   26.78 +                ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT "",
   26.79 +                p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g))
   26.80    );
   26.81  }
   26.82  
   26.83 @@ -232,8 +239,10 @@
   26.84                                           && e != f && e != g && e != h
   26.85                                                     && f != g && f != h
   26.86                                                               && g != h,
   26.87 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d",
   26.88 -                a, b, c, d, e, f, g, h)
   26.89 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
   26.90 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
   26.91 +                ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT "",
   26.92 +                p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h))
   26.93    );
   26.94  }
   26.95  
   26.96 @@ -258,8 +267,11 @@
   26.97                                                     && f != g && f != h && f != i
   26.98                                                               && g != h && g != i
   26.99                                                                         && h != i,
  26.100 -    err_msg_res("registers must be different: a=%d, b=%d, c=%d, d=%d, e=%d, f=%d, g=%d, h=%d, i=%d",
  26.101 -                a, b, c, d, e, f, g, h, i)
  26.102 +    err_msg_res("registers must be different: a=" INTPTR_FORMAT ", b=" INTPTR_FORMAT
  26.103 +                ", c=" INTPTR_FORMAT ", d=" INTPTR_FORMAT ", e=" INTPTR_FORMAT
  26.104 +                ", f=" INTPTR_FORMAT ", g=" INTPTR_FORMAT ", h=" INTPTR_FORMAT
  26.105 +                ", i=" INTPTR_FORMAT "",
  26.106 +                p2i(a), p2i(b), p2i(c), p2i(d), p2i(e), p2i(f), p2i(g), p2i(h), p2i(i))
  26.107    );
  26.108  }
  26.109  

    27.1 --- a/src/share/vm/c1/c1_CFGPrinter.cpp	Thu May 15 18:23:26 2014 -0400
    27.2 +++ b/src/share/vm/c1/c1_CFGPrinter.cpp	Thu May 22 15:52:41 2014 -0400
    27.3 @@ -1,5 +1,5 @@
    27.4  /*
    27.5 - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
    27.6 + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    27.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    27.8   *
    27.9   * This code is free software; you can redistribute it and/or modify it
   27.10 @@ -50,7 +50,7 @@
   27.11  
   27.12    void inc_indent();
   27.13    void dec_indent();
   27.14 -  void print(const char* format, ...);
   27.15 +  void print(const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
   27.16    void print_begin(const char* tag);
   27.17    void print_end(const char* tag);
   27.18  
   27.19 @@ -161,7 +161,7 @@
   27.20  
   27.21    print("name \"%s\"", method_name(_compilation->method(), true));
   27.22    print("method \"%s\"", method_name(_compilation->method()));
   27.23 -  print("date "INT64_FORMAT, os::javaTimeMillis());
   27.24 +  print("date "INT64_FORMAT, (int64_t) os::javaTimeMillis());
   27.25  
   27.26    print_end("compilation");
   27.27  }

    28.1 --- a/src/share/vm/c1/c1_InstructionPrinter.cpp	Thu May 15 18:23:26 2014 -0400
    28.2 +++ b/src/share/vm/c1/c1_InstructionPrinter.cpp	Thu May 22 15:52:41 2014 -0400
    28.3 @@ -1,5 +1,5 @@
    28.4  /*
    28.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    28.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    28.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    28.8   *
    28.9   * This code is free software; you can redistribute it and/or modify it
   28.10 @@ -134,23 +134,23 @@
   28.11      if (value->is_null_object()) {
   28.12        output()->print("null");
   28.13      } else if (!value->is_loaded()) {
   28.14 -      output()->print("<unloaded object " PTR_FORMAT ">", value);
   28.15 +      output()->print("<unloaded object " INTPTR_FORMAT ">", p2i(value));
   28.16      } else {
   28.17 -      output()->print("<object " PTR_FORMAT " klass=", value->constant_encoding());
   28.18 +      output()->print("<object " INTPTR_FORMAT " klass=", p2i(value->constant_encoding()));
   28.19        print_klass(value->klass());
   28.20        output()->print(">");
   28.21      }
   28.22    } else if (type->as_InstanceConstant() != NULL) {
   28.23      ciInstance* value = type->as_InstanceConstant()->value();
   28.24      if (value->is_loaded()) {
   28.25 -      output()->print("<instance " PTR_FORMAT " klass=", value->constant_encoding());
   28.26 +      output()->print("<instance " INTPTR_FORMAT " klass=", p2i(value->constant_encoding()));
   28.27        print_klass(value->klass());
   28.28        output()->print(">");
   28.29      } else {
   28.30 -      output()->print("<unloaded instance " PTR_FORMAT ">", value);
   28.31 +      output()->print("<unloaded instance " INTPTR_FORMAT ">", p2i(value));
   28.32      }
   28.33    } else if (type->as_ArrayConstant() != NULL) {
   28.34 -    output()->print("<array " PTR_FORMAT ">", type->as_ArrayConstant()->value()->constant_encoding());
   28.35 +    output()->print("<array " INTPTR_FORMAT ">", p2i(type->as_ArrayConstant()->value()->constant_encoding()));
   28.36    } else if (type->as_ClassConstant() != NULL) {
   28.37      ciInstanceKlass* klass = type->as_ClassConstant()->value();
   28.38      if (!klass->is_loaded()) {
   28.39 @@ -268,7 +268,7 @@
   28.40  
   28.41  
   28.42  void InstructionPrinter::print_unsafe_op(UnsafeOp* op, const char* name) {
   28.43 -  output()->print(name);
   28.44 +  output()->print("%s", name);
   28.45    output()->print(".(");
   28.46  }
   28.47  
   28.48 @@ -479,7 +479,7 @@
   28.49    if (x->declared_type()->is_klass())
   28.50      print_klass(x->declared_type()->as_klass());
   28.51    else
   28.52 -    output()->print(type2name(x->declared_type()->basic_type()));
   28.53 +    output()->print("%s", type2name(x->declared_type()->basic_type()));
   28.54  }
   28.55  
   28.56  

    29.1 --- a/src/share/vm/c1/c1_LIR.cpp	Thu May 15 18:23:26 2014 -0400
    29.2 +++ b/src/share/vm/c1/c1_LIR.cpp	Thu May 22 15:52:41 2014 -0400
    29.3 @@ -1,5 +1,5 @@
    29.4  /*
    29.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    29.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    29.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    29.8   *
    29.9   * This code is free software; you can redistribute it and/or modify it
   29.10 @@ -1563,15 +1563,15 @@
   29.11    } else if (is_virtual()) {
   29.12      out->print("R%d", vreg_number());
   29.13    } else if (is_single_cpu()) {
   29.14 -    out->print(as_register()->name());
   29.15 +    out->print("%s", as_register()->name());
   29.16    } else if (is_double_cpu()) {
   29.17 -    out->print(as_register_hi()->name());
   29.18 -    out->print(as_register_lo()->name());
   29.19 +    out->print("%s", as_register_hi()->name());
   29.20 +    out->print("%s", as_register_lo()->name());
   29.21  #if defined(X86)
   29.22    } else if (is_single_xmm()) {
   29.23 -    out->print(as_xmm_float_reg()->name());
   29.24 +    out->print("%s", as_xmm_float_reg()->name());
   29.25    } else if (is_double_xmm()) {
   29.26 -    out->print(as_xmm_double_reg()->name());
   29.27 +    out->print("%s", as_xmm_double_reg()->name());
   29.28    } else if (is_single_fpu()) {
   29.29      out->print("fpu%d", fpu_regnr());
   29.30    } else if (is_double_fpu()) {
   29.31 @@ -1583,9 +1583,9 @@
   29.32      out->print("d%d", fpu_regnrLo() >> 1);
   29.33  #else
   29.34    } else if (is_single_fpu()) {
   29.35 -    out->print(as_float_reg()->name());
   29.36 +    out->print("%s", as_float_reg()->name());
   29.37    } else if (is_double_fpu()) {
   29.38 -    out->print(as_double_reg()->name());
   29.39 +    out->print("%s", as_double_reg()->name());
   29.40  #endif
   29.41  
   29.42    } else if (is_illegal()) {
   29.43 @@ -1611,9 +1611,9 @@
   29.44      case T_LONG:   out->print("lng:" JLONG_FORMAT, as_jlong()); break;
   29.45      case T_FLOAT:  out->print("flt:%f",   as_jfloat());         break;
   29.46      case T_DOUBLE: out->print("dbl:%f",   as_jdouble());        break;
   29.47 -    case T_OBJECT: out->print("obj:0x%x", as_jobject());        break;
   29.48 -    case T_METADATA: out->print("metadata:0x%x", as_metadata());break;
   29.49 -    default:       out->print("%3d:0x%x",type(), as_jdouble()); break;
   29.50 +    case T_OBJECT: out->print("obj:" INTPTR_FORMAT, p2i(as_jobject()));        break;
   29.51 +    case T_METADATA: out->print("metadata:" INTPTR_FORMAT, p2i(as_metadata()));break;
   29.52 +    default:       out->print("%3d:0x" UINT64_FORMAT_X, type(), (uint64_t)as_jlong()); break;
   29.53    }
   29.54  }
   29.55  
   29.56 @@ -1629,7 +1629,7 @@
   29.57      case times_8: out->print(" * 8"); break;
   29.58      }
   29.59    }
   29.60 -  out->print(" Disp: %d", _disp);
   29.61 +  out->print(" Disp: " INTX_FORMAT, _disp);
   29.62  }
   29.63  
   29.64  // debug output of block header without InstructionPrinter
   29.65 @@ -1703,7 +1703,7 @@
   29.66    } else {
   29.67      out->print("     ");
   29.68    }
   29.69 -  out->print(name()); out->print(" ");
   29.70 +  out->print("%s ", name());
   29.71    print_instr(out);
   29.72    if (info() != NULL) out->print(" [bci:%d]", info()->stack()->bci());
   29.73  #ifdef ASSERT
   29.74 @@ -1833,7 +1833,7 @@
   29.75  // LIR_OpJavaCall
   29.76  void LIR_OpJavaCall::print_instr(outputStream* out) const {
   29.77    out->print("call: ");
   29.78 -  out->print("[addr: 0x%x]", address());
   29.79 +  out->print("[addr: " INTPTR_FORMAT "]", p2i(address()));
   29.80    if (receiver()->is_valid()) {
   29.81      out->print(" [recv: ");   receiver()->print(out);   out->print("]");
   29.82    }
   29.83 @@ -1844,7 +1844,7 @@
   29.84  
   29.85  // LIR_OpLabel
   29.86  void LIR_OpLabel::print_instr(outputStream* out) const {
   29.87 -  out->print("[label:0x%x]", _label);
   29.88 +  out->print("[label:" INTPTR_FORMAT "]", p2i(_label));
   29.89  }
   29.90  
   29.91  // LIR_OpArrayCopy
   29.92 @@ -1911,7 +1911,7 @@
   29.93  // LIR_Op1
   29.94  void LIR_OpRTCall::print_instr(outputStream* out) const {
   29.95    intx a = (intx)addr();
   29.96 -  out->print(Runtime1::name_for_address(addr()));
   29.97 +  out->print("%s", Runtime1::name_for_address(addr()));
   29.98    out->print(" ");
   29.99    tmp()->print(out);
  29.100  }
  29.101 @@ -1934,10 +1934,10 @@
  29.102    } else if (stub() != NULL) {
  29.103      out->print("[");
  29.104      stub()->print_name(out);
  29.105 -    out->print(": 0x%x]", stub());
  29.106 +    out->print(": " INTPTR_FORMAT "]", p2i(stub()));
  29.107      if (stub()->info() != NULL) out->print(" [bci:%d]", stub()->info()->stack()->bci());
  29.108    } else {
  29.109 -    out->print("[label:0x%x] ", label());
  29.110 +    out->print("[label:" INTPTR_FORMAT "] ", p2i(label()));
  29.111    }
  29.112    if (ublock() != NULL) {
  29.113      out->print("unordered: [B%d] ", ublock()->block_id());
  29.114 @@ -2004,7 +2004,7 @@
  29.115    tmp4()->print(out);                       out->print(" ");
  29.116    out->print("[hdr:%d]", header_size()); out->print(" ");
  29.117    out->print("[obj:%d]", object_size()); out->print(" ");
  29.118 -  out->print("[lbl:0x%x]", stub()->entry());
  29.119 +  out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
  29.120  }
  29.121  
  29.122  void LIR_OpRoundFP::print_instr(outputStream* out) const {
  29.123 @@ -2037,7 +2037,7 @@
  29.124    tmp3()->print(out);                    out->print(" ");
  29.125    tmp4()->print(out);                    out->print(" ");
  29.126    out->print("[type:0x%x]", type());     out->print(" ");
  29.127 -  out->print("[label:0x%x]", stub()->entry());
  29.128 +  out->print("[label:" INTPTR_FORMAT "]", p2i(stub()->entry()));
  29.129  }
  29.130  
  29.131  
  29.132 @@ -2074,7 +2074,7 @@
  29.133    if (_scratch->is_valid()) {
  29.134      _scratch->print(out);  out->print(" ");
  29.135    }
  29.136 -  out->print("[lbl:0x%x]", stub()->entry());
  29.137 +  out->print("[lbl:" INTPTR_FORMAT "]", p2i(stub()->entry()));
  29.138  }
  29.139  
  29.140  #ifdef ASSERT
  29.141 @@ -2082,7 +2082,7 @@
  29.142    print_condition(out, condition()); out->print(" ");
  29.143    in_opr1()->print(out);             out->print(" ");
  29.144    in_opr2()->print(out);             out->print(", \"");
  29.145 -  out->print(msg());                 out->print("\"");
  29.146 +  out->print("%s", msg());          out->print("\"");
  29.147  }
  29.148  #endif
  29.149  

    30.1 --- a/src/share/vm/c1/c1_RangeCheckElimination.cpp	Thu May 15 18:23:26 2014 -0400
    30.2 +++ b/src/share/vm/c1/c1_RangeCheckElimination.cpp	Thu May 22 15:52:41 2014 -0400
    30.3 @@ -1,5 +1,5 @@
    30.4  /*
    30.5 - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    30.6 + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
    30.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    30.8   *
    30.9   * This code is free software; you can redistribute it and/or modify it
   30.10 @@ -62,10 +62,10 @@
   30.11    _optimistic = ir->compilation()->is_optimistic();
   30.12  
   30.13    TRACE_RANGE_CHECK_ELIMINATION(
   30.14 -    tty->print_cr("");
   30.15 +    tty->cr();
   30.16      tty->print_cr("Range check elimination");
   30.17      ir->method()->print_name(tty);
   30.18 -    tty->print_cr("");
   30.19 +    tty->cr();
   30.20    );
   30.21  
   30.22    TRACE_RANGE_CHECK_ELIMINATION(
   30.23 @@ -1024,7 +1024,7 @@
   30.24                                                           tty->print("i%d", phi->id());
   30.25                                                           tty->print(": ");
   30.26                                                           bound->print();
   30.27 -                                                         tty->print_cr("");
   30.28 +                                                         tty->cr();
   30.29                             );
   30.30                           }
   30.31                       });
   30.32 @@ -1039,7 +1039,7 @@
   30.33                                              tty->print("i%d", instr->id());
   30.34                                              tty->print(": ");
   30.35                                              bound->print();
   30.36 -                                            tty->print_cr("");
   30.37 +                                            tty->cr();
   30.38                );
   30.39            }
   30.40          }
   30.41 @@ -1400,7 +1400,7 @@
   30.42  
   30.43  // print
   30.44  void RangeCheckEliminator::Bound::print() {
   30.45 -  tty->print("");
   30.46 +  tty->print("%s", "");
   30.47    if (this->_lower_instr || this->_lower != min_jint) {
   30.48      if (this->_lower_instr) {
   30.49        tty->print("i%d", this->_lower_instr->id());

    31.1 --- a/src/share/vm/c1/c1_Runtime1.cpp	Thu May 15 18:23:26 2014 -0400
    31.2 +++ b/src/share/vm/c1/c1_Runtime1.cpp	Thu May 22 15:52:41 2014 -0400
    31.3 @@ -1,5 +1,5 @@
    31.4  /*
    31.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    31.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    31.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    31.8   *
    31.9   * This code is free software; you can redistribute it and/or modify it
   31.10 @@ -532,8 +532,8 @@
   31.11      if (TraceExceptions) {
   31.12        ttyLocker ttyl;
   31.13        ResourceMark rm;
   31.14 -      tty->print_cr("Exception <%s> (0x%x) thrown in compiled method <%s> at PC " PTR_FORMAT " for thread 0x%x",
   31.15 -                    exception->print_value_string(), (address)exception(), nm->method()->print_value_string(), pc, thread);
   31.16 +      tty->print_cr("Exception <%s> (" INTPTR_FORMAT ") thrown in compiled method <%s> at PC " INTPTR_FORMAT " for thread " INTPTR_FORMAT "",
   31.17 +                    exception->print_value_string(), p2i((address)exception()), nm->method()->print_value_string(), p2i(pc), p2i(thread));
   31.18      }
   31.19      // for AbortVMOnException flag
   31.20      NOT_PRODUCT(Exceptions::debug_check_abort(exception));
   31.21 @@ -563,7 +563,7 @@
   31.22      ttyLocker ttyl;
   31.23      ResourceMark rm;
   31.24      tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT,
   31.25 -                  thread, continuation, pc);
   31.26 +                  p2i(thread), p2i(continuation), p2i(pc));
   31.27    }
   31.28  
   31.29    return continuation;
   31.30 @@ -970,8 +970,8 @@
   31.31          address copy_buff = stub_location - *byte_skip - *byte_count;
   31.32          address being_initialized_entry = stub_location - *being_initialized_entry_offset;
   31.33          if (TracePatching) {
   31.34 -          tty->print_cr(" Patching %s at bci %d at address 0x%x  (%s)", Bytecodes::name(code), bci,
   31.35 -                        instr_pc, (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
   31.36 +          tty->print_cr(" Patching %s at bci %d at address " INTPTR_FORMAT "  (%s)", Bytecodes::name(code), bci,
   31.37 +                        p2i(instr_pc), (stub_id == Runtime1::access_field_patching_id) ? "field" : "klass");
   31.38            nmethod* caller_code = CodeCache::find_nmethod(caller_frame.pc());
   31.39            assert(caller_code != NULL, "nmethod not found");
   31.40  
   31.41 @@ -1430,7 +1430,7 @@
   31.42      methodHandle inlinee = methodHandle(vfst.method());
   31.43      inlinee->print_short_name(&ss1);
   31.44      m->print_short_name(&ss2);
   31.45 -    tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc %x", ss1.as_string(), vfst.bci(), ss2.as_string(), caller_frame.pc());
   31.46 +    tty->print_cr("Predicate failed trap in method %s at bci %d inlined in %s at pc " INTPTR_FORMAT, ss1.as_string(), vfst.bci(), ss2.as_string(), p2i(caller_frame.pc()));
   31.47    }
   31.48  
   31.49  

    32.1 --- a/src/share/vm/c1/c1_ValueType.hpp	Thu May 15 18:23:26 2014 -0400
    32.2 +++ b/src/share/vm/c1/c1_ValueType.hpp	Thu May 22 15:52:41 2014 -0400
    32.3 @@ -1,5 +1,5 @@
    32.4  /*
    32.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    32.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    32.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    32.8   *
    32.9   * This code is free software; you can redistribute it and/or modify it
   32.10 @@ -175,7 +175,7 @@
   32.11    ValueType* join(ValueType* y) const;
   32.12  
   32.13    // debugging
   32.14 -  void print(outputStream* s = tty)              { s->print(name()); }
   32.15 +  void print(outputStream* s = tty)              { s->print("%s", name()); }
   32.16  };
   32.17  
   32.18  

    33.1 --- a/src/share/vm/ci/bcEscapeAnalyzer.cpp	Thu May 15 18:23:26 2014 -0400
    33.2 +++ b/src/share/vm/ci/bcEscapeAnalyzer.cpp	Thu May 22 15:52:41 2014 -0400
    33.3 @@ -1,5 +1,5 @@
    33.4  /*
    33.5 - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
    33.6 + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    33.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33.8   *
    33.9   * This code is free software; you can redistribute it and/or modify it
   33.10 @@ -1287,10 +1287,10 @@
   33.11          tty->print_cr("class of method is not initialized.");
   33.12        else if (_level > MaxBCEAEstimateLevel)
   33.13          tty->print_cr("level (%d) exceeds MaxBCEAEstimateLevel (%d).",
   33.14 -                      _level, MaxBCEAEstimateLevel);
   33.15 +                      _level, (int) MaxBCEAEstimateLevel);
   33.16        else if (method()->code_size() > MaxBCEAEstimateSize)
   33.17 -        tty->print_cr("code size (%d) exceeds MaxBCEAEstimateSize.",
   33.18 -                      method()->code_size(), MaxBCEAEstimateSize);
   33.19 +        tty->print_cr("code size (%d) exceeds MaxBCEAEstimateSize (%d).",
   33.20 +                      method()->code_size(), (int) MaxBCEAEstimateSize);
   33.21        else
   33.22          ShouldNotReachHere();
   33.23      }

    34.1 --- a/src/share/vm/ci/ciConstant.cpp	Thu May 15 18:23:26 2014 -0400
    34.2 +++ b/src/share/vm/ci/ciConstant.cpp	Thu May 22 15:52:41 2014 -0400
    34.3 @@ -1,5 +1,5 @@
    34.4  /*
    34.5 - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    34.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    34.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    34.8   *
    34.9   * This code is free software; you can redistribute it and/or modify it
   34.10 @@ -48,7 +48,7 @@
   34.11      tty->print("%d", _value._int);
   34.12      break;
   34.13    case T_LONG:
   34.14 -    tty->print(INT64_FORMAT, _value._long);
   34.15 +    tty->print(INT64_FORMAT, (int64_t)(_value._long));
   34.16      break;
   34.17    case T_FLOAT:
   34.18      tty->print("%f", _value._float);

    35.1 --- a/src/share/vm/ci/ciEnv.cpp	Thu May 15 18:23:26 2014 -0400
    35.2 +++ b/src/share/vm/ci/ciEnv.cpp	Thu May 22 15:52:41 2014 -0400
    35.3 @@ -1,5 +1,5 @@
    35.4  /*
    35.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    35.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    35.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    35.8   *
    35.9   * This code is free software; you can redistribute it and/or modify it
   35.10 @@ -1220,8 +1220,7 @@
   35.11        if (replay_data_file != NULL) {
   35.12          fileStream replay_data_stream(replay_data_file, /*need_close=*/true);
   35.13          dump_replay_data(&replay_data_stream);
   35.14 -        tty->print("# Compiler replay data is saved as: ");
   35.15 -        tty->print_cr(buffer);
   35.16 +        tty->print_cr("# Compiler replay data is saved as: %s", buffer);
   35.17        } else {
   35.18          tty->print_cr("# Can't open file to dump replay data.");
   35.19        }
   35.20 @@ -1244,7 +1243,7 @@
   35.21          )
   35.22          replay_data_stream.flush();
   35.23          tty->print("# Compiler inline data is saved as: ");
   35.24 -        tty->print_cr(buffer);
   35.25 +        tty->print_cr("%s", buffer);
   35.26        } else {
   35.27          tty->print_cr("# Can't open file to dump inline data.");
   35.28        }

    36.1 --- a/src/share/vm/ci/ciInstanceKlass.cpp	Thu May 15 18:23:26 2014 -0400
    36.2 +++ b/src/share/vm/ci/ciInstanceKlass.cpp	Thu May 22 15:52:41 2014 -0400
    36.3 @@ -1,5 +1,5 @@
    36.4  /*
    36.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    36.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    36.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    36.8   *
    36.9   * This code is free software; you can redistribute it and/or modify it
   36.10 @@ -292,7 +292,7 @@
   36.11  // Implementation of the print method.
   36.12  void ciInstanceKlass::print_impl(outputStream* st) {
   36.13    ciKlass::print_impl(st);
   36.14 -  GUARDED_VM_ENTRY(st->print(" loader=0x%x", (address)loader());)
   36.15 +  GUARDED_VM_ENTRY(st->print(" loader=" INTPTR_FORMAT, p2i((address)loader()));)
   36.16    if (is_loaded()) {
   36.17      st->print(" loaded=true initialized=%s finalized=%s subklass=%s size=%d flags=",
   36.18                bool_to_str(is_initialized()),
   36.19 @@ -618,7 +618,7 @@
   36.20          case T_SHORT:   _out->print_cr("%d", mirror->short_field(fd->offset()));  break;
   36.21          case T_CHAR:    _out->print_cr("%d", mirror->char_field(fd->offset()));   break;
   36.22          case T_INT:     _out->print_cr("%d", mirror->int_field(fd->offset()));    break;
   36.23 -        case T_LONG:    _out->print_cr(INT64_FORMAT, mirror->long_field(fd->offset()));   break;
   36.24 +        case T_LONG:    _out->print_cr(INT64_FORMAT, (int64_t)(mirror->long_field(fd->offset())));   break;
   36.25          case T_FLOAT: {
   36.26            float f = mirror->float_field(fd->offset());
   36.27            _out->print_cr("%d", *(int*)&f);
   36.28 @@ -626,7 +626,7 @@
   36.29          }
   36.30          case T_DOUBLE: {
   36.31            double d = mirror->double_field(fd->offset());
   36.32 -          _out->print_cr(INT64_FORMAT, *(jlong*)&d);
   36.33 +          _out->print_cr(INT64_FORMAT, *(int64_t*)&d);
   36.34            break;
   36.35          }
   36.36          case T_ARRAY: {
   36.37 @@ -656,7 +656,7 @@
   36.38                _out->print_cr("\"");
   36.39              } else {
   36.40                const char* klass_name  = value->klass()->name()->as_quoted_ascii();
   36.41 -              _out->print_cr(klass_name);
   36.42 +              _out->print_cr("%s", klass_name);
   36.43              }
   36.44            } else {
   36.45              ShouldNotReachHere();

    37.1 --- a/src/share/vm/ci/ciMetadata.cpp	Thu May 15 18:23:26 2014 -0400
    37.2 +++ b/src/share/vm/ci/ciMetadata.cpp	Thu May 22 15:52:41 2014 -0400
    37.3 @@ -1,5 +1,5 @@
    37.4  /*
    37.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    37.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    37.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    37.8   *
    37.9   * This code is free software; you can redistribute it and/or modify it
   37.10 @@ -38,7 +38,7 @@
   37.11  void ciMetadata::print(outputStream* st) {
   37.12    st->print("<%s", type_string());
   37.13    GUARDED_VM_ENTRY(print_impl(st);)
   37.14 -  st->print(" ident=%d address=0x%x>", ident(), (address)this);
   37.15 +  st->print(" ident=%d address=" INTPTR_FORMAT ">", ident(), p2i((address)this));
   37.16  }
   37.17  
   37.18  

    38.1 --- a/src/share/vm/ci/ciMethodData.cpp	Thu May 15 18:23:26 2014 -0400
    38.2 +++ b/src/share/vm/ci/ciMethodData.cpp	Thu May 22 15:52:41 2014 -0400
    38.3 @@ -1,5 +1,5 @@
    38.4  /*
    38.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
    38.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
    38.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    38.8   *
    38.9   * This code is free software; you can redistribute it and/or modify it
   38.10 @@ -557,7 +557,7 @@
   38.11              if (round == 0) {
   38.12                count++;
   38.13              } else {
   38.14 -              out->print(" %d %s", dp_to_di(vdata->dp() + in_bytes(vdata->receiver_offset(i))) / sizeof(intptr_t), k->name()->as_quoted_ascii());
   38.15 +              out->print(" %d %s", (int)(dp_to_di(vdata->dp() + in_bytes(vdata->receiver_offset(i))) / sizeof(intptr_t)), k->name()->as_quoted_ascii());
   38.16              }
   38.17            }
   38.18          }
   38.19 @@ -569,7 +569,7 @@
   38.20              if (round == 0) {
   38.21                count++;
   38.22              } else {
   38.23 -              out->print(" %d %s", dp_to_di(vdata->dp() + in_bytes(vdata->receiver_offset(i))) / sizeof(intptr_t), k->name()->as_quoted_ascii());
   38.24 +              out->print(" %d %s", (int)(dp_to_di(vdata->dp() + in_bytes(vdata->receiver_offset(i))) / sizeof(intptr_t)), k->name()->as_quoted_ascii());
   38.25              }
   38.26            }
   38.27          }

    39.1 --- a/src/share/vm/ci/ciObject.cpp	Thu May 15 18:23:26 2014 -0400
    39.2 +++ b/src/share/vm/ci/ciObject.cpp	Thu May 22 15:52:41 2014 -0400
    39.3 @@ -1,5 +1,5 @@
    39.4  /*
    39.5 - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
    39.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    39.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    39.8   *
    39.9   * This code is free software; you can redistribute it and/or modify it
   39.10 @@ -214,9 +214,9 @@
   39.11  void ciObject::print(outputStream* st) {
   39.12    st->print("<%s", type_string());
   39.13    GUARDED_VM_ENTRY(print_impl(st);)
   39.14 -  st->print(" ident=%d %s address=0x%x>", ident(),
   39.15 +  st->print(" ident=%d %s address=" INTPTR_FORMAT ">", ident(),
   39.16          is_scavengable() ? "SCAVENGABLE" : "",
   39.17 -        (address)this);
   39.18 +        p2i((address)this));
   39.19  }
   39.20  
   39.21  // ------------------------------------------------------------------

    40.1 --- a/src/share/vm/ci/ciSignature.cpp	Thu May 15 18:23:26 2014 -0400
    40.2 +++ b/src/share/vm/ci/ciSignature.cpp	Thu May 22 15:52:41 2014 -0400
    40.3 @@ -1,5 +1,5 @@
    40.4  /*
    40.5 - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    40.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    40.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    40.8   *
    40.9   * This code is free software; you can redistribute it and/or modify it
   40.10 @@ -148,5 +148,5 @@
   40.11    print_signature();
   40.12   tty->print(" accessing_klass=");
   40.13    _accessing_klass->print();
   40.14 -  tty->print(" address=0x%x>", (address)this);
   40.15 +  tty->print(" address=" INTPTR_FORMAT ">", p2i((address)this));
   40.16  }

    41.1 --- a/src/share/vm/ci/ciType.cpp	Thu May 15 18:23:26 2014 -0400
    41.2 +++ b/src/share/vm/ci/ciType.cpp	Thu May 22 15:52:41 2014 -0400
    41.3 @@ -1,5 +1,5 @@
    41.4  /*
    41.5 - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    41.6 + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
    41.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    41.8   *
    41.9   * This code is free software; you can redistribute it and/or modify it
   41.10 @@ -87,7 +87,7 @@
   41.11  // Print the name of this type
   41.12  void ciType::print_name_on(outputStream* st) {
   41.13    ResourceMark rm;
   41.14 -  st->print(name());
   41.15 +  st->print("%s", name());
   41.16  }
   41.17  
   41.18  

    42.1 --- a/src/share/vm/classfile/classFileError.cpp	Thu May 15 18:23:26 2014 -0400
    42.2 +++ b/src/share/vm/classfile/classFileError.cpp	Thu May 22 15:52:41 2014 -0400
    42.3 @@ -1,5 +1,5 @@
    42.4  /*
    42.5 - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    42.6 + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    42.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    42.8   *
    42.9   * This code is free software; you can redistribute it and/or modify it
   42.10 @@ -29,6 +29,9 @@
   42.11  
   42.12  // Keep these in a separate file to prevent inlining
   42.13  
   42.14 +PRAGMA_DIAG_PUSH
   42.15 +PRAGMA_FORMAT_NONLITERAL_IGNORED
   42.16 +
   42.17  void ClassFileParser::classfile_parse_error(const char* msg, TRAPS) {
   42.18      ResourceMark rm(THREAD);
   42.19      Exceptions::fthrow(THREAD_AND_LOCATION, vmSymbols::java_lang_ClassFormatError(),
   42.20 @@ -53,6 +56,8 @@
   42.21                         msg, index, name, _class_name->as_C_string());
   42.22  }
   42.23  
   42.24 +PRAGMA_DIAG_POP
   42.25 +
   42.26  void StackMapStream::stackmap_format_error(const char* msg, TRAPS) {
   42.27    ResourceMark rm(THREAD);
   42.28    Exceptions::fthrow(

    43.1 --- a/src/share/vm/classfile/classFileParser.hpp	Thu May 15 18:23:26 2014 -0400
    43.2 +++ b/src/share/vm/classfile/classFileParser.hpp	Thu May 22 15:52:41 2014 -0400
    43.3 @@ -1,5 +1,5 @@
    43.4  /*
    43.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    43.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    43.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    43.8   *
    43.9   * This code is free software; you can redistribute it and/or modify it
   43.10 @@ -312,7 +312,9 @@
   43.11      if (!b) { classfile_parse_error(msg, CHECK); }
   43.12    }
   43.13  
   43.14 -  inline void assert_property(bool b, const char* msg, TRAPS) {
   43.15 +PRAGMA_DIAG_PUSH
   43.16 +PRAGMA_FORMAT_NONLITERAL_IGNORED
   43.17 +inline void assert_property(bool b, const char* msg, TRAPS) {
   43.18  #ifdef ASSERT
   43.19      if (!b) {
   43.20        ResourceMark rm(THREAD);
   43.21 @@ -329,6 +331,7 @@
   43.22      }
   43.23  #endif
   43.24    }
   43.25 +PRAGMA_DIAG_POP
   43.26  
   43.27    inline void check_property(bool property, const char* msg, int index, TRAPS) {
   43.28      if (_need_verify) {

    44.1 --- a/src/share/vm/classfile/classLoader.cpp	Thu May 15 18:23:26 2014 -0400
    44.2 +++ b/src/share/vm/classfile/classLoader.cpp	Thu May 22 15:52:41 2014 -0400
    44.3 @@ -1,5 +1,5 @@
    44.4  /*
    44.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    44.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    44.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44.8   *
    44.9   * This code is free software; you can redistribute it and/or modify it
   44.10 @@ -343,7 +343,7 @@
   44.11    tty->print("[Meta index for %s=", entry->name());
   44.12    for (int i = 0; i < meta_packages.length(); i++) {
   44.13      if (i > 0) tty->print(" ");
   44.14 -    tty->print(meta_packages.at(i));
   44.15 +    tty->print("%s", meta_packages.at(i));
   44.16    }
   44.17    tty->print_cr("]");
   44.18  }
   44.19 @@ -1299,7 +1299,7 @@
   44.20      e = e->next();
   44.21    }
   44.22    jlong end = os::javaTimeMillis();
   44.23 -  tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, %d ms)",
   44.24 +  tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, " JLONG_FORMAT " ms)",
   44.25                  _compile_the_world_class_counter, _compile_the_world_method_counter, (end - start));
   44.26    {
   44.27      // Print statistics as if before normal exit:

    45.1 --- a/src/share/vm/classfile/classLoaderData.cpp	Thu May 15 18:23:26 2014 -0400
    45.2 +++ b/src/share/vm/classfile/classLoaderData.cpp	Thu May 22 15:52:41 2014 -0400
    45.3 @@ -269,10 +269,10 @@
    45.4      ResourceMark rm;
    45.5      tty->print_cr("[TraceClassLoaderData] Adding k: " PTR_FORMAT " %s to CLD: "
    45.6                    PTR_FORMAT " loader: " PTR_FORMAT " %s",
    45.7 -                  k,
    45.8 +                  p2i(k),
    45.9                    k->external_name(),
   45.10 -                  k->class_loader_data(),
   45.11 -                  (void *)k->class_loader(),
   45.12 +                  p2i(k->class_loader_data()),
   45.13 +                  p2i((void *)k->class_loader()),
   45.14                    loader_name());
   45.15    }
   45.16  }
   45.17 @@ -307,11 +307,11 @@
   45.18  
   45.19    if (TraceClassLoaderData) {
   45.20      ResourceMark rm;
   45.21 -    tty->print("[ClassLoaderData: unload loader data "PTR_FORMAT, this);
   45.22 -    tty->print(" for instance "PTR_FORMAT" of %s", (void *)class_loader(),
   45.23 +    tty->print("[ClassLoaderData: unload loader data " INTPTR_FORMAT, p2i(this));
   45.24 +    tty->print(" for instance " INTPTR_FORMAT " of %s", p2i((void *)class_loader()),
   45.25                 loader_name());
   45.26      if (is_anonymous()) {
   45.27 -      tty->print(" for anonymous class  "PTR_FORMAT " ", _klasses);
   45.28 +      tty->print(" for anonymous class  " INTPTR_FORMAT " ", p2i(_klasses));
   45.29      }
   45.30      tty->print_cr("]");
   45.31    }
   45.32 @@ -469,14 +469,14 @@
   45.33  void ClassLoaderData::dump(outputStream * const out) {
   45.34    ResourceMark rm;
   45.35    out->print("ClassLoaderData CLD: "PTR_FORMAT", loader: "PTR_FORMAT", loader_klass: "PTR_FORMAT" %s {",
   45.36 -      this, (void *)class_loader(),
   45.37 -      class_loader() != NULL ? class_loader()->klass() : NULL, loader_name());
   45.38 +      p2i(this), p2i((void *)class_loader()),
   45.39 +      p2i(class_loader() != NULL ? class_loader()->klass() : NULL), loader_name());
   45.40    if (claimed()) out->print(" claimed ");
   45.41    if (is_unloading()) out->print(" unloading ");
   45.42 -  out->print(" handles " INTPTR_FORMAT, handles());
   45.43 +  out->print(" handles " INTPTR_FORMAT, p2i(handles()));
   45.44    out->cr();
   45.45    if (metaspace_or_null() != NULL) {
   45.46 -    out->print_cr("metaspace: " PTR_FORMAT, metaspace_or_null());
   45.47 +    out->print_cr("metaspace: " INTPTR_FORMAT, p2i(metaspace_or_null()));
   45.48      metaspace_or_null()->dump(out);
   45.49    } else {
   45.50      out->print_cr("metaspace: NULL");
   45.51 @@ -572,8 +572,8 @@
   45.52        if (TraceClassLoaderData) {
   45.53          ResourceMark rm;
   45.54          tty->print("[ClassLoaderData: ");
   45.55 -        tty->print("create class loader data "PTR_FORMAT, cld);
   45.56 -        tty->print(" for instance "PTR_FORMAT" of %s", (void *)cld->class_loader(),
   45.57 +        tty->print("create class loader data " INTPTR_FORMAT, p2i(cld));
   45.58 +        tty->print(" for instance " INTPTR_FORMAT " of %s", p2i((void *)cld->class_loader()),
   45.59                     cld->loader_name());
   45.60          tty->print_cr("]");
   45.61        }
   45.62 @@ -804,7 +804,7 @@
   45.63    if (class_loader() == NULL) {
   45.64      out->print("NULL class_loader");
   45.65    } else {
   45.66 -    out->print("class loader "PTR_FORMAT, this);
   45.67 +    out->print("class loader " INTPTR_FORMAT, p2i(this));
   45.68      class_loader()->print_value_on(out);
   45.69    }
   45.70  }

    46.1 --- a/src/share/vm/classfile/defaultMethods.cpp	Thu May 15 18:23:26 2014 -0400
    46.2 +++ b/src/share/vm/classfile/defaultMethods.cpp	Thu May 22 15:52:41 2014 -0400
    46.3 @@ -436,7 +436,7 @@
    46.4        _exception_name = vmSymbols::java_lang_IncompatibleClassChangeError();
    46.5        if (TraceDefaultMethods) {
    46.6          _exception_message->print_value_on(tty);
    46.7 -        tty->print_cr("");
    46.8 +        tty->cr();
    46.9        }
   46.10      }
   46.11    }
   46.12 @@ -463,7 +463,7 @@
   46.13        if (_members.at(i).second == DISQUALIFIED) {
   46.14          str->print(" (disqualified)");
   46.15        }
   46.16 -      str->print_cr("");
   46.17 +      str->cr();
   46.18      }
   46.19  
   46.20      if (_selected_target != NULL) {
   46.21 @@ -480,7 +480,7 @@
   46.22      if (!method_holder->is_interface()) {
   46.23        tty->print(" : in superclass");
   46.24      }
   46.25 -    str->print_cr("");
   46.26 +    str->cr();
   46.27    }
   46.28  
   46.29    void print_exception(outputStream* str, int indent) {
   46.30 @@ -688,7 +688,7 @@
   46.31      for (int i = 0; i < slots->length(); ++i) {
   46.32        tty->indent();
   46.33        slots->at(i)->print_on(tty);
   46.34 -      tty->print_cr("");
   46.35 +      tty->cr();
   46.36      }
   46.37    }
   46.38  #endif // ndef PRODUCT
   46.39 @@ -828,7 +828,7 @@
   46.40        streamIndentor si(tty, 2);
   46.41        tty->indent().print("Looking for default methods for slot ");
   46.42        slot->print_on(tty);
   46.43 -      tty->print_cr("");
   46.44 +      tty->cr();
   46.45      }
   46.46  #endif // ndef PRODUCT
   46.47  
   46.48 @@ -946,7 +946,7 @@
   46.49        if (TraceDefaultMethods) {
   46.50          tty->print("for slot: ");
   46.51          slot->print_on(tty);
   46.52 -        tty->print_cr("");
   46.53 +        tty->cr();
   46.54          if (method->has_target()) {
   46.55            method->print_selected(tty, 1);
   46.56          } else if (method->throws_exception()) {

    47.1 --- a/src/share/vm/classfile/dictionary.cpp	Thu May 15 18:23:26 2014 -0400
    47.2 +++ b/src/share/vm/classfile/dictionary.cpp	Thu May 22 15:52:41 2014 -0400
    47.3 @@ -30,6 +30,7 @@
    47.4  #include "prims/jvmtiRedefineClassesTrace.hpp"
    47.5  #include "utilities/hashtable.inline.hpp"
    47.6  
    47.7 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    47.8  
    47.9  DictionaryEntry*  Dictionary::_current_class_entry = NULL;
   47.10  int               Dictionary::_current_class_index =    0;

    48.1 --- a/src/share/vm/classfile/dictionary.hpp	Thu May 15 18:23:26 2014 -0400
    48.2 +++ b/src/share/vm/classfile/dictionary.hpp	Thu May 22 15:52:41 2014 -0400
    48.3 @@ -1,5 +1,5 @@
    48.4  /*
    48.5 - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    48.6 + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
    48.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    48.8   *
    48.9   * This code is free software; you can redistribute it and/or modify it
   48.10 @@ -379,7 +379,7 @@
   48.11      }
   48.12      if (method_type() != NULL) {
   48.13        if (printed)  st->print(" and ");
   48.14 -      st->print(INTPTR_FORMAT, (void *)method_type());
   48.15 +      st->print(INTPTR_FORMAT, p2i((void *)method_type()));
   48.16        printed = true;
   48.17      }
   48.18      st->print_cr(printed ? "" : "(empty)");

    49.1 --- a/src/share/vm/classfile/javaClasses.cpp	Thu May 15 18:23:26 2014 -0400
    49.2 +++ b/src/share/vm/classfile/javaClasses.cpp	Thu May 22 15:52:41 2014 -0400
    49.3 @@ -51,6 +51,8 @@
    49.4  #include "runtime/vframe.hpp"
    49.5  #include "utilities/preserveException.hpp"
    49.6  
    49.7 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    49.8 +
    49.9  #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java)    \
   49.10    klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
   49.11  
   49.12 @@ -1481,7 +1483,7 @@
   49.13    while (h_throwable.not_null()) {
   49.14      objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
   49.15      if (result.is_null()) {
   49.16 -      st->print_cr(no_stack_trace_message());
   49.17 +      st->print_cr("%s", no_stack_trace_message());
   49.18        return;
   49.19      }
   49.20  

    50.1 --- a/src/share/vm/classfile/symbolTable.cpp	Thu May 15 18:23:26 2014 -0400
    50.2 +++ b/src/share/vm/classfile/symbolTable.cpp	Thu May 22 15:52:41 2014 -0400
    50.3 @@ -39,6 +39,8 @@
    50.4  #include "gc_implementation/g1/g1StringDedup.hpp"
    50.5  #endif
    50.6  
    50.7 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
    50.8 +
    50.9  // --------------------------------------------------------------------------
   50.10  
   50.11  // the number of buckets a thread claims

    51.1 --- a/src/share/vm/classfile/systemDictionary.cpp	Thu May 15 18:23:26 2014 -0400
    51.2 +++ b/src/share/vm/classfile/systemDictionary.cpp	Thu May 22 15:52:41 2014 -0400
    51.3 @@ -2268,7 +2268,7 @@
    51.4        oop appendix = appendix_box->obj_at(0);
    51.5        if (TraceMethodHandles) {
    51.6      #ifndef PRODUCT
    51.7 -        tty->print("Linked method="INTPTR_FORMAT": ", m);
    51.8 +        tty->print("Linked method=" INTPTR_FORMAT ": ", p2i(m));
    51.9          m->print();
   51.10          if (appendix != NULL) { tty->print("appendix = "); appendix->print(); }
   51.11          tty->cr();

    52.1 --- a/src/share/vm/classfile/verifier.cpp	Thu May 15 18:23:26 2014 -0400
    52.2 +++ b/src/share/vm/classfile/verifier.cpp	Thu May 22 15:52:41 2014 -0400
    52.3 @@ -364,7 +364,7 @@
    52.4  
    52.5  void ErrorContext::details(outputStream* ss, const Method* method) const {
    52.6    if (is_valid()) {
    52.7 -    ss->print_cr("");
    52.8 +    ss->cr();
    52.9      ss->print_cr("Exception Details:");
   52.10      location_details(ss, method);
   52.11      reason_details(ss);
   52.12 @@ -379,7 +379,7 @@
   52.13    streamIndentor si(ss);
   52.14    ss->indent().print_cr("Reason:");
   52.15    streamIndentor si2(ss);
   52.16 -  ss->indent().print("");
   52.17 +  ss->indent().print("%s", "");
   52.18    switch (_fault) {
   52.19      case INVALID_BYTECODE:
   52.20        ss->print("Error exists in the bytecode");
   52.21 @@ -432,7 +432,7 @@
   52.22        ShouldNotReachHere();
   52.23        ss->print_cr("Unknown");
   52.24    }
   52.25 -  ss->print_cr("");
   52.26 +  ss->cr();
   52.27  }
   52.28  
   52.29  void ErrorContext::location_details(outputStream* ss, const Method* method) const {
   52.30 @@ -507,7 +507,7 @@
   52.31      for (u2 i = 0; i < sm_table->number_of_entries(); ++i) {
   52.32        ss->indent();
   52.33        sm_frame->print_on(ss, current_offset);
   52.34 -      ss->print_cr("");
   52.35 +      ss->cr();
   52.36        current_offset += sm_frame->offset_delta();
   52.37        sm_frame = sm_frame->next();
   52.38      }
   52.39 @@ -579,7 +579,8 @@
   52.40      tty->print_cr("Verifying method %s", m->name_and_sig_as_C_string());
   52.41    }
   52.42  
   52.43 -  const char* bad_type_msg = "Bad type on operand stack in %s";
   52.44 +// For clang, the only good constant format string is a literal constant format string.
   52.45 +#define bad_type_msg "Bad type on operand stack in %s"
   52.46  
   52.47    int32_t max_stack = m->verifier_max_stack();
   52.48    int32_t max_locals = m->max_locals();
   52.49 @@ -1676,6 +1677,8 @@
   52.50    }
   52.51  }
   52.52  
   52.53 +#undef bad_type_message
   52.54 +
   52.55  char* ClassVerifier::generate_code_data(methodHandle m, u4 code_length, TRAPS) {
   52.56    char* code_data = NEW_RESOURCE_ARRAY(char, code_length);
   52.57    memset(code_data, 0, sizeof(char) * code_length);
   52.58 @@ -2363,11 +2366,12 @@
   52.59    if (opcode == Bytecodes::_invokedynamic) {
   52.60      if (!EnableInvokeDynamic ||
   52.61          _klass->major_version() < Verifier::INVOKEDYNAMIC_MAJOR_VERSION) {
   52.62 -      class_format_error(
   52.63 -        (!EnableInvokeDynamic ?
   52.64 -         "invokedynamic instructions not enabled in this JVM" :
   52.65 -         "invokedynamic instructions not supported by this class file version"),
   52.66 -        _klass->external_name());
   52.67 +        if (!EnableInvokeDynamic) {
   52.68 +            class_format_error("invokedynamic instructions not enabled in this JVM");
   52.69 +        } else {
   52.70 +            class_format_error("invokedynamic instructions not supported by this class file version (%d), class %s",
   52.71 +                               _klass->major_version(), _klass->external_name());
   52.72 +        }
   52.73        return;
   52.74      }
   52.75    } else {

    53.1 --- a/src/share/vm/classfile/verifier.hpp	Thu May 15 18:23:26 2014 -0400
    53.2 +++ b/src/share/vm/classfile/verifier.hpp	Thu May 22 15:52:41 2014 -0400
    53.3 @@ -1,5 +1,5 @@
    53.4  /*
    53.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    53.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    53.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    53.8   *
    53.9   * This code is free software; you can redistribute it and/or modify it
   53.10 @@ -375,15 +375,15 @@
   53.11    bool has_error() const { return result() != NULL; }
   53.12    char* exception_message() {
   53.13      stringStream ss;
   53.14 -    ss.print(_message);
   53.15 +    ss.print("%s", _message);
   53.16      _error_context.details(&ss, _method());
   53.17      return ss.as_string();
   53.18    }
   53.19  
   53.20    // Called when verify or class format errors are encountered.
   53.21    // May throw an exception based upon the mode.
   53.22 -  void verify_error(ErrorContext ctx, const char* fmt, ...);
   53.23 -  void class_format_error(const char* fmt, ...);
   53.24 +  void verify_error(ErrorContext ctx, const char* fmt, ...) ATTRIBUTE_PRINTF(3, 4);
   53.25 +  void class_format_error(const char* fmt, ...) ATTRIBUTE_PRINTF(2, 3);
   53.26  
   53.27    Klass* load_class(Symbol* name, TRAPS);
   53.28  

    54.1 --- a/src/share/vm/classfile/vmSymbols.cpp	Thu May 15 18:23:26 2014 -0400
    54.2 +++ b/src/share/vm/classfile/vmSymbols.cpp	Thu May 22 15:52:41 2014 -0400
    54.3 @@ -1,5 +1,5 @@
    54.4  /*
    54.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    54.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    54.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    54.8   *
    54.9   * This code is free software; you can redistribute it and/or modify it
   54.10 @@ -533,7 +533,7 @@
   54.11      xtty->begin_elem("intrinsic_misdeclared actual='%s' declared='%s'",
   54.12                       actual_name, declared_name);
   54.13      xtty->method(mh);
   54.14 -    xtty->end_elem("");
   54.15 +    xtty->end_elem("%s", "");
   54.16    }
   54.17    if (PrintMiscellaneous && (WizardMode || Verbose)) {
   54.18      tty->print_cr("*** misidentified method; %s(%d) should be %s(%d):",

    55.1 --- a/src/share/vm/code/codeBlob.cpp	Thu May 15 18:23:26 2014 -0400
    55.2 +++ b/src/share/vm/code/codeBlob.cpp	Thu May 22 15:52:41 2014 -0400
    55.3 @@ -1,5 +1,5 @@
    55.4  /*
    55.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    55.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    55.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55.8   *
    55.9   * This code is free software; you can redistribute it and/or modify it
   55.10 @@ -530,7 +530,7 @@
   55.11  }
   55.12  
   55.13  void CodeBlob::print_on(outputStream* st) const {
   55.14 -  st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", this);
   55.15 +  st->print_cr("[CodeBlob (" INTPTR_FORMAT ")]", p2i(this));
   55.16    st->print_cr("Framesize: %d", _frame_size);
   55.17  }
   55.18  
   55.19 @@ -548,7 +548,7 @@
   55.20  }
   55.21  
   55.22  void BufferBlob::print_value_on(outputStream* st) const {
   55.23 -  st->print_cr("BufferBlob (" INTPTR_FORMAT  ") used for %s", this, name());
   55.24 +  st->print_cr("BufferBlob (" INTPTR_FORMAT  ") used for %s", p2i(this), name());
   55.25  }
   55.26  
   55.27  void RuntimeStub::verify() {
   55.28 @@ -558,13 +558,13 @@
   55.29  void RuntimeStub::print_on(outputStream* st) const {
   55.30    ttyLocker ttyl;
   55.31    CodeBlob::print_on(st);
   55.32 -  st->print("Runtime Stub (" INTPTR_FORMAT "): ", this);
   55.33 -  st->print_cr(name());
   55.34 +  st->print("Runtime Stub (" INTPTR_FORMAT "): ", p2i(this));
   55.35 +  st->print_cr("%s", name());
   55.36    Disassembler::decode((CodeBlob*)this, st);
   55.37  }
   55.38  
   55.39  void RuntimeStub::print_value_on(outputStream* st) const {
   55.40 -  st->print("RuntimeStub (" INTPTR_FORMAT "): ", this); st->print(name());
   55.41 +  st->print("RuntimeStub (" INTPTR_FORMAT "): ", p2i(this)); st->print("%s", name());
   55.42  }
   55.43  
   55.44  void SingletonBlob::verify() {
   55.45 @@ -574,12 +574,12 @@
   55.46  void SingletonBlob::print_on(outputStream* st) const {
   55.47    ttyLocker ttyl;
   55.48    CodeBlob::print_on(st);
   55.49 -  st->print_cr(name());
   55.50 +  st->print_cr("%s", name());
   55.51    Disassembler::decode((CodeBlob*)this, st);
   55.52  }
   55.53  
   55.54  void SingletonBlob::print_value_on(outputStream* st) const {
   55.55 -  st->print_cr(name());
   55.56 +  st->print_cr("%s", name());
   55.57  }
   55.58  
   55.59  void DeoptimizationBlob::print_value_on(outputStream* st) const {

    56.1 --- a/src/share/vm/code/codeCache.cpp	Thu May 15 18:23:26 2014 -0400
    56.2 +++ b/src/share/vm/code/codeCache.cpp	Thu May 22 15:52:41 2014 -0400
    56.3 @@ -1,5 +1,5 @@
    56.4  /*
    56.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    56.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    56.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    56.8   *
    56.9   * This code is free software; you can redistribute it and/or modify it
   56.10 @@ -81,10 +81,10 @@
   56.11    bool is_empty()                                { return count == 0; }
   56.12  
   56.13    void print(const char* title) {
   56.14 -    tty->print_cr(" #%d %s = %dK (hdr %d%%,  loc %d%%, code %d%%, stub %d%%, [oops %d%%, data %d%%, pcs %d%%])",
   56.15 +    tty->print_cr(" #%d %s = %dK (hdr %d%%,  loc %d%%, code %d%%, stub %d%%, [oops %d%%, metadata %d%%, data %d%%, pcs %d%%])",
   56.16                    count,
   56.17                    title,
   56.18 -                  total() / K,
   56.19 +                  (int)(total() / K),
   56.20                    header_size             * 100 / total_size,
   56.21                    relocation_size         * 100 / total_size,
   56.22                    code_size               * 100 / total_size,
   56.23 @@ -191,7 +191,7 @@
   56.24      }
   56.25      if (PrintCodeCacheExtension) {
   56.26        ResourceMark rm;
   56.27 -      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (%d bytes)",
   56.28 +      tty->print_cr("code cache extended to [" INTPTR_FORMAT ", " INTPTR_FORMAT "] (" SSIZE_FORMAT " bytes)",
   56.29                      (intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
   56.30                      (address)_heap->high() - (address)_heap->low_boundary());
   56.31      }
   56.32 @@ -496,7 +496,7 @@
   56.33            if (CompiledIC::is_icholder_call_site(iter.virtual_call_reloc())) {
   56.34              CompiledIC *ic = CompiledIC_at(iter.reloc());
   56.35              if (TraceCompiledIC) {
   56.36 -              tty->print("noticed icholder " INTPTR_FORMAT " ", ic->cached_icholder());
   56.37 +              tty->print("noticed icholder " INTPTR_FORMAT " ", p2i(ic->cached_icholder()));
   56.38                ic->print();
   56.39              }
   56.40              assert(ic->cached_icholder() != NULL, "must be non-NULL");
   56.41 @@ -775,7 +775,7 @@
   56.42    if (PrintCodeCache2) {  // Need to add a new flag
   56.43      ResourceMark rm;
   56.44      if (size == 0)  size = cb->size();
   56.45 -    tty->print_cr("CodeCache %s:  addr: " INTPTR_FORMAT ", size: 0x%x", event, cb, size);
   56.46 +    tty->print_cr("CodeCache %s:  addr: " INTPTR_FORMAT ", size: 0x%x", event, p2i(cb), size);
   56.47    }
   56.48  }
   56.49  
   56.50 @@ -900,7 +900,7 @@
   56.51  
   56.52    tty->print_cr("CodeCache:");
   56.53  
   56.54 -  tty->print_cr("nmethod dependency checking time %f", dependentCheckTime.seconds(),
   56.55 +  tty->print_cr("nmethod dependency checking time %f, per dependent %f", dependentCheckTime.seconds(),
   56.56                  dependentCheckTime.seconds() / dependentCheckCount);
   56.57  
   56.58    if (!live.is_empty()) {
   56.59 @@ -947,9 +947,9 @@
   56.60  
   56.61    if (detailed) {
   56.62      st->print_cr(" bounds [" INTPTR_FORMAT ", " INTPTR_FORMAT ", " INTPTR_FORMAT "]",
   56.63 -                 _heap->low_boundary(),
   56.64 -                 _heap->high(),
   56.65 -                 _heap->high_boundary());
   56.66 +                 p2i(_heap->low_boundary()),
   56.67 +                 p2i(_heap->high()),
   56.68 +                 p2i(_heap->high_boundary()));
   56.69      st->print_cr(" total_blobs=" UINT32_FORMAT " nmethods=" UINT32_FORMAT
   56.70                   " adapters=" UINT32_FORMAT,
   56.71                   nof_blobs(), nof_nmethods(), nof_adapters());

    57.1 --- a/src/share/vm/code/compiledIC.cpp	Thu May 15 18:23:26 2014 -0400
    57.2 +++ b/src/share/vm/code/compiledIC.cpp	Thu May 22 15:52:41 2014 -0400
    57.3 @@ -1,5 +1,5 @@
    57.4  /*
    57.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    57.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    57.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    57.8   *
    57.9   * This code is free software; you can redistribute it and/or modify it
   57.10 @@ -88,9 +88,9 @@
   57.11    if (TraceCompiledIC) {
   57.12      tty->print("  ");
   57.13      print_compiled_ic();
   57.14 -    tty->print(" changing destination to " INTPTR_FORMAT, entry_point);
   57.15 +    tty->print(" changing destination to " INTPTR_FORMAT, p2i(entry_point));
   57.16      if (!is_optimized()) {
   57.17 -      tty->print(" changing cached %s to " INTPTR_FORMAT, is_icholder ? "icholder" : "metadata", (address)cache);
   57.18 +      tty->print(" changing cached %s to " INTPTR_FORMAT, is_icholder ? "icholder" : "metadata", p2i((address)cache));
   57.19      }
   57.20      if (is_icstub) {
   57.21        tty->print(" (icstub)");
   57.22 @@ -195,7 +195,7 @@
   57.23    if (TraceICs) {
   57.24      ResourceMark rm;
   57.25      tty->print_cr ("IC@" INTPTR_FORMAT ": to megamorphic %s entry: " INTPTR_FORMAT,
   57.26 -                   instruction_address(), call_info->selected_method()->print_value_string(), entry);
   57.27 +                   p2i(instruction_address()), call_info->selected_method()->print_value_string(), p2i(entry));
   57.28    }
   57.29  
   57.30    // We can't check this anymore. With lazy deopt we could have already
   57.31 @@ -272,7 +272,7 @@
   57.32  void CompiledIC::set_to_clean() {
   57.33    assert(SafepointSynchronize::is_at_safepoint() || CompiledIC_lock->is_locked() , "MT-unsafe call");
   57.34    if (TraceInlineCacheClearing || TraceICs) {
   57.35 -    tty->print_cr("IC@" INTPTR_FORMAT ": set to clean", instruction_address());
   57.36 +    tty->print_cr("IC@" INTPTR_FORMAT ": set to clean", p2i(instruction_address()));
   57.37      print();
   57.38    }
   57.39  
   57.40 @@ -354,7 +354,7 @@
   57.41        if (TraceICs) {
   57.42           ResourceMark rm(thread);
   57.43           tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to interpreter: %s",
   57.44 -           instruction_address(),
   57.45 +           p2i(instruction_address()),
   57.46             method->print_value_string());
   57.47        }
   57.48      } else {
   57.49 @@ -362,7 +362,7 @@
   57.50        InlineCacheBuffer::create_transition_stub(this, info.claim_cached_icholder(), info.entry());
   57.51        if (TraceICs) {
   57.52           ResourceMark rm(thread);
   57.53 -         tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to interpreter via icholder ", instruction_address());
   57.54 +         tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to interpreter via icholder ", p2i(instruction_address()));
   57.55        }
   57.56      }
   57.57    } else {
   57.58 @@ -392,7 +392,7 @@
   57.59        ResourceMark rm(thread);
   57.60        assert(info.cached_metadata() == NULL || info.cached_metadata()->is_klass(), "must be");
   57.61        tty->print_cr ("IC@" INTPTR_FORMAT ": monomorphic to compiled (rcvr klass) %s: %s",
   57.62 -        instruction_address(),
   57.63 +        p2i(instruction_address()),
   57.64          ((Klass*)info.cached_metadata())->print_value_string(),
   57.65          (safe) ? "" : "via stub");
   57.66      }
   57.67 @@ -530,8 +530,8 @@
   57.68      if (TraceICs) {
   57.69        ResourceMark rm;
   57.70        tty->print_cr("CompiledStaticCall@" INTPTR_FORMAT ": set_to_compiled " INTPTR_FORMAT,
   57.71 -                    instruction_address(),
   57.72 -                    info.entry());
   57.73 +                    p2i(instruction_address()),
   57.74 +                    p2i(info.entry()));
   57.75      }
   57.76      // Call to compiled code
   57.77      assert (CodeCache::contains(info.entry()), "wrong entry point");
   57.78 @@ -600,11 +600,11 @@
   57.79  
   57.80  void CompiledIC::print_compiled_ic() {
   57.81    tty->print("Inline cache at " INTPTR_FORMAT ", calling %s " INTPTR_FORMAT " cached_value " INTPTR_FORMAT,
   57.82 -             instruction_address(), is_call_to_interpreted() ? "interpreted " : "", ic_destination(), is_optimized() ? NULL : cached_value());
   57.83 +             p2i(instruction_address()), is_call_to_interpreted() ? "interpreted " : "", p2i(ic_destination()), p2i(is_optimized() ? NULL : cached_value()));
   57.84  }
   57.85  
   57.86  void CompiledStaticCall::print() {
   57.87 -  tty->print("static call at " INTPTR_FORMAT " -> ", instruction_address());
   57.88 +  tty->print("static call at " INTPTR_FORMAT " -> ", p2i(instruction_address()));
   57.89    if (is_clean()) {
   57.90      tty->print("clean");
   57.91    } else if (is_call_to_compiled()) {

    58.1 --- a/src/share/vm/code/compressedStream.cpp	Thu May 15 18:23:26 2014 -0400
    58.2 +++ b/src/share/vm/code/compressedStream.cpp	Thu May 22 15:52:41 2014 -0400
    58.3 @@ -1,5 +1,5 @@
    58.4  /*
    58.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    58.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    58.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    58.8   *
    58.9   * This code is free software; you can redistribute it and/or modify it
   58.10 @@ -212,6 +212,8 @@
   58.11    return h ^ l;
   58.12  }
   58.13  
   58.14 +PRAGMA_DIAG_PUSH
   58.15 +PRAGMA_FORMAT_IGNORED // Someone needs to deal with this.
   58.16  void test_compressed_stream(int trace) {
   58.17    CompressedWriteStream bytes(stretch_limit * 100);
   58.18    jint n;
   58.19 @@ -275,6 +277,7 @@
   58.20    guarantee(length == length2, "bad length");
   58.21    guarantee(fails == 0, "test failures");
   58.22  }
   58.23 +PRAGMA_DIAG_POP
   58.24  
   58.25  #if defined(_MSC_VER) &&_MSC_VER >=1400 && !defined(_WIN64)
   58.26  #pragma warning(default: 4748)

    59.1 --- a/src/share/vm/code/debugInfo.cpp	Thu May 15 18:23:26 2014 -0400
    59.2 +++ b/src/share/vm/code/debugInfo.cpp	Thu May 22 15:52:41 2014 -0400
    59.3 @@ -1,5 +1,5 @@
    59.4  /*
    59.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    59.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    59.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    59.8   *
    59.9   * This code is free software; you can redistribute it and/or modify it
   59.10 @@ -28,7 +28,9 @@
   59.11  #include "code/nmethod.hpp"
   59.12  #include "runtime/handles.inline.hpp"
   59.13  
   59.14 -// Comstructors
   59.15 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   59.16 +
   59.17 +// Constructors
   59.18  
   59.19  DebugInfoWriteStream::DebugInfoWriteStream(DebugInformationRecorder* recorder, int initial_size)
   59.20  : CompressedWriteStream(initial_size) {

    60.1 --- a/src/share/vm/code/exceptionHandlerTable.cpp	Thu May 15 18:23:26 2014 -0400
    60.2 +++ b/src/share/vm/code/exceptionHandlerTable.cpp	Thu May 22 15:52:41 2014 -0400
    60.3 @@ -1,5 +1,5 @@
    60.4  /*
    60.5 - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
    60.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    60.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    60.8   *
    60.9   * This code is free software; you can redistribute it and/or modify it
   60.10 @@ -27,6 +27,8 @@
   60.11  #include "code/nmethod.hpp"
   60.12  #include "memory/allocation.inline.hpp"
   60.13  
   60.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   60.15 +
   60.16  void ExceptionHandlerTable::add_entry(HandlerTableEntry entry) {
   60.17    _nesting.check();
   60.18    if (_length >= _size) {

    61.1 --- a/src/share/vm/code/icBuffer.cpp	Thu May 15 18:23:26 2014 -0400
    61.2 +++ b/src/share/vm/code/icBuffer.cpp	Thu May 22 15:52:41 2014 -0400
    61.3 @@ -1,5 +1,5 @@
    61.4  /*
    61.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    61.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    61.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    61.8   *
    61.9   * This code is free software; you can redistribute it and/or modify it
   61.10 @@ -39,6 +39,7 @@
   61.11  #include "runtime/mutexLocker.hpp"
   61.12  #include "runtime/stubRoutines.hpp"
   61.13  
   61.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   61.15  
   61.16  DEF_STUB_INTERFACE(ICStub);
   61.17  

    62.1 --- a/src/share/vm/code/nmethod.cpp	Thu May 15 18:23:26 2014 -0400
    62.2 +++ b/src/share/vm/code/nmethod.cpp	Thu May 22 15:52:41 2014 -0400
    62.3 @@ -1,5 +1,5 @@
    62.4  /*
    62.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    62.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    62.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    62.8   *
    62.9   * This code is free software; you can redistribute it and/or modify it
   62.10 @@ -46,6 +46,8 @@
   62.11  #include "shark/sharkCompiler.hpp"
   62.12  #endif
   62.13  
   62.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   62.15 +
   62.16  #ifdef DTRACE_ENABLED
   62.17  
   62.18  // Only bother with this argument setup if dtrace is available

    63.1 --- a/src/share/vm/code/pcDesc.cpp	Thu May 15 18:23:26 2014 -0400
    63.2 +++ b/src/share/vm/code/pcDesc.cpp	Thu May 22 15:52:41 2014 -0400
    63.3 @@ -1,5 +1,5 @@
    63.4  /*
    63.5 - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    63.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    63.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    63.8   *
    63.9   * This code is free software; you can redistribute it and/or modify it
   63.10 @@ -29,6 +29,8 @@
   63.11  #include "code/scopeDesc.hpp"
   63.12  #include "memory/resourceArea.hpp"
   63.13  
   63.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   63.15 +
   63.16  PcDesc::PcDesc(int pc_offset, int scope_decode_offset, int obj_decode_offset) {
   63.17    _pc_offset           = pc_offset;
   63.18    _scope_decode_offset = scope_decode_offset;

    64.1 --- a/src/share/vm/code/relocInfo.cpp	Thu May 15 18:23:26 2014 -0400
    64.2 +++ b/src/share/vm/code/relocInfo.cpp	Thu May 22 15:52:41 2014 -0400
    64.3 @@ -1,5 +1,5 @@
    64.4  /*
    64.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    64.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    64.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    64.8   *
    64.9   * This code is free software; you can redistribute it and/or modify it
   64.10 @@ -31,6 +31,7 @@
   64.11  #include "runtime/stubCodeGenerator.hpp"
   64.12  #include "utilities/copy.hpp"
   64.13  
   64.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   64.15  
   64.16  const RelocationHolder RelocationHolder::none; // its type is relocInfo::none
   64.17  

    65.1 --- a/src/share/vm/code/scopeDesc.cpp	Thu May 15 18:23:26 2014 -0400
    65.2 +++ b/src/share/vm/code/scopeDesc.cpp	Thu May 22 15:52:41 2014 -0400
    65.3 @@ -1,5 +1,5 @@
    65.4  /*
    65.5 - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
    65.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    65.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    65.8   *
    65.9   * This code is free software; you can redistribute it and/or modify it
   65.10 @@ -30,6 +30,7 @@
   65.11  #include "oops/oop.inline.hpp"
   65.12  #include "runtime/handles.inline.hpp"
   65.13  
   65.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   65.15  
   65.16  ScopeDesc::ScopeDesc(const nmethod* code, int decode_offset, int obj_decode_offset, bool reexecute, bool return_oop) {
   65.17    _code          = code;

    66.1 --- a/src/share/vm/code/vtableStubs.cpp	Thu May 15 18:23:26 2014 -0400
    66.2 +++ b/src/share/vm/code/vtableStubs.cpp	Thu May 22 15:52:41 2014 -0400
    66.3 @@ -1,5 +1,5 @@
    66.4  /*
    66.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    66.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
    66.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    66.8   *
    66.9   * This code is free software; you can redistribute it and/or modify it
   66.10 @@ -39,6 +39,8 @@
   66.11  #include "opto/matcher.hpp"
   66.12  #endif
   66.13  
   66.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   66.15 +
   66.16  // -----------------------------------------------------------------------------------------
   66.17  // Implementation of VtableStub
   66.18  

    67.1 --- a/src/share/vm/compiler/compileBroker.cpp	Thu May 15 18:23:26 2014 -0400
    67.2 +++ b/src/share/vm/compiler/compileBroker.cpp	Thu May 22 15:52:41 2014 -0400
    67.3 @@ -1,5 +1,5 @@
    67.4  /*
    67.5 - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    67.6 + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
    67.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    67.8   *
    67.9   * This code is free software; you can redistribute it and/or modify it
   67.10 @@ -206,7 +206,7 @@
   67.11    void log_nmethod(JavaThread* thread, nmethod* nm) {
   67.12      log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
   67.13          nm->compile_id(), nm->is_osr_method() ? "%" : "",
   67.14 -        nm, nm->code_begin(), nm->code_end());
   67.15 +        p2i(nm), p2i(nm->code_begin()), p2i(nm->code_end()));
   67.16    }
   67.17  
   67.18    void log_failure(JavaThread* thread, CompileTask* task, const char* reason, const char* retry_message) {
   67.19 @@ -1791,7 +1791,7 @@
   67.20          if (xtty != NULL) {
   67.21            ttyLocker ttyl;
   67.22            // Record any per thread log files
   67.23 -          xtty->elem("thread_logfile thread='%d' filename='%s'", thread_id, file_name);
   67.24 +          xtty->elem("thread_logfile thread='" INTX_FORMAT "' filename='%s'", thread_id, file_name);
   67.25          }
   67.26          return;
   67.27        }
   67.28 @@ -1822,7 +1822,7 @@
   67.29    if (_should_block) {
   67.30  #ifndef PRODUCT
   67.31      if (PrintCompilation && (Verbose || WizardMode))
   67.32 -      tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", Thread::current());
   67.33 +      tty->print_cr("compiler thread " INTPTR_FORMAT " poll detects block request", p2i(Thread::current()));
   67.34  #endif
   67.35      ThreadInVMfromNative tivfn(JavaThread::current());
   67.36    }
   67.37 @@ -1839,7 +1839,7 @@
   67.38      CodeCache::print_summary(&s, detailed);
   67.39    }
   67.40    ttyLocker ttyl;
   67.41 -  tty->print(s.as_string());
   67.42 +  tty->print("%s", s.as_string());
   67.43  }
   67.44  
   67.45  // ------------------------------------------------------------------
   67.46 @@ -2044,7 +2044,7 @@
   67.47        // Lock to prevent tearing
   67.48        ttyLocker ttyl;
   67.49        xtty->begin_elem("code_cache_full");
   67.50 -      xtty->print(s.as_string());
   67.51 +      xtty->print("%s", s.as_string());
   67.52        xtty->stamp();
   67.53        xtty->end_elem();
   67.54      }

    68.1 --- a/src/share/vm/compiler/compileLog.cpp	Thu May 15 18:23:26 2014 -0400
    68.2 +++ b/src/share/vm/compiler/compileLog.cpp	Thu May 22 15:52:41 2014 -0400
    68.3 @@ -1,5 +1,5 @@
    68.4  /*
    68.5 - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    68.6 + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    68.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    68.8   *
    68.9   * This code is free software; you can redistribute it and/or modify it
   68.10 @@ -294,7 +294,7 @@
   68.11  // Print about successful method inlining.
   68.12  void CompileLog::inline_success(const char* reason) {
   68.13    begin_elem("inline_success reason='");
   68.14 -  text(reason);
   68.15 +  text("%s", reason);
   68.16    end_elem("'");
   68.17  }
   68.18  
   68.19 @@ -304,7 +304,7 @@
   68.20  // Print about failed method inlining.
   68.21  void CompileLog::inline_fail(const char* reason) {
   68.22    begin_elem("inline_fail reason='");
   68.23 -  text(reason);
   68.24 +  text("%s", reason);
   68.25    end_elem("'");
   68.26  }
   68.27  
   68.28 @@ -330,5 +330,5 @@
   68.29  void CompileLog::code_cache_state() {
   68.30    begin_elem("code_cache");
   68.31    CodeCache::log_state(this);
   68.32 -  end_elem("");
   68.33 +  end_elem("%s", "");
   68.34  }

    69.1 --- a/src/share/vm/compiler/compileLog.hpp	Thu May 15 18:23:26 2014 -0400
    69.2 +++ b/src/share/vm/compiler/compileLog.hpp	Thu May 22 15:52:41 2014 -0400
    69.3 @@ -1,5 +1,5 @@
    69.4  /*
    69.5 - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
    69.6 + * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    69.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    69.8   *
    69.9   * This code is free software; you can redistribute it and/or modify it
   69.10 @@ -54,7 +54,7 @@
   69.11  
   69.12    static CompileLog* _first;     // head of static chain
   69.13  
   69.14 -  void va_tag(bool push, const char* format, va_list ap);
   69.15 +  void va_tag(bool push, const char* format, va_list ap) ATTRIBUTE_PRINTF(3, 0);
   69.16  
   69.17   public:
   69.18    CompileLog(const char* file_name, FILE* fp, intx thread_id);
   69.19 @@ -68,7 +68,7 @@
   69.20    // or reset, context string will be silently ignored
   69.21    stringStream* context()                        { return &_context; }
   69.22    void    clear_context()                        { context()->reset(); }
   69.23 -  void      set_context(const char* format, ...);
   69.24 +  void      set_context(const char* format, ...) ATTRIBUTE_PRINTF(2, 3);
   69.25  
   69.26    void          name(ciSymbol* s);               // name='s'
   69.27    void          name(Symbol* s)                  { xmlStream::name(s); }

    70.1 --- a/src/share/vm/compiler/compilerOracle.cpp	Thu May 15 18:23:26 2014 -0400
    70.2 +++ b/src/share/vm/compiler/compilerOracle.cpp	Thu May 22 15:52:41 2014 -0400
    70.3 @@ -1,5 +1,5 @@
    70.4  /*
    70.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    70.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    70.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    70.8   *
    70.9   * This code is free software; you can redistribute it and/or modify it
   70.10 @@ -539,7 +539,7 @@
   70.11      tty->print_cr("CompilerOracle: unrecognized line");
   70.12      tty->print_cr("  \"%s\"", original_line);
   70.13      if (error_msg != NULL) {
   70.14 -      tty->print_cr(error_msg);
   70.15 +      tty->print_cr("%s", error_msg);
   70.16      }
   70.17    }
   70.18  }
   70.19 @@ -661,7 +661,7 @@
   70.20    char method_sep = have_colon ? ':' : '.';
   70.21  
   70.22    if (Verbose) {
   70.23 -    tty->print_cr(line);
   70.24 +    tty->print_cr("%s", line);
   70.25    }
   70.26  
   70.27    ResourceMark rm;

    71.1 --- a/src/share/vm/compiler/disassembler.cpp	Thu May 15 18:23:26 2014 -0400
    71.2 +++ b/src/share/vm/compiler/disassembler.cpp	Thu May 22 15:52:41 2014 -0400
    71.3 @@ -1,5 +1,5 @@
    71.4  /*
    71.5 - * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
    71.6 + * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
    71.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    71.8   *
    71.9   * This code is free software; you can redistribute it and/or modify it
   71.10 @@ -51,6 +51,8 @@
   71.11  #include "shark/sharkEntry.hpp"
   71.12  #endif
   71.13  
   71.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   71.15 +
   71.16  void*       Disassembler::_library               = NULL;
   71.17  bool        Disassembler::_tried_to_load_library = false;
   71.18  
   71.19 @@ -411,6 +413,7 @@
   71.20    return env->handle_event(event, (address) arg);
   71.21  }
   71.22  
   71.23 +ATTRIBUTE_PRINTF(2, 3)
   71.24  static int printf_to_env(void* env_pv, const char* format, ...) {
   71.25    decode_env* env = (decode_env*) env_pv;
   71.26    outputStream* st = env->output();

    72.1 --- a/src/share/vm/compiler/methodLiveness.cpp	Thu May 15 18:23:26 2014 -0400
    72.2 +++ b/src/share/vm/compiler/methodLiveness.cpp	Thu May 22 15:52:41 2014 -0400
    72.3 @@ -1,5 +1,5 @@
    72.4  /*
    72.5 - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
    72.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    72.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    72.8   *
    72.9   * This code is free software; you can redistribute it and/or modify it
   72.10 @@ -32,6 +32,8 @@
   72.11  #include "memory/allocation.inline.hpp"
   72.12  #include "utilities/bitMap.inline.hpp"
   72.13  
   72.14 +PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
   72.15 +
   72.16  // The MethodLiveness class performs a simple liveness analysis on a method
   72.17  // in order to decide which locals are live (that is, will be used again) at
   72.18  // a particular bytecode index (bci).

    73.1 --- a/src/share/vm/compiler/oopMap.cpp	Thu May 15 18:23:26 2014 -0400
    73.2 +++ b/src/share/vm/compiler/oopMap.cpp	Thu May 22 15:52:41 2014 -0400
    73.3 @@ -1,5 +1,5 @@
    73.4  /*
    73.5 - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
    73.6 + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
    73.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    73.8   *
    73.9   * This code is free software; you can redistribute it and/or modify it
   73.10 @@ -646,8 +646,8 @@
   73.11        tty->print_cr(
   73.12          "Add derived pointer@" INTPTR_FORMAT
   73.13          " - Derived: " INTPTR_FORMAT
   73.14 -        " Base: " INTPTR_FORMAT " (@" INTPTR_FORMAT ") (Offset: %d)",
   73.15 -        derived_loc, (address)*derived_loc, (address)*base_loc, base_loc, offset
   73.16 +        " Base: " INTPTR_FORMAT " (@" INTPTR_FORMAT ") (Offset: " INTX_FORMAT ")",
   73.17 +        p2i(derived_loc), p2i((address)*derived_loc), p2i((address)*base_loc), p2i(base_loc), offset
   73.18        );
   73.19      }
   73.20      // Set derived oop location to point to base.
   73.21 @@ -674,8 +674,8 @@
   73.22  
   73.23      if (TraceDerivedPointers) {
   73.24        tty->print_cr("Updating derived pointer@" INTPTR_FORMAT
   73.25 -                    " - Derived: " INTPTR_FORMAT "  Base: " INTPTR_FORMAT " (Offset: %d)",
   73.26 -          derived_loc, (address)*derived_loc, (address)base, offset);
   73.27 +                    " - Derived: " INTPTR_FORMAT "  Base: " INTPTR_FORMAT " (Offset: " INTX_FORMAT ")",
   73.28 +          p2i(derived_loc), p2i((address)*derived_loc), p2i((address)base), offset);
   73.29      }
   73.30  
   73.31      // Delete entry

    74.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp	Thu May 15 18:23:26 2014 -0400
    74.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/adaptiveFreeList.cpp	Thu May 22 15:52:41 2014 -0400
    74.3 @@ -1,5 +1,5 @@
    74.4  /*
    74.5 - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    74.6 + * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
    74.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    74.8   *
    74.9   * This code is free software; you can redistribute it and/or modify it
   74.10 @@ -157,7 +157,7 @@
   74.11                   " split_deaths(" SIZE_FORMAT ")"
   74.12                   " coal_deaths(" SIZE_FORMAT ")"
   74.13                   " + count(" SSIZE_FORMAT ")",
   74.14 -                 this, size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(),
   74.15 +                 p2i(this), size(), _allocation_stats.prev_sweep(), _allocation_stats.split_births(),
   74.16                   _allocation_stats.split_births(), _allocation_stats.split_deaths(),
   74.17                   _allocation_stats.coal_deaths(), count()));
   74.18  }

    75.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Thu May 15 18:23:26 2014 -0400
    75.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Thu May 22 15:52:41 2014 -0400
    75.3 @@ -1,5 +1,5 @@
    75.4  /*
    75.5 - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
    75.6 + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
    75.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    75.8   *
    75.9   * This code is free software; you can redistribute it and/or modify it
   75.10 @@ -427,7 +427,7 @@
   75.11  void LinearAllocBlock::print_on(outputStream* st) const {
   75.12    st->print_cr(" LinearAllocBlock: ptr = " PTR_FORMAT ", word_size = " SIZE_FORMAT
   75.13              ", refillsize = " SIZE_FORMAT ", allocation_size_limit = " SIZE_FORMAT,
   75.14 -            _ptr, _word_size, _refillSize, _allocation_size_limit);
   75.15 +            p2i(_ptr), _word_size, _refillSize, _allocation_size_limit);
   75.16  }
   75.17  
   75.18  void CompactibleFreeListSpace::print_on(outputStream* st) const {
   75.19 @@ -458,7 +458,7 @@
   75.20      for (FreeChunk* fc = _indexedFreeList[i].head(); fc != NULL;
   75.21           fc = fc->next()) {
   75.22        gclog_or_tty->print_cr("\t[" PTR_FORMAT "," PTR_FORMAT ")  %s",
   75.23 -                          fc, (HeapWord*)fc + i,
   75.24 +                          p2i(fc), p2i((HeapWord*)fc + i),
   75.25                            fc->cantCoalesce() ? "\t CC" : "");
   75.26      }
   75.27    }
   75.28 @@ -502,7 +502,7 @@
   75.29    if (_sp->block_is_obj(addr)) {
   75.30      const bool dead = _post_remark && !_live_bit_map->isMarked(addr);
   75.31      _st->print_cr(PTR_FORMAT ": %s object of size " SIZE_FORMAT "%s",
   75.32 -      addr,
   75.33 +      p2i(addr),
   75.34        dead ? "dead" : "live",
   75.35        sz,
   75.36        (!dead && CMSPrintObjectsInDump) ? ":" : ".");
   75.37 @@ -512,7 +512,7 @@
   75.38      }
   75.39    } else { // free block
   75.40      _st->print_cr(PTR_FORMAT ": free block of size " SIZE_FORMAT "%s",
   75.41 -      addr, sz, CMSPrintChunksInDump ? ":" : ".");
   75.42 +      p2i(addr), sz, CMSPrintChunksInDump ? ":" : ".");
   75.43      if (CMSPrintChunksInDump) {
   75.44        ((FreeChunk*)addr)->print_on(_st);
   75.45        _st->print_cr("--------------------------------------");
   75.46 @@ -564,11 +564,11 @@
   75.47                        "--------------------------------\n");
   75.48    size_t total_size = totalSizeInIndexedFreeLists();
   75.49    size_t   free_blocks = numFreeBlocksInIndexedFreeLists();
   75.50 -  gclog_or_tty->print("Total Free Space: %d\n", total_size);
   75.51 -  gclog_or_tty->print("Max   Chunk Size: %d\n", maxChunkSizeInIndexedFreeLists());
   75.52 -  gclog_or_tty->print("Number of Blocks: %d\n", free_blocks);
   75.53 +  gclog_or_tty->print("Total Free Space: " SIZE_FORMAT "\n", total_size);
   75.54 +  gclog_or_tty->print("Max   Chunk Size: " SIZE_FORMAT "\n", maxChunkSizeInIndexedFreeLists());
   75.55 +  gclog_or_tty->print("Number of Blocks: " SIZE_FORMAT "\n", free_blocks);
   75.56    if (free_blocks != 0) {
   75.57 -    gclog_or_tty->print("Av.  Block  Size: %d\n", total_size/free_blocks);
   75.58 +    gclog_or_tty->print("Av.  Block  Size: " SIZE_FORMAT "\n", total_size/free_blocks);
   75.59    }
   75.60  }
   75.61  
   75.62 @@ -2011,7 +2011,7 @@
   75.63    assert(ur.contains(urasm),
   75.64           err_msg(" Error at save_marks(): [" PTR_FORMAT "," PTR_FORMAT ")"
   75.65                   " should contain [" PTR_FORMAT "," PTR_FORMAT ")",
   75.66 -                 ur.start(), ur.end(), urasm.start(), urasm.end()));
   75.67 +                 p2i(ur.start()), p2i(ur.end()), p2i(urasm.start()), p2i(urasm.end())));
   75.68  #endif
   75.69    // inform allocator that promotions should be tracked.
   75.70    assert(_promoInfo.noPromotions(), "_promoInfo inconsistency");
   75.71 @@ -2181,7 +2181,7 @@
   75.72    for (i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
   75.73      AdaptiveFreeList<FreeChunk>* fl    = &_indexedFreeList[i];
   75.74      if (PrintFLSStatistics > 1) {
   75.75 -      gclog_or_tty->print("size[%d] : ", i);
   75.76 +      gclog_or_tty->print("size[" SIZE_FORMAT "] : ", i);
   75.77      }
   75.78      fl->compute_desired(inter_sweep_current, inter_sweep_estimate, intra_sweep_estimate);
   75.79      fl->set_coal_desired((ssize_t)((double)fl->desired() * CMSSmallCoalSurplusPercent));
   75.80 @@ -2234,7 +2234,7 @@
   75.81    if (PrintFLSStatistics > 0) {
   75.82      HeapWord* largestAddr = (HeapWord*) dictionary()->find_largest_dict();
   75.83      gclog_or_tty->print_cr("CMS: Large block " PTR_FORMAT,
   75.84 -                           largestAddr);
   75.85 +                           p2i(largestAddr));
   75.86    }
   75.87    setFLSurplus();
   75.88    setFLHints();
   75.89 @@ -2383,8 +2383,8 @@
   75.90        gclog_or_tty->print_cr(
   75.91          " Current:  addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n"
   75.92          " Previous: addr = " PTR_FORMAT ", size = " SIZE_FORMAT ", obj = %s, live = %s \n",
   75.93 -        addr,       res,        was_obj      ?"true":"false", was_live      ?"true":"false",
   75.94 -        _last_addr, _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
   75.95 +        p2i(addr),       res,        was_obj      ?"true":"false", was_live      ?"true":"false",
   75.96 +        p2i(_last_addr), _last_size, _last_was_obj?"true":"false", _last_was_live?"true":"false");
   75.97        _sp->print_on(gclog_or_tty);
   75.98        guarantee(false, "Seppuku!");
   75.99      }
  75.100 @@ -2712,7 +2712,7 @@
  75.101        _global_num_workers[i] = 0;
  75.102        _global_num_blocks[i] = 0;
  75.103        if (PrintOldPLAB) {
  75.104 -        gclog_or_tty->print_cr("[%d]: %d", i, (size_t)_blocks_to_claim[i].average());
  75.105 +        gclog_or_tty->print_cr("[" SIZE_FORMAT "]: " SIZE_FORMAT, i, (size_t)_blocks_to_claim[i].average());
  75.106        }
  75.107      }
  75.108    }
  75.109 @@ -2751,7 +2751,7 @@
  75.110          }
  75.111        }
  75.112        if (PrintOldPLAB) {
  75.113 -        gclog_or_tty->print_cr("%d[%d]: %d/%d/%d",
  75.114 +        gclog_or_tty->print_cr("%d[" SIZE_FORMAT "]: " SIZE_FORMAT "/" SIZE_FORMAT "/" SIZE_FORMAT,
  75.115                                 tid, i, num_retire, _num_blocks[i], (size_t)_blocks_to_claim[i].average());
  75.116        }
  75.117        // Reset stats for next round