src/hotspot/share/interpreter/bytecodes.hpp

*** 24,10 ***
--- 24,11 ---
  
  #ifndef SHARE_INTERPRETER_BYTECODES_HPP
  #define SHARE_INTERPRETER_BYTECODES_HPP
  
  #include "memory/allStatic.hpp"
+ #include "runtime/globals.hpp"
  #include "utilities/globalDefinitions.hpp"
  
  // Bytecodes specifies all bytecodes used in the VM and
  // provides utility functions to get bytecode attributes.
  

*** 246,19 ***
--- 247,21 ---
  
      number_of_java_codes,
  
      // JVM bytecodes
      _fast_agetfield       = number_of_java_codes,
+     _fast_vgetfield       ,
      _fast_bgetfield       ,
      _fast_cgetfield       ,
      _fast_dgetfield       ,
      _fast_fgetfield       ,
      _fast_igetfield       ,
      _fast_lgetfield       ,
      _fast_sgetfield       ,
  
      _fast_aputfield       ,
+     _fast_vputfield       ,
      _fast_bputfield       ,
      _fast_zputfield       ,
      _fast_cputfield       ,
      _fast_dputfield       ,
      _fast_fputfield       ,

*** 417,11 ***
    static bool        is_const       (Code code)    { return (_aconst_null <= code && code <= _ldc2_w); }
    static bool        is_zero_const  (Code code)    { return (code == _aconst_null || code == _iconst_0
                                                             || code == _fconst_0 || code == _dconst_0); }
    static bool        is_return      (Code code)    { return (_ireturn <= code && code <= _return); }
    static bool        is_invoke      (Code code)    { return (_invokevirtual <= code && code <= _invokedynamic); }
!   static bool        is_field_code  (Code code)    { return (_getstatic <= java_code(code) && java_code(code) <= _putfield); }
    static bool        has_receiver   (Code code)    { assert(is_invoke(code), "");  return code == _invokevirtual ||
                                                                                            code == _invokespecial ||
                                                                                            code == _invokeinterface; }
    static bool        has_optional_appendix(Code code) { return code == _invokedynamic || code == _invokehandle; }
  
--- 420,13 ---
    static bool        is_const       (Code code)    { return (_aconst_null <= code && code <= _ldc2_w); }
    static bool        is_zero_const  (Code code)    { return (code == _aconst_null || code == _iconst_0
                                                             || code == _fconst_0 || code == _dconst_0); }
    static bool        is_return      (Code code)    { return (_ireturn <= code && code <= _return); }
    static bool        is_invoke      (Code code)    { return (_invokevirtual <= code && code <= _invokedynamic); }
!   static bool        is_field_code  (Code code)    {
+     return (_getstatic <= java_code(code) && java_code(code) <= _putfield);
+   }
    static bool        has_receiver   (Code code)    { assert(is_invoke(code), "");  return code == _invokevirtual ||
                                                                                            code == _invokespecial ||
                                                                                            code == _invokeinterface; }
    static bool        has_optional_appendix(Code code) { return code == _invokedynamic || code == _invokehandle; }