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.

Sign up for GitHub

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

Jump to bottom

More fixes for shared_ptr #10078

Merged
merged 3 commits into from
Apr 9, 2021
Merged

More fixes for shared_ptr #10078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
332c512
shared_ptr.hpp: minor optimization (GCC hotfix)
Nekotekina Apr 8, 2021
8c5f2b2
shared_ptr.hpp: further fixes
Nekotekina Apr 8, 2021
10bbb7f
Fix some warnings (deprecate enum arithmetics)
Nekotekina Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 6 additions & 13 deletions rpcs3/Emu/Memory/vm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,16 @@ namespace vm

enum block_flags_3
{
page_hidden = 0x1000,
};
enum block_flags_2_page_size
{
page_hidden = 0x1000,

page_size_4k = 0x100, // SYS_MEMORY_PAGE_SIZE_4K
page_size_64k = 0x200, // SYS_MEMORY_PAGE_SIZE_64K
page_size_1m = 0x400, // SYS_MEMORY_PAGE_SIZE_1M

page_size_mask = 0xF00, // SYS_MEMORY_PAGE_SIZE_MASK
};
enum block_flags_1
{
stack_guarded = 0x10,
preallocated = 0x20, // nonshareable
};
enum block_flags_0
{

stack_guarded = 0x10,
preallocated = 0x20, // nonshareable

bf0_0x1 = 0x1, // TODO: document
bf0_0x2 = 0x2, // TODO: document

Expand Down