Fix wrongly converted specifiers
Sorry that was a lot in one go so some of them had some mistakes
This commit is contained in:
		| @@ -82,7 +82,7 @@ std::shared_ptr<Applet> Applet::Get(Service::APT::AppletId id) { | |||||||
| static void AppletUpdateEvent(u64 applet_id, int cycles_late) { | static void AppletUpdateEvent(u64 applet_id, int cycles_late) { | ||||||
|     Service::APT::AppletId id = static_cast<Service::APT::AppletId>(applet_id); |     Service::APT::AppletId id = static_cast<Service::APT::AppletId>(applet_id); | ||||||
|     std::shared_ptr<Applet> applet = Applet::Get(id); |     std::shared_ptr<Applet> applet = Applet::Get(id); | ||||||
|     ASSERT_MSG(applet != nullptr, "Applet doesn't exist! applet_id={:#X}", static_cast<u32>(id)); |     ASSERT_MSG(applet != nullptr, "Applet doesn't exist! applet_id={:#08X}", static_cast<u32>(id)); | ||||||
|  |  | ||||||
|     applet->Update(); |     applet->Update(); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -154,7 +154,7 @@ ResultCode HLERequestContext::PopulateFromIncomingCommandBuffer(const u32_le* sr | |||||||
|             break; |             break; | ||||||
|         } |         } | ||||||
|         default: |         default: | ||||||
|             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#X}", descriptor); |             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#010X}", descriptor); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -218,7 +218,7 @@ ResultCode HLERequestContext::WriteToOutgoingCommandBuffer(u32_le* dst_cmdbuf, P | |||||||
|             break; |             break; | ||||||
|         } |         } | ||||||
|         default: |         default: | ||||||
|             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#X}", descriptor); |             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#010X}", descriptor); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -199,7 +199,7 @@ ResultCode TranslateCommandBuffer(SharedPtr<Thread> src_thread, SharedPtr<Thread | |||||||
|             break; |             break; | ||||||
|         } |         } | ||||||
|         default: |         default: | ||||||
|             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#X}", descriptor); |             UNIMPLEMENTED_MSG("Unsupported handle translation: {:#010X}", descriptor); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -865,7 +865,7 @@ static ResultCode GetProcessIdOfThread(u32* process_id, Handle thread_handle) { | |||||||
|  |  | ||||||
|     const SharedPtr<Process> process = thread->owner_process; |     const SharedPtr<Process> process = thread->owner_process; | ||||||
|  |  | ||||||
|     ASSERT_MSG(process != nullptr, "Invalid parent process for thread={:#X}", thread_handle); |     ASSERT_MSG(process != nullptr, "Invalid parent process for thread={:#010X}", thread_handle); | ||||||
|  |  | ||||||
|     *process_id = process->process_id; |     *process_id = process->process_id; | ||||||
|     return RESULT_SUCCESS; |     return RESULT_SUCCESS; | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ static void MapPages(PageTable& page_table, u32 base, u32 size, u8* memory, Page | |||||||
|  |  | ||||||
|     u32 end = base + size; |     u32 end = base + size; | ||||||
|     while (base != end) { |     while (base != end) { | ||||||
|         ASSERT_MSG(base < PAGE_TABLE_NUM_ENTRIES, "out of range mapping at {:#010X}", base); |         ASSERT_MSG(base < PAGE_TABLE_NUM_ENTRIES, "out of range mapping at {:08X}", base); | ||||||
|  |  | ||||||
|         page_table.attributes[base] = type; |         page_table.attributes[base] = type; | ||||||
|         page_table.pointers[base] = memory; |         page_table.pointers[base] = memory; | ||||||
| @@ -58,22 +58,22 @@ static void MapPages(PageTable& page_table, u32 base, u32 size, u8* memory, Page | |||||||
| } | } | ||||||
|  |  | ||||||
| void MapMemoryRegion(PageTable& page_table, VAddr base, u32 size, u8* target) { | void MapMemoryRegion(PageTable& page_table, VAddr base, u32 size, u8* target) { | ||||||
|     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:#010X}", size); |     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); | ||||||
|     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:#010X}", base); |     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); | ||||||
|     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, target, PageType::Memory); |     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, target, PageType::Memory); | ||||||
| } | } | ||||||
|  |  | ||||||
| void MapIoRegion(PageTable& page_table, VAddr base, u32 size, MMIORegionPointer mmio_handler) { | void MapIoRegion(PageTable& page_table, VAddr base, u32 size, MMIORegionPointer mmio_handler) { | ||||||
|     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:#010X}", size); |     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); | ||||||
|     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:#010X}", base); |     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); | ||||||
|     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, nullptr, PageType::Special); |     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, nullptr, PageType::Special); | ||||||
|  |  | ||||||
|     page_table.special_regions.emplace_back(SpecialRegion{base, size, mmio_handler}); |     page_table.special_regions.emplace_back(SpecialRegion{base, size, mmio_handler}); | ||||||
| } | } | ||||||
|  |  | ||||||
| void UnmapRegion(PageTable& page_table, VAddr base, u32 size) { | void UnmapRegion(PageTable& page_table, VAddr base, u32 size) { | ||||||
|     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:#010X}", size); |     ASSERT_MSG((size & PAGE_MASK) == 0, "non-page aligned size: {:08X}", size); | ||||||
|     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:#010X}", base); |     ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:08X}", base); | ||||||
|     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, nullptr, PageType::Unmapped); |     MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, nullptr, PageType::Unmapped); | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Daniel Lim Wee Soong
					Daniel Lim Wee Soong