hotspot/src/share/vm/prims/methodComparator.hpp
author ysr
Thu, 03 Dec 2009 15:01:57 -0800
changeset 4461 c17c526d36ef
parent 1 489c9b5090e2
child 5547 f4b087cbb361
permissions -rw-r--r--
6906727: UseCompressedOops: some card-marking fixes related to object arrays Summary: Introduced a new write_ref_array(HeapWords* start, size_t count) method that does the requisite MemRegion range calculation so (some of the) clients of the erstwhile write_ref_array(MemRegion mr) do not need to worry. This removed all external uses of array_size(), which was also simplified and made private. Asserts were added to catch other possible issues. Further, less essential, fixes stemming from this investigation are deferred to CR 6904516 (to follow shortly in hs17). Reviewed-by: kvn, coleenp, jmasa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
489c9b5090e2 Initial load
duke
parents:
diff changeset
     1
/*
489c9b5090e2 Initial load
duke
parents:
diff changeset
     2
 * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     4
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
489c9b5090e2 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
489c9b5090e2 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
489c9b5090e2 Initial load
duke
parents:
diff changeset
     8
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
489c9b5090e2 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
489c9b5090e2 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
489c9b5090e2 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    14
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
489c9b5090e2 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    18
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    19
 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
489c9b5090e2 Initial load
duke
parents:
diff changeset
    20
 * CA 95054 USA or visit www.sun.com if you need additional information or
489c9b5090e2 Initial load
duke
parents:
diff changeset
    21
 * have any questions.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    22
 *
489c9b5090e2 Initial load
duke
parents:
diff changeset
    23
 */
489c9b5090e2 Initial load
duke
parents:
diff changeset
    24
489c9b5090e2 Initial load
duke
parents:
diff changeset
    25
class BciMap;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    26
489c9b5090e2 Initial load
duke
parents:
diff changeset
    27
// methodComparator provides an interface for determining if methods of
489c9b5090e2 Initial load
duke
parents:
diff changeset
    28
// different versions of classes are equivalent or switchable
489c9b5090e2 Initial load
duke
parents:
diff changeset
    29
489c9b5090e2 Initial load
duke
parents:
diff changeset
    30
