1.1 --- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -22,8 +22,18 @@ 1.4 * 1.5 */ 1.6 1.7 -#include "incls/_precompiled.incl" 1.8 -#include "incls/_c1_MacroAssembler_x86.cpp.incl" 1.9 +#include "precompiled.hpp" 1.10 +#include "c1/c1_MacroAssembler.hpp" 1.11 +#include "c1/c1_Runtime1.hpp" 1.12 +#include "classfile/systemDictionary.hpp" 1.13 +#include "gc_interface/collectedHeap.hpp" 1.14 +#include "interpreter/interpreter.hpp" 1.15 +#include "oops/arrayOop.hpp" 1.16 +#include "oops/markOop.hpp" 1.17 +#include "runtime/basicLock.hpp" 1.18 +#include "runtime/biasedLocking.hpp" 1.19 +#include "runtime/os.hpp" 1.20 +#include "runtime/stubRoutines.hpp" 1.21 1.22 int C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Register scratch, Label& slow_case) { 1.23 const int aligned_mask = BytesPerWord -1;