6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-04-08 08:43:42 +00:00
Code Issues Projects Releases Wiki Activity

New guess: the definition of size_t varies?

Browse Source
This commit is contained in:
Thomas Harte 2023-11-16 23:46:22 -05:00
parent fbe02e3ad5
commit 3f27338b2c
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
InstructionSets/x86/Decoder.cpp
View File

@ -15,7 +15,7 @@
using namespace InstructionSet::x86;
template <Model model>
std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(const uint8_t *source, size_t length) {
std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(const uint8_t *source, uint32_t length) {
// Instruction length limits:
//
// 8086/80186: none*
@ -26,8 +26,8 @@ std::pair<int, typename Decoder<model>::InstructionT> Decoder<model>::decode(con
// be back to wherever it started, so it's safe to spit out a NOP and reset parsing
// without any loss of context. This reduces the risk of the decoder tricking a caller into
// an infinite loop.
constexpr int max_instruction_length = model >= Model::i80386 ? 15 : (model == Model::i80286 ? 10 : 65536);
const uint8_t *const end = source + std::min(length, size_t(max_instruction_length - consumed_));
constexpr uint32_t max_instruction_length = model >= Model::i80386 ? 15 : (model == Model::i80286 ? 10 : 65536);
const uint8_t *const end = source + std::min(length, max_instruction_length - consumed_);
// MARK: - Prefixes (if present) and the opcode.
@ -1119,19 +1119,7 @@ template <Model model> void Decoder<model>::set_32bit_protected_mode(bool enable
}
// Ensure all possible decoders are built.
//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i8086>;
//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80186>;
//template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80286>;
template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i8086>;
template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80186>;
template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80286>;
template class InstructionSet::x86::Decoder<InstructionSet::x86::Model::i80386>;
template
std::pair<int, typename Decoder<InstructionSet::x86::Model::i8086>::InstructionT>
Decoder<InstructionSet::x86::Model::i8086>::decode(const uint8_t *, size_t);
template
std::pair<int, typename Decoder<InstructionSet::x86::Model::i80186>::InstructionT>
Decoder<InstructionSet::x86::Model::i80186>::decode(const uint8_t *, size_t);
template
std::pair<int, typename Decoder<InstructionSet::x86::Model::i80286>::InstructionT>
Decoder<InstructionSet::x86::Model::i80286>::decode(const uint8_t *, size_t);

4
InstructionSets/x86/Decoder.hpp
View File

@ -44,7 +44,7 @@ template <Model model> class Decoder {
The 80286 and 80386 have instruction length limits of 10 and 15 bytes respectively, so
cannot overflow the field.
*/
std::pair<int, InstructionT> decode(const uint8_t *source, size_t length);
std::pair<int, InstructionT> decode(const uint8_t *source, uint32_t length);
/*!
Enables or disables 32-bit protected mode. Meaningful only if the @c Model supports it.
@ -173,7 +173,7 @@ template <Model model> class Decoder {
// Ephemeral decoding state.
Operation operation_ = Operation::Invalid;
int consumed_ = 0, operand_bytes_ = 0;
uint32_t consumed_ = 0, operand_bytes_ = 0;
// Source and destination locations.
Source source_ = Source::None;