1.1 --- a/src/share/vm/adlc/output_h.cpp Wed Jul 27 15:06:35 2011 -0700
1.2 +++ b/src/share/vm/adlc/output_h.cpp Wed Jul 27 17:28:36 2011 -0700
1.3 @@ -1536,16 +1536,12 @@
1.4 // Each instruction attribute results in a virtual call of same name.
1.5 // The ins_cost is not handled here.
1.6 Attribute *attr = instr->_attribs;
1.7 - bool is_pc_relative = false;
1.8 while (attr != NULL) {
1.9 if (strcmp(attr->_ident,"ins_cost") &&
1.10 - strcmp(attr->_ident,"ins_pc_relative")) {
1.11 + strcmp(attr->_ident,"ins_short_branch")) {
1.12 fprintf(fp," int %s() const { return %s; }\n",
1.13 attr->_ident, attr->_val);
1.14 }
1.15 - // Check value for ins_pc_relative, and if it is true (1), set the flag
1.16 - if (!strcmp(attr->_ident,"ins_pc_relative") && attr->int_val(*this) != 0)
1.17 - is_pc_relative = true;
1.18 attr = (Attribute *)attr->_next;
1.19 }
1.20
1.21 @@ -1657,20 +1653,10 @@
1.22 fprintf(fp," _num_opnds = %d; _opnds = _opnd_array; ", instr->num_opnds());
1.23
1.24 bool node_flags_set = false;
1.25 - // flag: if this instruction matches an ideal 'Goto' node
1.26 - if ( instr->is_ideal_goto() ) {
1.27 - fprintf(fp,"init_flags(Flag_is_Goto");
1.28 - node_flags_set = true;
1.29 - }
1.30 -
1.31 // flag: if this instruction matches an ideal 'Copy*' node
1.32 if ( instr->is_ideal_copy() != 0 ) {
1.33 - if ( node_flags_set ) {
1.34 - fprintf(fp," | Flag_is_Copy");
1.35 - } else {
1.36 - fprintf(fp,"init_flags(Flag_is_Copy");
1.37 - node_flags_set = true;
1.38 - }
1.39 + fprintf(fp,"init_flags(Flag_is_Copy");
1.40 + node_flags_set = true;
1.41 }
1.42
1.43 // Is an instruction is a constant? If so, get its type
1.44 @@ -1708,16 +1694,6 @@
1.45 }
1.46 }
1.47
1.48 - // flag: if this instruction is pc relative
1.49 - if ( is_pc_relative ) {
1.50 - if ( node_flags_set ) {
1.51 - fprintf(fp," | Flag_is_pc_relative");
1.52 - } else {
1.53 - fprintf(fp,"init_flags(Flag_is_pc_relative");
1.54 - node_flags_set = true;
1.55 - }
1.56 - }
1.57 -
1.58 // flag: if this instruction has short branch form
1.59 if ( instr->has_short_branch_form() ) {
1.60 if ( node_flags_set ) {
1.61 @@ -1743,10 +1719,6 @@
1.62 fprintf(fp,"); ");
1.63 }
1.64
1.65 - if (instr->is_ideal_unlock() || instr->is_ideal_call_leaf()) {
1.66 - fprintf(fp,"clear_flag(Flag_is_safepoint_node); ");
1.67 - }
1.68 -
1.69 fprintf(fp,"}\n");
1.70
1.71 // size_of, used by base class's clone to obtain the correct size.
