From 13735955f39b3b304c37d2b2840663c131262c18 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 8 Oct 2014 12:43:28 -0700 Subject: stdint types all the way! Change-Id: I4e4ef3a2002fc59ebd9097087f150eaf3f2a7e08 --- compiler/common_compiler_test.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/common_compiler_test.cc') diff --git a/compiler/common_compiler_test.cc b/compiler/common_compiler_test.cc index fbaed9ffab..e3eb9e9915 100644 --- a/compiler/common_compiler_test.cc +++ b/compiler/common_compiler_test.cc @@ -144,12 +144,12 @@ CommonCompilerTest::~CommonCompilerTest() {} OatFile::OatMethod CommonCompilerTest::CreateOatMethod(const void* code, const uint8_t* gc_map) { CHECK(code != nullptr); - const byte* base; + const uint8_t* base; uint32_t code_offset, gc_map_offset; if (gc_map == nullptr) { - base = reinterpret_cast(code); // Base of data points at code. - base -= kPointerSize; // Move backward so that code_offset != 0. - code_offset = kPointerSize; + base = reinterpret_cast(code); // Base of data points at code. + base -= sizeof(void*); // Move backward so that code_offset != 0. + code_offset = sizeof(void*); gc_map_offset = 0; } else { // TODO: 64bit support. @@ -398,7 +398,7 @@ void CommonCompilerTest::ReserveImageSpace() { // accidentally end up colliding with the fixed memory address when we need to load the image. std::string error_msg; image_reservation_.reset(MemMap::MapAnonymous("image reservation", - reinterpret_cast(ART_BASE_ADDRESS), + reinterpret_cast(ART_BASE_ADDRESS), (size_t)100 * 1024 * 1024, // 100MB PROT_NONE, false /* no need for 4gb flag with fixed mmap*/, -- cgit v1.2.3-59-g8ed1b