Changed all casts in svc_wrap.h to be static_cast instead
This commit is contained in:
parent
09b6dda8f0
commit
2db37ddea9
@ -35,18 +35,18 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <ResultCode func(u32)>
|
template <ResultCode func(u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)Param(0)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u32)>
|
template <ResultCode func(u32, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)Param(0), (u32)Param(1)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0)), static_cast<u32>(Param(1))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32*, u32)>
|
template <ResultCode func(u32*, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
u32 retval = func(¶m_1, (u32)Param(1)).raw;
|
u32 retval = func(¶m_1, static_cast<u32>(Param(1))).raw;
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
@ -61,7 +61,7 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <ResultCode func(u64, s32)>
|
template <ResultCode func(u64, s32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func(Param(0), (s32)Param(1)).raw);
|
FuncReturn(func(Param(0), static_cast<s32>(Param(1))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u32)>
|
template <ResultCode func(u64, u32)>
|
||||||
@ -79,19 +79,19 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <ResultCode func(u32, u64)>
|
template <ResultCode func(u32, u64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)(Param(0) & 0xFFFFFFFF), Param(1)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0)), Param(1)).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u32, u64)>
|
template <ResultCode func(u32, u32, u64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)(Param(0) & 0xFFFFFFFF), (u32)(Param(1) & 0xFFFFFFFF), Param(2)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0)), static_cast<u32>(Param(1)), Param(2)).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u32*, u64*)>
|
template <ResultCode func(u32, u32*, u64*)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
u64 param_2 = 0;
|
u64 param_2 = 0;
|
||||||
ResultCode retval = func((u32)(Param(2) & 0xFFFFFFFF), ¶m_1, ¶m_2);
|
ResultCode retval = func(static_cast<u32>(Param(2)), ¶m_1, ¶m_2);
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
Core::CurrentArmInterface().SetReg(2, param_2);
|
Core::CurrentArmInterface().SetReg(2, param_2);
|
||||||
FuncReturn(retval.raw);
|
FuncReturn(retval.raw);
|
||||||
@ -100,12 +100,12 @@ void SvcWrap() {
|
|||||||
template <ResultCode func(u64, u64, u32, u32)>
|
template <ResultCode func(u64, u64, u32, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(
|
FuncReturn(
|
||||||
func(Param(0), Param(1), (u32)(Param(3) & 0xFFFFFFFF), (u32)(Param(3) & 0xFFFFFFFF)).raw);
|
func(Param(0), Param(1), static_cast<u32>(Param(3)), static_cast<u32>(Param(3))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u64, u32)>
|
template <ResultCode func(u32, u64, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)Param(0), Param(1), (u32)Param(2)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0)), Param(1), static_cast<u32>(Param(2))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u64, u64)>
|
template <ResultCode func(u64, u64, u64)>
|
||||||
@ -115,25 +115,28 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <ResultCode func(u32, u64, u64, u32)>
|
template <ResultCode func(u32, u64, u64, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)Param(0), Param(1), Param(2), (u32)Param(3)).raw);
|
FuncReturn(
|
||||||
|
func(static_cast<u32>(Param(0)), Param(1), Param(2), static_cast<u32>(Param(3))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32, u64, u64)>
|
template <ResultCode func(u32, u64, u64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func((u32)Param(0), Param(1), Param(2)).raw);
|
FuncReturn(func(static_cast<u32>(Param(0)), Param(1), Param(2)).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u32*, u64, u64, s64)>
|
template <ResultCode func(u32*, u64, u64, s64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
ResultCode retval = func(¶m_1, Param(1), (u32)(Param(2) & 0xFFFFFFFF), (s64)Param(3));
|
ResultCode retval =
|
||||||
|
func(¶m_1, Param(1), static_cast<u32>(Param(2)), static_cast<s64>(Param(3)));
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
FuncReturn(retval.raw);
|
FuncReturn(retval.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u64, u32, s64)>
|
template <ResultCode func(u64, u64, u32, s64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func(Param(0), Param(1), (u32)Param(2), (s64)Param(3)).raw);
|
FuncReturn(
|
||||||
|
func(Param(0), Param(1), static_cast<u32>(Param(2)), static_cast<s64>(Param(3))).raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64*, u64, u64, u64)>
|
template <ResultCode func(u64*, u64, u64, u64)>
|
||||||
@ -147,8 +150,8 @@ void SvcWrap() {
|
|||||||
template <ResultCode func(u32*, u64, u64, u64, u32, s32)>
|
template <ResultCode func(u32*, u64, u64, u64, u32, s32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
u32 retval =
|
u32 retval = func(¶m_1, Param(1), Param(2), Param(3), static_cast<u32>(Param(4)),
|
||||||
func(¶m_1, Param(1), Param(2), Param(3), (u32)Param(4), (s32)(Param(5) & 0xFFFFFFFF))
|
static_cast<s32>(Param(5)))
|
||||||
.raw;
|
.raw;
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
@ -172,7 +175,7 @@ void SvcWrap() {
|
|||||||
template <ResultCode func(u32*, u64, u64, u32)>
|
template <ResultCode func(u32*, u64, u64, u32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
u32 retval = func(¶m_1, Param(1), Param(2), (u32)(Param(3) & 0xFFFFFFFF)).raw;
|
u32 retval = func(¶m_1, Param(1), Param(2), static_cast<u32>(Param(3))).raw;
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
@ -181,22 +184,22 @@ template <ResultCode func(Handle*, u64, u32, u32)>
|
|||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
u32 param_1 = 0;
|
u32 param_1 = 0;
|
||||||
u32 retval =
|
u32 retval =
|
||||||
func(¶m_1, Param(1), (u32)(Param(2) & 0xFFFFFFFF), (u32)(Param(3) & 0xFFFFFFFF)).raw;
|
func(¶m_1, Param(1), static_cast<u32>(Param(2)), static_cast<u32>(Param(3))).raw;
|
||||||
Core::CurrentArmInterface().SetReg(1, param_1);
|
Core::CurrentArmInterface().SetReg(1, param_1);
|
||||||
FuncReturn(retval);
|
FuncReturn(retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u32, s32, s64)>
|
template <ResultCode func(u64, u32, s32, s64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(
|
FuncReturn(func(Param(0), static_cast<u32>(Param(1)), static_cast<s32>(Param(2)),
|
||||||
func(Param(0), (u32)(Param(1) & 0xFFFFFFFF), (s32)(Param(2) & 0xFFFFFFFF), (s64)Param(3))
|
static_cast<s64>(Param(3)))
|
||||||
.raw);
|
.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(u64, u32, s32, s32)>
|
template <ResultCode func(u64, u32, s32, s32)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
FuncReturn(func(Param(0), (u32)(Param(1) & 0xFFFFFFFF), (s32)(Param(2) & 0xFFFFFFFF),
|
FuncReturn(func(Param(0), static_cast<u32>(Param(1)), static_cast<s32>(Param(2)),
|
||||||
(s32)(Param(3) & 0xFFFFFFFF))
|
static_cast<s32>(Param(3)))
|
||||||
.raw);
|
.raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -226,7 +229,7 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <void func(s64)>
|
template <void func(s64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
func((s64)Param(0));
|
func(static_cast<s64>(Param(0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
template <void func(u64, u64 len)>
|
template <void func(u64, u64 len)>
|
||||||
@ -241,7 +244,7 @@ void SvcWrap() {
|
|||||||
|
|
||||||
template <void func(u32, u64, u64)>
|
template <void func(u32, u64, u64)>
|
||||||
void SvcWrap() {
|
void SvcWrap() {
|
||||||
func((u32)(Param(0) & 0xFFFFFFFF), Param(1), Param(2));
|
func(static_cast<u32>(Param(0)), Param(1), Param(2));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Kernel
|
} // namespace Kernel
|
||||||
|
Loading…
Reference in New Issue
Block a user