src/cpu/x86/vm/macroAssembler_x86.cpp

rev 8362 : 8079792: GC directory structure cleanup
Reviewed-by:

*** 24,36 ****
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "asm/assembler.inline.hpp"
  #include "compiler/disassembler.hpp"
! #include "gc_interface/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
- #include "memory/cardTableModRefBS.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "prims/methodHandles.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/interfaceSupport.hpp"
--- 24,36 ----
  
  #include "precompiled.hpp"
  #include "asm/assembler.hpp"
  #include "asm/assembler.inline.hpp"
  #include "compiler/disassembler.hpp"
! #include "gc/shared/cardTableModRefBS.hpp"
! #include "gc/shared/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "prims/methodHandles.hpp"
  #include "runtime/biasedLocking.hpp"
  #include "runtime/interfaceSupport.hpp"
*** 38,50 ****
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
! #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
! #include "gc_implementation/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) /* nothing */
  #define STOP(error) stop(error)
--- 38,50 ----
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1CollectedHeap.inline.hpp"
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
! #include "gc/g1/heapRegion.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef PRODUCT
  #define BLOCK_COMMENT(str) /* nothing */
  #define STOP(error) stop(error)