comparison src/share/vm/graal/graalCompiler.cpp @ 7216:5a95c784febf

fixed windows make files and VS2012-specific compilation issues
author Christian Haeubl <haeubl@ssw.jku.at>
date Tue, 04 Dec 2012 11:14:23 +0100
parents ce248dc0a656
children 8a3efb8c831d
comparison
equal deleted inserted replaced
7215:7c5f7e7cf2c2 7216:5a95c784febf
47 47
48 ThreadToNativeFromVM trans(JavaThread::current()); 48 ThreadToNativeFromVM trans(JavaThread::current());
49 JavaThread* THREAD = JavaThread::current(); 49 JavaThread* THREAD = JavaThread::current();
50 TRACE_graal_1("GraalCompiler::initialize"); 50 TRACE_graal_1("GraalCompiler::initialize");
51 51
52 unsigned long heap_end = (long) Universe::heap()->reserved_region().end(); 52 uintptr_t heap_end = (uintptr_t) Universe::heap()->reserved_region().end();
53 unsigned long allocation_end = heap_end + 16l * 1024 * 1024 * 1024; 53 uintptr_t allocation_end = heap_end + ((uintptr_t)16) * 1024 * 1024 * 1024;
54 guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)"); 54 guarantee(heap_end < allocation_end, "heap end too close to end of address space (might lead to erroneous TLAB allocations)");
55 NOT_LP64(error("check TLAB allocation code for address space conflicts")); 55 NOT_LP64(error("check TLAB allocation code for address space conflicts"));
56 56
57 _deopted_leaf_graph_count = 0; 57 _deopted_leaf_graph_count = 0;
58 58