src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

@@ -717,13 +717,13 @@
  }
  
  // Interpreter stub for calling a native method. (asm interpreter)
  // This sets up a somewhat different looking stack for calling the
  // native method than the typical interpreter frame setup.
- address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
+ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized, bool runtime_upcalls) {
    // determine code generation flags
-   bool inc_counter  = UseCompiler || CountCompiledCalls;
+   bool inc_counter = (UseCompiler || CountCompiledCalls) && !PreloadOnly;
  
    // rbx: Method*
    // rbcp: sender sp
  
    address entry_point = __ pc();

@@ -840,10 +840,15 @@
  #endif
  
    // jvmti support
    __ notify_method_entry();
  
+   // runtime upcalls
+   if (runtime_upcalls) {
+     __ generate_runtime_upcalls_on_method_entry();
+   }
+ 
    // work registers
    const Register method = rbx;
    const Register thread = r15_thread;
    const Register t      = r11;
  

@@ -1204,13 +1209,13 @@
  }
  
  //
  // Generic interpreted method entry to (asm) interpreter
  //
- address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized) {
+ address TemplateInterpreterGenerator::generate_normal_entry(bool synchronized, bool runtime_upcalls) {
    // determine code generation flags
-   bool inc_counter  = UseCompiler || CountCompiledCalls;
+   bool inc_counter = (UseCompiler || CountCompiledCalls) && !PreloadOnly;
  
    // ebx: Method*
    // rbcp: sender sp (set in InterpreterMacroAssembler::prepare_to_jump_from_interpreted / generate_call_stub)
    address entry_point = __ pc();
  

@@ -1343,10 +1348,14 @@
  #endif
  
    // jvmti support
    __ notify_method_entry();
  
+   if (runtime_upcalls) {
+     __ generate_runtime_upcalls_on_method_entry();
+   }
+ 
    __ dispatch_next(vtos);
  
    // invocation counter overflow
    if (inc_counter) {
      // Handle overflow of counter and compile method

@@ -1656,19 +1665,21 @@
    __ pop(state);
    __ ret(0);                                   // return from result handler
  
    return entry;
  }
+ #endif // PRODUCT
  
  void TemplateInterpreterGenerator::count_bytecode() {
    __ incrementq(ExternalAddress((address) &BytecodeCounter::_counter_value), rscratch1);
  }
  
  void TemplateInterpreterGenerator::histogram_bytecode(Template* t) {
    __ incrementl(ExternalAddress((address) &BytecodeHistogram::_counters[t->bytecode()]), rscratch1);
  }
  
+ #ifndef PRODUCT
  void TemplateInterpreterGenerator::histogram_bytecode_pair(Template* t) {
    __ mov32(rbx, ExternalAddress((address) &BytecodePairHistogram::_index));
    __ shrl(rbx, BytecodePairHistogram::log2_number_of_codes);
    __ orl(rbx,
           ((int) t->bytecode()) <<