diff options
| author | 2018-09-29 10:54:39 -0400 | |
|---|---|---|
| committer | 2018-09-29 10:54:39 -0400 | |
| commit | f7b69d61f2a871e8afcd9819b014e873f6e0b80d (patch) | |
| tree | ab6fa797e0a0edd41cc84138ac56aaba0c5238fe /src/core/file_sys | |
| parent | Merge pull request #1360 from FearlessTobi/port-3979 (diff) | |
| parent | memory: Dehardcode the use of fixed memory range constants (diff) | |
| download | yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.tar.gz yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.tar.xz yuzu-f7b69d61f2a871e8afcd9819b014e873f6e0b80d.zip | |
Merge pull request #1395 from lioncash/vm
process/vm_manager: Initial modifications to load NPDM metadata
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/program_metadata.cpp | 4 | ||||
| -rw-r--r-- | src/core/file_sys/program_metadata.h | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index 02319ce0f..8903ed1d3 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp | |||
| @@ -83,10 +83,12 @@ void ProgramMetadata::Print() const { | |||
| 83 | 83 | ||
| 84 | auto address_space = "Unknown"; | 84 | auto address_space = "Unknown"; |
| 85 | switch (npdm_header.address_space_type) { | 85 | switch (npdm_header.address_space_type) { |
| 86 | case ProgramAddressSpaceType::Is64Bit: | 86 | case ProgramAddressSpaceType::Is36Bit: |
| 87 | case ProgramAddressSpaceType::Is39Bit: | ||
| 87 | address_space = "64-bit"; | 88 | address_space = "64-bit"; |
| 88 | break; | 89 | break; |
| 89 | case ProgramAddressSpaceType::Is32Bit: | 90 | case ProgramAddressSpaceType::Is32Bit: |
| 91 | case ProgramAddressSpaceType::Is32BitNoMap: | ||
| 90 | address_space = "32-bit"; | 92 | address_space = "32-bit"; |
| 91 | break; | 93 | break; |
| 92 | } | 94 | } |
diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.h index 1143e36c4..e4470d6f0 100644 --- a/src/core/file_sys/program_metadata.h +++ b/src/core/file_sys/program_metadata.h | |||
| @@ -17,8 +17,10 @@ enum class ResultStatus : u16; | |||
| 17 | namespace FileSys { | 17 | namespace FileSys { |
| 18 | 18 | ||
| 19 | enum class ProgramAddressSpaceType : u8 { | 19 | enum class ProgramAddressSpaceType : u8 { |
| 20 | Is64Bit = 1, | 20 | Is32Bit = 0, |
| 21 | Is32Bit = 2, | 21 | Is36Bit = 1, |
| 22 | Is32BitNoMap = 2, | ||
| 23 | Is39Bit = 3, | ||
| 22 | }; | 24 | }; |
| 23 | 25 | ||
| 24 | enum class ProgramFilePermission : u64 { | 26 | enum class ProgramFilePermission : u64 { |