--- old/src/share/vm/c1/c1_MacroAssembler.hpp
          +++ new/src/share/vm/c1/c1_MacroAssembler.hpp
   1    1  /*
   2      - * Copyright 2000-2005 Sun Microsystems, Inc.  All Rights Reserved.
        2 + * Copyright 2000-2010 Sun Microsystems, Inc.  All Rights Reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that

  13   13   * accompanied this code).
  14   14   *
  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *
  19   19   * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  20   20   * CA 95054 USA or visit www.sun.com if you need additional information or
  21   21   * have any questions.
  22   22   *
  23   23   */
  24   24  
  25   25  class CodeEmitInfo;
  26   26  

  27   27  class C1_MacroAssembler: public MacroAssembler {
  28   28   public:
  29   29    // creation
  30   30    C1_MacroAssembler(CodeBuffer* code) : MacroAssembler(code) { pd_init(); }
  31   31  
  32   32    //----------------------------------------------------
  33   33    void explicit_null_check(Register base);
  34   34  
  35   35    void inline_cache_check(Register receiver, Register iCache);
  36   36    void build_frame(int frame_size_in_bytes);
  37      -  void method_exit(bool restore_frame);
       37 +  void remove_frame(int frame_size_in_bytes);
  38   38  
  39   39    void unverified_entry(Register receiver, Register ic_klass);
  40   40    void verified_entry();
  41   41    void verify_stack_oop(int offset) PRODUCT_RETURN;
  42   42    void verify_not_null_oop(Register r)  PRODUCT_RETURN;
  43   43  
  44   44  #include "incls/_c1_MacroAssembler_pd.hpp.incl"
  45   45  };
  46   46  
  47   47  

  48   48  
  49   49  // A StubAssembler is a MacroAssembler w/ extra functionality for runtime
  50   50  // stubs. Currently it 'knows' some stub info. Eventually, the information
  51   51  // may be set automatically or can be asserted when using specialised
  52   52  // StubAssembler functions.
  53   53  
  54   54  class StubAssembler: public C1_MacroAssembler {
  55   55   private:
  56   56    const char* _name;
  57   57    bool        _must_gc_arguments;
  58   58    int         _frame_size;
  59   59    int         _num_rt_args;
  60   60    int         _stub_id;
  61   61  
  62   62   public:
  63   63    // creation
  64   64    StubAssembler(CodeBuffer* code, const char * name, int stub_id);
  65   65    void set_info(const char* name, bool must_gc_arguments);
  66   66  
  67   67    void set_frame_size(int size);
  68   68    void set_num_rt_args(int args);
  69   69  
  70   70    // accessors
  71   71    const char* name() const                       { return _name; }
  72   72    bool  must_gc_arguments() const                { return _must_gc_arguments; }
  73   73    int frame_size() const                         { return _frame_size; }
  74   74    int num_rt_args() const                        { return _num_rt_args; }
  75   75    int stub_id() const                            { return _stub_id; }
  76   76  
  77   77    // runtime calls (return offset of call to be used by GC map)
  78   78    int call_RT(Register oop_result1, Register oop_result2, address entry, int args_size = 0);
  79   79    int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1);
  80   80    int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2);
  81   81    int call_RT(Register oop_result1, Register oop_result2, address entry, Register arg1, Register arg2, Register arg3);
  82   82  };

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX