emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Remove IntUtils and use BitUtils instead. (#774)

Browse source
This commit is contained in:
Ac_K 2019-09-20 06:41:57 +02:00 committed by jduncanator
parent 72b9f8f0a0
commit f48df486e2
2 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Ryujinx.HLE/HOS/Services/Nv/NvDrvServices/NvMap/NvMapIoctl.cs
View file

@ -1,8 +1,8 @@
using ARMeilleure.Memory; using ARMeilleure.Memory;
using Ryujinx.Common;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.Graphics.Memory; using Ryujinx.Graphics.Memory;
using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Process;
using Ryujinx.HLE.Utilities;
using System.Collections.Concurrent; using System.Collections.Concurrent;
namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
return NvResult.InvalidInput; return NvResult.InvalidInput;
} }
int size = IntUtils.AlignUp(args.Size, NvGpuVmm.PageSize); int size = BitUtils.AlignUp(args.Size, NvGpuVmm.PageSize);
args.Handle = AddNvMap(context, new NvMapHandle(size)); args.Handle = AddNvMap(context, new NvMapHandle(size));
@ -122,7 +122,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap
map.Align = args.Align; map.Align = args.Align;
map.Kind = (byte)args.Kind; map.Kind = (byte)args.Kind;
int size = IntUtils.AlignUp(map.Size, NvGpuVmm.PageSize); int size = BitUtils.AlignUp(map.Size, NvGpuVmm.PageSize);
long address = args.Address; long address = args.Address;

25
Ryujinx.HLE/Utilities/IntUtils.cs
View file

@ -1,25 +0,0 @@
namespace Ryujinx.HLE.Utilities
{
static class IntUtils
{
public static int AlignUp(int value, int size)
{
return (value + (size - 1)) & ~(size - 1);
}
public static long AlignUp(long value, int size)
{
return (value + (size - 1)) & ~((long)size - 1);
}
public static int AlignDown(int value, int size)
{
return value & ~(size - 1);
}
public static long AlignDown(long value, int size)
{
return value & ~((long)size - 1);
}
}
}