More flexible memory manager (#307)
* Keep track mapped buffers with fixed offsets * Started rewriting the memory manager * Initial support for MapPhysicalMemory and UnmapPhysicalMemory, other tweaks * MapPhysicalMemory/UnmapPhysicalMemory support, other tweaks * Rebased * Optimize the map/unmap physical memory svcs * Integrate shared font support * Fix address space reserve alignment * Some fixes related to gpu memory mapping * Some cleanup * Only try uploading const buffers that are really used * Check if memory region is contiguous * Rebased * Add missing count increment on IsRegionModified * Check for reads/writes outside of the address space, optimize translation with a tail call
This commit is contained in:
parent
76d95dee05
commit
c393cdf8e3
64 changed files with 3289 additions and 1852 deletions
122
Ryujinx.HLE/OsHle/Font/SharedFontManager.cs
Normal file
122
Ryujinx.HLE/OsHle/Font/SharedFontManager.cs
Normal file
|
@ -0,0 +1,122 @@
|
|||
using Ryujinx.HLE.Memory;
|
||||
using Ryujinx.HLE.OsHle.Utilities;
|
||||
using Ryujinx.HLE.Resource;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
namespace Ryujinx.HLE.OsHle.Font
|
||||
{
|
||||
class SharedFontManager
|
||||
{
|
||||
private DeviceMemory Memory;
|
||||
|
||||
private long PhysicalAddress;
|
||||
|
||||
private string FontsPath;
|
||||
|
||||
private struct FontInfo
|
||||
{
|
||||
public int Offset;
|
||||
public int Size;
|
||||
|
||||
public FontInfo(int Offset, int Size)
|
||||
{
|
||||
this.Offset = Offset;
|
||||
this.Size = Size;
|
||||
}
|
||||
}
|
||||
|
||||
private Dictionary<SharedFontType, FontInfo> FontData;
|
||||
|
||||
public SharedFontManager(Switch Device, long PhysicalAddress)
|
||||
{
|
||||
this.PhysicalAddress = PhysicalAddress;
|
||||
|
||||
Memory = Device.Memory;
|
||||
|
||||
FontsPath = Path.Combine(Device.VFs.GetSystemPath(), "fonts");
|
||||
}
|
||||
|
||||
public void EnsureInitialized()
|
||||
{
|
||||
if (FontData == null)
|
||||
{
|
||||
Memory.FillWithZeros(PhysicalAddress, Horizon.FontSize);
|
||||
|
||||
uint FontOffset = 0;
|
||||
|
||||
FontInfo CreateFont(string Name)
|
||||
{
|
||||
string FontFilePath = Path.Combine(FontsPath, Name + ".ttf");
|
||||
|
||||
if (File.Exists(FontFilePath))
|
||||
{
|
||||
byte[] Data = File.ReadAllBytes(FontFilePath);
|
||||
|
||||
FontInfo Info = new FontInfo((int)FontOffset, Data.Length);
|
||||
|
||||
WriteMagicAndSize(PhysicalAddress + FontOffset, Data.Length);
|
||||
|
||||
FontOffset += 8;
|
||||
|
||||
uint Start = FontOffset;
|
||||
|
||||
for (; FontOffset - Start < Data.Length; FontOffset++)
|
||||
{
|
||||
Memory.WriteByte(PhysicalAddress + FontOffset, Data[FontOffset - Start]);
|
||||
}
|
||||
|
||||
return Info;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new InvalidSystemResourceException($"Font \"{Name}.ttf\" not found. Please provide it in \"{FontsPath}\".");
|
||||
}
|
||||
}
|
||||
|
||||
FontData = new Dictionary<SharedFontType, FontInfo>()
|
||||
{
|
||||
{ SharedFontType.JapanUsEurope, CreateFont("FontStandard") },
|
||||
{ SharedFontType.SimplifiedChinese, CreateFont("FontChineseSimplified") },
|
||||
{ SharedFontType.SimplifiedChineseEx, CreateFont("FontExtendedChineseSimplified") },
|
||||
{ SharedFontType.TraditionalChinese, CreateFont("FontChineseTraditional") },
|
||||
{ SharedFontType.Korean, CreateFont("FontKorean") },
|
||||
{ SharedFontType.NintendoEx, CreateFont("FontNintendoExtended") }
|
||||
};
|
||||
|
||||
if (FontOffset > Horizon.FontSize)
|
||||
{
|
||||
throw new InvalidSystemResourceException(
|
||||
$"The sum of all fonts size exceed the shared memory size. " +
|
||||
$"Please make sure that the fonts don't exceed {Horizon.FontSize} bytes in total. " +
|
||||
$"(actual size: {FontOffset} bytes).");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void WriteMagicAndSize(long Position, int Size)
|
||||
{
|
||||
const int DecMagic = 0x18029a7f;
|
||||
const int Key = 0x49621806;
|
||||
|
||||
int EncryptedSize = EndianSwap.Swap32(Size ^ Key);
|
||||
|
||||
Memory.WriteInt32(Position + 0, DecMagic);
|
||||
Memory.WriteInt32(Position + 4, EncryptedSize);
|
||||
}
|
||||
|
||||
public int GetFontSize(SharedFontType FontType)
|
||||
{
|
||||
EnsureInitialized();
|
||||
|
||||
return FontData[FontType].Size;
|
||||
}
|
||||
|
||||
public int GetSharedMemoryAddressOffset(SharedFontType FontType)
|
||||
{
|
||||
EnsureInitialized();
|
||||
|
||||
return FontData[FontType].Offset + 8;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue