src/share/vm/c1/c1_LIRAssembler.cpp

rev 9434 : 8138952: C1: Distinguish between PPC32 and PPC64
Reviewed-by: twisti

*** 1,7 ****
  /*
!  * Copyright (c) 2000, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2015, 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.
*** 411,427 ****
  
    debug_info->end_non_safepoint(pc_offset);
  }
  
  
! void LIR_Assembler::add_debug_info_for_null_check_here(CodeEmitInfo* cinfo) {
!   add_debug_info_for_null_check(code_offset(), cinfo);
  }
  
! void LIR_Assembler::add_debug_info_for_null_check(int pc_offset, CodeEmitInfo* cinfo) {
    ImplicitNullCheckStub* stub = new ImplicitNullCheckStub(pc_offset, cinfo);
    append_code_stub(stub);
  }
  
  void LIR_Assembler::add_debug_info_for_div0_here(CodeEmitInfo* info) {
    add_debug_info_for_div0(code_offset(), info);
  }
--- 411,428 ----
  
    debug_info->end_non_safepoint(pc_offset);
  }
  
  
! ImplicitNullCheckStub* LIR_Assembler::add_debug_info_for_null_check_here(CodeEmitInfo* cinfo) {
!   return add_debug_info_for_null_check(code_offset(), cinfo);
  }
  
! ImplicitNullCheckStub* LIR_Assembler::add_debug_info_for_null_check(int pc_offset, CodeEmitInfo* cinfo) {
    ImplicitNullCheckStub* stub = new ImplicitNullCheckStub(pc_offset, cinfo);
    append_code_stub(stub);
+   return stub;
  }
  
  void LIR_Assembler::add_debug_info_for_div0_here(CodeEmitInfo* info) {
    add_debug_info_for_div0(code_offset(), info);
  }
*** 555,568 ****
        leal(op->in_opr(), op->result_opr());
        break;
  
      case lir_null_check:
        if (GenerateCompilerNullChecks) {
!         add_debug_info_for_null_check_here(op->info());
  
          if (op->in_opr()->is_single_cpu()) {
!           _masm->null_check(op->in_opr()->as_register());
          } else {
            Unimplemented();
          }
        }
        break;
--- 556,569 ----
        leal(op->in_opr(), op->result_opr());
        break;
  
      case lir_null_check:
        if (GenerateCompilerNullChecks) {
!         ImplicitNullCheckStub* stub = add_debug_info_for_null_check_here(op->info());
  
          if (op->in_opr()->is_single_cpu()) {
!           _masm->null_check(op->in_opr()->as_register(), stub->entry());
          } else {
            Unimplemented();
          }
        }
        break;