Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/cpu/zero/vm/frame_zero.cpp	Sat Aug 06 08:28:08 2011 -0700
     1.2 +++ b/src/cpu/zero/vm/frame_zero.cpp	Mon Aug 08 05:49:04 2011 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  /*
     1.5   * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
     1.6 - * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
     1.7 + * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
     1.8   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.9   *
    1.10   * This code is free software; you can redistribute it and/or modify it
    1.11 @@ -417,3 +417,11 @@
    1.12      return;
    1.13    }
    1.14  }
    1.15 +
    1.16 +#ifdef ASSERT
    1.17 +
    1.18 +void frame::describe_pd(FrameValues& values, int frame_no) {
    1.19 +
    1.20 +}
    1.21 +
    1.22 +#endif

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/src/cpu/zero/vm/methodHandles_zero.hpp	Mon Aug 08 05:49:04 2011 -0700
     2.3 @@ -0,0 +1,71 @@
     2.4 +/*
     2.5 + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
     2.6 + * Copyright 2011 Red Hat, Inc.
     2.7 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8 + *
     2.9 + * This code is free software; you can redistribute it and/or modify it
    2.10 + * under the terms of the GNU General Public License version 2 only, as
    2.11 + * published by the Free Software Foundation.
    2.12 + *
    2.13 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.14 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.15 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.16 + * version 2 for more details (a copy is included in the LICENSE file that
    2.17 + * accompanied this code).
    2.18 + *
    2.19 + * You should have received a copy of the GNU General Public License version
    2.20 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.21 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.22 + *
    2.23 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.24 + * or visit www.oracle.com if you need additional information or have any
    2.25 + * questions.
    2.26 + *
    2.27 + */
    2.28 +
    2.29 +
    2.30 +// Adapters
    2.31 +enum /* platform_dependent_constants */ {
    2.32 +  adapter_code_size = 0
    2.33 +};
    2.34 +
    2.35 +#define TARGET_ARCH_NYI_6939861 1
    2.36 +// ..#ifdef TARGET_ARCH_NYI_6939861
    2.37 +// ..  // Here are some backward compatible declarations until the 6939861 ports are updated.
    2.38 +// ..  #define _adapter_flyby    (_EK_LIMIT + 10)
    2.39 +// ..  #define _adapter_ricochet (_EK_LIMIT + 11)
    2.40 +// ..  #define _adapter_opt_spread_1    _adapter_opt_spread_1_ref
    2.41 +// ..  #define _adapter_opt_spread_more _adapter_opt_spread_ref
    2.42 +// ..  enum {
    2.43 +// ..    _INSERT_NO_MASK   = -1,
    2.44 +// ..    _INSERT_REF_MASK  = 0,
    2.45 +// ..    _INSERT_INT_MASK  = 1,
    2.46 +// ..    _INSERT_LONG_MASK = 3
    2.47 +// ..  };
    2.48 +// ..  static void get_ek_bound_mh_info(EntryKind ek, BasicType& arg_type, int& arg_mask, int& arg_slots) {
    2.49 +// ..    arg_type = ek_bound_mh_arg_type(ek);
    2.50 +// ..    arg_mask = 0;
    2.51 +// ..    arg_slots = type2size[arg_type];;
    2.52 +// ..  }
    2.53 +// ..  static void get_ek_adapter_opt_swap_rot_info(EntryKind ek, int& swap_bytes, int& rotate) {
    2.54 +// ..    int swap_slots = ek_adapter_opt_swap_slots(ek);
    2.55 +// ..    rotate = ek_adapter_opt_swap_mode(ek);
    2.56 +// ..    swap_bytes = swap_slots * Interpreter::stackElementSize;
    2.57 +// ..  }
    2.58 +// ..  static int get_ek_adapter_opt_spread_info(EntryKind ek) {
    2.59 +// ..    return ek_adapter_opt_spread_count(ek);
    2.60 +// ..  }
    2.61 +// ..
    2.62 +// ..  static void insert_arg_slots(MacroAssembler* _masm,
    2.63 +// ..                               RegisterOrConstant arg_slots,
    2.64 +// ..                               int arg_mask,
    2.65 +// ..                               Register argslot_reg,
    2.66 +// ..                               Register temp_reg, Register temp2_reg, Register temp3_reg = noreg);
    2.67 +// ..
    2.68 +// ..  static void remove_arg_slots(MacroAssembler* _masm,
    2.69 +// ..                               RegisterOrConstant arg_slots,
    2.70 +// ..                               Register argslot_reg,
    2.71 +// ..                               Register temp_reg, Register temp2_reg, Register temp3_reg = noreg);
    2.72 +// ..
    2.73 +// ..  static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN;
    2.74 +// ..#endif //TARGET_ARCH_NYI_6939861

     3.1 --- a/src/cpu/zero/vm/sharedRuntime_zero.cpp	Sat Aug 06 08:28:08 2011 -0700
     3.2 +++ b/src/cpu/zero/vm/sharedRuntime_zero.cpp	Mon Aug 08 05:49:04 2011 -0700
     3.3 @@ -46,14 +46,6 @@
     3.4  #include "shark/sharkCompiler.hpp"
     3.5  #endif
     3.6  
     3.7 -DeoptimizationBlob *SharedRuntime::_deopt_blob;
     3.8 -SafepointBlob      *SharedRuntime::_polling_page_safepoint_handler_blob;
     3.9 -SafepointBlob      *SharedRuntime::_polling_page_return_handler_blob;
    3.10 -RuntimeStub        *SharedRuntime::_wrong_method_blob;
    3.11 -RuntimeStub        *SharedRuntime::_ic_miss_blob;
    3.12 -RuntimeStub        *SharedRuntime::_resolve_opt_virtual_call_blob;
    3.13 -RuntimeStub        *SharedRuntime::_resolve_virtual_call_blob;
    3.14 -RuntimeStub        *SharedRuntime::_resolve_static_call_blob;
    3.15  
    3.16  int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
    3.17                                             VMRegPair *regs,
    3.18 @@ -114,22 +106,22 @@
    3.19    return SafepointBlob::create(&buffer, NULL, 0);
    3.20  }
    3.21  
    3.22 -void SharedRuntime::generate_stubs() {
    3.23 -  _wrong_method_blob =
    3.24 -    generate_empty_runtime_stub("wrong_method_stub");
    3.25 -  _ic_miss_blob =
    3.26 -    generate_empty_runtime_stub("ic_miss_stub");
    3.27 -  _resolve_opt_virtual_call_blob =
    3.28 -    generate_empty_runtime_stub("resolve_opt_virtual_call");
    3.29 -  _resolve_virtual_call_blob =
    3.30 -    generate_empty_runtime_stub("resolve_virtual_call");
    3.31 -  _resolve_static_call_blob =
    3.32 -    generate_empty_runtime_stub("resolve_static_call");
    3.33 +static DeoptimizationBlob* generate_empty_deopt_blob() {
    3.34 +  CodeBuffer buffer("handler_blob", 0, 0);
    3.35 +  return DeoptimizationBlob::create(&buffer, NULL, 0, 0, 0, 0);
    3.36 +}
    3.37  
    3.38 -  _polling_page_safepoint_handler_blob =
    3.39 -    generate_empty_safepoint_blob();
    3.40 -  _polling_page_return_handler_blob =
    3.41 -    generate_empty_safepoint_blob();
    3.42 +
    3.43 +void SharedRuntime::generate_deopt_blob() {
    3.44 +  _deopt_blob = generate_empty_deopt_blob();
    3.45 +}
    3.46 +
    3.47 +SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause_return) {
    3.48 +  return generate_empty_safepoint_blob();
    3.49 +}
    3.50 +
    3.51 +RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
    3.52 +  return generate_empty_runtime_stub("resolve_blob");
    3.53  }
    3.54  
    3.55  int SharedRuntime::c_calling_convention(const BasicType *sig_bt,

     4.1 --- a/src/share/vm/shark/sharkContext.hpp	Sat Aug 06 08:28:08 2011 -0700
     4.2 +++ b/src/share/vm/shark/sharkContext.hpp	Mon Aug 08 05:49:04 2011 -0700
     4.3 @@ -171,7 +171,7 @@
     4.4                               BasicType                type) const {
     4.5      assert(type >= 0 && type < T_CONFLICT, "unhandled type");
     4.6      const llvm::Type* result = table[type];
     4.7 -    assert(type != NULL, "unhandled type");
     4.8 +    assert(result != NULL, "unhandled type");
     4.9      return result;
    4.10    }
    4.11