6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-20 14:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Implement LEAVE, almost.

Browse Source
This commit is contained in:
Thomas Harte 2023-11-14 11:39:36 -05:00
parent 2533fd2da9
commit aafa7de536
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InstructionSets/x86/Implementation/PerformImplementation.hpp
View File

@ -216,8 +216,10 @@ template <
Primitive::idiv<true, IntT>(pair_high(), pair_low(), source_r(), context); Primitive::idiv<true, IntT>(pair_high(), pair_low(), source_r(), context);
break; break;
} else { } else {
// TODO: perform LEAVE as of the 80186.
static_assert(int(Operation::IDIV_REP) == int(Operation::LEAVE)); static_assert(int(Operation::IDIV_REP) == int(Operation::LEAVE));
if constexpr (std::is_same_v<IntT, uint16_t> || std::is_same_v<IntT, uint32_t>) {
Primitive::leave<IntT>();
}
} }
return; return;

15
InstructionSets/x86/Implementation/Stack.hpp
View File

@ -144,6 +144,21 @@ void pusha(
} }
} }
template <typename IntT, typename ContextT>
void leave(
ContextT &context
) {
// TODO: should use StackAddressSize to determine assignment of bp to sp.
// Probably make that a static constexpr on registers.
if constexpr (std::is_same_v<IntT, uint32_t>) {
context.registers.esp() = context.registers.ebp();
context.registers.ebp() = pop<uint32_t, false>(context);
} else {
context.registers.sp() = context.registers.bp();
context.registers.bp() = pop<uint16_t, false>(context);
}
}
} }
#endif /* Stack_hpp */ #endif /* Stack_hpp */