hotspot/src/cpu/x86/vm/templateTable_x86_32.hpp

rev 611 : Merge

*** 1,10 ****
- #ifdef USE_PRAGMA_IDENT_HDR
- #pragma ident "@(#)templateTable_x86_32.hpp     1.20 07/05/05 17:04:20 JVM"
- #endif
  /*
!  * Copyright 1998-2005 Sun Microsystems, Inc.  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.
--- 1,7 ----
  /*
!  * Copyright 1998-2008 Sun Microsystems, Inc.  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.
*** 27,36 ****
  
    static void prepare_invoke(Register method, Register index, int byte_no,
                               Bytecodes::Code code);
    static void invokevirtual_helper(Register index, Register recv,
                                     Register flags);
!   static void volatile_barrier( );
  
    // Helpers
    static void index_check(Register array, Register index);
    static void index_check_without_pop(Register array, Register index);
--- 24,33 ----
  
    static void prepare_invoke(Register method, Register index, int byte_no,
                               Bytecodes::Code code);
    static void invokevirtual_helper(Register index, Register recv,
                                     Register flags);
!   static void volatile_barrier(Assembler::Membar_mask_bits order_constraint );
  
    // Helpers
    static void index_check(Register array, Register index);
    static void index_check_without_pop(Register array, Register index);