wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 969336 - ARM simulator: don't flush icache when icache checking is disabled. r=dougc

Browse Source
This commit is contained in:
Jan de Mooij 2014-02-11 11:08:42 +01:00
parent 5440916c46
commit 1a3d4ee313
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jit/arm/Simulator-arm.cpp
View File

@ -991,6 +991,8 @@ AllOnOnePage(uintptr_t start, int size)
static CachePage * static CachePage *
GetCachePage(SimulatorRuntime::ICacheMap &i_cache, void *page) GetCachePage(SimulatorRuntime::ICacheMap &i_cache, void *page)
{ {
MOZ_ASSERT(Simulator::ICacheCheckingEnabled);
SimulatorRuntime::ICacheMap::AddPtr p = i_cache.lookupForAdd(page); SimulatorRuntime::ICacheMap::AddPtr p = i_cache.lookupForAdd(page);
if (p) if (p)
return p->value(); return p->value();
@ -1085,6 +1087,8 @@ Simulator::setLastDebuggerInput(char *input)
void void
Simulator::FlushICache(void *start_addr, size_t size) Simulator::FlushICache(void *start_addr, size_t size)
{ {
if (!Simulator::ICacheCheckingEnabled)
return;
SimulatorRuntime *srt = Simulator::Current()->srt_; SimulatorRuntime *srt = Simulator::Current()->srt_;
AutoLockSimulatorRuntime alsr(srt); AutoLockSimulatorRuntime alsr(srt);
js::jit::FlushICache(srt->icache(), start_addr, size); js::jit::FlushICache(srt->icache(), start_addr, size);
@ -1173,7 +1177,8 @@ class Redirection
Simulator *sim = Simulator::Current(); Simulator *sim = Simulator::Current();
SimulatorRuntime *srt = sim->srt_; SimulatorRuntime *srt = sim->srt_;
next_ = srt->redirection(); next_ = srt->redirection();
FlushICache(srt->icache(), addressOfSwiInstruction(), SimInstruction::kInstrSize); if (Simulator::ICacheCheckingEnabled)
FlushICache(srt->icache(), addressOfSwiInstruction(), SimInstruction::kInstrSize);
srt->setRedirection(this); srt->setRedirection(this);
} }