6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-04-20 10:17:05 +00:00
Code Issues Projects Releases Wiki Activity

Use std::popcount further.

Browse Source
This commit is contained in:
Thomas Harte
2025-04-25 22:24:00 -04:00
parent 55361b8552
commit 16fec0679b
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Components/DiskII/DiskII.cpp
+2 -5
View File
@@ -8,6 +8,7 @@
#include "DiskII.hpp"
#include <bit>
#include <cstdio>
#include <cstring>
@@ -62,11 +63,7 @@ void DiskII::set_control(const Control control, const bool on) {
if(stepper_mask_&4) direction += (((stepper_position_ - 4) + 4)&7) - 4;
if(stepper_mask_&8) direction += (((stepper_position_ - 6) + 4)&7) - 4;
// TODO: when adopting C++20, replace with std::popcount.
int bits_set = stepper_mask_;
bits_set = (bits_set & 0x5) + ((bits_set >> 1) & 0x5);
bits_set = (bits_set & 0x3) + ((bits_set >> 2) & 0x3);
const int bits_set = std::popcount(uint8_t(stepper_mask_));
direction /= bits_set;
// Compare to the stepper position to decide whether that pulls in the current cog notch,