Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SIO0 overhaul #1673

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

SIO0 overhaul #1673

wants to merge 15 commits into from

Conversation

johnbaumann
Copy link
Collaborator

@johnbaumann johnbaumann commented Jun 23, 2024

Draft PR, trying to shore up various changes I had worked up in preparation of adding multitap support. My initial branch became sorely outdated and conflicted, this branch attempts to cherry pick some of these changes and bring the branch back in line with head. Needs some additional cleanup; get rid of vectors, mentions of multitap, test various things, etc.

  • Moved all/most card + pad specific code out of SIO class
  • Began abstracting generic card & pad functions such as file IO to a parent class

@johnbaumann johnbaumann marked this pull request as ready for review August 5, 2024 01:57
@johnbaumann
Copy link
Collaborator Author

This one is ready for review. Moved a lot of things around to split the card and pad code away from the sio class.

@nicolasnoble
Copy link
Member

You're making Linux sad :)

@nicolasnoble
Copy link
Member

Looks like there's still an asan error, with a mismatched new/delete type.

Copy link

codecov bot commented Aug 18, 2024

Codecov Report

Attention: Patch coverage is 8.85781% with 391 lines in your changes missing coverage. Please review.

Please upload report for BASE (main@15520a9). Learn more about missing BASE report.

Files Patch % Lines
src/core/memorycard.cc 5.98% 220 Missing ⚠️
src/core/sio.cc 15.68% 43 Missing ⚠️
src/gui/widgets/memcard_manager.cc 0.00% 42 Missing ⚠️
src/core/memorycard.h 11.90% 37 Missing ⚠️
src/core/pad.cc 21.05% 30 Missing ⚠️
src/core/sstate.cc 0.00% 16 Missing ⚠️
src/gui/widgets/memcard_manager.h 0.00% 3 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1673   +/-   ##
=======================================
  Coverage        ?    9.87%           
=======================================
  Files           ?      448           
  Lines           ?   133030           
  Branches        ?        0           
=======================================
  Hits            ?    13143           
  Misses          ?   119887           
  Partials        ?        0           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

std::memcpy(data.get(), g_emulator->m_sio->getMcdData(1), SIO::c_cardSize);
std::memcpy(data.get() + SIO::c_cardSize, g_emulator->m_sio->getMcdData(2), SIO::c_cardSize);
std::unique_ptr<uint8_t[]> data = std::make_unique<uint8_t[]>(MemoryCards::c_cardSize * 2);
std::memcpy(data.get(), g_emulator->m_memoryCards->getMcdData(0), MemoryCards::c_cardSize);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we're here doing some refactoring, we might as well use proper enums for the memory cards indices, maybe?

// skip id 8
// skip id 9
// skip id 10
// skip id 11
typedef Protobuf::FieldRef<Protobuf::UInt32, TYPESTRING("pad_state"), 12> SIOPadState;
// skip id 12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, uuuuh, what happens if a savestate is done while an SIO read is in progress? This doesn't seem we're reloading into a proper state, able to continue gracefully. Or we never did, maybe, for memory cards at least?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll revisit the save state code. Admittedly, I had plans to eventually redo the SIO side of pads, so this escaped my focus. Thank you for catching this. I know pad issues have been noted regarding savestates back in #1173 maybe I can knock this one out in the process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants