add syscall emulation page table fault so we can allocate more stack pages
src/cpu/simple/base.cc: add syscall emulation page table fault so we can allocate more stack pages FaultBase::invoke will do this, we don't need to do it here src/sim/faults.hh: I have no idea why this #if was there... gone src/sim/process.cc: make stack_min actually be the current minimum --HG-- extra : convert_revision : 9786b39f2747b94654a5d77c74243cd20503add4
This commit is contained in:
parent
deaf940946
commit
c4be6f1e64
|
@ -35,6 +35,9 @@
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
#include "arch/alpha/ev5.hh"
|
#include "arch/alpha/ev5.hh"
|
||||||
|
#else
|
||||||
|
#include "sim/process.hh"
|
||||||
|
#include "mem/page_table.hh"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace AlphaISA
|
namespace AlphaISA
|
||||||
|
@ -56,6 +59,12 @@ FaultName ArithmeticFault::_name = "arith";
|
||||||
FaultVect ArithmeticFault::_vect = 0x0501;
|
FaultVect ArithmeticFault::_vect = 0x0501;
|
||||||
FaultStat ArithmeticFault::_count;
|
FaultStat ArithmeticFault::_count;
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
FaultName PageTableFault::_name = "page_table_fault";
|
||||||
|
FaultVect PageTableFault::_vect = 0x0000;
|
||||||
|
FaultStat PageTableFault::_count;
|
||||||
|
#endif
|
||||||
|
|
||||||
FaultName InterruptFault::_name = "interrupt";
|
FaultName InterruptFault::_name = "interrupt";
|
||||||
FaultVect InterruptFault::_vect = 0x0101;
|
FaultVect InterruptFault::_vect = 0x0101;
|
||||||
FaultStat InterruptFault::_count;
|
FaultStat InterruptFault::_count;
|
||||||
|
@ -173,6 +182,28 @@ void ItbFault::invoke(ThreadContext * tc)
|
||||||
AlphaFault::invoke(tc);
|
AlphaFault::invoke(tc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else //!FULL_SYSTEM
|
||||||
|
|
||||||
|
void PageTableFault::invoke(ThreadContext *tc)
|
||||||
|
{
|
||||||
|
Process *p = tc->getProcessPtr();
|
||||||
|
|
||||||
|
// address is higher than the stack region or in the current stack region
|
||||||
|
if (vaddr > p->stack_base || vaddr > p->stack_min)
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
|
||||||
|
// We've accessed the next page
|
||||||
|
if (vaddr > p->stack_min - PageBytes) {
|
||||||
|
p->stack_min -= PageBytes;
|
||||||
|
if (p->stack_base - p->stack_min > 8*1024*1024)
|
||||||
|
fatal("Over max stack size for one thread\n");
|
||||||
|
p->pTable->allocate(p->stack_min, PageBytes);
|
||||||
|
warn("Increasing stack size by one page.");
|
||||||
|
} else {
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace AlphaISA
|
} // namespace AlphaISA
|
||||||
|
|
|
@ -81,6 +81,29 @@ class AlignmentFault : public AlphaFault
|
||||||
bool isAlignmentFault() {return true;}
|
bool isAlignmentFault() {return true;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
class PageTableFault : public AlphaFault
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
Addr vaddr;
|
||||||
|
static FaultName _name;
|
||||||
|
static FaultVect _vect;
|
||||||
|
static FaultStat _count;
|
||||||
|
public:
|
||||||
|
PageTableFault(Addr va)
|
||||||
|
: vaddr(va) {}
|
||||||
|
FaultName name() {return _name;}
|
||||||
|
FaultVect vect() {return _vect;}
|
||||||
|
FaultStat & countStat() {return _count;}
|
||||||
|
void invoke(ThreadContext * tc);
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline Fault genPageTableFault(Addr va)
|
||||||
|
{
|
||||||
|
return new PageTableFault(va);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline Fault genMachineCheckFault()
|
static inline Fault genMachineCheckFault()
|
||||||
{
|
{
|
||||||
return new MachineCheckFault;
|
return new MachineCheckFault;
|
||||||
|
|
|
@ -32,6 +32,10 @@
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
#include "sim/process.hh"
|
||||||
|
#include "mem/page_table.hh"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace MipsISA
|
namespace MipsISA
|
||||||
{
|
{
|
||||||
|
@ -52,6 +56,12 @@ FaultName ArithmeticFault::_name = "arith";
|
||||||
FaultVect ArithmeticFault::_vect = 0x0501;
|
FaultVect ArithmeticFault::_vect = 0x0501;
|
||||||
FaultStat ArithmeticFault::_count;
|
FaultStat ArithmeticFault::_count;
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
FaultName PageTableFault::_name = "page_table_fault";
|
||||||
|
FaultVect PageTableFault::_vect = 0x0000;
|
||||||
|
FaultStat PageTableFault::_count;
|
||||||
|
#endif
|
||||||
|
|
||||||
FaultName InterruptFault::_name = "interrupt";
|
FaultName InterruptFault::_name = "interrupt";
|
||||||
FaultVect InterruptFault::_vect = 0x0101;
|
FaultVect InterruptFault::_vect = 0x0101;
|
||||||
FaultStat InterruptFault::_count;
|
FaultStat InterruptFault::_count;
|
||||||
|
@ -127,7 +137,28 @@ void ArithmeticFault::invoke(ThreadContext * tc)
|
||||||
panic("Arithmetic traps are unimplemented!");
|
panic("Arithmetic traps are unimplemented!");
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#else //!FULL_SYSTEM
|
||||||
|
|
||||||
|
void PageTableFault::invoke(ThreadContext *tc)
|
||||||
|
{
|
||||||
|
Process *p = tc->getProcessPtr();
|
||||||
|
|
||||||
|
// address is higher than the stack region or in the current stack region
|
||||||
|
if (vaddr > p->stack_base || vaddr > p->stack_min)
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
|
||||||
|
// We've accessed the next page
|
||||||
|
if (vaddr > p->stack_min - PageBytes) {
|
||||||
|
p->stack_min -= PageBytes;
|
||||||
|
if (p->stack_base - p->stack_min > 8*1024*1024)
|
||||||
|
fatal("Over max stack size for one thread\n");
|
||||||
|
p->pTable->allocate(p->stack_min, PageBytes);
|
||||||
|
warn("Increasing stack size by one page.");
|
||||||
|
} else {
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
} // namespace MipsISA
|
} // namespace MipsISA
|
||||||
|
|
||||||
|
|
|
@ -79,6 +79,30 @@ class AlignmentFault : public MipsFault
|
||||||
bool isAlignmentFault() {return true;}
|
bool isAlignmentFault() {return true;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
class PageTableFault : public MipsFault
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
Addr vaddr;
|
||||||
|
static FaultName _name;
|
||||||
|
static FaultVect _vect;
|
||||||
|
static FaultStat _count;
|
||||||
|
public:
|
||||||
|
PageTableFault(Addr va)
|
||||||
|
: vaddr(va) {}
|
||||||
|
FaultName name() {return _name;}
|
||||||
|
FaultVect vect() {return _vect;}
|
||||||
|
FaultStat & countStat() {return _count;}
|
||||||
|
void invoke(ThreadContext * tc);
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline Fault genPageTableFault(Addr va)
|
||||||
|
{
|
||||||
|
return new PageTableFault(va);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static inline Fault genMachineCheckFault()
|
static inline Fault genMachineCheckFault()
|
||||||
{
|
{
|
||||||
return new MachineCheckFault;
|
return new MachineCheckFault;
|
||||||
|
|
|
@ -33,6 +33,10 @@
|
||||||
#include "cpu/thread_context.hh"
|
#include "cpu/thread_context.hh"
|
||||||
#include "cpu/base.hh"
|
#include "cpu/base.hh"
|
||||||
#include "base/trace.hh"
|
#include "base/trace.hh"
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
#include "sim/process.hh"
|
||||||
|
#include "mem/page_table.hh"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace SparcISA
|
namespace SparcISA
|
||||||
{
|
{
|
||||||
|
@ -218,6 +222,13 @@ TrapType TrapInstruction::_baseTrapType = 0x100;
|
||||||
FaultPriority TrapInstruction::_priority = 16;
|
FaultPriority TrapInstruction::_priority = 16;
|
||||||
FaultStat TrapInstruction::_count;
|
FaultStat TrapInstruction::_count;
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
FaultName PageTableFault::_name = "page_table_fault";
|
||||||
|
TrapType PageTableFault::_trapType = 0x0000;
|
||||||
|
FaultPriority PageTableFault::_priority = 0;
|
||||||
|
FaultStat PageTableFault::_count;
|
||||||
|
#endif
|
||||||
|
|
||||||
#if FULL_SYSTEM
|
#if FULL_SYSTEM
|
||||||
|
|
||||||
void SparcFault::invoke(ThreadContext * tc)
|
void SparcFault::invoke(ThreadContext * tc)
|
||||||
|
@ -252,6 +263,25 @@ void TrapInstruction::invoke(ThreadContext * tc)
|
||||||
// Should be handled in ISA.
|
// Should be handled in ISA.
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PageTableFault::invoke(ThreadContext *tc)
|
||||||
|
{
|
||||||
|
Process *p = tc->getProcessPtr();
|
||||||
|
|
||||||
|
// address is higher than the stack region or in the current stack region
|
||||||
|
if (vaddr > p->stack_base || vaddr > p->stack_min)
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
|
||||||
|
// We've accessed the next page
|
||||||
|
if (vaddr > p->stack_min - PageBytes) {
|
||||||
|
p->stack_min -= PageBytes;
|
||||||
|
if (p->stack_base - p->stack_min > 8*1024*1024)
|
||||||
|
fatal("Over max stack size for one thread\n");
|
||||||
|
p->pTable->allocate(p->stack_min, PageBytes);
|
||||||
|
warn("Increasing stack size by one page.");
|
||||||
|
} else {
|
||||||
|
FaultBase::invoke(tc);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
} // namespace SparcISA
|
} // namespace SparcISA
|
||||||
|
|
|
@ -83,6 +83,31 @@ class MemAddressNotAligned : public SparcFault
|
||||||
bool isAlignmentFault() {return true;}
|
bool isAlignmentFault() {return true;}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if !FULL_SYSTEM
|
||||||
|
class PageTableFault : public SparcFault
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
Addr vaddr;
|
||||||
|
static FaultName _name;
|
||||||
|
static TrapType _trapType;
|
||||||
|
static FaultPriority _priority;
|
||||||
|
static FaultStat _count;
|
||||||
|
public:
|
||||||
|
PageTableFault(Addr va)
|
||||||
|
: vaddr(va) {}
|
||||||
|
FaultName name() {return _name;}
|
||||||
|
TrapType trapType() {return _trapType;}
|
||||||
|
FaultPriority priority() {return _priority;}
|
||||||
|
FaultStat & countStat() {return _count;}
|
||||||
|
void invoke(ThreadContext * tc);
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline Fault genPageTableFault(Addr va)
|
||||||
|
{
|
||||||
|
return new PageTableFault(va);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline Fault genMachineCheckFault()
|
static inline Fault genMachineCheckFault()
|
||||||
{
|
{
|
||||||
return new InternalProcessorError;
|
return new InternalProcessorError;
|
||||||
|
@ -589,6 +614,7 @@ class TrapInstruction : public EnumeratedFault
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
} // SparcISA namespace
|
} // SparcISA namespace
|
||||||
|
|
||||||
#endif // __FAULTS_HH__
|
#endif // __FAULTS_HH__
|
||||||
|
|
|
@ -446,11 +446,7 @@ void
|
||||||
BaseSimpleCPU::advancePC(Fault fault)
|
BaseSimpleCPU::advancePC(Fault fault)
|
||||||
{
|
{
|
||||||
if (fault != NoFault) {
|
if (fault != NoFault) {
|
||||||
#if FULL_SYSTEM
|
|
||||||
fault->invoke(tc);
|
fault->invoke(tc);
|
||||||
#else // !FULL_SYSTEM
|
|
||||||
fatal("fault (%s) detected @ PC %08p", fault->name(), thread->readPC());
|
|
||||||
#endif // FULL_SYSTEM
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// go to the next instruction
|
// go to the next instruction
|
||||||
|
|
|
@ -130,7 +130,7 @@ PageTable::translate(RequestPtr &req)
|
||||||
assert(pageAlign(req->getVaddr() + req->getSize() - 1)
|
assert(pageAlign(req->getVaddr() + req->getSize() - 1)
|
||||||
== pageAlign(req->getVaddr()));
|
== pageAlign(req->getVaddr()));
|
||||||
if (!translate(req->getVaddr(), paddr)) {
|
if (!translate(req->getVaddr(), paddr)) {
|
||||||
return genMachineCheckFault();
|
return genPageTableFault(req->getVaddr());
|
||||||
}
|
}
|
||||||
req->setPaddr(paddr);
|
req->setPaddr(paddr);
|
||||||
return page_check(req->getPaddr(), req->getSize());
|
return page_check(req->getPaddr(), req->getSize());
|
||||||
|
|
|
@ -54,11 +54,7 @@ class FaultBase : public RefCounted
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual FaultName name() = 0;
|
virtual FaultName name() = 0;
|
||||||
#if FULL_SYSTEM
|
|
||||||
virtual void invoke(ThreadContext * tc);
|
virtual void invoke(ThreadContext * tc);
|
||||||
#else
|
|
||||||
virtual void invoke(ThreadContext * tc);
|
|
||||||
#endif
|
|
||||||
// template<typename T>
|
// template<typename T>
|
||||||
// bool isA() {return dynamic_cast<T *>(this);}
|
// bool isA() {return dynamic_cast<T *>(this);}
|
||||||
virtual bool isMachineCheckFault() {return false;}
|
virtual bool isMachineCheckFault() {return false;}
|
||||||
|
|
|
@ -326,11 +326,10 @@ LiveProcess::argsInit(int intSize, int pageSize)
|
||||||
// set bottom of stack
|
// set bottom of stack
|
||||||
stack_min = stack_base - space_needed;
|
stack_min = stack_base - space_needed;
|
||||||
// align it
|
// align it
|
||||||
stack_min &= ~(intSize-1);
|
stack_min = roundDown(stack_min, pageSize);
|
||||||
stack_size = stack_base - stack_min;
|
stack_size = stack_base - stack_min;
|
||||||
// map memory
|
// map memory
|
||||||
pTable->allocate(roundDown(stack_min, pageSize),
|
pTable->allocate(stack_min, roundUp(stack_size, pageSize));
|
||||||
roundUp(stack_size, pageSize));
|
|
||||||
|
|
||||||
// map out initial stack contents
|
// map out initial stack contents
|
||||||
Addr argv_array_base = stack_min + intSize; // room for argc
|
Addr argv_array_base = stack_min + intSize; // room for argc
|
||||||
|
|
Loading…
Reference in a new issue