src/hotspot/cpu/x86/x86_32.ad

@@ -609,14 +609,11 @@
  
  void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
    Compile* C = ra_->C;
    C2_MacroAssembler _masm(&cbuf);
  
-   int framesize = C->output()->frame_size_in_bytes();
-   int bangsize = C->output()->bang_size_in_bytes();
- 
-   __ verified_entry(framesize, C->output()->need_stack_bang(bangsize)?bangsize:0, C->in_24_bit_fp_mode(), C->stub_function() != NULL);
+   __ verified_entry(C);
  
    C->output()->set_frame_complete(cbuf.insts_size());
  
    if (C->has_mach_constant_base_node()) {
      // NOTE: We set the table base offset here because users might be

@@ -1050,11 +1047,11 @@
    int size = 0;
  
    if( src_first == dst_first && src_second == dst_second )
      return size;            // Self copy, no move
  
-   if (bottom_type()->isa_vect() != NULL && bottom_type()->isa_vectmask() == NULL) {
+   if (bottom_type()->isa_vect() != nullptr && bottom_type()->isa_vectmask() == nullptr) {
      uint ireg = ideal_reg();
      assert((src_first_rc != rc_int && dst_first_rc != rc_int), "sanity");
      assert((src_first_rc != rc_float && dst_first_rc != rc_float), "sanity");
      assert((ireg == Op_VecS || ireg == Op_VecD || ireg == Op_VecX || ireg == Op_VecY || ireg == Op_VecZ ), "sanity");
      if( src_first_rc == rc_stack && dst_first_rc == rc_stack ) {

@@ -1318,16 +1315,16 @@
    return 0; // Mute compiler
  }
  
  #ifndef PRODUCT
  void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream* st) const {
-   implementation( NULL, ra_, false, st );
+   implementation( nullptr, ra_, false, st );
  }
  #endif
  
  void MachSpillCopyNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
-   implementation( &cbuf, ra_, false, NULL );
+   implementation( &cbuf, ra_, false, nullptr );
  }
  
  uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
    return MachNode::size(ra_);
  }

@@ -1723,11 +1720,11 @@
      Register Resi = as_Register(ESI_enc); // sub class
      Label miss;
  
      MacroAssembler _masm(&cbuf);
      __ check_klass_subtype_slow_path(Resi, Reax, Recx, Redi,
-                                      NULL, &miss,
+                                      nullptr, &miss,
                                       /*set_cond_codes:*/ true);
      if ($primary) {
        __ xorptr(Redi, Redi);
      }
      __ bind(miss);

@@ -1841,11 +1838,11 @@
          // a stub to the interpreter.
          cbuf.shared_stub_to_interp_for(_method, cbuf.insts()->mark_off());
        } else {
          // Emit stubs for static call.
          address stub = CompiledStaticCall::emit_to_interp_stub(cbuf, mark);
-         if (stub == NULL) {
+         if (stub == nullptr) {
            ciEnv::current()->record_failure("CodeCache is full");
            return;
          }
        }
      }

@@ -3394,11 +3391,11 @@
    op_cost(10);
    format %{ %}
    interface(CONST_INTER);
  %}
  
- // NULL Pointer Immediate
+ // nullptr Pointer Immediate
  operand immP0() %{
    predicate( n->get_ptr() == 0 );
    match(ConP);
    op_cost(0);