diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2018-02-25 22:44:30 -0300 |
|---|---|---|
| committer | gdkchan <gab.dark.100@gmail.com> | 2018-02-25 22:44:30 -0300 |
| commit | 13214ffa43f65686a9a5a99ca1c78b6c405a34db (patch) | |
| tree | 586abccc81798622fc8d2410d87157d9fc71df86 /Ryujinx.Core/OsHle/Process.cs | |
| parent | 950011c90fe28fe9edd8ebe0d0a771f6adcff7a1 (diff) | |
Fix regression introduced on last commit with wrong ImageEnd
Diffstat (limited to 'Ryujinx.Core/OsHle/Process.cs')
| -rw-r--r-- | Ryujinx.Core/OsHle/Process.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Ryujinx.Core/OsHle/Process.cs b/Ryujinx.Core/OsHle/Process.cs index 60e71ee9..9ca9a2bd 100644 --- a/Ryujinx.Core/OsHle/Process.cs +++ b/Ryujinx.Core/OsHle/Process.cs @@ -113,9 +113,11 @@ namespace Ryujinx.Core.OsHle if (UseHbAbi) { - Homebrew Homebrew_ABI = new Homebrew(Memory, Executables[0].ImageEnd, (long)Handle); + long HbAbiDataPosition = (Executables[0].ImageEnd + 0xfff) & ~0xfff; - MainThread.Thread.ThreadState.X0 = (ulong)Executables[0].ImageEnd; + Homebrew.WriteHbAbiData(Memory, HbAbiDataPosition, Handle); + + MainThread.Thread.ThreadState.X0 = (ulong)HbAbiDataPosition; MainThread.Thread.ThreadState.X1 = ulong.MaxValue; } @@ -223,14 +225,12 @@ namespace Ryujinx.Core.OsHle { foreach (KeyValuePair<long, string> KV in Exe.SymbolTable) { - SymbolTable.Add(Exe.ImageBase + KV.Key, KV.Value); + SymbolTable.TryAdd(Exe.ImageBase + KV.Key, KV.Value); } } Translator = new ATranslator(SymbolTable); - - Translator.CpuTrace += CpuTraceHandler; } @@ -239,7 +239,7 @@ namespace Ryujinx.Core.OsHle private void CpuTraceHandler(object sender, ACpuTraceEventArgs e) { - Logging.Info($"Executing at 0x{e.Position:x16} {e.SubName}"); + Logging.Trace($"Executing at 0x{e.Position:x16} {e.SubName}"); } private int GetFreeTlsSlot(AThread Thread) |