X86: Distinguish between hardware and software interrupts/exceptions
This commit is contained in:
parent
041402a949
commit
9b4d1e0f9a
2 changed files with 5 additions and 3 deletions
|
@ -86,7 +86,7 @@ let {{
|
|||
|
||||
# Add in symbols for the various checks of segment selectors.
|
||||
for check in ("NoCheck", "CSCheck", "CallGateCheck", "IntGateCheck",
|
||||
"SSCheck", "IretCheck", "IntCSCheck"):
|
||||
"SoftIntGateCheck", "SSCheck", "IretCheck", "IntCSCheck"):
|
||||
assembler.symbols[check] = "Seg%s" % check
|
||||
|
||||
for reg in ("TR", "IDTR"):
|
||||
|
|
|
@ -234,7 +234,7 @@ output header {{
|
|||
|
||||
enum SegmentSelectorCheck {
|
||||
SegNoCheck, SegCSCheck, SegCallGateCheck, SegIntGateCheck,
|
||||
SegSSCheck, SegIretCheck, SegIntCSCheck
|
||||
SegSoftIntGateCheck, SegSSCheck, SegIretCheck, SegIntCSCheck
|
||||
};
|
||||
|
||||
enum LongModeDescriptorType {
|
||||
|
@ -1066,11 +1066,13 @@ let {{
|
|||
panic("CS checks for far calls/jumps through call gates"
|
||||
"not implemented.\\n");
|
||||
break;
|
||||
case SegIntGateCheck:
|
||||
case SegSoftIntGateCheck:
|
||||
// Check permissions.
|
||||
if (desc.dpl < m5reg.cpl) {
|
||||
fault = new GeneralProtection((uint16_t)selector);
|
||||
}
|
||||
// Fall through on purpose
|
||||
case SegIntGateCheck:
|
||||
// Make sure the gate's the right type.
|
||||
if (m5reg.mode == LongMode && ((desc.type & 0xe) != 0xe) ||
|
||||
((desc.type & 0x6) != 0x6)) {
|
||||
|
|
Loading…
Reference in a new issue