src/cpu/x86/vm/macroAssembler_x86.hpp

changeset 4542
db9981fd3124
parent 4413
038dd2875b94
child 4543
8391fdd36e1f
     1.1 --- a/src/cpu/x86/vm/macroAssembler_x86.hpp	Fri Jan 18 05:33:32 2013 -0800
     1.2 +++ b/src/cpu/x86/vm/macroAssembler_x86.hpp	Wed Jan 23 13:02:39 2013 -0500
     1.3 @@ -26,6 +26,7 @@
     1.4  #define CPU_X86_VM_MACROASSEMBLER_X86_HPP
     1.5  
     1.6  #include "asm/assembler.hpp"
     1.7 +#include "utilities/macros.hpp"
     1.8  
     1.9  
    1.10  // MacroAssembler extends Assembler by frequently used macros.
    1.11 @@ -294,7 +295,7 @@
    1.12    void store_check(Register obj);                // store check for obj - register is destroyed afterwards
    1.13    void store_check(Register obj, Address dst);   // same as above, dst is exact store location (reg. is destroyed)
    1.14  
    1.15 -#ifndef SERIALGC
    1.16 +#if INCLUDE_ALL_GCS
    1.17  
    1.18    void g1_write_barrier_pre(Register obj,
    1.19                              Register pre_val,
    1.20 @@ -309,7 +310,7 @@
    1.21                               Register tmp,
    1.22                               Register tmp2);
    1.23  
    1.24 -#endif // SERIALGC
    1.25 +#endif // INCLUDE_ALL_GCS
    1.26  
    1.27    // split store_check(Register obj) to enhance instruction interleaving
    1.28    void store_check_part_1(Register obj);

mercurial