*** old/src/share/vm/runtime/globals.cpp	Mon Mar 31 17:29:37 2014
--- new/src/share/vm/runtime/globals.cpp	Mon Mar 31 17:29:36 2014

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 603,621 ****
--- 603,621 ----
    e.set_new_value(new_value);
    e.set_origin(origin);
    e.commit();
  }
  
! bool CommandLineFlags::boolAt(const char* name, size_t len, bool* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_bool()) return false;
    *value = result->get_bool();
    return true;
  }
  
! bool CommandLineFlags::boolAtPut(const char* name, size_t len, bool* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_bool()) return false;
    bool old_value = result->get_bool();
    trace_flag_changed<EventBooleanFlagChanged, bool>(name, old_value, *value, origin);

*** 631,649 ****
--- 631,649 ----
    trace_flag_changed<EventBooleanFlagChanged, bool>(faddr->_name, faddr->get_bool(), value, origin);
    faddr->set_bool(value);
    faddr->set_origin(origin);
  }
  
! bool CommandLineFlags::intxAt(const char* name, size_t len, intx* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_intx()) return false;
    *value = result->get_intx();
    return true;
  }
  
! bool CommandLineFlags::intxAtPut(const char* name, size_t len, intx* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_intx()) return false;
    intx old_value = result->get_intx();
    trace_flag_changed<EventLongFlagChanged, s8>(name, old_value, *value, origin);

*** 659,677 ****
--- 659,677 ----
    trace_flag_changed<EventLongFlagChanged, s8>(faddr->_name, faddr->get_intx(), value, origin);
    faddr->set_intx(value);
    faddr->set_origin(origin);
  }
  
! bool CommandLineFlags::uintxAt(const char* name, size_t len, uintx* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_uintx()) return false;
    *value = result->get_uintx();
    return true;
  }
  
! bool CommandLineFlags::uintxAtPut(const char* name, size_t len, uintx* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_uintx()) return false;
    uintx old_value = result->get_uintx();
    trace_flag_changed<EventUnsignedLongFlagChanged, u8>(name, old_value, *value, origin);

*** 687,705 ****
--- 687,705 ----
    trace_flag_changed<EventUnsignedLongFlagChanged, u8>(faddr->_name, faddr->get_uintx(), value, origin);
    faddr->set_uintx(value);
    faddr->set_origin(origin);
  }
  
! bool CommandLineFlags::uint64_tAt(const char* name, size_t len, uint64_t* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_uint64_t()) return false;
    *value = result->get_uint64_t();
    return true;
  }
  
! bool CommandLineFlags::uint64_tAtPut(const char* name, size_t len, uint64_t* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_uint64_t()) return false;
    uint64_t old_value = result->get_uint64_t();
    trace_flag_changed<EventUnsignedLongFlagChanged, u8>(name, old_value, *value, origin);

*** 715,733 ****
--- 715,733 ----
    trace_flag_changed<EventUnsignedLongFlagChanged, u8>(faddr->_name, faddr->get_uint64_t(), value, origin);
    faddr->set_uint64_t(value);
    faddr->set_origin(origin);
  }
  
! bool CommandLineFlags::doubleAt(const char* name, size_t len, double* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_double()) return false;
    *value = result->get_double();
    return true;
  }
  
! bool CommandLineFlags::doubleAtPut(const char* name, size_t len, double* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_double()) return false;
    double old_value = result->get_double();
    trace_flag_changed<EventDoubleFlagChanged, double>(name, old_value, *value, origin);

*** 743,761 ****
--- 743,761 ----
    trace_flag_changed<EventDoubleFlagChanged, double>(faddr->_name, faddr->get_double(), value, origin);
    faddr->set_double(value);
    faddr->set_origin(origin);
  }
  
! bool CommandLineFlags::ccstrAt(const char* name, size_t len, ccstr* value) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_ccstr()) return false;
    *value = result->get_ccstr();
    return true;
  }
  
! bool CommandLineFlags::ccstrAtPut(const char* name, size_t len, ccstr* value, Flag::Flags origin) {
    Flag* result = Flag::find_flag(name, len);
    if (result == NULL) return false;
    if (!result->is_ccstr()) return false;
    ccstr old_value = result->get_ccstr();
    trace_flag_changed<EventStringFlagChanged, const char*>(name, old_value, *value, origin);