More MIPS fixes. The vm-tests and oat tests all work on the emulator.
- Changed the base address of the art image for MIPS to allow enough
space for CTS to run on the target.
- Fixed exception delivery to jump without linking, and to preserve the
value of $gp.
- Added dumping of /proc/self/maps whenever mmap fails, and cleaned up
other debugging output (not MIPS related).
Change-Id: I4e92e992ee6a6167e901db8ad90a6062bbc5168a
diff --git a/src/image_test.cc b/src/image_test.cc
index b72226b..feb490c 100644
--- a/src/image_test.cc
+++ b/src/image_test.cc
@@ -48,13 +48,15 @@
}
}
- ImageWriter writer(NULL);
ScratchFile tmp_image;
- const uintptr_t requested_image_base = 0x60000000;
- bool success_image = writer.Write(tmp_image.GetFilename(), requested_image_base,
- tmp_oat.GetFilename(), tmp_oat.GetFilename(),
- *compiler_.get());
- ASSERT_TRUE(success_image);
+ const uintptr_t requested_image_base = ART_BASE_ADDRESS;
+ {
+ ImageWriter writer(NULL);
+ bool success_image = writer.Write(tmp_image.GetFilename(), requested_image_base,
+ tmp_oat.GetFilename(), tmp_oat.GetFilename(),
+ *compiler_.get());
+ ASSERT_TRUE(success_image);
+ }
{
UniquePtr<File> file(OS::OpenFile(tmp_image.GetFilename().c_str(), false));