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

Jit: Use ibat_table for dcbf/dcbi/dcbst address check #9978

Merged
merged 1 commit into from Jul 31, 2021

Conversation

JosJuice
Copy link
Member

Minor mistake in PR #9957. We should be using ibat_table instead of dbat_table, since we're dealing with invalidating icache.

Minor mistake in 92d1d60. We should be using ibat_table instead
of dbat_table, since we're dealing with invalidating icache.
@leoetlino leoetlino merged commit 3b88ffb into dolphin-emu:master Jul 31, 2021
11 checks passed
@JosJuice JosJuice deleted the jit-ibat-table branch July 31, 2021 17:18
@@ -91,9 +91,9 @@ void EmuCodeBlock::SwitchToNearCode()
SetCodePtr(m_near_code, m_near_code_end, m_near_code_write_failed);
}

FixupBranch EmuCodeBlock::BATAddressLookup(X64Reg addr, X64Reg tmp)
FixupBranch EmuCodeBlock::BATAddressLookup(X64Reg addr, X64Reg tmp, const void* bat_table)
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer const uint64_t* bat_table, but I don't care much.

Copy link
Member Author

Choose a reason for hiding this comment

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

It would have to be uint32_t instead of uint64_t in order to not make calling this function awkward, since the BAT table type is defined as using BatTable = std::array<u32, 1 << (32 - BAT_INDEX_SHIFT)>.

Originally I was going to pass in const BatTable&, but then I realized I would need to include MMU.h in EmuCodeBlock.h (doing a simple class BatTable; forward declaration isn't possible with using), so I switched to this.

Copy link
Member

Choose a reason for hiding this comment

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

Indeed, my bad, u32.

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