archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-16 11:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

utils: Rename address_range to address_range32 to allow implementation of address_range16 and address_range64

Browse source
This commit is contained in:
kd-11 2025-05-26 02:49:20 +03:00 • committed by kd-11
parent 79bcb7790c
commit 4f7c82ba8a
51 changed files with 368 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

14
rpcs3/Emu/RSX/rsx_utils.h
View file

@ -14,8 +14,8 @@ extern "C"
namespace rsx
{
// Import address_range utilities
using utils::address_range;
// Import address_range32 utilities
using utils::address_range32;
using utils::address_range_vector;
using utils::page_for;
using utils::page_start;
@ -120,7 +120,7 @@ namespace rsx
u8 bpp = 0;
u8 samples = 0;
address_range range{};
address_range32 range{};
gcm_framebuffer_info() = default;
@ -131,16 +131,16 @@ namespace rsx
// Account for the last line of the block not reaching the end
const u32 block_size = pitch * (height - 1) * aa_factor_v;
const u32 line_size = width * aa_factor_u * bpp;
range = address_range::start_length(address, block_size + line_size);
range = address_range32::start_length(address, block_size + line_size);
}
address_range get_memory_range(const u32* aa_factors)
address_range32 get_memory_range(const u32* aa_factors)
{
calculate_memory_range(aa_factors[0], aa_factors[1]);
return range;
}
address_range get_memory_range() const
address_range32 get_memory_range() const
{
ensure(range.start == address);
return range;
@ -260,7 +260,7 @@ namespace rsx
static inline u32 get_location(u32 addr)
{
// We don't really care about the actual memory map, it shouldn't be possible to use the mmio bar region anyway
constexpr address_range local_mem_range = address_range::start_length(rsx::constants::local_mem_base, 0x1000'0000);
constexpr address_range32 local_mem_range = address_range32::start_length(rsx::constants::local_mem_base, 0x1000'0000);
return local_mem_range.overlaps(addr) ?
CELL_GCM_LOCATION_LOCAL :
CELL_GCM_LOCATION_MAIN;