src/share/vm/code/vmreg.hpp

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 2008, Oracle and/or its affiliates. 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 (c) 1998, 2010, Oracle and/or its affiliates. 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.
*** 20,29 ****
--- 20,60 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
+ #ifndef SHARE_VM_CODE_VMREG_HPP
+ #define SHARE_VM_CODE_VMREG_HPP
+ 
+ #include "memory/allocation.hpp"
+ #include "utilities/globalDefinitions.hpp"
+ #ifdef TARGET_ARCH_x86
+ # include "register_x86.hpp"
+ #endif
+ #ifdef TARGET_ARCH_sparc
+ # include "register_sparc.hpp"
+ #endif
+ #ifdef TARGET_ARCH_zero
+ # include "register_zero.hpp"
+ #endif
+ #ifdef COMPILER2
+ #include "opto/adlcVMDeps.hpp"
+ #include "utilities/ostream.hpp"
+ #ifdef TARGET_ARCH_MODEL_x86_32
+ # include "adfiles/adGlobals_x86_32.hpp"
+ #endif
+ #ifdef TARGET_ARCH_MODEL_x86_64
+ # include "adfiles/adGlobals_x86_64.hpp"
+ #endif
+ #ifdef TARGET_ARCH_MODEL_sparc
+ # include "adfiles/adGlobals_sparc.hpp"
+ #endif
+ #ifdef TARGET_ARCH_MODEL_zero
+ # include "adfiles/adGlobals_zero.hpp"
+ #endif
+ #endif
+ 
  //------------------------------VMReg------------------------------------------
  // The VM uses 'unwarped' stack slots; the compiler uses 'warped' stack slots.
  // Register numbers below VMRegImpl::stack0 are the same for both.  Register
  // numbers above stack0 are either warped (in the compiler) or unwarped
  // (in the VM).  Unwarped numbers represent stack indices, offsets from
*** 122,132 ****
      return value() - stack0->value();
    }
  
    static void set_regName();
  
! #include "incls/_vmreg_pd.hpp.incl"
  
  };
  
  //---------------------------VMRegPair-------------------------------------------
  // Pairs of 32-bit registers for arguments.
--- 153,172 ----
      return value() - stack0->value();
    }
  
    static void set_regName();
  
! #ifdef TARGET_ARCH_x86
! # include "vmreg_x86.hpp"
! #endif
! #ifdef TARGET_ARCH_sparc
! # include "vmreg_sparc.hpp"
! #endif
! #ifdef TARGET_ARCH_zero
! # include "vmreg_zero.hpp"
! #endif
! 
  
  };
  
  //---------------------------VMRegPair-------------------------------------------
  // Pairs of 32-bit registers for arguments.
*** 179,183 ****
--- 219,225 ----
    VMReg first()  const { return _first; }
    VMRegPair(VMReg s, VMReg f) {  _second = s; _first = f; }
    VMRegPair(VMReg f) { _second = VMRegImpl::Bad(); _first = f; }
    VMRegPair() { _second = VMRegImpl::Bad(); _first = VMRegImpl::Bad(); }
  };
+ 
+ #endif // SHARE_VM_CODE_VMREG_HPP