Remove more signed to unsigned conversions in emotion_mmi.cpp, emotion_special.cpp

Souzooka · Souzooka · commit 5429d6c3224f · 2020-02-24T16:10:01.000-10:00
diff --git a/src/core/ee/emotion_mmi.cpp b/src/core/ee/emotion_mmi.cpp
@@ -2631,7 +2631,7 @@ void EmotionInterpreter::div1(EmotionEngine &cpu, uint32_t instruction)
     op2 = cpu.get_gpr<int32_t>(op2);
     if (op1 == 0x80000000 && op2 == 0xFFFFFFFF)
     {
-        cpu.set_LO_HI((int64_t)(int32_t)0x80000000, 0, true);
+        cpu.set_LO_HI(0xFFFFFFFF'80000000, 0, true);
     }
     else if (op2)
     {
@@ -2660,7 +2660,7 @@ void EmotionInterpreter::divu1(EmotionEngine &cpu, uint32_t instruction)
     }
     else
     {
-        cpu.set_LO_HI((int64_t)-1, (int64_t)(int32_t)op1, true);
+        cpu.set_LO_HI(UINT64_MAX, (int64_t)(int32_t)op1, true);
     }
 }
 
diff --git a/src/core/ee/emotion_special.cpp b/src/core/ee/emotion_special.cpp
@@ -527,7 +527,7 @@ void EmotionInterpreter::div(EmotionEngine &cpu, uint32_t instruction)
     op2 = cpu.get_gpr<int32_t>(op2);
     if (op1 == 0x80000000 && op2 == 0xFFFFFFFF)
     {
-        cpu.set_LO_HI((int64_t)(int32_t)0x80000000, 0);
+        cpu.set_LO_HI(0xFFFFFFFF'80000000, 0);
     }
     else if (op2)
     {
@@ -556,7 +556,7 @@ void EmotionInterpreter::divu(EmotionEngine &cpu, uint32_t instruction)
     }
     else
     {
-        cpu.set_LO_HI((int64_t)-1, (int64_t)(int32_t)op1);
+        cpu.set_LO_HI(UINT64_MAX, (int64_t)(int32_t)op1);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2631,7 +2631,7 @@ void EmotionInterpreter::div1(EmotionEngine &cpu, uint32_t instruction)`
`2631`	`2631`	`op2 = cpu.get_gpr<int32_t>(op2);`
`2632`	`2632`	`if (op1 == 0x80000000 && op2 == 0xFFFFFFFF)`
`2633`	`2633`	`{`
`2634`		`- cpu.set_LO_HI((int64_t)(int32_t)0x80000000, 0, true);`
	`2634`	`+ cpu.set_LO_HI(0xFFFFFFFF'80000000, 0, true);`
`2635`	`2635`	`}`
`2636`	`2636`	`else if (op2)`
`2637`	`2637`	`{`
`@@ -2660,7 +2660,7 @@ void EmotionInterpreter::divu1(EmotionEngine &cpu, uint32_t instruction)`
`2660`	`2660`	`}`
`2661`	`2661`	`else`
`2662`	`2662`	`{`
`2663`		`- cpu.set_LO_HI((int64_t)-1, (int64_t)(int32_t)op1, true);`
	`2663`	`+ cpu.set_LO_HI(UINT64_MAX, (int64_t)(int32_t)op1, true);`
`2664`	`2664`	`}`
`2665`	`2665`	`}`
`2666`	`2666`
Original file line number	Diff line number	Diff line change
`@@ -527,7 +527,7 @@ void EmotionInterpreter::div(EmotionEngine &cpu, uint32_t instruction)`
`527`	`527`	`op2 = cpu.get_gpr<int32_t>(op2);`
`528`	`528`	`if (op1 == 0x80000000 && op2 == 0xFFFFFFFF)`
`529`	`529`	`{`
`530`		`- cpu.set_LO_HI((int64_t)(int32_t)0x80000000, 0);`
	`530`	`+ cpu.set_LO_HI(0xFFFFFFFF'80000000, 0);`
`531`	`531`	`}`
`532`	`532`	`else if (op2)`
`533`	`533`	`{`
`@@ -556,7 +556,7 @@ void EmotionInterpreter::divu(EmotionEngine &cpu, uint32_t instruction)`
`556`	`556`	`}`
`557`	`557`	`else`
`558`	`558`	`{`
`559`		`- cpu.set_LO_HI((int64_t)-1, (int64_t)(int32_t)op1);`
	`559`	`+ cpu.set_LO_HI(UINT64_MAX, (int64_t)(int32_t)op1);`
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`