6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-22 12:33:29 +00:00
Code Issues Projects Releases Wiki Activity

Avoid ambiguous template parameter; use standard type.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-04 12:20:40 -05:00
parent 1f43047de8
commit 79865e295b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
InstructionSets/ARM/Registers.hpp
View File

@ -140,14 +140,14 @@ struct Registers {
}; };
/// Updates the program counter, interupt flags and link register if applicable to begin @c exception. /// Updates the program counter, interupt flags and link register if applicable to begin @c exception.
template <Exception exception> template <Exception type>
void exception() { void exception() {
interrupt_flags_ |= ConditionCode::IRQDisable; interrupt_flags_ |= ConditionCode::IRQDisable;
if constexpr (exception == Exception::Reset || exception == Exception::FIQ) { if constexpr (type == Exception::Reset || type == Exception::FIQ) {
interrupt_flags_ |= ConditionCode::FIQDisable; interrupt_flags_ |= ConditionCode::FIQDisable;
} }
switch(exception) { switch(type) {
case Exception::IRQ: case Exception::IRQ:
set_mode(Mode::IRQ); set_mode(Mode::IRQ);
active_[14] = pc(8); active_[14] = pc(8);
@ -262,11 +262,11 @@ struct Registers {
mode_ = target_mode; mode_ = target_mode;
} }
uint32_t &operator[](int offset) { uint32_t &operator[](size_t offset) {
return active_[offset]; return active_[offset];
} }
const uint32_t operator[](int offset) const { const uint32_t operator[](size_t offset) const {
return active_[offset]; return active_[offset];
} }