class MethodComparator {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    31
 private:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    32
  static BytecodeStream *_s_old, *_s_new;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    33
  static constantPoolOop _old_cp, _new_cp;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    34
  static BciMap *_bci_map;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    35
  static bool _switchable_test;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    36
  static GrowableArray<int> *_fwd_jmps;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    37
489c9b5090e2 Initial load
duke
parents:
diff changeset
    38
  static bool args_same(Bytecodes::Code c_old, Bytecodes::Code c_new);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    39
  static int check_stack_and_locals_size(methodOop old_method, methodOop new_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    40
489c9b5090e2 Initial load
duke
parents:
diff changeset
    41
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    42
  // Check if the new method is equivalent to the old one modulo constant pool (EMCP).
489c9b5090e2 Initial load
duke
parents:
diff changeset
    43
  // Intuitive definition: two versions of the same method are EMCP, if they don't differ
489c9b5090e2 Initial load
duke
parents:
diff changeset
    44
  // on the source code level. Practically, we check whether the only difference between
489c9b5090e2 Initial load
duke
parents:
diff changeset
    45
  // method versions is some constantpool indices embedded into the bytecodes, and whether
489c9b5090e2 Initial load
duke
parents:
diff changeset
    46
  // these indices eventually point to the same constants for both method versions.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    47
  static bool methods_EMCP(methodOop old_method, methodOop new_method);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    48
489c9b5090e2 Initial load
duke
parents:
diff changeset
    49
  static bool methods_switchable(methodOop old_method, methodOop new_method, BciMap &bci_map);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    50
};
489c9b5090e2 Initial load
duke
parents:
diff changeset
    51
489c9b5090e2 Initial load
duke
parents:
diff changeset
    52
489c9b5090e2 Initial load
duke
parents:
diff changeset
    53
// ByteCode Index Map. For two versions of the same method, where the new version may contain
489c9b5090e2 Initial load
duke
parents:
diff changeset
    54
// fragments not found in the old version, provides a mapping from an index of a bytecode in
489c9b5090e2 Initial load
duke
parents:
diff changeset
    55
// the old method to the index of the same bytecode in the new method.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    56
489c9b5090e2 Initial load
duke
parents:
diff changeset
    57
class BciMap {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    58
 private:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    59
  int *_old_bci, *_new_st_bci, *_new_end_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    60
  int _cur_size, _cur_pos;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    61
  int _pos;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    62
489c9b5090e2 Initial load
duke
parents:
diff changeset
    63
 public:
489c9b5090e2 Initial load
duke
parents:
diff changeset
    64
  BciMap() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    65
    _cur_size = 50;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    66
    _old_bci = (int*) malloc(sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    67
    _new_st_bci = (int*) malloc(sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    68
    _new_end_bci = (int*) malloc(sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    69
    _cur_pos = 0;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    70
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    71
489c9b5090e2 Initial load
duke
parents:
diff changeset
    72
  ~BciMap() {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    73
    free(_old_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    74
    free(_new_st_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    75
    free(_new_end_bci);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    76
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    77
489c9b5090e2 Initial load
duke
parents:
diff changeset
    78
  // Store the position of an added fragment, e.g.
489c9b5090e2 Initial load
duke
parents:
diff changeset
    79
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
    80
  //                              |<- old_bci
489c9b5090e2 Initial load
duke
parents:
diff changeset
    81
  // -----------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
    82
  // Old method   |invokevirtual 5|aload 1|...
489c9b5090e2 Initial load
duke
parents:
diff changeset
    83
  // -----------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
    84
  //
489c9b5090e2 Initial load
duke
parents:
diff changeset
    85
  //                                 |<- new_st_bci          |<- new_end_bci
489c9b5090e2 Initial load
duke
parents:
diff changeset
    86
  // --------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
    87
  // New method       |invokevirual 5|aload 2|invokevirtual 6|aload 1|...
489c9b5090e2 Initial load
duke
parents:
diff changeset
    88
  // --------------------------------------------------------------------
489c9b5090e2 Initial load
duke
parents:
diff changeset
    89
  //                                 ^^^^^^^^^^^^^^^^^^^^^^^^
489c9b5090e2 Initial load
duke
parents:
diff changeset
    90
  //                                    Added fragment
489c9b5090e2 Initial load
duke
parents:
diff changeset
    91
489c9b5090e2 Initial load
duke
parents:
diff changeset
    92
  void store_fragment_location(int old_bci, int new_st_bci, int new_end_bci) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    93
    if (_cur_pos == _cur_size) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
    94
      _cur_size += 10;
489c9b5090e2 Initial load
duke
parents:
diff changeset
    95
      _old_bci = (int*) realloc(_old_bci, sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    96
      _new_st_bci = (int*) realloc(_new_st_bci, sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    97
      _new_end_bci = (int*) realloc(_new_end_bci, sizeof(int) * _cur_size);
489c9b5090e2 Initial load
duke
parents:
diff changeset
    98
    }
489c9b5090e2 Initial load
duke
parents:
diff changeset
    99
    _old_bci[_cur_pos] = old_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   100
    _new_st_bci[_cur_pos] = new_st_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   101
    _new_end_bci[_cur_pos] = new_end_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   102
    _cur_pos++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   103
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   104
489c9b5090e2 Initial load
duke
parents:
diff changeset
   105
  int new_bci_for_old(int old_bci) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   106
    if (_cur_pos == 0 || old_bci < _old_bci[0]) return old_bci;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   107
    _pos = 1;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   108
    while (_pos < _cur_pos && old_bci >= _old_bci[_pos])
489c9b5090e2 Initial load
duke
parents:
diff changeset
   109
      _pos++;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   110
    return _new_end_bci[_pos-1] + (old_bci - _old_bci[_pos-1]);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   111
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   112
489c9b5090e2 Initial load
duke
parents:
diff changeset
   113
  // Test if two indexes - one in the old method and another in the new one - correspond
489c9b5090e2 Initial load
duke
parents:
diff changeset
   114
  // to the same bytecode
489c9b5090e2 Initial load
duke
parents:
diff changeset
   115
  bool old_and_new_locations_same(int old_dest_bci, int new_dest_bci) {
489c9b5090e2 Initial load
duke
parents:
diff changeset
   116
    if (new_bci_for_old(old_dest_bci) == new_dest_bci)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   117
      return true;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   118
    else if (_old_bci[_pos-1] == old_dest_bci)
489c9b5090e2 Initial load
duke
parents:
diff changeset
   119
      return (new_dest_bci == _new_st_bci[_pos-1]);
489c9b5090e2 Initial load
duke
parents:
diff changeset
   120
    else return false;
489c9b5090e2 Initial load
duke
parents:
diff changeset
   121
  }
489c9b5090e2 Initial load
duke
parents:
diff changeset
   122
};