Mercurial > hg > truffle
diff src/cpu/x86/vm/macroAssembler_x86.hpp @ 8002:8391fdd36e1f
Merge
author | dlong |
---|---|
date | Sun, 27 Jan 2013 01:07:09 -0800 |
parents | b30b3c2a0cf2 db9981fd3124 |
children | e961c11b85fe |
line wrap: on
line diff
--- a/src/cpu/x86/vm/macroAssembler_x86.hpp Fri Jan 25 03:03:23 2013 -0800 +++ b/src/cpu/x86/vm/macroAssembler_x86.hpp Sun Jan 27 01:07:09 2013 -0800 @@ -26,6 +26,7 @@ #define CPU_X86_VM_MACROASSEMBLER_X86_HPP #include "asm/assembler.hpp" +#include "utilities/macros.hpp" // MacroAssembler extends Assembler by frequently used macros. @@ -294,7 +295,7 @@ void store_check(Register obj); // store check for obj - register is destroyed afterwards void store_check(Register obj, Address dst); // same as above, dst is exact store location (reg. is destroyed) -#ifndef SERIALGC +#if INCLUDE_ALL_GCS void g1_write_barrier_pre(Register obj, Register pre_val, @@ -309,7 +310,7 @@ Register tmp, Register tmp2); -#endif // SERIALGC +#endif // INCLUDE_ALL_GCS // split store_check(Register obj) to enhance instruction interleaving void store_check_part_1(Register obj);