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

rev 611 : Merge

*** 1,10 ****
- #ifdef USE_PRAGMA_IDENT_HDR
- #pragma ident "@(#)stubRoutines_x86_32.hpp      1.71 07/05/05 17:04:20 JVM"
- #endif
  /*
!  * Copyright 1997-2007 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 1997-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.
*** 32,42 ****
  enum platform_dependent_constants {
    code_size1 =  9000,           // simply increase if too small (assembler will crash if too small)
    code_size2 = 22000            // simply increase if too small (assembler will crash if too small)
  };
  
! class i486 {
   friend class StubGenerator;
   friend class VMStructs;
  
   private:
    // If we call compiled code directly from the call stub we will
--- 29,39 ----
  enum platform_dependent_constants {
    code_size1 =  9000,           // simply increase if too small (assembler will crash if too small)
    code_size2 = 22000            // simply increase if too small (assembler will crash if too small)
  };
  
! class x86 {
   friend class StubGenerator;
   friend class VMStructs;
  
   private:
    // If we call compiled code directly from the call stub we will
*** 55,60 ****
    static address get_call_stub_compiled_return()             { return _call_stub_compiled_return; }
    static void set_call_stub_compiled_return(address ret)     { _call_stub_compiled_return = ret; }
  };
  
    static bool    returns_to_call_stub(address return_pc)     { return (return_pc == _call_stub_return_address) || 
!                                                                        return_pc == i486::get_call_stub_compiled_return(); }
--- 52,57 ----
    static address get_call_stub_compiled_return()             { return _call_stub_compiled_return; }
    static void set_call_stub_compiled_return(address ret)     { _call_stub_compiled_return = ret; }
  };
  
    static bool    returns_to_call_stub(address return_pc)     { return (return_pc == _call_stub_return_address) ||
!                                                                        return_pc == x86::get_call_stub_compiled_return(); }