Mercurial > hg > truffle

comparison src/cpu/x86/vm/assembler_x86.cpp @ 8002:8391fdd36e1f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author dlong
date Sun, 27 Jan 2013 01:07:09 -0800
parents b30b3c2a0cf2 db9981fd3124
children 91a23b11d8dc
comparison
equal deleted inserted replaced
7946:6fbe8a57549d 8002:8391fdd36e1f
34 #include "runtime/interfaceSupport.hpp" 34 #include "runtime/interfaceSupport.hpp"
35 #include "runtime/objectMonitor.hpp" 35 #include "runtime/objectMonitor.hpp"
36 #include "runtime/os.hpp" 36 #include "runtime/os.hpp"
37 #include "runtime/sharedRuntime.hpp" 37 #include "runtime/sharedRuntime.hpp"
38 #include "runtime/stubRoutines.hpp" 38 #include "runtime/stubRoutines.hpp"
39 #ifndef SERIALGC 39 #include "utilities/macros.hpp"
40 #if INCLUDE_ALL_GCS
40 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp" 41 #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
41 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp" 42 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
42 #include "gc_implementation/g1/heapRegion.hpp" 43 #include "gc_implementation/g1/heapRegion.hpp"
43 #endif 44 #endif // INCLUDE_ALL_GCS
44 45
45 #ifdef PRODUCT 46 #ifdef PRODUCT
46 #define BLOCK_COMMENT(str) /* nothing */ 47 #define BLOCK_COMMENT(str) /* nothing */
47 #define STOP(error) stop(error) 48 #define STOP(error) stop(error)
48 #else 49 #else