src/share/vm/interpreter/cppInterpreter.hpp

rev 11647 : 8161258: Simplify including platform files.
Summary: Include patform files with macros cpu_header() etc. Do various cleanups of macro usages. Remove _64/_32 from adlc generated files and platform .hpp files. Merge stubRoutines_x86*.hpp. Remove empty mutex_<os>* files.
Reviewed-by: dholmes, coleenp, kbarrett

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, 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) 1997, 2016, 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.
*** 24,33 ****
--- 24,35 ----
  
  #ifndef SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
  #define SHARE_VM_INTERPRETER_CPPINTERPRETER_HPP
  
  #include "interpreter/abstractInterpreter.hpp"
+ #include "utilities/macros.hpp"
+ 
  #ifdef CC_INTERP
  
  class InterpreterCodelet;
  
  // This file contains the platform-independent parts
*** 58,68 ****
    static void invoke_method(Method* method, address entry_point, TRAPS);
    static void invoke_osr(Method* method,
                           address   entry_point,
                           address   osr_buf,
                           TRAPS);
! #ifdef TARGET_ARCH_zero
  # include "cppInterpreter_zero.hpp"
  #endif
  
  };
  
--- 60,70 ----
    static void invoke_method(Method* method, address entry_point, TRAPS);
    static void invoke_osr(Method* method,
                           address   entry_point,
                           address   osr_buf,
                           TRAPS);
! #ifdef ZERO
  # include "cppInterpreter_zero.hpp"
  #endif
  
  };