diff options
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/disassembler/load_symbol_map.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 43 | ||||
| -rw-r--r-- | src/core/hw/gpu.cpp | 12 |
3 files changed, 9 insertions, 48 deletions
diff --git a/src/core/arm/disassembler/load_symbol_map.cpp b/src/core/arm/disassembler/load_symbol_map.cpp index f156c43ce..0f384ad3e 100644 --- a/src/core/arm/disassembler/load_symbol_map.cpp +++ b/src/core/arm/disassembler/load_symbol_map.cpp @@ -18,7 +18,7 @@ void LoadSymbolMap(std::string filename) { std::ifstream infile(filename); std::string address_str, function_name, line; - u32 size, address; + u32 size; while (std::getline(infile, line)) { std::istringstream iss(line); diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index e56f1879e..88cbc1af5 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -85,47 +85,8 @@ int ObjectPool::GetCount() { } Object* ObjectPool::CreateByIDType(int type) { - // Used for save states. This is ugly, but what other way is there? - switch (type) { - //case SCE_KERNEL_TMID_Alarm: - // return __KernelAlarmObject(); - //case SCE_KERNEL_TMID_EventFlag: - // return __KernelEventFlagObject(); - //case SCE_KERNEL_TMID_Mbox: - // return __KernelMbxObject(); - //case SCE_KERNEL_TMID_Fpl: - // return __KernelMemoryFPLObject(); - //case SCE_KERNEL_TMID_Vpl: - // return __KernelMemoryVPLObject(); - //case PPSSPP_KERNEL_TMID_PMB: - // return __KernelMemoryPMBObject(); - //case PPSSPP_KERNEL_TMID_Module: - // return __KernelModuleObject(); - //case SCE_KERNEL_TMID_Mpipe: - // return __KernelMsgPipeObject(); - //case SCE_KERNEL_TMID_Mutex: - // return __KernelMutexObject(); - //case SCE_KERNEL_TMID_LwMutex: - // return __KernelLwMutexObject(); - //case SCE_KERNEL_TMID_Semaphore: - // return __KernelSemaphoreObject(); - //case SCE_KERNEL_TMID_Callback: - // return __KernelCallbackObject(); - //case SCE_KERNEL_TMID_Thread: - // return __KernelThreadObject(); - //case SCE_KERNEL_TMID_VTimer: - // return __KernelVTimerObject(); - //case SCE_KERNEL_TMID_Tlspl: - // return __KernelTlsplObject(); - //case PPSSPP_KERNEL_TMID_File: - // return __KernelFileNodeObject(); - //case PPSSPP_KERNEL_TMID_DirList: - // return __KernelDirListingObject(); - - default: - ERROR_LOG(COMMON, "Unable to load state: could not find object type %d.", type); - return nullptr; - } + ERROR_LOG(COMMON, "Unimplemented: %d.", type); + return nullptr; } /// Initialize the kernel diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 2e0943776..7afb00d6c 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -49,7 +49,7 @@ inline void Write(u32 addr, const T data) { return; } - g_regs[index] = data; + g_regs[index] = static_cast<u32>(data); switch (index) { @@ -81,9 +81,9 @@ inline void Write(u32 addr, const T data) { u8* source_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalInputAddress())); u8* dest_pointer = Memory::GetPointer(Memory::PhysicalToVirtualAddress(config.GetPhysicalOutputAddress())); - for (int y = 0; y < config.output_height; ++y) { + for (u32 y = 0; y < config.output_height; ++y) { // TODO: Why does the register seem to hold twice the framebuffer width? - for (int x = 0; x < config.output_width; ++x) { + for (u32 x = 0; x < config.output_width; ++x) { struct { int r, g, b, a; } source_color = { 0, 0, 0, 0 }; @@ -134,10 +134,10 @@ inline void Write(u32 addr, const T data) { } } - DEBUG_LOG(GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%dx%d)-> 0x%08x(%dx%d), dst format %x", + DEBUG_LOG(GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%ux%u)-> 0x%08x(%ux%u), dst format %x", config.output_height * config.output_width * 4, - config.GetPhysicalInputAddress(), (int)config.input_width, (int)config.input_height, - config.GetPhysicalOutputAddress(), (int)config.output_width, (int)config.output_height, + config.GetPhysicalInputAddress(), config.input_width, config.input_height, + config.GetPhysicalOutputAddress(), config.output_width, config.output_height, config.output_format.Value()); } break; |