*** old/src/share/vm/interpreter/abstractInterpreter.cpp	Thu Feb 18 15:25:04 2016
--- new/src/share/vm/interpreter/abstractInterpreter.cpp	Thu Feb 18 15:25:04 2016

*** 23,39 ****
--- 23,43 ----
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "asm/macroAssembler.inline.hpp"
+ #include "compiler/disassembler.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/bytecodeInterpreter.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "interpreter/templateTable.hpp"
  #include "memory/allocation.inline.hpp"
+ #if INCLUDE_CDS
+ #include "memory/metaspaceShared.hpp"
+ #endif
  #include "memory/resourceArea.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"

*** 91,100 ****
--- 95,105 ----
  
  address    AbstractInterpreter::_native_entry_begin                         = NULL;
  address    AbstractInterpreter::_native_entry_end                           = NULL;
  address    AbstractInterpreter::_slow_signature_handler;
  address    AbstractInterpreter::_entry_table            [AbstractInterpreter::number_of_method_entries];
+ address    AbstractInterpreter::_cds_entry_table        [AbstractInterpreter::number_of_method_entries];
  address    AbstractInterpreter::_native_abi_to_tosca    [AbstractInterpreter::number_of_result_handlers];
  
  //------------------------------------------------------------------------------------------------------------------------
  // Generation of complete interpreter
  

*** 202,219 ****
--- 207,251 ----
  
    // Note: for now: zero locals for all non-empty methods
    return zerolocals;
  }
  
+ #if INCLUDE_CDS
+ 
+ address AbstractInterpreter::get_trampoline_code_buffer(AbstractInterpreter::MethodKind kind) {
+   const size_t trampoline_size = SharedRuntime::trampoline_size();
+   address addr = MetaspaceShared::cds_i2i_entry_code_buffers((size_t)(AbstractInterpreter::number_of_method_entries) * trampoline_size);
+   addr += (size_t)(kind) * trampoline_size;
+ 
+   return addr;
+ }
+ 
+ void AbstractInterpreter::update_cds_entry_table(AbstractInterpreter::MethodKind kind) {
+   if (DumpSharedSpaces || UseSharedSpaces) {
+     address trampoline = get_trampoline_code_buffer(kind);
+     _cds_entry_table[kind] = trampoline;
+ 
+     CodeBuffer buffer(trampoline, (int)(SharedRuntime::trampoline_size()));
+     MacroAssembler _masm(&buffer);
+     SharedRuntime::generate_trampoline(&_masm, _entry_table[kind]);
+ 
+     if (PrintInterpreter) {
+       Disassembler::decode(buffer.insts_begin(), buffer.insts_end());
+     }
+   }
+ }
+ 
+ #endif
  
  void AbstractInterpreter::set_entry_for_kind(AbstractInterpreter::MethodKind kind, address entry) {
    assert(kind >= method_handle_invoke_FIRST &&
           kind <= method_handle_invoke_LAST, "late initialization only for MH entry points");
    assert(_entry_table[kind] == _entry_table[abstract], "previous value must be AME entry");
    _entry_table[kind] = entry;
  }
  
+   update_cds_entry_table(kind);
+ }
  
  // Return true if the interpreter can prove that the given bytecode has
  // not yet been executed (in Java semantics, not in actual operation).
  bool AbstractInterpreter::is_not_reached(const methodHandle& method, int bci) {
    Bytecodes::Code code = method()->code_at(bci);

*** 414,420 ****
--- 446,453 ----
  void AbstractInterpreter::initialize_method_handle_entries() {
    // method handle entry kinds are generated later in MethodHandlesAdapterGenerator::generate:
    for (int i = method_handle_invoke_FIRST; i <= method_handle_invoke_LAST; i++) {
      MethodKind kind = (MethodKind) i;
      _entry_table[kind] = _entry_table[Interpreter::abstract];
+     Interpreter::update_cds_entry_table(kind);
    }
  }