truffle: src/share/vm/opto/callnode.cpp comparison

comparison src/share/vm/opto/callnode.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26

author	Gilles Duboscq <duboscq@ssw.jku.at>
date	Wed, 15 Oct 2014 16:02:50 +0200
parents	89152779163c 0bf37f737702
children	7848fc12602b

comparison

equal deleted inserted replaced

-:45d7b2c7029d
+:52b4284cb496
 /*
-* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 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.
 };
 #ifndef PRODUCT
 void ParmNode::dump_spec(outputStream *st) const {
 if( _con < TypeFunc::Parms ) {
-st->print(names[_con]);
+st->print("%s", names[_con]);
 } else {
 st->print("Parm%d: ",_con-TypeFunc::Parms);
 // Verbose and WizardMode dump bottom_type for all nodes
 if( !Verbose && !WizardMode )   bottom_type()->dump_on(st);
 }
 switch (t->base()) {
 case Type::Int:
 st->print(" %s%d]=#"INT32_FORMAT,msg,i,t->is_int()->get_con());
 break;
 case Type::AnyPtr:
-assert( t == TypePtr::NULL_PTR, "" );
+assert( t == TypePtr::NULL_PTR || n->in_dump(), "" );
 st->print(" %s%d]=#NULL",msg,i);
 break;
 case Type::AryPtr:
 case Type::InstPtr:
-st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,t->isa_oopptr()->const_oop());
+st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,p2i(t->isa_oopptr()->const_oop()));
 break;
 case Type::KlassPtr:
-st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,t->make_ptr()->isa_klassptr()->klass());
+st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,p2i(t->make_ptr()->isa_klassptr()->klass()));
 break;
 case Type::MetadataPtr:
-st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,t->make_ptr()->isa_metadataptr()->metadata());
+st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,p2i(t->make_ptr()->isa_metadataptr()->metadata()));
 break;
 case Type::NarrowOop:
-st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,t->make_ptr()->isa_oopptr()->const_oop());
+st->print(" %s%d]=#Ptr" INTPTR_FORMAT,msg,i,p2i(t->make_ptr()->isa_oopptr()->const_oop()));
 break;
 case Type::RawPtr:
-st->print(" %s%d]=#Raw" INTPTR_FORMAT,msg,i,t->is_rawptr());
+st->print(" %s%d]=#Raw" INTPTR_FORMAT,msg,i,p2i(t->is_rawptr()));
 break;
 case Type::DoubleCon:
 st->print(" %s%d]=#%fD",msg,i,t->is_double_constant()->_d);
 break;
 case Type::FloatCon:
 st->print(" %s%d]=#%fF",msg,i,t->is_float_constant()->_f);
 break;
 case Type::Long:
-st->print(" %s%d]=#"INT64_FORMAT,msg,i,t->is_long()->get_con());
+st->print(" %s%d]=#"INT64_FORMAT,msg,i,(int64_t)(t->is_long()->get_con()));
 break;
 case Type::Half:
 case Type::Top:
 st->print(" %s%d]=_",msg,i);
 break;
 format_helper(regalloc, st, obj, obj_msg, i, &scobjs);
 }
 for (i = 0; i < (uint)scobjs.length(); i++) {
 // Scalar replaced objects.
-st->print_cr("");
+st->cr();
 st->print("        # ScObj" INT32_FORMAT " ", i);
 SafePointScalarObjectNode* spobj = scobjs.at(i);
 ciKlass* cik = spobj->bottom_type()->is_oopptr()->klass();
 assert(cik->is_instance_klass() ||
 cik->is_array_klass(), "Not supported allocation.");
 }
 }
 st->print(" }");
 }
 }
-st->print_cr("");
+st->cr();
 if (caller() != NULL) caller()->format(regalloc, n, st);
 }
 void JVMState::dump_spec(outputStream *st) const {
 */
 void JVMState::set_map_deep(SafePointNode* map) {
 for (JVMState* p = this; p->_caller != NULL; p = p->_caller) {
 p->set_map(map);
 }
+}
+// Adapt offsets in in-array after adding or removing an edge.
+// Prerequisite is that the JVMState is used by only one node.
+void JVMState::adapt_position(int delta) {
+for (JVMState* jvms = this; jvms != NULL; jvms = jvms->caller()) {
+jvms->set_locoff(jvms->locoff() + delta);
+jvms->set_stkoff(jvms->stkoff() + delta);
+jvms->set_monoff(jvms->monoff() + delta);
+jvms->set_scloff(jvms->scloff() + delta);
+jvms->set_endoff(jvms->endoff() + delta);
+}
+}
+// Mirror the stack size calculation in the deopt code
+// How much stack space would we need at this point in the program in
+// case of deoptimization?
+int JVMState::interpreter_frame_size() const {
+const JVMState* jvms = this;
+int size = 0;
+int callee_parameters = 0;
+int callee_locals = 0;
+int extra_args = method()->max_stack() - stk_size();
+while (jvms != NULL) {
+int locks = jvms->nof_monitors();
+int temps = jvms->stk_size();
+bool is_top_frame = (jvms == this);
+ciMethod* method = jvms->method();
+int frame_size = BytesPerWord * Interpreter::size_activation(method->max_stack(),
+temps + callee_parameters,
+extra_args,
+locks,
+callee_parameters,
+callee_locals,
+is_top_frame);
+size += frame_size;
+callee_parameters = method->size_of_parameters();
+callee_locals = method->max_locals();
+extra_args = 0;
+jvms = jvms->caller();
+}
+return size + Deoptimization::last_frame_adjust(0, callee_locals) * BytesPerWord;
 }
 //=============================================================================
 uint CallNode::cmp( const Node &n ) const
 { return _tf == ((CallNode&)n)._tf && _jvms == ((CallNode&)n)._jvms; }
 int CallStaticJavaNode::extract_uncommon_trap_request(const Node* call) {
 #ifndef PRODUCT
 if (!(call->req() > TypeFunc::Parms &&
 call->in(TypeFunc::Parms) != NULL &&
 call->in(TypeFunc::Parms)->is_Con())) {
-assert(_in_dump_cnt != 0, "OK if dumping");
+assert(in_dump() != 0, "OK if dumping");
 tty->print("[bad uncommon trap]");
 return 0;
 }
 #endif
 return call->in(TypeFunc::Parms)->bottom_type()->is_int()->get_con();
 return CallNode::cmp(call) && !strcmp(_name,call._name);
 }
 #ifndef PRODUCT
 void CallRuntimeNode::dump_spec(outputStream *st) const {
 st->print("# ");
-st->print(_name);
+st->print("%s", _name);
 CallNode::dump_spec(st);
 }
 #endif
 //------------------------------calling_convention-----------------------------
 //=============================================================================
 #ifndef PRODUCT
 void CallLeafNode::dump_spec(outputStream *st) const {
 st->print("# ");
-st->print(_name);
+st->print("%s", _name);
 CallNode::dump_spec(st);
 }
 #endif
 //=============================================================================

Mercurial > hg > truffle

comparison src/share/vm/opto/callnode.cpp @ 18041:52b4284cb496