From 770b575c30e734b3ed9528558a72c476a9e4bf41 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 8 Nov 2006 10:27:38 -0500 Subject: [PATCH] Sorted faults by the trap type constant, expanded their names, added in new faults for ua2005, and commented out ones which are apparently dropped. --HG-- extra : convert_revision : 32bd0c3a75d7c036ad4a3cb0bc1c32e0b6cb3d87 --- src/arch/sparc/faults.cc | 180 +++++++++++++++++++------ src/arch/sparc/faults.hh | 285 ++++++++++++++++++++++----------------- 2 files changed, 306 insertions(+), 159 deletions(-) diff --git a/src/arch/sparc/faults.cc b/src/arch/sparc/faults.cc index 6a905a76c..ebd9926b2 100644 --- a/src/arch/sparc/faults.cc +++ b/src/arch/sparc/faults.cc @@ -50,118 +50,222 @@ namespace SparcISA { template<> SparcFaultBase::FaultVals - SparcFault::vals = {"intprocerr", 0x029, 4}; + SparcFault::vals = + {"power_on_reset", 0x001, 0, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unalign", 0x034, 10}; + SparcFault::vals = + {"watch_dog_reset", 0x002, 120, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"pow_reset", 0x001, 0}; + SparcFault::vals = + {"externally_initiated_reset", 0x003, 110, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"watch_dog_reset", 0x002, 1}; + SparcFault::vals = + {"software_initiated_reset", 0x004, 130, {SH, SH, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"extern_reset", 0x003, 1}; + SparcFault::vals = + {"RED_state_exception", 0x005, 1, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"software_reset", 0x004, 1}; + SparcFault::vals = + {"store_error", 0x007, 201, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"red_counte", 0x005, 1}; + SparcFault::vals = + {"instruction_access_exception", 0x008, 300, {H, H, H}}; + +//XXX This trap is apparently dropped from ua2005 +/*template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"inst_mmu", 0x009, 2, {H, H, H}};*/ template<> SparcFaultBase::FaultVals - SparcFault::vals = {"inst_access", 0x008, 5}; + SparcFault::vals = + {"instruction_access_error", 0x00A, 400, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"inst_mmu", 0x009, 2}; + SparcFault::vals = + {"illegal_instruction", 0x010, 620, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"inst_error", 0x00A, 3}; + SparcFault::vals = + {"privileged_opcode", 0x011, 700, {P, SH, SH}}; + +//XXX This trap is apparently dropped from ua2005 +/*template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"unimp_ldd", 0x012, 6, {H, H, H}};*/ + +//XXX This trap is apparently dropped from ua2005 +/*template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"unimp_std", 0x013, 6, {H, H, H}};*/ template<> SparcFaultBase::FaultVals - SparcFault::vals = {"illegal_inst", 0x010, 7}; + SparcFault::vals = + {"fp_disabled", 0x020, 800, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"priv_opcode", 0x011, 6}; + SparcFault::vals = + {"fp_exception_ieee_754", 0x021, 1110, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unimp_ldd", 0x012, 6}; + SparcFault::vals = + {"fp_exception_other", 0x022, 1110, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unimp_std", 0x013, 6}; + SparcFault::vals = + {"tag_overflow", 0x023, 1400, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"fp_disabled", 0x020, 8}; + SparcFault::vals = + {"clean_window", 0x024, 1010, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"fp_754", 0x021, 11}; + SparcFault::vals = + {"division_by_zero", 0x028, 1500, {P, P, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"fp_other", 0x022, 11}; + SparcFault::vals = + {"internal_processor_error", 0x029, 4, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"tag_overflow", 0x023, 14}; + SparcFault::vals = + {"instruction_invalid_tsb_entry", 0x02A, 210, {H, H, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"div_by_zero", 0x028, 15}; + SparcFault::vals = + {"data_invalid_tsb_entry", 0x02B, 1203, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"data_access", 0x030, 12}; + SparcFault::vals = + {"data_access_exception", 0x030, 1201, {H, H, H}}; + +//XXX This trap is apparently dropped from ua2005 +/*template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"data_mmu", 0x031, 12, {H, H, H}};*/ template<> SparcFaultBase::FaultVals - SparcFault::vals = {"data_mmu", 0x031, 12}; + SparcFault::vals = + {"data_access_error", 0x032, 1210, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"data_error", 0x032, 12}; + SparcFault::vals = + {"data_access_protection", 0x033, 1207, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"data_protection", 0x033, 12}; + SparcFault::vals = + {"mem_address_not_aligned", 0x034, 1020, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unalign_lddf", 0x035, 10}; + SparcFault::vals = + {"LDDF_mem_address_not_aligned", 0x035, 1010, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unalign_stdf", 0x036, 10}; + SparcFault::vals = + {"STDF_mem_address_not_aligned", 0x036, 1010, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"priv_action", 0x037, 11}; + SparcFault::vals = + {"privileged_action", 0x037, 1110, {H, H, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unalign_ldqf", 0x038, 10}; + SparcFault::vals = + {"LDQF_mem_address_not_aligned", 0x038, 1010, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"unalign_stqf", 0x039, 10}; + SparcFault::vals = + {"STQF_mem_address_not_aligned", 0x039, 1010, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"async_data", 0x040, 2}; + SparcFault::vals = + {"instruction_real_translation_miss", 0x03E, 208, {H, H, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"clean_win", 0x024, 10}; + SparcFault::vals = + {"data_real_translation_miss", 0x03F, 1203, {H, H, H}}; -//The enumerated faults +//XXX This trap is apparently dropped from ua2005 +/*template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"async_data", 0x040, 2, {H, H, H}};*/ template<> SparcFaultBase::FaultVals - SparcFault::vals = {"interrupt_n", 0x041, 0}; + SparcFault::vals = + {"interrupt_level_n", 0x041, 0, {P, P, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"spill_n_normal", 0x080, 9}; + SparcFault::vals = + {"hstick_match", 0x05E, 1601, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"spill_n_other", 0x0A0, 9}; + SparcFault::vals = + {"trap_level_zero", 0x05F, 202, {H, H, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"fill_n_normal", 0x0C0, 9}; + SparcFault::vals = + {"PA_watchpoint", 0x061, 1209, {H, H, H}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"fill_n_other", 0x0E0, 9}; + SparcFault::vals = + {"VA_watchpoint", 0x062, 1120, {P, P, SH}}; template<> SparcFaultBase::FaultVals - SparcFault::vals = {"trap_inst_n", 0x100, 16}; + SparcFault::vals = + {"fast_instruction_access_MMU_miss", 0x064, 208, {H, H, SH}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"fast_data_access_MMU_miss", 0x068, 1203, {H, H, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"fast_data_access_protection", 0x06C, 1207, {H, H, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"instruction_break", 0x076, 610, {H, H, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"cpu_mondo", 0x07C, 1608, {P, P, SH}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"dev_mondo", 0x07D, 1611, {P, P, SH}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"resume_error", 0x07E, 3330, {P, P, SH}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"spill_n_normal", 0x080, 900, {P, P, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"spill_n_other", 0x0A0, 900, {P, P, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"fill_n_normal", 0x0C0, 900, {P, P, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"fill_n_other", 0x0E0, 900, {P, P, H}}; + +template<> SparcFaultBase::FaultVals + SparcFault::vals = + {"trap_instruction", 0x100, 1602, {P, P, H}}; #if !FULL_SYSTEM template<> SparcFaultBase::FaultVals - SparcFault::vals = {"page_table_fault", 0x0000, 0}; + SparcFault::vals = + {"page_table_fault", 0x0000, 0, {SH, SH, SH}}; #endif /** diff --git a/src/arch/sparc/faults.hh b/src/arch/sparc/faults.hh index 9cc7739d9..e632502aa 100644 --- a/src/arch/sparc/faults.hh +++ b/src/arch/sparc/faults.hh @@ -45,11 +45,21 @@ typedef uint32_t FaultPriority; class SparcFaultBase : public FaultBase { public: + enum PrivilegeLevel + { + U, User = U, + P, Privileged = P, + H, Hyperprivileged = H, + NumLevels, + SH = -1, + ShouldntHappen = SH + }; struct FaultVals { const FaultName name; const TrapType trapType; const FaultPriority priority; + const PrivilegeLevel nextPrivilegeLevel[NumLevels]; FaultStat count; }; #if FULL_SYSTEM @@ -59,6 +69,7 @@ class SparcFaultBase : public FaultBase virtual TrapType trapType() = 0; virtual FaultPriority priority() = 0; virtual FaultStat & countStat() = 0; + virtual PrivilegeLevel getNextLevel(PrivilegeLevel current) = 0; }; template @@ -71,8 +82,53 @@ class SparcFault : public SparcFaultBase TrapType trapType() {return vals.trapType;} FaultPriority priority() {return vals.priority;} FaultStat & countStat() {return vals.count;} + PrivilegeLevel getNextLevel(PrivilegeLevel current) + { + return vals.nextPrivilegeLevel[current]; + } }; +class PowerOnReset : public SparcFault +{ + void invoke(ThreadContext * tc); +}; + +class WatchDogReset : public SparcFault {}; + +class ExternallyInitiatedReset : public SparcFault {}; + +class SoftwareInitiatedReset : public SparcFault {}; + +class REDStateException : public SparcFault {}; + +class StoreError : public SparcFault {}; + +class InstructionAccessException : public SparcFault {}; + +//class InstructionAccessMMUMiss : public SparcFault {}; + +class InstructionAccessError : public SparcFault {}; + +class IllegalInstruction : public SparcFault {}; + +class PrivilegedOpcode : public SparcFault {}; + +//class UnimplementedLDD : public SparcFault {}; + +//class UnimplementedSTD : public SparcFault {}; + +class FpDisabled : public SparcFault {}; + +class FpExceptionIEEE754 : public SparcFault {}; + +class FpExceptionOther : public SparcFault {}; + +class TagOverflow : public SparcFault {}; + +class CleanWindow : public SparcFault {}; + +class DivisionByZero : public SparcFault {}; + class InternalProcessorError : public SparcFault { @@ -80,6 +136,18 @@ class InternalProcessorError : bool isMachineCheckFault() {return true;} }; +class InstructionInvalidTSBEntry : public SparcFault {}; + +class DataInvalidTSBEntry : public SparcFault {}; + +class DataAccessException : public SparcFault {}; + +//class DataAccessMMUMiss : public SparcFault {}; + +class DataAccessError : public SparcFault {}; + +class DataAccessProtection : public SparcFault {}; + class MemAddressNotAligned : public SparcFault { @@ -87,6 +155,102 @@ class MemAddressNotAligned : bool isAlignmentFault() {return true;} }; +class LDDFMemAddressNotAligned : public SparcFault {}; + +class STDFMemAddressNotAligned : public SparcFault {}; + +class PrivilegedAction : public SparcFault {}; + +class LDQFMemAddressNotAligned : public SparcFault {}; + +class STQFMemAddressNotAligned : public SparcFault {}; + +class InstructionRealTranslationMiss : + public SparcFault {}; + +class DataRealTranslationMiss : public SparcFault {}; + +//class AsyncDataError : public SparcFault {}; + +template +class EnumeratedFault : public SparcFault +{ + protected: + uint32_t _n; + public: + EnumeratedFault(uint32_t n) : SparcFault(), _n(n) {} + TrapType trapType() {return SparcFault::trapType() + _n;} +}; + +class InterruptLevelN : public EnumeratedFault +{ + public: + InterruptLevelN(uint32_t n) : EnumeratedFault(n) {;} + FaultPriority priority() {return 3200 - _n*100;} +}; + +class HstickMatch : public SparcFault {}; + +class TrapLevelZero : public SparcFault {}; + +class PAWatchpoint : public SparcFault {}; + +class VAWatchpoint : public SparcFault {}; + +class FastInstructionAccessMMUMiss : + public SparcFault {}; + +class FastDataAccessMMUMiss : public SparcFault {}; + +class FastDataAccessProtection : public SparcFault {}; + +class InstructionBreakpoint : public SparcFault {}; + +class CpuMondo : public SparcFault {}; + +class DevMondo : public SparcFault {}; + +class ResumeableError : public SparcFault {}; + +class SpillNNormal : public EnumeratedFault +{ + public: + SpillNNormal(uint32_t n) : EnumeratedFault(n) {;} + //These need to be handled specially to enable spill traps in SE +#if !FULL_SYSTEM + void invoke(ThreadContext * tc); +#endif +}; + +class SpillNOther : public EnumeratedFault +{ + public: + SpillNOther(uint32_t n) : EnumeratedFault(n) {;} +}; + +class FillNNormal : public EnumeratedFault +{ + public: + FillNNormal(uint32_t n) : EnumeratedFault(n) {;} + //These need to be handled specially to enable fill traps in SE +#if !FULL_SYSTEM + void invoke(ThreadContext * tc); +#endif +}; + +class FillNOther : public EnumeratedFault +{ + public: + FillNOther(uint32_t n) : EnumeratedFault(n) {;} +}; + +class TrapInstruction : public EnumeratedFault +{ + + public: + TrapInstruction(uint32_t n) : EnumeratedFault(n) {;} +}; + #if !FULL_SYSTEM class PageTableFault : public SparcFault { @@ -113,127 +277,6 @@ static inline Fault genAlignmentFault() return new MemAddressNotAligned; } -class PowerOnReset : public SparcFault -{ - void invoke(ThreadContext * tc); -}; - -class WatchDogReset : public SparcFault {}; - -class ExternallyInitiatedReset : public SparcFault {}; - -class SoftwareInitiatedReset : public SparcFault {}; - -class REDStateException : public SparcFault {}; - -class InstructionAccessException : public SparcFault {}; - -class InstructionAccessMMUMiss : public SparcFault {}; - -class InstructionAccessError : public SparcFault {}; - -class IllegalInstruction : public SparcFault {}; - -class PrivilegedOpcode : public SparcFault {}; - -class UnimplementedLDD : public SparcFault {}; - -class UnimplementedSTD : public SparcFault {}; - -class FpDisabled : public SparcFault {}; - -class FpExceptionIEEE754 : public SparcFault {}; - -class FpExceptionOther : public SparcFault {}; - -class TagOverflow : public SparcFault {}; - -class DivisionByZero : public SparcFault {}; - -class DataAccessException : public SparcFault {}; - -class DataAccessMMUMiss : public SparcFault {}; - -class DataAccessError : public SparcFault {}; - -class DataAccessProtection : public SparcFault {}; - -class LDDFMemAddressNotAligned : public SparcFault {}; - -class STDFMemAddressNotAligned : public SparcFault {}; - -class PrivilegedAction : public SparcFault {}; - -class LDQFMemAddressNotAligned : public SparcFault {}; - -class STQFMemAddressNotAligned : public SparcFault {}; - -class AsyncDataError : public SparcFault {}; - -class CleanWindow : public SparcFault {}; - -template -class EnumeratedFault : public SparcFault -{ - protected: - uint32_t _n; - public: - EnumeratedFault(uint32_t n) : SparcFault(), _n(n) {} - TrapType trapType() {return SparcFault::trapType() + _n;} -}; - -class InterruptLevelN : public EnumeratedFault -{ - public: - InterruptLevelN(uint32_t n) : - EnumeratedFault(n) {;} - FaultPriority priority() {return 32 - _n;} -}; - -class SpillNNormal : public EnumeratedFault -{ - public: - SpillNNormal(uint32_t n) : - EnumeratedFault(n) {;} - //These need to be handled specially to enable spill traps in SE -#if !FULL_SYSTEM - void invoke(ThreadContext * tc); -#endif -}; - -class SpillNOther : public EnumeratedFault -{ - public: - SpillNOther(uint32_t n) : - EnumeratedFault(n) {;} -}; - -class FillNNormal : public EnumeratedFault -{ - public: - FillNNormal(uint32_t n) : - EnumeratedFault(n) {;} - //These need to be handled specially to enable fill traps in SE -#if !FULL_SYSTEM - void invoke(ThreadContext * tc); -#endif -}; - -class FillNOther : public EnumeratedFault -{ - public: - FillNOther(uint32_t n) : - EnumeratedFault(n) {;} -}; - -class TrapInstruction : public EnumeratedFault -{ - - public: - TrapInstruction(uint32_t n) : - EnumeratedFault(n) {;} -}; - } // SparcISA namespace