Compilation fixes

--HG--
extra : convert_revision : 974e91a960251a35d5ebb76c7e6c7ac330339896
This commit is contained in:
Gabe Black 2006-12-07 18:49:10 -05:00
parent 0f8fd5fd68
commit 97cdd5198b
4 changed files with 24 additions and 5 deletions

View file

@ -128,6 +128,24 @@ class SparcO3CPU : public FullO3CPU<Impl>
*/ */
void squashFromTC(unsigned tid); void squashFromTC(unsigned tid);
#if FULL_SYSTEM
/** Posts an interrupt. */
void post_interrupt(int int_num, int index);
/** HW return from error interrupt. */
Fault hwrei(unsigned tid);
bool simPalCheck(int palFunc, unsigned tid);
/** Returns the Fault for any valid interrupt. */
Fault getInterrupts();
/** Processes any an interrupt fault. */
void processInterrupts(Fault interrupt);
/** Halts the CPU. */
void halt() { panic("Halt not implemented!\n"); }
#endif
/** Traps to handle given fault. */ /** Traps to handle given fault. */
void trap(Fault fault, unsigned tid); void trap(Fault fault, unsigned tid);

View file

@ -55,8 +55,8 @@ BEGIN_DECLARE_SIM_OBJECT_PARAMS(DerivO3CPU)
#if FULL_SYSTEM #if FULL_SYSTEM
SimObjectParam<System *> system; SimObjectParam<System *> system;
Param<int> cpu_id; Param<int> cpu_id;
SimObjectParam<AlphaISA::ITB *> itb; SimObjectParam<SparcISA::ITB *> itb;
SimObjectParam<AlphaISA::DTB *> dtb; SimObjectParam<SparcISA::DTB *> dtb;
Param<Tick> profile; Param<Tick> profile;
Param<bool> do_quiesce; Param<bool> do_quiesce;

View file

@ -126,7 +126,8 @@ template <class Impl>
bool bool
SparcDynInst<Impl>::simPalCheck(int palFunc) SparcDynInst<Impl>::simPalCheck(int palFunc)
{ {
return this->cpu->simPalCheck(palFunc, this->threadNumber); panic("simPalCheck called, but there's no PAL in SPARC!\n");
return false;
} }
#else #else
template <class Impl> template <class Impl>

View file

@ -68,10 +68,10 @@ class O3ThreadContext : public ThreadContext
#if FULL_SYSTEM #if FULL_SYSTEM
/** Returns a pointer to the ITB. */ /** Returns a pointer to the ITB. */
virtual AlphaISA::ITB *getITBPtr() { return cpu->itb; } TheISA::ITB *getITBPtr() { return cpu->itb; }
/** Returns a pointer to the DTB. */ /** Returns a pointer to the DTB. */
virtual AlphaISA::DTB *getDTBPtr() { return cpu->dtb; } TheISA::DTB *getDTBPtr() { return cpu->dtb; }
#endif #endif
/** Returns a pointer to this CPU. */ /** Returns a pointer to this CPU. */