Skip to content

Commit

Permalink
md: pass "CDC REGS" test in mcd-verificator
Browse files Browse the repository at this point in the history
  • Loading branch information
LukeUsher committed Oct 18, 2023
1 parent dd01cf7 commit 5984867
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions ares/md/mcd/io-internal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ auto MCD::readIO(n1 upper, n1 lower, n24 address, n16 data) -> n16 {
}

if(address == 0xff8004) {
data.bit( 0, 3) = cdc.address;
data.bit( 4, 7) = Unmapped;
data.bit( 0, 4) = cdc.address;
data.bit( 5, 7) = Unmapped;
data.bit( 8,10) = cdc.transfer.destination;
data.bit(11,13) = Unmapped;
data.bit(14) = cdc.transfer.ready;
Expand Down Expand Up @@ -208,7 +208,7 @@ auto MCD::writeIO(n1 upper, n1 lower, n24 address, n16 data) -> void {

if(address == 0xff8004) {
if(lower) {
cdc.address = data.bit(0,3);
cdc.address = data.bit(0,4);
}
if(upper) {
cdc.transfer.destination = data.bit(8,10);
Expand Down
2 changes: 1 addition & 1 deletion ares/md/mcd/mcd.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ struct MCD : M68000, Thread {

Memory::Writable<n16> ram;

n4 address;
n5 address;
n12 stopwatch;

struct IRQ : MCD::IRQ {
Expand Down
2 changes: 1 addition & 1 deletion ares/md/system/serialization.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
static const string SerializerVersion = "v132.3";
static const string SerializerVersion = "v133";

auto System::serialize(bool synchronize) -> serializer {
if(synchronize) scheduler.enter(Scheduler::Mode::Synchronize);
Expand Down

0 comments on commit 5984867

Please sign in to comment.