From 1ed8edb0d3238acff65450203bb893ba89dcc91d Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Thu, 22 Aug 2013 23:23:48 -0700 Subject: [PATCH] Avoid some dangerous hex constant widths. --- Common/ArmEmitter.cpp | 10 ++--- Core/Dialog/SavedataParam.cpp | 12 +++--- Core/HDRemaster.h | 12 +++--- Core/HLE/sceIo.cpp | 2 +- Core/HLE/sceKernelMemory.cpp | 64 +++++++++++++++--------------- Core/HLE/sceKernelModule.cpp | 2 +- Core/HLE/sceKernelThread.cpp | 2 +- Core/HLE/sceMpeg.cpp | 2 +- Core/HW/SasAudio.cpp | 2 +- Core/MIPS/ARM/ArmCompLoadStore.cpp | 2 +- Core/MIPS/MIPSAnalyst.cpp | 2 +- Core/MIPS/MIPSAsm.cpp | 22 +++++----- Core/MIPS/MIPSDis.cpp | 2 +- Core/MIPS/MIPSInt.cpp | 2 +- Core/System.cpp | 2 +- GPU/GLES/Framebuffer.cpp | 2 +- GPU/GLES/TextureCache.cpp | 2 +- GPU/GPUCommon.cpp | 14 +++---- Windows/Debugger/CtrlMemView.cpp | 4 +- ext/disarm.cpp | 2 +- 20 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Common/ArmEmitter.cpp b/Common/ArmEmitter.cpp index 0e6d829242..21d7a82e70 100644 --- a/Common/ArmEmitter.cpp +++ b/Common/ArmEmitter.cpp @@ -127,7 +127,7 @@ void ARMXEmitter::MOVI2F(ARMReg dest, float val, ARMReg tempReg, bool negate) // VFP Encoding for Imms: <7> Not(<6>) Repeat(<6>,5) <5:0> Zeros(19) bool bit6 = (conv.u & 0x40000000) == 0x40000000; bool canEncode = true; - for (u32 mask = 0x20000000; mask >= 0x2000000; mask >>= 1) + for (u32 mask = 0x20000000; mask >= 0x02000000; mask >>= 1) { if (((conv.u & mask) == mask) == bit6) canEncode = false; @@ -136,7 +136,7 @@ void ARMXEmitter::MOVI2F(ARMReg dest, float val, ARMReg tempReg, bool negate) { u32 imm8 = (conv.u & 0x80000000) >> 24; // sign bit imm8 |= (!bit6 << 6); - imm8 |= (conv.u & 0x1F80000) >> 19; + imm8 |= (conv.u & 0x01F80000) >> 19; VMOV(dest, IMM(imm8)); return; } @@ -434,7 +434,7 @@ void ARMXEmitter::B (const void *fnptr) void ARMXEmitter::B(ARMReg src) { - Write32(condition | 0x12FFF10 | src); + Write32(condition | 0x012FFF10 | src); } bool ARMXEmitter::BLInRange(const void *fnptr) { @@ -455,7 +455,7 @@ void ARMXEmitter::BL(const void *fnptr) } void ARMXEmitter::BL(ARMReg src) { - Write32(condition | 0x12FFF30 | src); + Write32(condition | 0x012FFF30 | src); } void ARMXEmitter::PUSH(const int num, ...) { @@ -1104,7 +1104,7 @@ void ARMXEmitter::VSTR(ARMReg Src, ARMReg Base, s16 offset) } void ARMXEmitter::VMRS_APSR() { - Write32(condition | 0xEF10A10 | (15 << 12)); + Write32(condition | 0x0EF10A10 | (15 << 12)); } void ARMXEmitter::VMRS(ARMReg Rt) { Write32(condition | (0xEF << 20) | (1 << 16) | (Rt << 12) | 0xA10); diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index 974ec4bbf9..7e6d0d5e05 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -126,17 +126,17 @@ namespace int GetSDKMainVersion(int sdkVersion) { - if(sdkVersion > 0x307FFFF) + if(sdkVersion > 0x0307FFFF) return 6; - if(sdkVersion > 0x300FFFF) + if(sdkVersion > 0x0300FFFF) return 5; - if(sdkVersion > 0x206FFFF) + if(sdkVersion > 0x0206FFFF) return 4; - if(sdkVersion > 0x205FFFF) + if(sdkVersion > 0x0205FFFF) return 3; - if(sdkVersion >= 0x2000000) + if(sdkVersion >= 0x02000000) return 2; - if(sdkVersion >= 0x1000000) + if(sdkVersion >= 0x01000000) return 1; return 0; }; diff --git a/Core/HDRemaster.h b/Core/HDRemaster.h index 18f92e5427..7a7d484598 100644 --- a/Core/HDRemaster.h +++ b/Core/HDRemaster.h @@ -36,10 +36,10 @@ struct HDRemaster { // TODO: Use UMD_DATA.bin to differentiate the Eiyuu games from the regular PSP editions. // TODO: Do all of the remasters aside from Monster Hunter/Shin Sangoku use double texture coordinates? const struct HDRemaster g_HDRemasters[] = { - { "NPJB40001", 0x4000000, false }, // MONSTER HUNTER PORTABLE 3rd HD Ver. - { "NPJB40002", 0x4000000, true }, // K-ON Houkago Live HD Ver - { "NPJB40003", 0x4000000, false }, // Shin Sangoku Musou Multi Raid 2 HD Ver - // { "ULJM05170", 0x4000000, true }, // Eiyuu Densetsu Sora no Kiseki FC Kai HD Edition - // { "ULJM05277", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki SC Kai HD Edition, game needs 76 MB - // { "ULJM05353", 0x4C00000, true }, // Eiyuu Densetsu: Sora no Kiseki 3rd Kai HD Edition, game needs 76 MB + { "NPJB40001", 0x04000000, false }, // MONSTER HUNTER PORTABLE 3rd HD Ver. + { "NPJB40002", 0x04000000, true }, // K-ON Houkago Live HD Ver + { "NPJB40003", 0x04000000, false }, // Shin Sangoku Musou Multi Raid 2 HD Ver + // { "ULJM05170", 0x04000000, true }, // Eiyuu Densetsu Sora no Kiseki FC Kai HD Edition + // { "ULJM05277", 0x04C00000, true }, // Eiyuu Densetsu: Sora no Kiseki SC Kai HD Edition, game needs 76 MB + // { "ULJM05353", 0x04C00000, true }, // Eiyuu Densetsu: Sora no Kiseki 3rd Kai HD Edition, game needs 76 MB }; diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp index 2f6348b857..a3a17ea85f 100644 --- a/Core/HLE/sceIo.cpp +++ b/Core/HLE/sceIo.cpp @@ -1788,7 +1788,7 @@ int __IoIoctl(u32 id, u32 cmd, u32 indataPtr, u32 inlen, u32 outdataPtr, u32 out break; //Unknown command, always expects return value of 1 according to JPCSP, used by Pangya Fantasy Golf. - case 0x1f30003: + case 0x01f30003: INFO_LOG(HLE, "sceIoIoCtl: Unknown cmd %08x always returns 1", cmd); if(inlen != 4 || outlen != 1 || Memory::Read_U32(indataPtr) != outlen) { INFO_LOG(HLE, "sceIoIoCtl id: %08x, cmd %08x, indataPtr %08x, inlen %08x, outdataPtr %08x, outlen %08x has invalid parameters", id, cmd, indataPtr, inlen, outdataPtr, outlen); diff --git a/Core/HLE/sceKernelMemory.cpp b/Core/HLE/sceKernelMemory.cpp index 7505823a2e..e1a6571ca6 100644 --- a/Core/HLE/sceKernelMemory.cpp +++ b/Core/HLE/sceKernelMemory.cpp @@ -655,19 +655,19 @@ void sceKernelSetCompiledSdkVersion(int sdkVersion) bool valiSDK = false; switch(sdkMainVersion) { - case 0x1000000: - case 0x1050000: - case 0x2000000: - case 0x2050000: - case 0x2060000: - case 0x2070000: - case 0x2080000: - case 0x3000000: - case 0x3010000: - case 0x3030000: - case 0x3040000: - case 0x3050000: - case 0x3060000: + case 0x01000000: + case 0x01050000: + case 0x02000000: + case 0x02050000: + case 0x02060000: + case 0x02070000: + case 0x02080000: + case 0x03000000: + case 0x03010000: + case 0x03030000: + case 0x03040000: + case 0x03050000: + case 0x03060000: valiSDK = true; break; default: @@ -690,7 +690,7 @@ void sceKernelSetCompiledSdkVersion(int sdkVersion) void sceKernelSetCompiledSdkVersion370(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x3070000) + if(sdkMainVersion == 0x03070000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -705,7 +705,7 @@ void sceKernelSetCompiledSdkVersion370(int sdkVersion) void sceKernelSetCompiledSdkVersion380_390(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x3080000 || sdkMainVersion == 0x3090000) + if(sdkMainVersion == 0x03080000 || sdkMainVersion == 0x03090000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -720,11 +720,11 @@ void sceKernelSetCompiledSdkVersion380_390(int sdkVersion) void sceKernelSetCompiledSdkVersion395(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFFFF00; - if(sdkMainVersion == 0x4000000 - || sdkMainVersion == 0x4000100 - || sdkMainVersion == 0x4000500 - || sdkMainVersion == 0x3090500 - || sdkMainVersion == 0x3090600) + if(sdkMainVersion == 0x04000000 + || sdkMainVersion == 0x04000100 + || sdkMainVersion == 0x04000500 + || sdkMainVersion == 0x03090500 + || sdkMainVersion == 0x03090600) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -739,9 +739,9 @@ void sceKernelSetCompiledSdkVersion395(int sdkVersion) void sceKernelSetCompiledSdkVersion600_602(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x6010000 - || sdkMainVersion == 0x6000000 - || sdkMainVersion == 0x6020000) + if(sdkMainVersion == 0x06010000 + || sdkMainVersion == 0x06000000 + || sdkMainVersion == 0x06020000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -756,8 +756,8 @@ void sceKernelSetCompiledSdkVersion600_602(int sdkVersion) void sceKernelSetCompiledSdkVersion500_505(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x5000000 - || sdkMainVersion == 0x5050000) + if(sdkMainVersion == 0x05000000 + || sdkMainVersion == 0x05050000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -772,8 +772,8 @@ void sceKernelSetCompiledSdkVersion500_505(int sdkVersion) void sceKernelSetCompiledSdkVersion401_402(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x4010000 - || sdkMainVersion == 0x4020000) + if(sdkMainVersion == 0x04010000 + || sdkMainVersion == 0x04020000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -788,7 +788,7 @@ void sceKernelSetCompiledSdkVersion401_402(int sdkVersion) void sceKernelSetCompiledSdkVersion507(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x5070000) + if(sdkMainVersion == 0x05070000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -803,9 +803,9 @@ void sceKernelSetCompiledSdkVersion507(int sdkVersion) void sceKernelSetCompiledSdkVersion603_605(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x6040000 - || sdkMainVersion == 0x6030000 - || sdkMainVersion == 0x6050000) + if(sdkMainVersion == 0x06040000 + || sdkMainVersion == 0x06030000 + || sdkMainVersion == 0x06050000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; @@ -820,7 +820,7 @@ void sceKernelSetCompiledSdkVersion603_605(int sdkVersion) void sceKernelSetCompiledSdkVersion606(int sdkVersion) { int sdkMainVersion = sdkVersion & 0xFFFF0000; - if(sdkMainVersion == 0x6060000) + if(sdkMainVersion == 0x06060000) { sdkVersion_ = sdkVersion; flags_ |= SCE_KERNEL_HASCOMPILEDSDKVERSION; diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp index 4240d67e58..1816d66ad5 100644 --- a/Core/HLE/sceKernelModule.cpp +++ b/Core/HLE/sceKernelModule.cpp @@ -964,7 +964,7 @@ bool __KernelLoadExec(const char *filename, u32 paramPtr, std::string *error_str u32 handle = pspFileSystem.OpenFile(filename, FILEACCESS_READ); - u8 *temp = new u8[(int)info.size + 0x1000000]; + u8 *temp = new u8[(int)info.size + 0x01000000]; pspFileSystem.ReadFile(handle, temp, (size_t)info.size); diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp index 448fe5744c..b438d9a5b8 100644 --- a/Core/HLE/sceKernelThread.cpp +++ b/Core/HLE/sceKernelThread.cpp @@ -1291,7 +1291,7 @@ u32 sceKernelReferThreadStatus(u32 threadID, u32 statusPtr) u32 wantedSize = Memory::Read_U32(statusPtr); - if (sceKernelGetCompiledSdkVersion() > 0x2060010) + if (sceKernelGetCompiledSdkVersion() > 0x02060010) { if (wantedSize > THREADINFO_SIZE_AFTER_260) { diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp index 6e72200e22..4bab1f3749 100644 --- a/Core/HLE/sceMpeg.cpp +++ b/Core/HLE/sceMpeg.cpp @@ -617,7 +617,7 @@ u32 sceMpegAvcDecode(u32 mpeg, u32 auAddr, u32 frameWidth, u32 bufferAddr, u32 i return 0; } - if (frameWidth == 0) { // wtf, go sudoku passes in 0xccccccccc + if (frameWidth == 0) { // wtf, go sudoku passes in 0xcccccccc if (!ctx->defaultFrameWidth) { frameWidth = ctx->avc.avcDetailFrameWidth; } else { diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index 26e1d587fd..2f03387d8b 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -250,7 +250,7 @@ static int getReleaseRate(int bitfield2) { if (getReleaseType(bitfield2) == PSP_SAS_ADSR_CURVE_MODE_LINEAR_DECREASE) { return (0x40000000 >> (n + 2)); } - return (0x8000000 >> n); + return (0x08000000 >> n); } static int getSustainLevel(int bitfield1) { diff --git a/Core/MIPS/ARM/ArmCompLoadStore.cpp b/Core/MIPS/ARM/ArmCompLoadStore.cpp index c9538d5468..7855d1408a 100644 --- a/Core/MIPS/ARM/ArmCompLoadStore.cpp +++ b/Core/MIPS/ARM/ArmCompLoadStore.cpp @@ -200,7 +200,7 @@ namespace MIPSComp : (op - (4<<26) + 3))) { EatInstruction(nextOp); - nextOp = ((load ? 35 : 43) << 26) | ((isLeft ? nextOp : op) & 0x3FFFFFF); //lw, sw + nextOp = ((load ? 35 : 43) << 26) | ((isLeft ? nextOp : op) & 0x03FFFFFF); //lw, sw Comp_ITypeMem(nextOp); return; } diff --git a/Core/MIPS/MIPSAnalyst.cpp b/Core/MIPS/MIPSAnalyst.cpp index 1f0cf6ff57..63e8300b2e 100644 --- a/Core/MIPS/MIPSAnalyst.cpp +++ b/Core/MIPS/MIPSAnalyst.cpp @@ -276,7 +276,7 @@ namespace MIPSAnalyst if (flags & IN_IMM16) validbits&=~0xFFFF; if (flags & IN_IMM26) - validbits&=~0x3FFFFFF; + validbits&=~0x03FFFFFF; hash = __rotl(hash,13); hash ^= (instr&validbits); } diff --git a/Core/MIPS/MIPSAsm.cpp b/Core/MIPS/MIPSAsm.cpp index cd3b37892f..595e01ea0b 100644 --- a/Core/MIPS/MIPSAsm.cpp +++ b/Core/MIPS/MIPSAsm.cpp @@ -294,7 +294,7 @@ bool CMipsInstruction::Validate() if (Opcode.flags & O_IPCA) // absolute value >> 2) { - Vars.Immediate = (Vars.Immediate >> 2) & 0x3FFFFFF; + Vars.Immediate = (Vars.Immediate >> 2) & 0x03FFFFFF; } else if (Opcode.flags & O_IPCR) // relative 16 bit value { int num = (Vars.Immediate-RamPos-4); @@ -319,28 +319,28 @@ bool CMipsInstruction::Validate() Vars.Immediate &= 0x1F; break; case MIPS_IMMEDIATE16: - if (abs(Vars.Immediate) > 0xFFFF) + if (abs(Vars.Immediate) > 0x0000FFFF) { // QueueError(ERROR_ERROR,"Immediate value %04X out of range",Vars.OriginalImmediate); return false; } - Vars.Immediate &= 0xFFFF; + Vars.Immediate &= 0x0000FFFF; break; case MIPS_IMMEDIATE20: - if (abs(Vars.Immediate) > 0xFFFFF) + if (abs(Vars.Immediate) > 0x000FFFFF) { // QueueError(ERROR_ERROR,"Immediate value %08X out of range",Vars.OriginalImmediate); return false; } - Vars.Immediate &= 0xFFFFF; + Vars.Immediate &= 0x000FFFFF; break; case MIPS_IMMEDIATE26: - if (abs(Vars.Immediate) > 0x3FFFFFF) + if (abs(Vars.Immediate) > 0x03FFFFFF) { // QueueError(ERROR_ERROR,"Immediate value %08X out of range",Vars.OriginalImmediate); return false; } - Vars.Immediate &= 0x3FFFFFF; + Vars.Immediate &= 0x03FFFFFF; break; } } @@ -393,16 +393,16 @@ void CMipsInstruction::Encode() switch (Vars.ImmediateType) { case MIPS_IMMEDIATE5: - encoding |= ((Vars.Immediate & 0x1F) << 6); + encoding |= (Vars.Immediate & 0x0000001F) << 6; break; case MIPS_IMMEDIATE16: - encoding |= (Vars.Immediate & 0xFFFF); + encoding |= (Vars.Immediate & 0x0000FFFF); break; case MIPS_IMMEDIATE20: - encoding |= (Vars.Immediate & 0xFFFFF) << 6; + encoding |= (Vars.Immediate & 0x000FFFFF) << 6; break; case MIPS_IMMEDIATE26: - encoding |= Vars.Immediate & 0x3FFFFFF; + encoding |= (Vars.Immediate & 0x03FFFFFF); break; } } diff --git a/Core/MIPS/MIPSDis.cpp b/Core/MIPS/MIPSDis.cpp index 3aaac33b4e..7aa2953b7b 100644 --- a/Core/MIPS/MIPSDis.cpp +++ b/Core/MIPS/MIPSDis.cpp @@ -318,7 +318,7 @@ namespace MIPSDis void Dis_JumpType(u32 op, char *out) { - u32 off = ((op & 0x3FFFFFF) << 2); + u32 off = ((op & 0x03FFFFFF) << 2); u32 addr = (disPC & 0xF0000000) | off; const char *name = MIPSGetName(op); sprintf(out, "%s\t->$%08x",name,addr); diff --git a/Core/MIPS/MIPSInt.cpp b/Core/MIPS/MIPSInt.cpp index a71377b7d6..47d22a5130 100644 --- a/Core/MIPS/MIPSInt.cpp +++ b/Core/MIPS/MIPSInt.cpp @@ -264,7 +264,7 @@ namespace MIPSInt if (mipsr4k.inDelaySlot) _dbg_assert_msg_(CPU,0,"Jump in delay slot :("); - u32 off = ((op & 0x3FFFFFF) << 2); + u32 off = ((op & 0x03FFFFFF) << 2); u32 addr = (currentMIPS->pc & 0xF0000000) | off; switch (op>>26) diff --git a/Core/System.cpp b/Core/System.cpp index 5312965328..075225ffcc 100644 --- a/Core/System.cpp +++ b/Core/System.cpp @@ -135,7 +135,7 @@ void CPU_Init() { // Default memory settings // Seems to be the safest place currently.. - Memory::g_MemorySize = 0x2000000; // 32 MB of ram by default + Memory::g_MemorySize = 0x02000000; // 32 MB of ram by default g_RemasterMode = false; g_DoubleTextureCoordinates = false; diff --git a/GPU/GLES/Framebuffer.cpp b/GPU/GLES/Framebuffer.cpp index 9b4a0602bf..6058e7ece0 100644 --- a/GPU/GLES/Framebuffer.cpp +++ b/GPU/GLES/Framebuffer.cpp @@ -76,7 +76,7 @@ enum { }; static bool MaskedEqual(u32 addr1, u32 addr2) { - return (addr1 & 0x3FFFFFF) == (addr2 & 0x3FFFFFF); + return (addr1 & 0x03FFFFFF) == (addr2 & 0x03FFFFFF); } inline u16 RGBA8888toRGB565(u32 px) { diff --git a/GPU/GLES/TextureCache.cpp b/GPU/GLES/TextureCache.cpp index 047b42f5d6..3a7b55ab4c 100644 --- a/GPU/GLES/TextureCache.cpp +++ b/GPU/GLES/TextureCache.cpp @@ -130,7 +130,7 @@ void TextureCache::Decimate() { } void TextureCache::Invalidate(u32 addr, int size, GPUInvalidationType type) { - addr &= 0xFFFFFFF; + addr &= 0x0FFFFFFF; u32 addr_end = addr + size; // They could invalidate inside the texture, let's just give a bit of leeway. diff --git a/GPU/GPUCommon.cpp b/GPU/GPUCommon.cpp index 79ee8c9885..b886bb7ebb 100644 --- a/GPU/GPUCommon.cpp +++ b/GPU/GPUCommon.cpp @@ -196,9 +196,9 @@ u32 GPUCommon::EnqueueList(u32 listpc, u32 stall, int subIntrBase, bool head) { DisplayList &dl = dls[id]; dl.id = id; - dl.startpc = listpc & 0xFFFFFFF; - dl.pc = listpc & 0xFFFFFFF; - dl.stall = stall & 0xFFFFFFF; + dl.startpc = listpc & 0x0FFFFFFF; + dl.pc = listpc & 0x0FFFFFFF; + dl.stall = stall & 0x0FFFFFFF; dl.subIntrBase = std::max(subIntrBase, -1); dl.stackptr = 0; dl.signal = PSP_GE_SIGNAL_NONE; @@ -263,7 +263,7 @@ u32 GPUCommon::UpdateStall(int listid, u32 newstall) { if (listid < 0 || listid >= DisplayListMaxCount || dls[listid].state == PSP_GE_DL_STATE_NONE) return SCE_KERNEL_ERROR_INVALID_ID; - dls[listid].stall = newstall & 0xFFFFFFF; + dls[listid].stall = newstall & 0x0FFFFFFF; if (dls[listid].signal == PSP_GE_SIGNAL_HANDLER_PAUSE) dls[listid].signal = PSP_GE_SIGNAL_HANDLER_SUSPEND; @@ -412,7 +412,7 @@ bool GPUCommon::InterpretList(DisplayList &list) { #endif cycleLastPC = list.pc; - downcount = list.stall == 0 ? 0xFFFFFFF : (list.stall - list.pc) / 4; + downcount = list.stall == 0 ? 0x0FFFFFFF : (list.stall - list.pc) / 4; list.state = PSP_GE_DL_STATE_RUNNING; list.interrupted = false; @@ -439,7 +439,7 @@ bool GPUCommon::InterpretList(DisplayList &list) { { easy_guard innerGuard(listLock); - downcount = list.stall == 0 ? 0xFFFFFFF : (list.stall - list.pc) / 4; + downcount = list.stall == 0 ? 0x0FFFFFFF : (list.stall - list.pc) / 4; if (gpuState == GPUSTATE_STALL && list.stall != list.pc) { // Unstalled. @@ -512,7 +512,7 @@ void GPUCommon::ReapplyGfxState() { void GPUCommon::ReapplyGfxStateInternal() { // ShaderManager_DirtyShader(); // The commands are embedded in the command memory so we can just reexecute the words. Convenient. - // To be safe we pass 0xFFFFFFF as the diff. + // To be safe we pass 0xFFFFFFFF as the diff. /* ExecuteOp(gstate.cmdmem[GE_CMD_ALPHABLENDENABLE], 0xFFFFFFFF); ExecuteOp(gstate.cmdmem[GE_CMD_ALPHATESTENABLE], 0xFFFFFFFF); diff --git a/Windows/Debugger/CtrlMemView.cpp b/Windows/Debugger/CtrlMemView.cpp index 4b08cae176..c00819f20c 100644 --- a/Windows/Debugger/CtrlMemView.cpp +++ b/Windows/Debugger/CtrlMemView.cpp @@ -281,7 +281,7 @@ void CtrlMemView::onPaint(WPARAM wParam, LPARAM lParam) sprintf(temp, "%s (0x%x b)", symbolMap.GetSymbolName(fn),symbolMap.GetSymbolSize(fn)); TextOut(hdc,200,rowY1,temp,(int)strlen(temp)); - SetTextColor(hdc,0x0000000); + SetTextColor(hdc,0x000000); if (align==4) { @@ -464,7 +464,7 @@ void CtrlMemView::onMouseUp(WPARAM wParam, LPARAM lParam, int button) else { outputfile = fopen("Ram.dump","wb"); // Could also dump Vram, but not useful for now. - fwrite(Memory::GetPointer(0x08800000), 1, 0x1800000, outputfile); + fwrite(Memory::GetPointer(0x08800000), 1, 0x01800000, outputfile); fclose(outputfile); break; } diff --git a/ext/disarm.cpp b/ext/disarm.cpp index aa72df4167..17bd426e20 100644 --- a/ext/disarm.cpp +++ b/ext/disarm.cpp @@ -535,7 +535,7 @@ instr_disassemble(word instr, address addr, pDisOptions opts) { mnemonic = "B"; format = "0"; break; - } else if ((instr & 0x0FFFFFF0) == 0x12FFF30) { + } else if ((instr & 0x0FFFFFF0) == 0x012FFF30) { mnemonic = "BL"; format = "0"; break;