fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into d3d12

Browse Source
This commit is contained in:
Triang3l
2018-11-02 09:30:53 +03:00
parent 5a79f675bd 3103ad8e16
commit d55a2a586f
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/kernel/user_module.cc
View File

@@ -679,12 +679,13 @@ void UserModule::Dump() {
const uint32_t page_size =
xex_module()->base_address() < 0x90000000 ? 64 * 1024 : 4 * 1024;
uint32_t start_address = xex_module()->base_address() + (page * page_size);
uint32_t end_address = start_address + (page_descriptor.size * page_size);
uint32_t end_address =
start_address + (page_descriptor.page_count * page_size);
sb.AppendFormat(" %3u %s %3u pages %.8X - %.8X (%d bytes)\n", page,
type, page_descriptor.size, start_address, end_address,
page_descriptor.size * page_size);
page += page_descriptor.size;
type, page_descriptor.page_count, start_address,
end_address, page_descriptor.page_count * page_size);
page += page_descriptor.page_count;
}
// Print out imports.

4
src/xenia/kernel/util/xex2_info.h
View File

@@ -514,8 +514,8 @@ struct xex2_header {
struct xex2_page_descriptor {
union {
struct {
uint32_t info : 4;
uint32_t size : 28;
xex2_section_type info : 4;
uint32_t page_count : 28;
};
xe::be<uint32_t> value; // 0x0
};