N-archive/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CPU] Fail early when the index/size of the vector is invalid

Browse source
This commit is contained in:
gdkchan 2018-04-06 15:39:39 -03:00
parent b27944c0b5
commit 702daf2ff4
1 changed files with 36 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
ChocolArm64/Instruction/AInstEmitSimdHelper.cs
View file

@ -562,10 +562,7 @@ namespace ChocolArm64.Instruction
public static void EmitVectorExtract(AILEmitterCtx Context, int Reg, int Index, int Size, bool Signed) public static void EmitVectorExtract(AILEmitterCtx Context, int Reg, int Index, int Size, bool Signed)
{ {
if (Size < 0 || Size > 3) ThrowIfInvalid(Index, Size);
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
IAOpCodeSimd Op = (IAOpCodeSimd)Context.CurrOp; IAOpCodeSimd Op = (IAOpCodeSimd)Context.CurrOp;
@ -580,6 +577,8 @@ namespace ChocolArm64.Instruction
public static void EmitVectorExtractF(AILEmitterCtx Context, int Reg, int Index, int Size) public static void EmitVectorExtractF(AILEmitterCtx Context, int Reg, int Index, int Size)
{ {
ThrowIfInvalidF(Index, Size);
Context.EmitLdvec(Reg); Context.EmitLdvec(Reg);
Context.EmitLdc_I4(Index); Context.EmitLdc_I4(Index);
@ -615,10 +614,7 @@ namespace ChocolArm64.Instruction
public static void EmitVectorInsert(AILEmitterCtx Context, int Reg, int Index, int Size) public static void EmitVectorInsert(AILEmitterCtx Context, int Reg, int Index, int Size)
{ {
if (Size < 0 || Size > 3) ThrowIfInvalid(Index, Size);
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
Context.EmitLdvec(Reg); Context.EmitLdvec(Reg);
Context.EmitLdc_I4(Index); Context.EmitLdc_I4(Index);
@ -631,10 +627,7 @@ namespace ChocolArm64.Instruction
public static void EmitVectorInsertTmp(AILEmitterCtx Context, int Index, int Size) public static void EmitVectorInsertTmp(AILEmitterCtx Context, int Index, int Size)
{ {
if (Size < 0 || Size > 3) ThrowIfInvalid(Index, Size);
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
Context.EmitLdvectmp(); Context.EmitLdvectmp();
Context.EmitLdc_I4(Index); Context.EmitLdc_I4(Index);
@ -647,10 +640,7 @@ namespace ChocolArm64.Instruction
public static void EmitVectorInsert(AILEmitterCtx Context, int Reg, int Index, int Size, long Value) public static void EmitVectorInsert(AILEmitterCtx Context, int Reg, int Index, int Size, long Value)
{ {
if (Size < 0 || Size > 3) ThrowIfInvalid(Index, Size);
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
Context.EmitLdc_I8(Value); Context.EmitLdc_I8(Value);
Context.EmitLdvec(Reg); Context.EmitLdvec(Reg);
@ -664,6 +654,8 @@ namespace ChocolArm64.Instruction
public static void EmitVectorInsertF(AILEmitterCtx Context, int Reg, int Index, int Size) public static void EmitVectorInsertF(AILEmitterCtx Context, int Reg, int Index, int Size)
{ {
ThrowIfInvalidF(Index, Size);
Context.EmitLdvec(Reg); Context.EmitLdvec(Reg);
Context.EmitLdc_I4(Index); Context.EmitLdc_I4(Index);
@ -685,6 +677,8 @@ namespace ChocolArm64.Instruction
public static void EmitVectorInsertTmpF(AILEmitterCtx Context, int Index, int Size) public static void EmitVectorInsertTmpF(AILEmitterCtx Context, int Index, int Size)
{ {
ThrowIfInvalidF(Index, Size);
Context.EmitLdvectmp(); Context.EmitLdvectmp();
Context.EmitLdc_I4(Index); Context.EmitLdc_I4(Index);
@ -703,5 +697,31 @@ namespace ChocolArm64.Instruction
Context.EmitStvectmp(); Context.EmitStvectmp();
} }
private static void ThrowIfInvalid(int Index, int Size)
{
if ((uint)Size > 3)
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
if ((uint)Index >= 16 >> Size)
{
throw new ArgumentOutOfRangeException(nameof(Index));
}
}
private static void ThrowIfInvalidF(int Index, int Size)
{
if ((uint)Size > 1)
{
throw new ArgumentOutOfRangeException(nameof(Size));
}
if ((uint)Index >= 4 >> Size)
{
throw new ArgumentOutOfRangeException(nameof(Index));
}
}
} }
} }