mirrors/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2024-11-14 10:49:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove unneeded code

Browse source
This commit is contained in:
Alex Barney 2019-02-03 13:57:25 -06:00
parent 0520c25c37
commit d2f7aa52dc
3 changed files with 81 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/LibHac/IO/RomFs/HierarchicalRomFileTable.cs
View file

@ -55,7 +55,7 @@ namespace LibHac.IO.RomFs
return FileTable.GetEntryData().ToArray(); return FileTable.GetEntryData().ToArray();
} }
public bool OpenFile(string path, out RomFileInfo fileInfo) public bool TryOpenFile(string path, out RomFileInfo fileInfo)
{ {
FindFileRecursive(GetUtf8Bytes(path), out RomEntryKey key); FindFileRecursive(GetUtf8Bytes(path), out RomEntryKey key);
@ -69,9 +69,9 @@ namespace LibHac.IO.RomFs
return false; return false;
} }
public bool OpenFile(int offset, out RomFileInfo fileInfo) public bool TryOpenFile(int fileId, out RomFileInfo fileInfo)
{ {
if (FileTable.TryGetValue(offset, out RomKeyValuePair<FileRomEntry> keyValuePair)) if (FileTable.TryGetValue(fileId, out RomKeyValuePair<FileRomEntry> keyValuePair))
{ {
fileInfo = keyValuePair.Value.Info; fileInfo = keyValuePair.Value.Info;
return true; return true;
@ -81,7 +81,7 @@ namespace LibHac.IO.RomFs
return false; return false;
} }
public bool OpenDirectory(string path, out FindPosition position) public bool TryOpenDirectory(string path, out FindPosition position)
{ {
FindDirectoryRecursive(GetUtf8Bytes(path), out RomEntryKey key); FindDirectoryRecursive(GetUtf8Bytes(path), out RomEntryKey key);
@ -95,9 +95,9 @@ namespace LibHac.IO.RomFs
return false; return false;
} }
public bool OpenDirectory(int offset, out FindPosition position) public bool TryOpenDirectory(int directoryId, out FindPosition position)
{ {
if (DirectoryTable.TryGetValue(offset, out RomKeyValuePair<DirectoryRomEntry> keyValuePair)) if (DirectoryTable.TryGetValue(directoryId, out RomKeyValuePair<DirectoryRomEntry> keyValuePair))
{ {
position = keyValuePair.Value.Pos; position = keyValuePair.Value.Pos;
return true; return true;
@ -107,11 +107,6 @@ namespace LibHac.IO.RomFs
return false; return false;
} }
private static ReadOnlySpan<byte> GetUtf8Bytes(string value)
{
return Encoding.UTF8.GetBytes(value).AsSpan();
}
public bool FindNextFile(ref FindPosition position, out RomFileInfo info, out string name) public bool FindNextFile(ref FindPosition position, out RomFileInfo info, out string name)
{ {
if (position.NextFile == -1) if (position.NextFile == -1)
@ -145,6 +140,26 @@ namespace LibHac.IO.RomFs
return true; return true;
} }
public void CreateFile(string path, ref RomFileInfo fileInfo)
{
path = PathTools.Normalize(path);
ReadOnlySpan<byte> pathBytes = GetUtf8Bytes(path);
CreateFileRecursiveInternal(pathBytes, ref fileInfo);
}
public void CreateDirectory(string path)
{
path = PathTools.Normalize(path);
CreateDirectoryRecursive(GetUtf8Bytes(path));
}
private static ReadOnlySpan<byte> GetUtf8Bytes(string value)
{
return Encoding.UTF8.GetBytes(value).AsSpan();
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
private static string GetUtf8String(ReadOnlySpan<byte> value) private static string GetUtf8String(ReadOnlySpan<byte> value)
{ {
@ -163,22 +178,7 @@ namespace LibHac.IO.RomFs
entry.Pos.NextDirectory = -1; entry.Pos.NextDirectory = -1;
entry.Pos.NextFile = -1; entry.Pos.NextFile = -1;
DirectoryTable.Insert(ref key, ref entry); DirectoryTable.Add(ref key, ref entry);
}
public void CreateFile(string path, ref RomFileInfo fileInfo)
{
path = PathTools.Normalize(path);
ReadOnlySpan<byte> pathBytes = GetUtf8Bytes(path);
CreateFileRecursiveInternal(pathBytes, ref fileInfo);
}
public void CreateDirectory(string path)
{
path = PathTools.Normalize(path);
CreateDirectoryRecursive(GetUtf8Bytes(path));
} }
private void CreateDirectoryRecursive(ReadOnlySpan<byte> path) private void CreateDirectoryRecursive(ReadOnlySpan<byte> path)
@ -193,7 +193,7 @@ namespace LibHac.IO.RomFs
int offset = DirectoryTable.GetOffsetFromKey(ref key); int offset = DirectoryTable.GetOffsetFromKey(ref key);
if (offset < 0) if (offset < 0)
{ {
ref DirectoryRomEntry entry = ref DirectoryTable.Insert(ref key, out offset, out _); ref DirectoryRomEntry entry = ref DirectoryTable.AddOrGet(ref key, out offset, out _, out _);
entry.NextSibling = -1; entry.NextSibling = -1;
entry.Pos.NextDirectory = -1; entry.Pos.NextDirectory = -1;
entry.Pos.NextFile = -1; entry.Pos.NextFile = -1;
@ -235,7 +235,7 @@ namespace LibHac.IO.RomFs
int offset = DirectoryTable.GetOffsetFromKey(ref key); int offset = DirectoryTable.GetOffsetFromKey(ref key);
if (offset < 0) if (offset < 0)
{ {
ref DirectoryRomEntry entry = ref DirectoryTable.Insert(ref key, out offset, out _); ref DirectoryRomEntry entry = ref DirectoryTable.AddOrGet(ref key, out offset, out _, out _);
entry.NextSibling = -1; entry.NextSibling = -1;
entry.Pos.NextDirectory = -1; entry.Pos.NextDirectory = -1;
entry.Pos.NextFile = -1; entry.Pos.NextFile = -1;
@ -265,7 +265,7 @@ namespace LibHac.IO.RomFs
} }
{ {
ref FileRomEntry entry = ref FileTable.Insert(ref key, out int offset, out _); ref FileRomEntry entry = ref FileTable.AddOrGet(ref key, out int offset, out _, out _);
entry.NextSibling = -1; entry.NextSibling = -1;
entry.Info = fileInfo; entry.Info = fileInfo;

143
src/LibHac/IO/RomFs/RomFsDictionary.cs
View file

@ -42,18 +42,7 @@ namespace LibHac.IO.RomFs
public bool TryGetValue(ref RomEntryKey key, out RomKeyValuePair<T> value) public bool TryGetValue(ref RomEntryKey key, out RomKeyValuePair<T> value)
{ {
int i = FindEntry(ref key); return TryGetValue(GetOffsetFromKey(ref key), out value);
if (i >= 0)
{
ref RomFsEntry entry = ref GetEntryReference(i);
value = new RomKeyValuePair<T> { Key = key, Value = entry.Value, Offset = i };
return true;
}
value = default;
return false;
} }
public bool TryGetValue(int offset, out RomKeyValuePair<T> value) public bool TryGetValue(int offset, out RomKeyValuePair<T> value)
@ -71,78 +60,75 @@ namespace LibHac.IO.RomFs
value.Key.Name = name; value.Key.Name = name;
value.Value = entry.Value; value.Value = entry.Value;
value.Key.Parent = entry.Parent; value.Key.Parent = entry.Parent;
value.Offset = offset;
return true; return true;
} }
public bool TrySetValue(ref RomEntryKey key, ref T value) public ref T GetValueReference(int offset)
{ {
int i = FindEntry(ref key); ref RomFsEntry entry = ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0];
if (i < 0) return false;
ref RomFsEntry entry = ref GetEntryReference(i);
entry.Value = value;
return true;
}
public ref T GetValue(int offset, out Span<byte> name)
{
ref RomFsEntry entry = ref GetEntryReference(offset, out name);
return ref entry.Value; return ref entry.Value;
} }
public bool ContainsKey(ref RomEntryKey key) => FindEntry(ref key) >= 0; public ref T GetValueReference(int offset, out Span<byte> name)
public int Insert(ref RomEntryKey key, ref T value)
{ {
if (ContainsKey(ref key)) ref RomFsEntry entry = ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0];
name = Entries.AsSpan(offset + _sizeOfEntry, entry.KeyLength);
return ref entry.Value;
}
public bool ContainsKey(ref RomEntryKey key) => GetOffsetFromKey(ref key) >= 0;
public int Add(ref RomEntryKey key, ref T value)
{
ref T entry = ref AddOrGet(ref key, out int offset, out bool alreadyExists, out _);
if (alreadyExists)
{ {
throw new ArgumentException("Key already exists in dictionary."); throw new ArgumentException("Key already exists in dictionary.");
} }
uint hashCode = key.GetRomHashCode(); entry = value;
int bucket = (int)(hashCode % Buckets.Length); return offset;
int newOffset = FindOffsetForInsert(key.Name.Length);
ref RomFsEntry entry = ref GetEntryReference(newOffset, out Span<byte> name, key.Name.Length);
entry.Next = Buckets[bucket];
entry.Parent = key.Parent;
entry.KeyLength = key.Name.Length;
entry.Value = value;
key.Name.CopyTo(name);
Buckets[bucket] = newOffset;
_count++;
return newOffset;
} }
public ref T Insert(ref RomEntryKey key, out int offset, out Span<byte> name) public ref T AddOrGet(ref RomEntryKey key, out int offset, out bool alreadyExists, out Span<byte> name)
{ {
uint hashCode = key.GetRomHashCode(); int oldOffset = GetOffsetFromKey(ref key);
int bucket = (int)(hashCode % Buckets.Length); if (oldOffset >= 0)
int newOffset = FindOffsetForInsert(key.Name.Length); {
alreadyExists = true;
offset = oldOffset;
ref RomFsEntry entry = ref GetEntryReference(newOffset, out name, key.Name.Length); ref RomFsEntry entry = ref GetEntryReference(oldOffset, out name);
return ref entry.Value;
}
else
{
int newOffset = CreateNewEntry(key.Name.Length);
alreadyExists = false;
offset = newOffset;
entry.KeyLength = key.Name.Length; ref RomFsEntry entry = ref GetEntryReference(newOffset, out name, key.Name.Length);
entry.Next = Buckets[bucket]; entry.Parent = key.Parent;
entry.Parent = key.Parent; entry.KeyLength = key.Name.Length;
key.Name.CopyTo(name); key.Name.CopyTo(name);
Buckets[bucket] = newOffset; int bucket = (int)(key.GetRomHashCode() % Buckets.Length);
_count++;
offset = newOffset; entry.Next = Buckets[bucket];
return ref entry.Value; Buckets[bucket] = newOffset;
_count++;
return ref entry.Value;
}
} }
private int FindOffsetForInsert(int nameLength) private int CreateNewEntry(int nameLength)
{ {
int bytesNeeded = Util.AlignUp(_sizeOfEntry + nameLength, 4); int bytesNeeded = Util.AlignUp(_sizeOfEntry + nameLength, 4);
@ -157,27 +143,6 @@ namespace LibHac.IO.RomFs
return offset; return offset;
} }
private int FindEntry(ref RomEntryKey key)
{
uint hashCode = key.GetRomHashCode();
int index = (int)(hashCode % Buckets.Length);
int i = Buckets[index];
while (i != -1)
{
ref RomFsEntry entry = ref GetEntryReference(i, out Span<byte> name);
if (key.Parent == entry.Parent && key.Name.SequenceEqual(name))
{
break;
}
i = entry.Next;
}
return i;
}
public int GetOffsetFromKey(ref RomEntryKey key) public int GetOffsetFromKey(ref RomEntryKey key)
{ {
uint hashCode = key.GetRomHashCode(); uint hashCode = key.GetRomHashCode();
@ -225,7 +190,7 @@ namespace LibHac.IO.RomFs
} }
} }
public int CountEntries() private int CountEntries()
{ {
int count = 0; int count = 0;
int nextStructOffset = (sizeof(int) + Marshal.SizeOf<T>()) / 4; int nextStructOffset = (sizeof(int) + Marshal.SizeOf<T>()) / 4;
@ -266,20 +231,6 @@ namespace LibHac.IO.RomFs
Buckets = newBuckets; Buckets = newBuckets;
} }
public ref T GetValueReference(int offset)
{
ref RomFsEntry entry = ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0];
return ref entry.Value;
}
public ref T GetValueReference(int offset, out Span<byte> name)
{
ref RomFsEntry entry = ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0];
name = Entries.AsSpan(offset + _sizeOfEntry, entry.KeyLength);
return ref entry.Value;
}
private ref RomFsEntry GetEntryReference(int offset) private ref RomFsEntry GetEntryReference(int offset)
{ {
return ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0]; return ref MemoryMarshal.Cast<byte, RomFsEntry>(Entries.AsSpan(offset))[0];

8
src/LibHac/IO/RomFs/RomFsFileSystem.cs
View file

@ -43,7 +43,7 @@ namespace LibHac.IO.RomFs
{ {
path = PathTools.Normalize(path); path = PathTools.Normalize(path);
if (!FileTable.OpenDirectory(path, out FindPosition position)) if (!FileTable.TryOpenDirectory(path, out FindPosition position))
{ {
throw new DirectoryNotFoundException(); throw new DirectoryNotFoundException();
} }
@ -55,7 +55,7 @@ namespace LibHac.IO.RomFs
{ {
path = PathTools.Normalize(path); path = PathTools.Normalize(path);
if (!FileTable.OpenFile(path, out RomFileInfo info)) if (!FileTable.TryOpenFile(path, out RomFileInfo info))
{ {
throw new FileNotFoundException(); throw new FileNotFoundException();
} }
@ -72,14 +72,14 @@ namespace LibHac.IO.RomFs
{ {
path = PathTools.Normalize(path); path = PathTools.Normalize(path);
return FileTable.OpenDirectory(path, out FindPosition _); return FileTable.TryOpenDirectory(path, out FindPosition _);
} }
public bool FileExists(string path) public bool FileExists(string path)
{ {
path = PathTools.Normalize(path); path = PathTools.Normalize(path);
return FileTable.OpenFile(path, out RomFileInfo _); return FileTable.TryOpenFile(path, out RomFileInfo _);
} }
public IStorage GetBaseStorage() public IStorage GetBaseStorage()