From 39ce4fbaf964403696a31919ce705426e7d82e11 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Fri, 2 Sep 2005 14:38:11 -0400 Subject: [PATCH] Bug fix: can't increment an iterator after you erase the thing it points to. Somehow Linux doesn't care, but Cygwin sure does. --HG-- extra : convert_revision : 1209a75831f080f17a95433e546d7074f9f07332 --- arch/alpha/alpha_memory.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc index 39c9397ea..8dda4d9c4 100644 --- a/arch/alpha/alpha_memory.cc +++ b/arch/alpha/alpha_memory.cc @@ -177,6 +177,7 @@ AlphaTLB::insert(Addr addr, AlphaISA::PTE &pte) void AlphaTLB::flushAll() { + DPRINTF(TLB, "flushAll\n"); memset(table, 0, sizeof(AlphaISA::PTE[size])); lookupTable.clear(); nlu = 0; @@ -192,13 +193,16 @@ AlphaTLB::flushProcesses() AlphaISA::PTE *pte = &table[index]; assert(pte->valid); + // we can't increment i after we erase it, so save a copy and + // increment it to get the next entry now + PageTable::iterator cur = i; + ++i; + if (!pte->asma) { DPRINTF(TLB, "flush @%d: %#x -> %#x\n", index, pte->tag, pte->ppn); pte->valid = false; - lookupTable.erase(i); + lookupTable.erase(cur); } - - ++i; } }