commit bcbaaf3df56178263dbc110dcb0d1cf6c9d167c3
author Ian Rogers <irogers@google.com> Mon Oct 10 11:37:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 10 11:37:13 2011 -0700
tree a477d898522992958455a4ad704a15c20412fb61
parent 726079d3e2e50854cd6ca4c393f4529a796dba58
parent 1634155a231665f16867cbecab9332a8b1cf3b1e

Merge "Flush icache when making pages executable." into dalvik-dev

src/assembler.cc

diff --git a/src/assembler.cc b/src/assembler.cc
index 4ab882e..d97cf5c 100644
--- a/src/assembler.cc
+++ b/src/assembler.cc
@@ -88,8 +88,6 @@
   // Copy the instructions from the buffer.
   MemoryRegion from(reinterpret_cast<void*>(contents()), Size());
   instructions.CopyFrom(0, from);
-  // Flush instruction cache
-  __builtin___clear_cache(instructions.start(), instructions.end());
   // Process fixups in the instructions.
   ProcessFixups(instructions);
 #if defined(DEBUG)

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 1039ff1..950020d 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -144,6 +144,8 @@
     uintptr_t limit = RoundUp(data + code_length, kPageSize);
     uintptr_t len = limit - base;
     int result = mprotect(reinterpret_cast<void*>(base), len, PROT_READ | PROT_WRITE | PROT_EXEC);
+    // Flush instruction cache
+    __builtin___clear_cache(reinterpret_cast<void*>(base), reinterpret_cast<void*>(base + len));
     CHECK_EQ(result, 0);
   }