6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-26 00:30:29 +00:00
Code Issues Projects Releases Wiki Activity

Avoid runtime checking of instruction supervisor requirements.

Browse Source
This commit is contained in:
Thomas Harte 2022-05-29 14:56:44 -04:00
parent 3da720c789
commit d6f72d9862
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Processors/68000Mk2/Implementation/68000Mk2Implementation.hpp
View File

@ -602,18 +602,21 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
bus_handler_.will_perform(instruction_address_.l, opcode_); bus_handler_.will_perform(instruction_address_.l, opcode_);
} }
// Check for a privilege violation.
if(instruction_.requires_supervisor() && !status_.is_supervisor) {
exception_vector_ = InstructionSet::M68k::Exception::PrivilegeViolation;
MoveToStateSpecific(StandardException);
}
// Ensure the first parameter is next fetched. // Ensure the first parameter is next fetched.
next_operand_ = 0; next_operand_ = 0;
// Obtain operand flags and pick a perform pattern. /// If operation x requires supervisor privileges, checks whether the user is currently in supervisor mode;
#define CASE(x) \ /// if not then raises a privilege violation exception.
case InstructionSet::M68k::Operation::x: \ #define CheckSupervisor(x) \
if constexpr (InstructionSet::M68k::requires_supervisor<InstructionSet::M68k::Model::M68000, InstructionSet::M68k::Operation::x>()) { \
if(!status_.is_supervisor) { \
RaiseException(InstructionSet::M68k::Exception::PrivilegeViolation); \
} \
}
#define CASE(x) \
case InstructionSet::M68k::Operation::x: \
CheckSupervisor(x); \
operand_flags_ = InstructionSet::M68k::operand_flags<InstructionSet::M68k::Model::M68000, InstructionSet::M68k::Operation::x>(); operand_flags_ = InstructionSet::M68k::operand_flags<InstructionSet::M68k::Model::M68000, InstructionSet::M68k::Operation::x>();
#define StdCASE(x, y) \ #define StdCASE(x, y) \
@ -642,7 +645,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
); \ ); \
[[fallthrough]]; [[fallthrough]];
#define SpecialCASE(x) case InstructionSet::M68k::Operation::x: MoveToStateSpecific(x) #define SpecialCASE(x) case InstructionSet::M68k::Operation::x: CheckSupervisor(x); MoveToStateSpecific(x)
switch(instruction_.operation) { switch(instruction_.operation) {
case InstructionSet::M68k::Operation::Undefined: case InstructionSet::M68k::Operation::Undefined:
@ -1003,6 +1006,7 @@ void Processor<BusHandler, dtack_is_implicit, permit_overrun, signal_will_perfor
#undef StdCASE #undef StdCASE
#undef CASE #undef CASE
#undef SpecialCASE #undef SpecialCASE
#undef CheckSupervisor
// MARK: - Fetch, dispatch. // MARK: - Fetch, dispatch.