6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-09-29 16:55:59 +00:00
Code Issues Projects Releases Wiki Activity

Fix current implementation of data_segment.

Browse Source 
As far as it goes.
This commit is contained in:
Thomas Harte 2022-03-08 17:08:21 -05:00
parent 926a373591
commit 21d4838322
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InstructionSets/x86/Instruction.hpp
View File

@ -611,7 +611,10 @@ template<bool is_32bit> class Instruction {
return AddressSize(address_size_);
}
Source data_segment() const {
const auto segment_override = Source((sources_ >> 12) & 7);
const auto segment_override = Source(
int(Source::ES) +
((sources_ >> 12) & 7)
);
if(segment_override != Source::None) return segment_override;
// TODO: default source should be SS for anything touching the stack.
@ -646,7 +649,7 @@ template<bool is_32bit> class Instruction {
sources_(uint16_t(
int(source) |
(int(destination) << 6) |
(int(segment_override) << 12) |
((int(segment_override) & 7) << 12) |
(int(lock) << 15)
)),
displacement_(displacement),