6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-06 13:31:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix condition.

Browse Source
This commit is contained in:
Thomas Harte 2024-03-03 14:40:05 -05:00
parent 9fd7d5c10f
commit 8a83d71560
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
InstructionSets/ARM/OperationMapper.hpp
View File

@ -254,7 +254,7 @@ struct SingleDataTransfer: public WithShiftControlBits {
/// The base register index. i.e. 'Rn'. /// The base register index. i.e. 'Rn'.
int base() const { return (opcode_ >> 16) & 0xf; } int base() const { return (opcode_ >> 16) & 0xf; }
/// The immediate offset, if @c offset_is_immediate() was @c true; meaningless otherwise. /// The immediate offset, if @c offset_is_register() was @c false; meaningless otherwise.
int immediate() const { return opcode_ & 0xfff; } int immediate() const { return opcode_ & 0xfff; }
}; };

6
OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm
View File

@ -30,7 +30,7 @@ struct Memory {
template <typename IntT> template <typename IntT>
bool read(uint32_t address, IntT &source, Mode mode, bool trans) { bool read(uint32_t address, IntT &source, Mode mode, bool trans) {
if(address > 0x3800000) { if(address >= 0x3800000) {
has_moved_rom_ = true; has_moved_rom_ = true;
source = *reinterpret_cast<const IntT *>(&rom[address - 0x3800000]); source = *reinterpret_cast<const IntT *>(&rom[address - 0x3800000]);
} else if(!has_moved_rom_) { } else if(!has_moved_rom_) {
@ -202,7 +202,7 @@ struct Memory {
} }
// TODO: turn the below into a trace-driven test case. // TODO: turn the below into a trace-driven test case.
/*- (void)testROM319 { - (void)testROM319 {
constexpr ROM::Name rom_name = ROM::Name::AcornRISCOS319; constexpr ROM::Name rom_name = ROM::Name::AcornRISCOS319;
ROM::Request request(rom_name); ROM::Request request(rom_name);
const auto roms = CSROMFetcher()(request); const auto roms = CSROMFetcher()(request);
@ -217,6 +217,6 @@ struct Memory {
printf("%08x: %08x\n", executor.pc(), instruction); printf("%08x: %08x\n", executor.pc(), instruction);
execute<Model::ARMv2>(instruction, executor); execute<Model::ARMv2>(instruction, executor);
} }
}*/ }
@end @end