mirror of
https://github.com/par274/sharpemu.git
synced 2026-07-25 20:28:48 +08:00
Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 90fdd20f9a | |||
| ae5ef0abe7 | |||
| 5e2c21edf1 | |||
| 3fb9d4db1c | |||
| de13735972 | |||
| fc0efca297 | |||
| 2a9a261913 | |||
| 290f5fd3d7 | |||
| c06c70cad7 | |||
| 5e54250752 | |||
| be6a6a5935 | |||
| caf859cc52 | |||
| d2f3511002 | |||
| 90a5d5176f | |||
| 28a43e09c7 | |||
| 093cfa1f3e | |||
| d8397b022e | |||
| 85cc2b9892 | |||
| 293194c40b | |||
| 1f09de8896 |
Binary file not shown.
|
After Width: | Height: | Size: 698 B |
Binary file not shown.
|
After Width: | Height: | Size: 802 B |
@@ -0,0 +1,172 @@
|
||||
# Copyright (C) 2026 SharpEmu Emulator Project
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#!/usr/bin/env python3
|
||||
|
||||
"""Offline check: SysAbiExport ExportName must hash to its Nid (name2nid).
|
||||
|
||||
NIDs absent from aerolib.bin are skipped (unknown/unresolved symbols).
|
||||
Known historic mislabels may be allowlisted with a one-line reason.
|
||||
|
||||
Run from the repository root:
|
||||
python scripts/check_sysabi_aerolib.py
|
||||
python scripts/check_sysabi_aerolib.py --strict
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import hashlib
|
||||
import re
|
||||
import struct
|
||||
import sys
|
||||
from base64 import b64encode as base64enc
|
||||
from binascii import unhexlify as uhx
|
||||
from pathlib import Path
|
||||
|
||||
SRC_ROOT = Path("src")
|
||||
AEROLIB_BIN = Path("src/SharpEmu.HLE/Aerolib/aerolib.bin")
|
||||
SYSABI_EXPORT_RE = re.compile(r"\[SysAbiExport\((.*?)\)\]", re.DOTALL)
|
||||
NID_RE = re.compile(r'Nid\s*=\s*"([^"]+)"')
|
||||
EXPORT_NAME_RE = re.compile(r'ExportName\s*=\s*"([^"]+)"')
|
||||
|
||||
# NID -> reason. Keep minimal; fix ExportName when safe instead of growing this list.
|
||||
ALLOWLISTED_NIDS: dict[str, str] = {
|
||||
"KMcEa+rHsIo": "Historic kernel MapMemory stub bound to sceAvPlayerAddSource NID; API rewrite deferred.",
|
||||
"WV1GwM32NgY": "Historic WebApi2 init alias for PushEventCreateHandle NID; ABI rewrite deferred.",
|
||||
}
|
||||
|
||||
|
||||
def name2nid(name: str) -> str:
|
||||
symbol = hashlib.sha1(name.encode() + uhx("518D64A635DED8C1E6B039B1C3E55230")).digest()
|
||||
id_val = struct.unpack("<Q", symbol[:8])[0]
|
||||
nid = base64enc(uhx("%016x" % id_val), b"+-").rstrip(b"=")
|
||||
return nid.decode("utf-8")
|
||||
|
||||
|
||||
def find_repo_root() -> Path:
|
||||
cwd = Path.cwd()
|
||||
if (cwd / SRC_ROOT).is_dir() and (cwd / "scripts").is_dir():
|
||||
return cwd
|
||||
script_root = Path(__file__).resolve().parent.parent
|
||||
if (script_root / SRC_ROOT).is_dir():
|
||||
return script_root
|
||||
raise SystemExit("Run from the repository root (src/ and scripts/ expected).")
|
||||
|
||||
|
||||
def load_aerolib_nids(aerolib_path: Path) -> set[str]:
|
||||
data = aerolib_path.read_bytes()
|
||||
if len(data) < 4:
|
||||
raise SystemExit(f"Aerolib binary too small: {aerolib_path}")
|
||||
|
||||
count = struct.unpack_from("<I", data, 0)[0]
|
||||
offset = 4
|
||||
nids: set[str] = set()
|
||||
for _ in range(count):
|
||||
if offset >= len(data):
|
||||
raise SystemExit(f"Truncated aerolib.bin while reading NIDs: {aerolib_path}")
|
||||
nid_len = data[offset]
|
||||
offset += 1
|
||||
nid = data[offset : offset + nid_len].decode("utf-8")
|
||||
offset += nid_len
|
||||
if offset + 2 > len(data):
|
||||
raise SystemExit(f"Truncated aerolib.bin name length: {aerolib_path}")
|
||||
name_len = struct.unpack_from("<H", data, offset)[0]
|
||||
offset += 2 + name_len
|
||||
nids.add(nid)
|
||||
return nids
|
||||
|
||||
|
||||
def iter_sysabi_exports(cs_path: Path, text: str):
|
||||
for match in SYSABI_EXPORT_RE.finditer(text):
|
||||
block = match.group(1)
|
||||
nid_match = NID_RE.search(block)
|
||||
export_match = EXPORT_NAME_RE.search(block)
|
||||
if nid_match is None or export_match is None:
|
||||
continue
|
||||
|
||||
nid = nid_match.group(1)
|
||||
export_name = export_match.group(1)
|
||||
nid_attr = f'Nid = "{nid}"'
|
||||
abs_pos = text.find(nid_attr, match.start(), match.end())
|
||||
if abs_pos < 0:
|
||||
abs_pos = match.start()
|
||||
line = text.count("\n", 0, abs_pos) + 1
|
||||
yield cs_path, line, nid, export_name
|
||||
|
||||
|
||||
def scan(src_root: Path, catalog_nids: set[str]):
|
||||
checked = 0
|
||||
mismatches = []
|
||||
skipped_no_catalog = 0
|
||||
allowlisted = 0
|
||||
|
||||
for cs_path in sorted(src_root.rglob("*.cs")):
|
||||
text = cs_path.read_text(encoding="utf-8")
|
||||
for path, line, nid, export_name in iter_sysabi_exports(cs_path, text):
|
||||
checked += 1
|
||||
computed = name2nid(export_name)
|
||||
if computed == nid:
|
||||
continue
|
||||
|
||||
if nid not in catalog_nids:
|
||||
skipped_no_catalog += 1
|
||||
continue
|
||||
|
||||
if nid in ALLOWLISTED_NIDS:
|
||||
allowlisted += 1
|
||||
continue
|
||||
|
||||
mismatches.append((path, line, nid, export_name, computed))
|
||||
|
||||
return checked, mismatches, skipped_no_catalog, allowlisted
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Check that SysAbiExport ExportName values hash to their Nid via name2nid."
|
||||
)
|
||||
parser.add_argument(
|
||||
"--strict",
|
||||
action="store_true",
|
||||
help="Exit 1 when any non-skipped/non-allowlisted ExportName does not hash to its Nid.",
|
||||
)
|
||||
parser.add_argument(
|
||||
"--quiet",
|
||||
action="store_true",
|
||||
help="Print only the summary line.",
|
||||
)
|
||||
args = parser.parse_args()
|
||||
|
||||
repo_root = find_repo_root()
|
||||
aerolib_path = repo_root / AEROLIB_BIN
|
||||
if not aerolib_path.is_file():
|
||||
raise SystemExit(f"Missing Aerolib catalog: {aerolib_path.as_posix()}")
|
||||
|
||||
catalog_nids = load_aerolib_nids(aerolib_path)
|
||||
checked, mismatches, skipped_no_catalog, allowlisted = scan(
|
||||
repo_root / SRC_ROOT, catalog_nids
|
||||
)
|
||||
ok = checked - len(mismatches) - skipped_no_catalog - allowlisted
|
||||
|
||||
if not args.quiet:
|
||||
for path, line, nid, export_name, computed in mismatches:
|
||||
rel = path.relative_to(repo_root).as_posix()
|
||||
print(
|
||||
f"{rel}:{line}: NID={nid} ExportName={export_name!r} "
|
||||
f"computed={computed}"
|
||||
)
|
||||
|
||||
print(
|
||||
f"checked={checked} ok={ok} fail={len(mismatches)} "
|
||||
f"skipped_no_catalog={skipped_no_catalog} allowlisted={allowlisted} "
|
||||
f"allowlist_size={len(ALLOWLISTED_NIDS)}"
|
||||
)
|
||||
|
||||
if args.strict and mismatches:
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -154449,3 +154449,9 @@ vector_str_substr
|
||||
WTFAnnotateBenignRaceSized
|
||||
WTFAnnotateHappensAfter
|
||||
WTFAnnotateHappensBefore
|
||||
_sceUlobjmgrRegisterObject
|
||||
_sceUlobjmgrUnregisterObject
|
||||
sceNpEAAccessInitialize
|
||||
sceNpEAAccessTerminate
|
||||
sceNpHasEAAccessSubscription
|
||||
sceNpHasEAAccessSubscriptionAbortRequest
|
||||
|
||||
@@ -5,6 +5,7 @@ using SharpEmu.Core.Runtime;
|
||||
using SharpEmu.Core.Cpu;
|
||||
using SharpEmu.GUI;
|
||||
using SharpEmu.HLE;
|
||||
using SharpEmu.Libs.VideoOut;
|
||||
using SharpEmu.Logging;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
@@ -111,8 +112,16 @@ internal static partial class Program
|
||||
using var runtime = SharpEmuRuntime.CreateDefault(runtimeOptions);
|
||||
|
||||
OrbisGen2Result result;
|
||||
ConsoleCancelEventHandler? cancelHandler = null;
|
||||
try
|
||||
{
|
||||
cancelHandler = (_, eventArgs) =>
|
||||
{
|
||||
eventArgs.Cancel = true;
|
||||
VideoOutExports.NotifyHostInterrupt();
|
||||
};
|
||||
Console.CancelKeyPress += cancelHandler;
|
||||
|
||||
Console.Error.WriteLine($"[DEBUG] Running: {ebootPath}");
|
||||
result = runtime.Run(ebootPath);
|
||||
Console.Error.WriteLine($"[DEBUG] Result: {result}");
|
||||
@@ -123,6 +132,13 @@ internal static partial class Program
|
||||
Log.Error("SharpEmu failed to run.", ex);
|
||||
return 3;
|
||||
}
|
||||
finally
|
||||
{
|
||||
if (cancelHandler is not null)
|
||||
{
|
||||
Console.CancelKeyPress -= cancelHandler;
|
||||
}
|
||||
}
|
||||
|
||||
Log.Info($"SharpEmu execution completed. Result={result} (0x{(int)result:X8})");
|
||||
if (!string.IsNullOrWhiteSpace(runtime.LastSessionSummary))
|
||||
|
||||
@@ -238,6 +238,22 @@ public sealed partial class DirectExecutionBackend
|
||||
cpuContext[CpuRegister.Rax] = 0uL;
|
||||
return 0uL;
|
||||
}
|
||||
if (_hostShutdownRequested)
|
||||
{
|
||||
if (isGuestWorker &&
|
||||
TryYieldGuestThreadToHostStub(argPackPtr, num, num7, importStubEntry.Nid, "host shutdown"))
|
||||
{
|
||||
cpuContext[CpuRegister.Rax] = 0uL;
|
||||
return 0uL;
|
||||
}
|
||||
|
||||
if (!isGuestWorker &&
|
||||
TryAbortGuestForHostShutdown(argPackPtr, num, num7))
|
||||
{
|
||||
cpuContext[CpuRegister.Rax] = 1uL;
|
||||
return 1uL;
|
||||
}
|
||||
}
|
||||
bool flag0 = ShouldSuppressStrlenTrace(importStubEntry.Nid);
|
||||
bool flag = num7 >= 2156221920u && num7 <= 2156225024u;
|
||||
bool flag2 = num7 >= 2156351360u && num7 <= 2156352080u;
|
||||
@@ -814,10 +830,10 @@ public sealed partial class DirectExecutionBackend
|
||||
return !_logUsleep;
|
||||
}
|
||||
|
||||
// Only mutex/rwlock *lock* is excluded: it may block a contended acquire, which the
|
||||
// leaf path can't. unlock never blocks and stays here — routing it off the fast path
|
||||
// slows guest spinlocks enough to livelock (Demon's Souls).
|
||||
// Mutex lock uses this block-capable leaf path. Keep it out of the no-block subset.
|
||||
return nid is
|
||||
"9UK1vLZQft4" or // scePthreadMutexLock
|
||||
"7H0iTOciTLo" or // pthread_mutex_lock
|
||||
"tn3VlD0hG60" or // scePthreadMutexUnlock
|
||||
"2Z+PpY6CaJg" or // pthread_mutex_unlock
|
||||
"EgmLo6EWgso" or // pthread_rwlock_unlock
|
||||
@@ -975,6 +991,31 @@ public sealed partial class DirectExecutionBackend
|
||||
return true;
|
||||
}
|
||||
|
||||
private unsafe bool TryAbortGuestForHostShutdown(nint argPackPtr, long dispatchIndex, ulong returnRip)
|
||||
{
|
||||
ulong hostExit = ActiveEntryReturnSentinelRip;
|
||||
if (hostExit < 65536 || !TryPatchActiveGuestReturnSlot(hostExit))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
try
|
||||
{
|
||||
*(ulong*)(argPackPtr + 96) = hostExit;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return false;
|
||||
}
|
||||
ActiveForcedGuestExit = true;
|
||||
if (string.IsNullOrWhiteSpace(LastError))
|
||||
{
|
||||
LastError = "Host shutdown requested.";
|
||||
}
|
||||
Console.Error.WriteLine(
|
||||
$"[LOADER][INFO] Guest unwind for host shutdown at import#{dispatchIndex} ret=0x{returnRip:X16} -> host_exit=0x{hostExit:X16}");
|
||||
return true;
|
||||
}
|
||||
|
||||
private unsafe bool TryCompleteGuestEntryToHostStub(nint argPackPtr, long dispatchIndex, ulong returnRip, string nid, string reason, ulong value)
|
||||
{
|
||||
ulong hostExit = ActiveEntryReturnSentinelRip;
|
||||
|
||||
@@ -576,6 +576,10 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
|
||||
// thread entering a freed stub).
|
||||
private volatile bool _guestTeardownRequested;
|
||||
|
||||
private volatile bool _hostShutdownRequested;
|
||||
|
||||
private static volatile DirectExecutionBackend? _activeSessionBackend;
|
||||
|
||||
private int _readyGuestThreadCount;
|
||||
|
||||
private readonly Dictionary<ulong, GuestThreadState> _guestThreads = new Dictionary<ulong, GuestThreadState>();
|
||||
@@ -812,7 +816,8 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
|
||||
|
||||
private bool ActiveForcedGuestExit
|
||||
{
|
||||
get => HasActiveExecutionThread ? _activeForcedGuestExit : _forcedGuestExit;
|
||||
get => _hostShutdownRequested ||
|
||||
(HasActiveExecutionThread ? _activeForcedGuestExit : _forcedGuestExit);
|
||||
set
|
||||
{
|
||||
if (HasActiveExecutionThread)
|
||||
@@ -974,7 +979,10 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
|
||||
_importLoopGuardSeconds = GetImportLoopGuardSeconds();
|
||||
_entryReturnSentinelRip = 0uL;
|
||||
_forcedGuestExit = false;
|
||||
_hostShutdownRequested = false;
|
||||
_guestTeardownRequested = false;
|
||||
_activeSessionBackend = this;
|
||||
HostSessionControl.SetShutdownHandler(RequestHostShutdown);
|
||||
_importLoopSignatureCount = 0;
|
||||
_importLoopSignatureWriteIndex = 0;
|
||||
_importLoopPatternHits = 0;
|
||||
@@ -1022,12 +1030,28 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
|
||||
}
|
||||
finally
|
||||
{
|
||||
HostSessionControl.SetShutdownHandler(null);
|
||||
if (ReferenceEquals(_activeSessionBackend, this))
|
||||
{
|
||||
_activeSessionBackend = null;
|
||||
}
|
||||
DrainDeferredBootstrapTraces();
|
||||
GuestThreadExecution.Scheduler = previousGuestThreadScheduler;
|
||||
Console.Error.WriteLine("[LOADER][INFO] === Execute END (LastError: " + (LastError ?? "null") + ") ===");
|
||||
}
|
||||
}
|
||||
|
||||
internal void RequestHostShutdown(string reason)
|
||||
{
|
||||
_hostShutdownRequested = true;
|
||||
_forcedGuestExit = true;
|
||||
_guestTeardownRequested = true;
|
||||
LastError = string.IsNullOrWhiteSpace(reason)
|
||||
? "Host shutdown requested."
|
||||
: $"Host shutdown requested: {reason}";
|
||||
Console.Error.WriteLine($"[LOADER][INFO] {LastError}");
|
||||
}
|
||||
|
||||
private bool SetupImportStubs(IReadOnlyDictionary<ulong, string> importStubs)
|
||||
{
|
||||
Console.Error.WriteLine($"[LOADER][INFO] Setting up {importStubs.Count} import stubs...");
|
||||
@@ -4425,7 +4449,9 @@ public sealed unsafe partial class DirectExecutionBackend : INativeCpuBackend, I
|
||||
result = OrbisGen2Result.ORBIS_GEN2_ERROR_CPU_TRAP;
|
||||
if (string.IsNullOrEmpty(LastError))
|
||||
{
|
||||
LastError = "Detected repeating import loop and forced guest unwind to host.";
|
||||
LastError = _hostShutdownRequested
|
||||
? "Host shutdown requested."
|
||||
: "Detected repeating import loop and forced guest unwind to host.";
|
||||
}
|
||||
Console.Error.WriteLine("[LOADER][ERROR] " + LastError);
|
||||
RequestGuestThreadTeardown(3000);
|
||||
|
||||
@@ -17,7 +17,9 @@ namespace SharpEmu.Core.Loader;
|
||||
public sealed class SelfLoader : ISelfLoader
|
||||
{
|
||||
private static readonly SharpEmuLogger Log = SharpEmuLog.For("Loader");
|
||||
private const uint SelfMagic = 0x4F153D1D;
|
||||
private const uint ElfMagic = 0x7F454C46;
|
||||
private const uint Ps4SelfMagic = 0x4F153D1D;
|
||||
private const uint Ps5SelfMagic = 0x5414F5EE;
|
||||
private const ulong SelfSegmentFlag = 0x800;
|
||||
private const int PageSize = 0x1000;
|
||||
private const ulong ImportStubBaseAddress = 0x0000_7000_0000_0000UL;
|
||||
@@ -323,7 +325,8 @@ public sealed class SelfLoader : ISelfLoader
|
||||
throw new InvalidDataException("Input image is too small to contain an ELF header.");
|
||||
}
|
||||
|
||||
if (imageData.Length >= sizeof(uint) && BinaryPrimitives.ReadUInt32BigEndian(imageData[..sizeof(uint)]) == SelfMagic)
|
||||
var magic = BinaryPrimitives.ReadUInt32BigEndian(imageData[..sizeof(uint)]);
|
||||
if (magic is Ps4SelfMagic or Ps5SelfMagic)
|
||||
{
|
||||
var selfHeader = ReadUnmanaged<SelfHeader>(imageData, 0);
|
||||
if (!selfHeader.HasKnownLayout || selfHeader.Unknown != 0x22)
|
||||
@@ -345,6 +348,12 @@ public sealed class SelfLoader : ISelfLoader
|
||||
return new LoadContext(IsSelf: true, elfOffset, selfHeader.FileSize, segments);
|
||||
}
|
||||
|
||||
if (magic != ElfMagic)
|
||||
{
|
||||
throw new InvalidDataException(
|
||||
$"Unsupported executable signature 0x{magic:X8}");
|
||||
}
|
||||
|
||||
return new LoadContext(IsSelf: false, ElfOffset: 0, SelfFileSize: 0, Array.Empty<SelfSegment>());
|
||||
}
|
||||
|
||||
@@ -2380,10 +2389,14 @@ public sealed class SelfLoader : ISelfLoader
|
||||
public ulong FileSize => _fileSize;
|
||||
|
||||
public bool HasKnownLayout =>
|
||||
_ident0 == 0x4F &&
|
||||
_ident1 == 0x15 &&
|
||||
_ident2 == 0x3D &&
|
||||
_ident3 == 0x1D &&
|
||||
((_ident0 == 0x4F &&
|
||||
_ident1 == 0x15 &&
|
||||
_ident2 == 0x3D &&
|
||||
_ident3 == 0x1D) ||
|
||||
(_ident0 == 0x54 &&
|
||||
_ident1 == 0x14 &&
|
||||
_ident2 == 0xF5 &&
|
||||
_ident3 == 0xEE)) &&
|
||||
_ident4 == 0x00 &&
|
||||
_ident5 == 0x01 &&
|
||||
_ident6 == 0x01 &&
|
||||
|
||||
@@ -550,6 +550,47 @@ public sealed unsafe class PhysicalVirtualMemory : IVirtualMemory, IGuestMemoryA
|
||||
}
|
||||
}
|
||||
|
||||
public bool TryCompare(ulong virtualAddress, ReadOnlySpan<byte> expected)
|
||||
{
|
||||
_gate.EnterReadLock();
|
||||
try
|
||||
{
|
||||
var region = FindRegion(virtualAddress, (ulong)expected.Length);
|
||||
if (region is null ||
|
||||
!TryResolveRegionOffset(
|
||||
virtualAddress,
|
||||
(ulong)expected.Length,
|
||||
region,
|
||||
out var offset))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (expected.IsEmpty)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
var srcPtr = (void*)(region.VirtualAddress + offset);
|
||||
if (region.IsReservedOnly &&
|
||||
!EnsureRangeCommitted((ulong)srcPtr, (ulong)expected.Length, region))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!CanReadWithoutProtectionChange((ulong)srcPtr, (ulong)expected.Length, region))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return new ReadOnlySpan<byte>(srcPtr, expected.Length).SequenceEqual(expected);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_gate.ExitReadLock();
|
||||
}
|
||||
}
|
||||
|
||||
public bool TryWrite(ulong virtualAddress, ReadOnlySpan<byte> source)
|
||||
{
|
||||
var requiresExclusiveAccess = false;
|
||||
|
||||
@@ -0,0 +1,129 @@
|
||||
{
|
||||
"_languageName": "Português (Brasil)",
|
||||
|
||||
"Page.Library": "Biblioteca",
|
||||
"Page.Options": "Opções",
|
||||
"Page.GameCount.One": "1 Jogo",
|
||||
"Page.GameCount.Other": "{0} jogos",
|
||||
|
||||
"Library.SearchWatermark": "Pesquisar na biblioteca…",
|
||||
"Library.AddFolder": "+ Adicionar pasta",
|
||||
"Library.Rescan": "⟳ Atualizar biblioteca",
|
||||
"Library.OpenFile": "Abrir arquivo…",
|
||||
|
||||
"Library.Context.Launch": "Jogar",
|
||||
"Library.Context.OpenFolder": "Abrir pasta do jogo",
|
||||
"Library.Context.CopyPath": "Copiar o caminho",
|
||||
"Library.Context.CopyTitleId": "Copiar ID do título",
|
||||
"Library.Context.Remove": "Remover da biblioteca",
|
||||
|
||||
"Library.Empty.Title": "Sua biblioteca está vazia",
|
||||
"Library.Empty.Hint": "Adicione uma pasta contendo seus jogos para começar.",
|
||||
"Library.Empty.SearchTitle": "Nenhum jogo corresponde à sua busca",
|
||||
"Library.Empty.SearchHint": "Nada na biblioteca corresponde a “{0}”.",
|
||||
"Library.Empty.AddFolder": "+ Adicionar pasta do jogo",
|
||||
|
||||
"Library.Loading": "Carregando biblioteca…",
|
||||
|
||||
"Options.General": "Opções Gerais",
|
||||
"Options.Section.Emulation": "EMULAÇÃO",
|
||||
"Options.Section.Logging": "LOGS",
|
||||
"Options.Section.Launcher": "INICIALIZADOR",
|
||||
|
||||
"Options.CpuEngine.Label": "Motor da CPU",
|
||||
"Options.CpuEngine.Desc": "Motor de execução usado para executar o código do jogo.",
|
||||
"Options.CpuEngine.Native": "Nativo",
|
||||
|
||||
"Options.Strict.Label": "Resolução estrita de bibliotecas dinâmicas",
|
||||
"Options.Strict.Desc": "Interrompe a inicialização caso um símbolo importado não possa ser vinculado.",
|
||||
|
||||
"Options.LogLevel.Label": "Nível de log",
|
||||
"Options.LogLevel.Desc": "Nível de detalhamento das mensagens exibidas no console do emulador.",
|
||||
"Options.LogLevel.Trace": "Trace",
|
||||
"Options.LogLevel.Debug": "Debug",
|
||||
"Options.LogLevel.Info": "Info",
|
||||
"Options.LogLevel.Warning": "Warning",
|
||||
"Options.LogLevel.Error": "Error",
|
||||
"Options.LogLevel.Critical": "Critical",
|
||||
|
||||
"Options.TraceImports.Label": "Limite de rastreamento de importações",
|
||||
"Options.TraceImports.Desc": "Rastreia as primeiras N importações de cada módulo (0 = desativado).",
|
||||
|
||||
"Options.LogToFile.Label": "Salvar log em arquivo",
|
||||
"Options.LogToFile.Desc": "Copia a saída do emulador para um arquivo de log.",
|
||||
|
||||
"Options.LogFilePath.Label": "Caminho do arquivo de log",
|
||||
"Options.LogFilePath.Default": "Nenhum caminho definido — logs vão para user/logs na pasta do emulador.",
|
||||
"Options.LogFilePath.Select": "Selecionar…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "Sobrescrever arquivo de log",
|
||||
"Options.OverrideLogFile.Desc": "Use o caminho exato do arquivo em vez de adicionar o ID do título e o log de data e hora.",
|
||||
|
||||
"Options.TitleMusic.Label": "Música de prévia",
|
||||
"Options.TitleMusic.Desc": "Reproduz em loop a música de prévia do jogo selecionado na biblioteca.",
|
||||
|
||||
"Options.Discord.Label": "Status do Discord",
|
||||
"Options.Discord.Desc": "Exibir o jogo em execução no seu perfil do Discord.",
|
||||
|
||||
"Options.Language.Label": "Idioma do emulador",
|
||||
"Options.Language.Desc": "Idioma usado em toda a interface do emulador. A alteração é aplicada imediatamente.",
|
||||
|
||||
"Common.On": "Ativado",
|
||||
"Common.Off": "Desativado",
|
||||
|
||||
"Console.Title": "CONSOLE",
|
||||
"Console.SearchWatermark": "Pesquisar...",
|
||||
"Console.AutoScroll": "Rolagem automática",
|
||||
"Console.Split": "Recortar",
|
||||
"Console.Copy": "Copiar",
|
||||
"Console.Clear": "Limpar",
|
||||
"Console.WindowTitle": "Console do SharpEmu",
|
||||
|
||||
"Launch.NoGameSelected": "Nenhum jogo selecionado",
|
||||
"Launch.NoGameHint": "Selecione um jogo na biblioteca ou abra um arquivo eboot.bin diretamente.",
|
||||
"Launch.Idle": "Ocioso",
|
||||
"Launch.Console": "≡ Console",
|
||||
"Launch.Launch": "▶ Iniciar",
|
||||
"Launch.Stop": "■ Parar",
|
||||
"Launch.Running": "Em execução — {0}",
|
||||
"Launch.Stopping": "Encerrando…",
|
||||
"Launch.Exited": "Encerrado com código {0} ({1})",
|
||||
"Launch.ExeNotFound": "Executável do SharpEmu não encontrado. Compile primeiro o projeto SharpEmu.CLI (dotnet build).",
|
||||
"Launch.LogFile": "Arquivo de log: {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "Falha ao iniciar o emulador: {0}",
|
||||
"Launch.ProcessExited": "O processo foi encerrado com código {0} ({1}).",
|
||||
|
||||
"Exit.Ok": "OK",
|
||||
"Exit.InvalidArguments": "argumentos inválidos",
|
||||
"Exit.EbootNotFound": "eboot.bin não encontrado",
|
||||
"Exit.RuntimeException": "exceção em tempo de execução",
|
||||
"Exit.EmulationError": "erro de emulação",
|
||||
"Exit.Unknown": "desconhecido",
|
||||
|
||||
"Status.EmulatorLocating": "Emulador: localizando…",
|
||||
"Status.EmulatorPath": "Emulador: {0}",
|
||||
"Status.EmulatorNotFound": "Emulador: executável do SharpEmu não encontrado — compile o SharpEmu.CLI primeiro.",
|
||||
"Status.ScanningLibrary": "Verificando biblioteca…",
|
||||
"Status.AddFolderPrompt": "Adicione uma pasta de jogos para preencher a biblioteca.",
|
||||
"Status.LibraryScanned": "Biblioteca verificada: {0} jogo(s) em {1} pasta(s).",
|
||||
"Status.CouldNotOpenFolder": "Não foi possível abrir a pasta: {0}",
|
||||
"Status.CopiedToClipboard": "{0} copiado para a área de transferência.",
|
||||
"Status.RemovedFromLibrary": "“{0}” removido da biblioteca. Adicione novamente sua pasta para restaurá-lo.",
|
||||
"Status.Running": "Executando {0}",
|
||||
"Status.Stopping": "Encerrando…",
|
||||
"Status.Idle": "Ocioso",
|
||||
|
||||
"Clipboard.Path": "Caminho",
|
||||
"Clipboard.TitleId": "ID do título",
|
||||
|
||||
"Discord.Playing": "Jogando {0}",
|
||||
"Discord.Browsing": "Navegando pela biblioteca",
|
||||
|
||||
"Dialog.ChooseGameFolder": "Escolha uma pasta contendo jogos",
|
||||
"Dialog.OpenExecutable": "Abrir um executável para iniciar",
|
||||
"Dialog.PsExecutables": "Executáveis de PS",
|
||||
"Dialog.SaveLogFile": "Selecione onde salvar o arquivo de log",
|
||||
"Dialog.PlainTextFiles": "Arquivos de texto simples",
|
||||
"Dialog.LogFiles": "Arquivos de log"
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
"Library.Empty.Title": "Deine Bibliothek ist leer",
|
||||
"Library.Empty.Hint": "Füge einen Ordner mit deinen Spielen hinzu, um zu beginnen.",
|
||||
"Library.Empty.SearchTitle": "Keine Spiele gefunden",
|
||||
"Library.Empty.SearchHint": "Nichts in der Bibliothek entspricht "{0}".",
|
||||
"Library.Empty.SearchHint": "Nichts in der Bibliothek entspricht “{0}”.",
|
||||
"Library.Empty.AddFolder": "+ Spielordner hinzufügen",
|
||||
|
||||
"Library.Loading": "Bibliothek wird geladen…",
|
||||
@@ -109,7 +109,7 @@
|
||||
"Status.LibraryScanned": "Bibliothek gescannt: {0} Spiel(e) in {1} Ordner(n).",
|
||||
"Status.CouldNotOpenFolder": "Ordner konnte nicht geöffnet werden: {0}",
|
||||
"Status.CopiedToClipboard": "{0} in die Zwischenablage kopiert.",
|
||||
"Status.RemovedFromLibrary": ""{0}" wurde aus der Bibliothek entfernt. Füge den Ordner erneut hinzu, um es wiederherzustellen.",
|
||||
"Status.RemovedFromLibrary": "“{0}” wurde aus der Bibliothek entfernt. Füge den Ordner erneut hinzu, um es wiederherzustellen.",
|
||||
"Status.Running": "Läuft {0}",
|
||||
"Status.Stopping": "Wird gestoppt…",
|
||||
"Status.Idle": "Bereit",
|
||||
|
||||
@@ -125,5 +125,13 @@
|
||||
"Dialog.PsExecutables": "PS executables",
|
||||
"Dialog.SaveLogFile": "Select where to save the Log file",
|
||||
"Dialog.PlainTextFiles": "Plain Text Files",
|
||||
"Dialog.LogFiles": "Log Files"
|
||||
"Dialog.LogFiles": "Log Files",
|
||||
|
||||
"Options.About" : "About",
|
||||
"About.Github.Label": "GitHub",
|
||||
"About.Github.Desc": "Source code, issues and project development.",
|
||||
"About.Discord.Label": "Discord",
|
||||
"About.Discord.Desc": "Join the community, get support and follow development.",
|
||||
"About.GithubButton": "Contribute in GitHub!",
|
||||
"About.DiscordButton": "Join our Discord!"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
{
|
||||
"_languageName": "Español",
|
||||
|
||||
"Page.Library": "Biblioteca",
|
||||
"Page.Options": "Opciones",
|
||||
"Page.GameCount.One": "1 juego",
|
||||
"Page.GameCount.Other": "{0} juegos",
|
||||
|
||||
"Library.SearchWatermark": "Buscar en la biblioteca…",
|
||||
"Library.AddFolder": "+ Añadir carpeta",
|
||||
"Library.Rescan": "⟳ Volver a escanear",
|
||||
"Library.OpenFile": "Abrir archivo…",
|
||||
|
||||
"Library.Context.Launch": "Iniciar",
|
||||
"Library.Context.OpenFolder": "Abrir carpeta de juegos",
|
||||
"Library.Context.CopyPath": "Copiar ruta",
|
||||
"Library.Context.CopyTitleId": "Copiar ID del título",
|
||||
"Library.Context.Remove": "Eliminar de la biblioteca",
|
||||
|
||||
"Library.Empty.Title": "Tu biblioteca está vacía",
|
||||
"Library.Empty.Hint": "Añade una carpeta que contenga tus juegos para empezar.",
|
||||
"Library.Empty.SearchTitle": "Ningún juego coincide con la búsqueda",
|
||||
"Library.Empty.SearchHint": "No se ha encontrado nada en la biblioteca que coincida con “{0}”.",
|
||||
"Library.Empty.AddFolder": "+ Añadir carpeta de juegos",
|
||||
|
||||
"Library.Loading": "Cargando biblioteca…",
|
||||
|
||||
"Options.General": "General",
|
||||
"Options.Section.Emulation": "EMULACIÓN",
|
||||
"Options.Section.Logging": "LOGS",
|
||||
"Options.Section.Launcher": "LAUNCHER",
|
||||
|
||||
"Options.CpuEngine.Label": "Motor de CPU",
|
||||
"Options.CpuEngine.Desc": "Motor utilizado para ejecutar el código del juego.",
|
||||
"Options.CpuEngine.Native": "Nativo",
|
||||
|
||||
"Options.Strict.Label": "Resolución estricta de dynlib (Bibliotecas dinámicas)",
|
||||
"Options.Strict.Desc": "Detener la ejecución cuando un símbolo importado no se pueda resolver.",
|
||||
|
||||
"Options.LogLevel.Label": "Nivel de Log",
|
||||
"Options.LogLevel.Desc": "Verbosidad de la salida en consola del emulador.",
|
||||
"Options.LogLevel.Trace": "Trazas",
|
||||
"Options.LogLevel.Debug": "Depuración",
|
||||
"Options.LogLevel.Info": "Información",
|
||||
"Options.LogLevel.Warning": "Advertencia",
|
||||
"Options.LogLevel.Error": "Error",
|
||||
"Options.LogLevel.Critical": "Crítico",
|
||||
|
||||
"Options.TraceImports.Label": "Límite de trazado de importaciones",
|
||||
"Options.TraceImports.Desc": "Trazar las primeras N importaciones por módulo (0 = off).",
|
||||
|
||||
"Options.LogToFile.Label": "Registrar log en archivo",
|
||||
"Options.LogToFile.Desc": "Duplicar la salida del emulador en un archivo de logs.",
|
||||
|
||||
"Options.LogFilePath.Label": "Ruta del archivo de Log",
|
||||
"Options.LogFilePath.Default": "Sin ruta personalizada — los logs van a user/logs al lado del emulador.",
|
||||
"Options.LogFilePath.Select": "Seleccionar…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "Sobreescribir archivo de logs",
|
||||
"Options.OverrideLogFile.Desc": "Utilizar la misma ruta para el archivo de logs en vez de añadir la ID del título y marca de tiempo.",
|
||||
|
||||
"Options.TitleMusic.Label": "Música del título",
|
||||
"Options.TitleMusic.Desc": "Repetir en bucle la preview de la música del juego seleccionado en la biblioteca.",
|
||||
|
||||
"Options.Discord.Label": "Actividad de Discord",
|
||||
"Options.Discord.Desc": "Mostrar juego en ejecución en tu perfil de Discord.",
|
||||
|
||||
"Options.Language.Label": "Idioma del emulador",
|
||||
"Options.Language.Desc": "Idioma utilizado en todo el launcher. Se aplica inmediatamente.",
|
||||
|
||||
"Common.On": "Encendido",
|
||||
"Common.Off": "Apagado",
|
||||
|
||||
"Console.Title": "CONSOLA",
|
||||
"Console.SearchWatermark": "Buscar...",
|
||||
"Console.AutoScroll": "Desplazamiento automático",
|
||||
"Console.Split": "Desacoplar",
|
||||
"Console.Copy": "Copiar",
|
||||
"Console.Clear": "Limpiar",
|
||||
"Console.WindowTitle": "Consola SharpEmu",
|
||||
|
||||
"Launch.NoGameSelected": "No hay ningún juego seleccionado",
|
||||
"Launch.NoGameHint": "Selecciona un juego de la biblioteca o abre un eboot.bin directamente.",
|
||||
"Launch.Idle": "Inactivo",
|
||||
"Launch.Console": "≡ Consola",
|
||||
"Launch.Launch": "▶ Iniciar",
|
||||
"Launch.Stop": "■ Detener",
|
||||
"Launch.Running": "En ejecución — {0}",
|
||||
"Launch.Stopping": "Deteniendo…",
|
||||
"Launch.Exited": "Finalizó con el código {0} ({1})",
|
||||
"Launch.ExeNotFound": "No se ha encontrado el ejecutable de SharpEmu. Compila previamente el proyecto SharpEmu.CLI (dotnet build).",
|
||||
"Launch.LogFile": "Archivo de Log: {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "Error al iniciar el emulador: {0}",
|
||||
"Launch.ProcessExited": "El proceso finalizó con el código {0} ({1}).",
|
||||
|
||||
"Exit.Ok": "OK",
|
||||
"Exit.InvalidArguments": "argumentos no válidos",
|
||||
"Exit.EbootNotFound": "no se encontró eboot",
|
||||
"Exit.RuntimeException": "excepción en tiempo de ejecución",
|
||||
"Exit.EmulationError": "error de emulación",
|
||||
"Exit.Unknown": "desconocido",
|
||||
|
||||
"Status.EmulatorLocating": "Emulador: localizando…",
|
||||
"Status.EmulatorPath": "Emulador: {0}",
|
||||
"Status.EmulatorNotFound": "Emulador: No se encontró el ejecutable de SharpEmu — compila previamente SharpEmu.CLI.",
|
||||
"Status.ScanningLibrary": "Escaneando biblioteca…",
|
||||
"Status.AddFolderPrompt": "Añade una carpeta de juegos para poblar la biblioteca.",
|
||||
"Status.LibraryScanned": "Biblioteca escaneada: Se encontraron {0} juego(s) en {1} carpeta(s).",
|
||||
"Status.CouldNotOpenFolder": "No se ha podido abrir la carpeta: {0}",
|
||||
"Status.CopiedToClipboard": "{0} copiado al portapapeles.",
|
||||
"Status.RemovedFromLibrary": "Se eliminó “{0}” de la biblioteca. Vuelve a añadir su carpeta para restaurarlo.",
|
||||
"Status.Running": "Ejecutando {0}",
|
||||
"Status.Stopping": "Deteniendo…",
|
||||
"Status.Idle": "Inactivo",
|
||||
|
||||
"Clipboard.Path": "Ruta",
|
||||
"Clipboard.TitleId": "ID del título",
|
||||
|
||||
"Discord.Playing": "Jugando a {0}",
|
||||
"Discord.Browsing": "Navegando en la biblioteca, buscando un juego para divertirse.",
|
||||
|
||||
"Dialog.ChooseGameFolder": "Selecciona una carpeta que contenga juegos",
|
||||
"Dialog.OpenExecutable": "Abrir un ejecutable para iniciar",
|
||||
"Dialog.PsExecutables": "Ejecutables de PS",
|
||||
"Dialog.SaveLogFile": "Selecciona dónde guardar el archivo de Logs",
|
||||
"Dialog.PlainTextFiles": "Archivos en texto plano",
|
||||
"Dialog.LogFiles": "Archivos de Log",
|
||||
|
||||
"Options.About" : "Informacion",
|
||||
"About.Github.Label": "GitHub",
|
||||
"About.Github.Desc": "Código fuente, issues y desarrollo del proyecto.",
|
||||
"About.Discord.Label": "Discord",
|
||||
"About.Discord.Desc": "Únete a la comunidad, recibe soporte y sigue el desarrollo.",
|
||||
"About.GithubButton": "Contribuye en GitHub!",
|
||||
"About.DiscordButton": "Únete a nuestro Discord!"
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
{
|
||||
"_languageName": "Français",
|
||||
|
||||
"Page.Library": "Bibliothèque",
|
||||
"Page.Options": "Options",
|
||||
"Page.GameCount.One": "1 jeu",
|
||||
"Page.GameCount.Other": "{0} jeux",
|
||||
|
||||
"Library.SearchWatermark": "Rechercher dans la bibliothèque…",
|
||||
"Library.AddFolder": "+ Ajouter un dossier",
|
||||
"Library.Rescan": "⟳ Analyser à nouveau",
|
||||
"Library.OpenFile": "Ouvrir un fichier…",
|
||||
|
||||
"Library.Context.Launch": "Lancer",
|
||||
"Library.Context.OpenFolder": "Ouvrir le dossier du jeu",
|
||||
"Library.Context.CopyPath": "Copier le chemin",
|
||||
"Library.Context.CopyTitleId": "Copier l’identifiant du jeu",
|
||||
"Library.Context.Remove": "Retirer de la bibliothèque",
|
||||
|
||||
"Library.Empty.Title": "Votre bibliothèque est vide",
|
||||
"Library.Empty.Hint": "Ajoutez un dossier contenant vos jeux pour commencer.",
|
||||
"Library.Empty.SearchTitle": "Aucun jeu ne correspond à votre recherche",
|
||||
"Library.Empty.SearchHint": "Aucun élément de la bibliothèque ne correspond à « {0} ».",
|
||||
"Library.Empty.AddFolder": "+ Ajouter un dossier de jeux",
|
||||
|
||||
"Library.Loading": "Chargement de la bibliothèque…",
|
||||
|
||||
"Options.General": "Général",
|
||||
"Options.Section.Emulation": "ÉMULATION",
|
||||
"Options.Section.Logging": "JOURNALISATION",
|
||||
"Options.Section.Launcher": "LANCEUR",
|
||||
|
||||
"Options.CpuEngine.Label": "Moteur CPU",
|
||||
"Options.CpuEngine.Desc": "Moteur d’exécution utilisé pour exécuter le code du jeu.",
|
||||
"Options.CpuEngine.Native": "Natif",
|
||||
|
||||
"Options.Strict.Label": "Résolution stricte des bibliothèques dynamiques",
|
||||
"Options.Strict.Desc": "Interrompre le lancement lorsqu’un symbole importé ne peut pas être résolu.",
|
||||
|
||||
"Options.LogLevel.Label": "Niveau de journalisation",
|
||||
"Options.LogLevel.Desc": "Niveau de détail des messages affichés dans la console de l’émulateur.",
|
||||
"Options.LogLevel.Trace": "Traçage",
|
||||
"Options.LogLevel.Debug": "Débogage",
|
||||
"Options.LogLevel.Info": "Informations",
|
||||
"Options.LogLevel.Warning": "Avertissements",
|
||||
"Options.LogLevel.Error": "Erreurs",
|
||||
"Options.LogLevel.Critical": "Erreurs critiques",
|
||||
|
||||
"Options.TraceImports.Label": "Limite de traçage des imports",
|
||||
"Options.TraceImports.Desc": "Tracer les N premiers imports de chaque module (0 = désactivé).",
|
||||
|
||||
"Options.LogToFile.Label": "Enregistrer dans un fichier",
|
||||
"Options.LogToFile.Desc": "Copier la sortie de l’émulateur dans un fichier journal.",
|
||||
|
||||
"Options.LogFilePath.Label": "Chemin du fichier journal",
|
||||
"Options.LogFilePath.Default": "Aucun chemin personnalisé — les journaux sont enregistrés dans user/logs à côté de l’émulateur.",
|
||||
"Options.LogFilePath.Select": "Sélectionner…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "Remplacer le fichier journal",
|
||||
"Options.OverrideLogFile.Desc": "Utiliser exactement ce chemin au lieu d’ajouter l’identifiant du jeu et l’horodatage.",
|
||||
|
||||
"Options.TitleMusic.Label": "Musique du jeu",
|
||||
"Options.TitleMusic.Desc": "Lire en boucle la musique d’aperçu du jeu sélectionné dans la bibliothèque.",
|
||||
|
||||
"Options.Discord.Label": "Présence Discord",
|
||||
"Options.Discord.Desc": "Afficher le jeu en cours d’exécution sur votre profil Discord.",
|
||||
|
||||
"Options.Language.Label": "Langue de l’émulateur",
|
||||
"Options.Language.Desc": "Langue utilisée dans l’ensemble du lanceur. Le changement est immédiat.",
|
||||
|
||||
"Common.On": "Activé",
|
||||
"Common.Off": "Désactivé",
|
||||
|
||||
"Console.Title": "CONSOLE",
|
||||
"Console.SearchWatermark": "Rechercher…",
|
||||
"Console.AutoScroll": "Défilement automatique",
|
||||
"Console.Split": "Détacher",
|
||||
"Console.Copy": "Copier",
|
||||
"Console.Clear": "Effacer",
|
||||
"Console.WindowTitle": "Console SharpEmu",
|
||||
|
||||
"Launch.NoGameSelected": "Aucun jeu sélectionné",
|
||||
"Launch.NoGameHint": "Choisissez un jeu dans la bibliothèque ou ouvrez directement un fichier eboot.bin.",
|
||||
"Launch.Idle": "Inactif",
|
||||
"Launch.Console": "≡ Console",
|
||||
"Launch.Launch": "▶ Lancer",
|
||||
"Launch.Stop": "■ Arrêter",
|
||||
"Launch.Running": "En cours d’exécution — {0}",
|
||||
"Launch.Stopping": "Arrêt en cours…",
|
||||
"Launch.Exited": "Processus terminé avec le code {0} ({1})",
|
||||
"Launch.ExeNotFound": "L’exécutable SharpEmu est introuvable. Compilez d’abord le projet SharpEmu.CLI (dotnet build).",
|
||||
"Launch.LogFile": "Fichier journal : {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "Impossible de démarrer l’émulateur : {0}",
|
||||
"Launch.ProcessExited": "Le processus s’est terminé avec le code {0} ({1}).",
|
||||
|
||||
"Exit.Ok": "OK",
|
||||
"Exit.InvalidArguments": "arguments non valides",
|
||||
"Exit.EbootNotFound": "eboot introuvable",
|
||||
"Exit.RuntimeException": "exception d’exécution",
|
||||
"Exit.EmulationError": "erreur d’émulation",
|
||||
"Exit.Unknown": "inconnu",
|
||||
|
||||
"Status.EmulatorLocating": "Émulateur : recherche en cours…",
|
||||
"Status.EmulatorPath": "Émulateur : {0}",
|
||||
"Status.EmulatorNotFound": "Émulateur : l’exécutable SharpEmu est introuvable — compilez d’abord SharpEmu.CLI.",
|
||||
"Status.ScanningLibrary": "Analyse de la bibliothèque…",
|
||||
"Status.AddFolderPrompt": "Ajoutez un dossier de jeux pour remplir la bibliothèque.",
|
||||
"Status.LibraryScanned": "Bibliothèque analysée : {0} jeu(x) dans {1} dossier(s).",
|
||||
"Status.CouldNotOpenFolder": "Impossible d’ouvrir le dossier : {0}",
|
||||
"Status.CopiedToClipboard": "{0} copié dans le presse-papiers.",
|
||||
"Status.RemovedFromLibrary": "« {0} » a été retiré de la bibliothèque. Ajoutez à nouveau son dossier pour le restaurer.",
|
||||
"Status.Running": "Exécution de {0}",
|
||||
"Status.Stopping": "Arrêt en cours…",
|
||||
"Status.Idle": "Inactif",
|
||||
|
||||
"Clipboard.Path": "Chemin",
|
||||
"Clipboard.TitleId": "Identifiant du jeu",
|
||||
|
||||
"Discord.Playing": "Joue à {0}",
|
||||
"Discord.Browsing": "Parcourt la bibliothèque",
|
||||
|
||||
"Dialog.ChooseGameFolder": "Choisir un dossier contenant des jeux",
|
||||
"Dialog.OpenExecutable": "Ouvrir un exécutable à lancer",
|
||||
"Dialog.PsExecutables": "Exécutables PlayStation",
|
||||
"Dialog.SaveLogFile": "Choisir l’emplacement du fichier journal",
|
||||
"Dialog.PlainTextFiles": "Fichiers texte brut",
|
||||
"Dialog.LogFiles": "Fichiers journaux"
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
{
|
||||
"_languageName": "日本語",
|
||||
|
||||
"Page.Library": "ライブラリ",
|
||||
"Page.Options": "オプション",
|
||||
"Page.GameCount.One": "ゲーム 1本",
|
||||
"Page.GameCount.Other": "ゲーム {0}本",
|
||||
|
||||
"Library.SearchWatermark": "ライブラリを検索…",
|
||||
"Library.AddFolder": "+ フォルダーを追加",
|
||||
"Library.Rescan": "⟳ 再スキャン",
|
||||
"Library.OpenFile": "ファイルを開く…",
|
||||
|
||||
"Library.Context.Launch": "起動",
|
||||
"Library.Context.OpenFolder": "ゲームフォルダーを開く",
|
||||
"Library.Context.CopyPath": "パスをコピー",
|
||||
"Library.Context.CopyTitleId": "ゲームIDをコピー",
|
||||
"Library.Context.Remove": "ライブラリから削除",
|
||||
|
||||
"Library.Empty.Title": "ライブラリが空です",
|
||||
"Library.Empty.Hint": "開始するには、ゲームが含まれるフォルダーを追加してください。",
|
||||
"Library.Empty.SearchTitle": "検索条件に一致するゲームが見つかりません",
|
||||
"Library.Empty.SearchHint": "ライブラリに「{0}」と一致する項目はありません。",
|
||||
"Library.Empty.AddFolder": "+ ゲームフォルダーを追加",
|
||||
|
||||
"Library.Loading": "ライブラリを読み込み中…",
|
||||
|
||||
"Options.General": "一般",
|
||||
"Options.Section.Emulation": "エミュレーション",
|
||||
"Options.Section.Logging": "ロギング",
|
||||
"Options.Section.Launcher": "ランチャー",
|
||||
|
||||
"Options.CpuEngine.Label": "CPUエンジン",
|
||||
"Options.CpuEngine.Desc": "ゲームコードを実行するために使用される実行エンジン。",
|
||||
"Options.CpuEngine.Native": "ネイティブ",
|
||||
|
||||
"Options.Strict.Label": "厳格な動的ライブラリ解決",
|
||||
"Options.Strict.Desc": "インポートされたシンボルが解決できない場合、起動を中断します。",
|
||||
|
||||
"Options.LogLevel.Label": "ログレベル",
|
||||
"Options.LogLevel.Desc": "エミュレータコンソールに表示されるメッセージの詳細度。",
|
||||
"Options.LogLevel.Trace": "トレース",
|
||||
"Options.LogLevel.Debug": "デバッグ",
|
||||
"Options.LogLevel.Info": "情報",
|
||||
"Options.LogLevel.Warning": "警告",
|
||||
"Options.LogLevel.Error": "エラー",
|
||||
"Options.LogLevel.Critical": "致命的なエラー",
|
||||
|
||||
"Options.TraceImports.Label": "インポートトレース制限",
|
||||
"Options.TraceImports.Desc": "各モジュールの最初のN個のインポートをトレースします(0 = 無効)。",
|
||||
|
||||
"Options.LogToFile.Label": "ファイルに保存",
|
||||
"Options.LogToFile.Desc": "エミュレータの出力をログファイルにコピーします。",
|
||||
|
||||
"Options.LogFilePath.Label": "ログファイルのパス",
|
||||
"Options.LogFilePath.Default": "カスタムパスなし — ログはエミュレータと同じ場所の user/logs フォルダーに保存されます。",
|
||||
"Options.LogFilePath.Select": "選択…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "ログファイルを上書き",
|
||||
"Options.OverrideLogFile.Desc": "ゲームIDやタイムスタンプを追加せず、指定されたパスをそのまま使用します。",
|
||||
|
||||
"Options.TitleMusic.Label": "ゲーム内音楽",
|
||||
"Options.TitleMusic.Desc": "ライブラリで選択したゲームのプレビュー音楽をループ再生します。",
|
||||
|
||||
"Options.Discord.Label": "Discordステータス表示",
|
||||
"Options.Discord.Desc": "現在プレイ中のゲームをDiscordのプロフィールに表示します。",
|
||||
|
||||
"Options.Language.Label": "エミュレータの言語",
|
||||
"Options.Language.Desc": "ランチャー全体で使用される言語。変更はすぐに適用されます。",
|
||||
|
||||
"Common.On": "オン",
|
||||
"Common.Off": "オフ",
|
||||
|
||||
"Console.Title": "コンソール",
|
||||
"Console.SearchWatermark": "検索…",
|
||||
"Console.AutoScroll": "自動スクロール",
|
||||
"Console.Split": "ウィンドウを分離",
|
||||
"Console.Copy": "コピー",
|
||||
"Console.Clear": "消去",
|
||||
"Console.WindowTitle": "SharpEmu コンソール",
|
||||
|
||||
"Launch.NoGameSelected": "ゲームが選択されていません",
|
||||
"Launch.NoGameHint": "ライブラリからゲームを選択するか、eboot.bin ファイルを直接開いてください。",
|
||||
"Launch.Idle": "待機中",
|
||||
"Launch.Console": "≡ コンソール",
|
||||
"Launch.Launch": "▶ 起動",
|
||||
"Launch.Stop": "■ 停止",
|
||||
"Launch.Running": "実行中 — {0}",
|
||||
"Launch.Stopping": "停止中…",
|
||||
"Launch.Exited": "プロセスがコード {0} ({1}) で終了しました",
|
||||
"Launch.ExeNotFound": "SharpEmuの実行ファイルが見つかりません。先に SharpEmu.CLI プロジェクトをビルドしてください(dotnet build)。",
|
||||
"Launch.LogFile": "ログファイル: {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "エミュレータを起動できませんでした: {0}",
|
||||
"Launch.ProcessExited": "プロセスがコード {0} ({1}) で終了しました。",
|
||||
|
||||
"Exit.Ok": "OK",
|
||||
"Exit.InvalidArguments": "無効な引数",
|
||||
"Exit.EbootNotFound": "eboot が見つかりません",
|
||||
"Exit.RuntimeException": "ランタイム例外",
|
||||
"Exit.EmulationError": "エミュレーションエラー",
|
||||
"Exit.Unknown": "不明",
|
||||
|
||||
"Status.EmulatorLocating": "エミュレータ: 位置を検索中…",
|
||||
"Status.EmulatorPath": "エミュレータ: {0}",
|
||||
"Status.EmulatorNotFound": "エミュレータ: SharpEmuの実行ファイルが見つかりません — 先に SharpEmu.CLI をビルドしてください。",
|
||||
"Status.ScanningLibrary": "ライブラリをスキャン中…",
|
||||
"Status.AddFolderPrompt": "ライブラリに表示するゲームフォルダーを追加してください。",
|
||||
"Status.LibraryScanned": "ライブラリのスキャン完了: {1} 個のフォルダーから {0} 本のゲームを検出。",
|
||||
"Status.CouldNotOpenFolder": "フォルダーを開けませんでした: {0}",
|
||||
"Status.CopiedToClipboard": "「{0}」をクリップボードにコピーしました。",
|
||||
"Status.RemovedFromLibrary": "「{0}」がライブラリから削除されました。復元するにはフォルダーを再追加してください。",
|
||||
"Status.Running": "{0} を実行中",
|
||||
"Status.Stopping": "停止中…",
|
||||
"Status.Idle": "待機中",
|
||||
|
||||
"Clipboard.Path": "パス",
|
||||
"Clipboard.TitleId": "ゲームID",
|
||||
|
||||
"Discord.Playing": "{0} をプレイ中",
|
||||
"Discord.Browsing": "ライブラリを閲覧中",
|
||||
|
||||
"Dialog.ChooseGameFolder": "ゲームが含まれるフォルダーを選択",
|
||||
"Dialog.OpenExecutable": "起動する実行ファイルを開く",
|
||||
"Dialog.PsExecutables": "PlayStation 実行ファイル",
|
||||
"Dialog.SaveLogFile": "ログファイルの保存先を選択",
|
||||
"Dialog.PlainTextFiles": "プレーンテキストファイル",
|
||||
"Dialog.LogFiles": "ログファイル"
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
{
|
||||
"_languageName": "한국어",
|
||||
|
||||
"Page.Library": "라이브러리",
|
||||
"Page.Options": "옵션",
|
||||
"Page.GameCount.One": "게임 1개",
|
||||
"Page.GameCount.Other": "게임 {0}개",
|
||||
|
||||
"Library.SearchWatermark": "라이브러리 검색…",
|
||||
"Library.AddFolder": "+ 폴더 추가",
|
||||
"Library.Rescan": "⟳ 다시 스캔",
|
||||
"Library.OpenFile": "파일 열기…",
|
||||
|
||||
"Library.Context.Launch": "실행",
|
||||
"Library.Context.OpenFolder": "게임 폴더 열기",
|
||||
"Library.Context.CopyPath": "경로 복사",
|
||||
"Library.Context.CopyTitleId": "게임 ID 복사",
|
||||
"Library.Context.Remove": "라이브러리에서 제거",
|
||||
|
||||
"Library.Empty.Title": "라이브러리가 비어 있습니다",
|
||||
"Library.Empty.Hint": "시작하려면 게임이 포함된 폴더를 추가하세요.",
|
||||
"Library.Empty.SearchTitle": "검색 결과와 일치하는 게임이 없습니다",
|
||||
"Library.Empty.SearchHint": "라이브러리에 '{0}'와(과) 일치하는 항목이 없습니다.",
|
||||
"Library.Empty.AddFolder": "+ 게임 폴더 추가",
|
||||
|
||||
"Library.Loading": "라이브러리 불러오는 중…",
|
||||
|
||||
"Options.General": "일반",
|
||||
"Options.Section.Emulation": "에뮬레이션",
|
||||
"Options.Section.Logging": "로깅",
|
||||
"Options.Section.Launcher": "런처",
|
||||
|
||||
"Options.CpuEngine.Label": "CPU 엔진",
|
||||
"Options.CpuEngine.Desc": "게임 코드를 실행하는 데 사용되는 실행 엔진입니다.",
|
||||
"Options.CpuEngine.Native": "네이티브",
|
||||
|
||||
"Options.Strict.Label": "엄격한 동적 라이브러리 해석",
|
||||
"Options.Strict.Desc": "가져온 심볼을 해석할 수 없는 경우 실행을 중단합니다.",
|
||||
|
||||
"Options.LogLevel.Label": "로그 수준",
|
||||
"Options.LogLevel.Desc": "에뮬레이터 콘솔에 표시할 메시지의 세부 정보 수준입니다.",
|
||||
"Options.LogLevel.Trace": "트레이스",
|
||||
"Options.LogLevel.Debug": "디버그",
|
||||
"Options.LogLevel.Info": "정보",
|
||||
"Options.LogLevel.Warning": "경고",
|
||||
"Options.LogLevel.Error": "오류",
|
||||
"Options.LogLevel.Critical": "치명적 오류",
|
||||
|
||||
"Options.TraceImports.Label": "가져오기 트레이스 한도",
|
||||
"Options.TraceImports.Desc": "각 모듈의 처음 N개 가져오기를 트레이스합니다 (0 = 비활성화).",
|
||||
|
||||
"Options.LogToFile.Label": "파일로 저장",
|
||||
"Options.LogToFile.Desc": "에뮬레이터 출력을 로그 파일에 복사합니다.",
|
||||
|
||||
"Options.LogFilePath.Label": "로그 파일 경로",
|
||||
"Options.LogFilePath.Default": "사용자 지정 경로 없음 — 로그는 에뮬레이터 옆의 user/logs 폴더에 저장됩니다.",
|
||||
"Options.LogFilePath.Select": "선택…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "로그 파일 덮어쓰기",
|
||||
"Options.OverrideLogFile.Desc": "게임 ID와 타임스탬프를 추가하는 대신 정확히 이 경로를 사용합니다.",
|
||||
|
||||
"Options.TitleMusic.Label": "게임 음악",
|
||||
"Options.TitleMusic.Desc": "라이브러리에서 선택한 게임의 미리보기 음악을 반복 재생합니다.",
|
||||
|
||||
"Options.Discord.Label": "디스코드 상태 표시",
|
||||
"Options.Discord.Desc": "디스코드 프로필에 현재 실행 중인 게임을 표시합니다.",
|
||||
|
||||
"Options.Language.Label": "에뮬레이터 언어",
|
||||
"Options.Language.Desc": "런처 전체에 사용되는 언어입니다. 변경 사항은 즉시 적용됩니다.",
|
||||
|
||||
"Common.On": "켬",
|
||||
"Common.Off": "끔",
|
||||
|
||||
"Console.Title": "콘솔",
|
||||
"Console.SearchWatermark": "검색…",
|
||||
"Console.AutoScroll": "자동 스크롤",
|
||||
"Console.Split": "창 분리",
|
||||
"Console.Copy": "복사",
|
||||
"Console.Clear": "지우기",
|
||||
"Console.WindowTitle": "SharpEmu 콘솔",
|
||||
|
||||
"Launch.NoGameSelected": "선택된 게임 없음",
|
||||
"Launch.NoGameHint": "라이브러리에서 게임을 선택하거나 eboot.bin 파일을 직접 여세요.",
|
||||
"Launch.Idle": "대기 중",
|
||||
"Launch.Console": "≡ 콘솔",
|
||||
"Launch.Launch": "▶ 실행",
|
||||
"Launch.Stop": "■ 중지",
|
||||
"Launch.Running": "실행 중 — {0}",
|
||||
"Launch.Stopping": "중지 중…",
|
||||
"Launch.Exited": "프로세스가 코드 {0} ({1})(으)로 종료되었습니다",
|
||||
"Launch.ExeNotFound": "SharpEmu 실행 파일을 찾을 수 없습니다. 먼저 SharpEmu.CLI 프로젝트를 컴파일하세요 (dotnet build).",
|
||||
"Launch.LogFile": "로그 파일: {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "에뮬레이터를 시작할 수 없습니다: {0}",
|
||||
"Launch.ProcessExited": "프로세스가 코드 {0} ({1})(으)로 종료되었습니다.",
|
||||
|
||||
"Exit.Ok": "확인",
|
||||
"Exit.InvalidArguments": "잘못된 인수",
|
||||
"Exit.EbootNotFound": "eboot을 찾을 수 없음",
|
||||
"Exit.RuntimeException": "런타임 예외",
|
||||
"Exit.EmulationError": "에뮬레이션 오류",
|
||||
"Exit.Unknown": "알 수 없음",
|
||||
|
||||
"Status.EmulatorLocating": "에뮬레이터: 위치 검색 중…",
|
||||
"Status.EmulatorPath": "에뮬레이터: {0}",
|
||||
"Status.EmulatorNotFound": "에뮬레이터: SharpEmu 실행 파일을 찾을 수 없습니다 — 먼저 SharpEmu.CLI를 컴파일하세요.",
|
||||
"Status.ScanningLibrary": "라이브러리 스캔 중…",
|
||||
"Status.AddFolderPrompt": "라이브러리를 채우려면 게임 폴더를 추가하세요.",
|
||||
"Status.LibraryScanned": "라이브러리 스캔 완료: {1}개 폴더에서 {0}개 게임 발견.",
|
||||
"Status.CouldNotOpenFolder": "폴더를 열 수 없습니다: {0}",
|
||||
"Status.CopiedToClipboard": "{0}이(가) 클립보드에 복사되었습니다.",
|
||||
"Status.RemovedFromLibrary": "'{0}'이(가) 라이브러리에서 제거되었습니다. 복구하려면 폴더를 다시 추가하세요.",
|
||||
"Status.Running": "{0} 실행 중",
|
||||
"Status.Stopping": "중지 중…",
|
||||
"Status.Idle": "대기 중",
|
||||
|
||||
"Clipboard.Path": "경로",
|
||||
"Clipboard.TitleId": "게임 ID",
|
||||
|
||||
"Discord.Playing": "{0} 플레이 중",
|
||||
"Discord.Browsing": "라이브러리 둘러보는 중",
|
||||
|
||||
"Dialog.ChooseGameFolder": "게임이 포함된 폴더 선택",
|
||||
"Dialog.OpenExecutable": "실행할 파일 열기",
|
||||
"Dialog.PsExecutables": "PlayStation 실행 파일",
|
||||
"Dialog.SaveLogFile": "로그 파일 저장 위치 선택",
|
||||
"Dialog.PlainTextFiles": "일반 텍스트 파일",
|
||||
"Dialog.LogFiles": "로그 파일"
|
||||
}
|
||||
@@ -0,0 +1,129 @@
|
||||
{
|
||||
"_languageName": "Nederlands",
|
||||
|
||||
"Page.Library": "Bibliotheek",
|
||||
"Page.Options": "Opties",
|
||||
"Page.GameCount.One": "1 game",
|
||||
"Page.GameCount.Other": "{0} games",
|
||||
|
||||
"Library.SearchWatermark": "Zoeken in bibliotheek…",
|
||||
"Library.AddFolder": "+ Map toevoegen",
|
||||
"Library.Rescan": "⟳ Opnieuw scannen",
|
||||
"Library.OpenFile": "Bestand openen…",
|
||||
|
||||
"Library.Context.Launch": "Starten",
|
||||
"Library.Context.OpenFolder": "Gamemap openen",
|
||||
"Library.Context.CopyPath": "Pad kopiëren",
|
||||
"Library.Context.CopyTitleId": "Titel-ID kopiëren",
|
||||
"Library.Context.Remove": "Verwijderen uit bibliotheek",
|
||||
|
||||
"Library.Empty.Title": "Je bibliotheek is leeg",
|
||||
"Library.Empty.Hint": "Voeg een map met je games toe om te beginnen.",
|
||||
"Library.Empty.SearchTitle": "Geen games komen overeen met je zoekopdracht",
|
||||
"Library.Empty.SearchHint": "Niets in de bibliotheek komt overeen met “{0}”.",
|
||||
"Library.Empty.AddFolder": "+ Gamemap toevoegen",
|
||||
|
||||
"Library.Loading": "Bibliotheek laden…",
|
||||
|
||||
"Options.General": "Algemeen",
|
||||
"Options.Section.Emulation": "EMULATIE",
|
||||
"Options.Section.Logging": "LOGGING",
|
||||
"Options.Section.Launcher": "LAUNCHER",
|
||||
|
||||
"Options.CpuEngine.Label": "CPU-engine",
|
||||
"Options.CpuEngine.Desc": "Engine die wordt gebruikt om gamecode uit te voeren.",
|
||||
"Options.CpuEngine.Native": "Native",
|
||||
|
||||
"Options.Strict.Label": "Strikte dynlib-resolutie",
|
||||
"Options.Strict.Desc": "Laat het opstarten mislukken wanneer een geïmporteerd symbool niet kan worden opgelost.",
|
||||
|
||||
"Options.LogLevel.Label": "Logniveau",
|
||||
"Options.LogLevel.Desc": "Uitgebreidheid van de console-uitvoer van de emulator.",
|
||||
"Options.LogLevel.Trace": "Trace",
|
||||
"Options.LogLevel.Debug": "Debug",
|
||||
"Options.LogLevel.Info": "Info",
|
||||
"Options.LogLevel.Warning": "Waarschuwing",
|
||||
"Options.LogLevel.Error": "Fout",
|
||||
"Options.LogLevel.Critical": "Kritiek",
|
||||
|
||||
"Options.TraceImports.Label": "Tracelimiet voor imports",
|
||||
"Options.TraceImports.Desc": "Traceer de eerste N imports per module (0 = uit).",
|
||||
|
||||
"Options.LogToFile.Label": "Loggen naar bestand",
|
||||
"Options.LogToFile.Desc": "Stuur de uitvoer van de emulator ook naar een logbestand.",
|
||||
|
||||
"Options.LogFilePath.Label": "Pad naar logbestand",
|
||||
"Options.LogFilePath.Default": "Geen aangepast pad — logs komen terecht in user/logs naast de emulator.",
|
||||
"Options.LogFilePath.Select": "Selecteren…",
|
||||
|
||||
"Options.OverrideLogFile.Label": "Logbestand overschrijven",
|
||||
"Options.OverrideLogFile.Desc": "Gebruik het exacte bestandspad in plaats van de titel-ID en tijdstempel toe te voegen.",
|
||||
|
||||
"Options.TitleMusic.Label": "Titelmuziek",
|
||||
"Options.TitleMusic.Desc": "Herhaal de voorbeeldmuziek van de geselecteerde game in de bibliotheek.",
|
||||
|
||||
"Options.Discord.Label": "Discord-aanwezigheid",
|
||||
"Options.Discord.Desc": "Toon de actieve game op je Discord-profiel.",
|
||||
|
||||
"Options.Language.Label": "Taal van de emulator",
|
||||
"Options.Language.Desc": "Taal die in de hele launcher wordt gebruikt. Wordt direct toegepast.",
|
||||
|
||||
"Common.On": "Aan",
|
||||
"Common.Off": "Uit",
|
||||
|
||||
"Console.Title": "CONSOLE",
|
||||
"Console.SearchWatermark": "Zoeken...",
|
||||
"Console.AutoScroll": "Automatisch scrollen",
|
||||
"Console.Split": "Splitsen",
|
||||
"Console.Copy": "Kopiëren",
|
||||
"Console.Clear": "Wissen",
|
||||
"Console.WindowTitle": "SharpEmu-console",
|
||||
|
||||
"Launch.NoGameSelected": "Geen game geselecteerd",
|
||||
"Launch.NoGameHint": "Kies een game uit de bibliotheek, of open direct een eboot.bin-bestand.",
|
||||
"Launch.Idle": "Inactief",
|
||||
"Launch.Console": "≡ Console",
|
||||
"Launch.Launch": "▶ Starten",
|
||||
"Launch.Stop": "■ Stoppen",
|
||||
"Launch.Running": "Actief — {0}",
|
||||
"Launch.Stopping": "Stoppen…",
|
||||
"Launch.Exited": "Afgesloten met code {0} ({1})",
|
||||
"Launch.ExeNotFound": "SharpEmu-uitvoerbaar bestand niet gevonden. Bouw eerst het SharpEmu.CLI-project (dotnet build).",
|
||||
"Launch.LogFile": "Logbestand: {0}",
|
||||
"Launch.Command": "$ SharpEmu {0}",
|
||||
"Launch.StartFailed": "Starten van de emulator mislukt: {0}",
|
||||
"Launch.ProcessExited": "Proces afgesloten met code {0} ({1}).",
|
||||
|
||||
"Exit.Ok": "OK",
|
||||
"Exit.InvalidArguments": "ongeldige argumenten",
|
||||
"Exit.EbootNotFound": "eboot niet gevonden",
|
||||
"Exit.RuntimeException": "runtime-uitzondering",
|
||||
"Exit.EmulationError": "emulatiefout",
|
||||
"Exit.Unknown": "onbekend",
|
||||
|
||||
"Status.EmulatorLocating": "Emulator: zoeken…",
|
||||
"Status.EmulatorPath": "Emulator: {0}",
|
||||
"Status.EmulatorNotFound": "Emulator: SharpEmu-uitvoerbaar bestand niet gevonden — bouw eerst SharpEmu.CLI.",
|
||||
"Status.ScanningLibrary": "Bibliotheek scannen…",
|
||||
"Status.AddFolderPrompt": "Voeg een gamemap toe om de bibliotheek te vullen.",
|
||||
"Status.LibraryScanned": "Bibliotheek gescand: {0} game(s) in {1} map(pen).",
|
||||
"Status.CouldNotOpenFolder": "Kan map niet openen: {0}",
|
||||
"Status.CopiedToClipboard": "{0} gekopieerd naar klembord.",
|
||||
"Status.RemovedFromLibrary": "“{0}” verwijderd uit de bibliotheek. Voeg de map opnieuw toe om dit te herstellen.",
|
||||
"Status.Running": "Actief {0}",
|
||||
"Status.Stopping": "Stoppen…",
|
||||
"Status.Idle": "Inactief",
|
||||
|
||||
"Clipboard.Path": "Pad",
|
||||
"Clipboard.TitleId": "Titel-ID",
|
||||
|
||||
"Discord.Playing": "Speelt {0}",
|
||||
"Discord.Browsing": "Bladert door de bibliotheek",
|
||||
|
||||
"Dialog.ChooseGameFolder": "Kies een map met games",
|
||||
"Dialog.OpenExecutable": "Open een uitvoerbaar bestand om te starten",
|
||||
"Dialog.PsExecutables": "PS-uitvoerbare bestanden",
|
||||
"Dialog.SaveLogFile": "Selecteer waar het logbestand moet worden opgeslagen",
|
||||
"Dialog.PlainTextFiles": "Platte tekstbestanden",
|
||||
"Dialog.LogFiles": "Logbestanden"
|
||||
}
|
||||
@@ -22,6 +22,8 @@ public sealed class Localization
|
||||
private const string EmbeddedResourceSuffix = ".json";
|
||||
|
||||
private Dictionary<string, string> _strings = new();
|
||||
private Dictionary<string, string> _fallbackStrings = new();
|
||||
|
||||
|
||||
private Localization()
|
||||
{
|
||||
@@ -32,7 +34,16 @@ public sealed class Localization
|
||||
|
||||
public string CurrentCode { get; private set; } = "en";
|
||||
|
||||
public string Get(string key) => _strings.TryGetValue(key, out var value) ? value : key;
|
||||
public string Get(string key)
|
||||
{
|
||||
if (_strings.TryGetValue(key, out var value))
|
||||
return value;
|
||||
|
||||
if (_fallbackStrings.TryGetValue(key, out var fallbackValue))
|
||||
return fallbackValue;
|
||||
|
||||
return key;
|
||||
}
|
||||
|
||||
public string Format(string key, params object?[] args) => string.Format(Get(key), args);
|
||||
|
||||
@@ -74,13 +85,46 @@ public sealed class Localization
|
||||
}
|
||||
|
||||
/// <summary>Loads a language by code (e.g. "en"): a loose override file first, then the embedded copy.</summary>
|
||||
/// english is the fallback language
|
||||
public void Load(string code)
|
||||
{
|
||||
if (!TryLoadLooseFile(code) && !TryLoadEmbedded(code) &&
|
||||
!string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
|
||||
if (_fallbackStrings.Count == 0 && !string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
_ = TryLoadLooseFile("en") || TryLoadEmbedded("en");
|
||||
if (!TryLoadLooseFile("en", out var fallback) && !TryLoadEmbedded("en", out fallback))
|
||||
{
|
||||
fallback = new Dictionary<string, string>();
|
||||
}
|
||||
_fallbackStrings = fallback;
|
||||
}
|
||||
else if (string.Equals(code, "en", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
if (TryLoadLooseFile("en", out var enDict) || TryLoadEmbedded("en", out enDict))
|
||||
{
|
||||
_strings = enDict;
|
||||
_fallbackStrings = enDict;
|
||||
}
|
||||
else
|
||||
{
|
||||
_strings = new Dictionary<string, string>();
|
||||
_fallbackStrings = new Dictionary<string, string>();
|
||||
}
|
||||
CurrentCode = "en";
|
||||
return;
|
||||
}
|
||||
|
||||
// Load the requested language
|
||||
if (TryLoadLooseFile(code, out var loaded) || TryLoadEmbedded(code, out loaded))
|
||||
{
|
||||
_strings = loaded;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_fallbackStrings.Count > 0)
|
||||
_strings = new Dictionary<string, string>(_fallbackStrings);
|
||||
else
|
||||
_strings = new Dictionary<string, string>();
|
||||
}
|
||||
CurrentCode = code;
|
||||
}
|
||||
|
||||
private static IEnumerable<string> EmbeddedLanguageCodes()
|
||||
@@ -149,16 +193,64 @@ public sealed class Localization
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoad(string code, string json)
|
||||
private bool TryLoadLooseFile(string code, out Dictionary<string, string> result)
|
||||
{
|
||||
result = new Dictionary<string, string>();
|
||||
try
|
||||
{
|
||||
var path = Path.Combine(LanguagesDirectory, $"{code}.json");
|
||||
if (!File.Exists(path))
|
||||
return false;
|
||||
|
||||
var json = File.ReadAllText(path);
|
||||
return TryLoad(json, out result);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoadEmbedded(string code, out Dictionary<string, string> result)
|
||||
{
|
||||
result = new Dictionary<string, string>();
|
||||
try
|
||||
{
|
||||
using var stream = OpenEmbeddedLanguageStream(code);
|
||||
if (stream is null)
|
||||
return false;
|
||||
|
||||
using var reader = new StreamReader(stream);
|
||||
var json = reader.ReadToEnd();
|
||||
return TryLoad(json, out result);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static bool TryLoad(string json, out Dictionary<string, string> result)
|
||||
{
|
||||
var loaded = JsonSerializer.Deserialize<Dictionary<string, string>>(json);
|
||||
if (loaded is null)
|
||||
{
|
||||
result = new Dictionary<string, string>();
|
||||
return false;
|
||||
}
|
||||
|
||||
_strings = loaded;
|
||||
CurrentCode = code;
|
||||
result = loaded;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryLoad(string code, string json)
|
||||
{
|
||||
if (TryLoad(json, out var dict))
|
||||
{
|
||||
_strings = dict;
|
||||
CurrentCode = code;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -317,7 +317,73 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<Border Classes="card">
|
||||
<StackPanel Spacing="14">
|
||||
<TextBlock x:Name="AboutSectionTitle"
|
||||
Classes="sectionTitle"
|
||||
Text="ABOUT" />
|
||||
|
||||
<!--Github-->
|
||||
<Grid ColumnDefinitions="*,Auto">
|
||||
<StackPanel Grid.Column="0"
|
||||
Orientation="Horizontal"
|
||||
Spacing="8"
|
||||
VerticalAlignment="Center">
|
||||
<Image Source="avares://SharpEmu.GUI/Assets/github.png"
|
||||
Width="20"
|
||||
Height="20"
|
||||
VerticalAlignment="Center" />
|
||||
<StackPanel VerticalAlignment="Center"
|
||||
Spacing="2">
|
||||
<TextBlock x:Name="GithubLabel"
|
||||
Text="GitHub"
|
||||
FontSize="13" />
|
||||
<TextBlock x:Name="GithubDesc"
|
||||
Text="Source code, issues and project development."
|
||||
FontSize="11"
|
||||
Foreground="{StaticResource MutedBrush}"
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<Button Grid.Column="1"
|
||||
x:Name="GithubButton"
|
||||
Classes="ghost"
|
||||
Content="Open"
|
||||
VerticalAlignment="Center" />
|
||||
</Grid>
|
||||
|
||||
<!--Discord-->
|
||||
<Grid ColumnDefinitions="*,Auto">
|
||||
<StackPanel Grid.Column="0"
|
||||
Orientation="Horizontal"
|
||||
Spacing="8"
|
||||
VerticalAlignment="Center">
|
||||
<Image Source="avares://SharpEmu.GUI/Assets/discord.png"
|
||||
Width="20"
|
||||
Height="20"
|
||||
VerticalAlignment="Center" />
|
||||
<StackPanel VerticalAlignment="Center"
|
||||
Spacing="2">
|
||||
<TextBlock x:Name="DiscordServerLabel"
|
||||
Text="Discord"
|
||||
FontSize="13" />
|
||||
<TextBlock x:Name="DiscordServerDesc"
|
||||
Text="Join the community, get support and follow development."
|
||||
FontSize="11"
|
||||
Foreground="{StaticResource MutedBrush}"
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
|
||||
<Button Grid.Column="1"
|
||||
x:Name="DiscordButton"
|
||||
Classes="ghost"
|
||||
Content="Join"
|
||||
VerticalAlignment="Center" />
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</TabItem>
|
||||
|
||||
@@ -147,6 +147,25 @@ public partial class MainWindow : Window
|
||||
};
|
||||
_gamepadTimer.Tick += (_, _) => PollGamepad();
|
||||
_gamepadTimer.Start();
|
||||
|
||||
|
||||
GithubButton.Click += (_, _) =>
|
||||
{
|
||||
Process.Start(new ProcessStartInfo
|
||||
{
|
||||
FileName = "https://github.com/par274/sharpemu",
|
||||
UseShellExecute = true
|
||||
});
|
||||
};
|
||||
|
||||
DiscordButton.Click += (_, _) =>
|
||||
{
|
||||
Process.Start(new ProcessStartInfo
|
||||
{
|
||||
FileName = "https://discord.com/invite/6GejPEDqpc",
|
||||
UseShellExecute = true
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -443,6 +462,14 @@ public partial class MainWindow : Window
|
||||
LaunchButton.Content = loc.Get("Launch.Launch");
|
||||
StopButton.Content = loc.Get("Launch.Stop");
|
||||
|
||||
AboutSectionTitle.Text = loc.Get("Options.About");
|
||||
GithubLabel.Text = loc.Get("About.Github.Label");
|
||||
GithubDesc.Text = loc.Get("About.Github.Desc");
|
||||
DiscordServerLabel.Text = loc.Get("About.Discord.Label");
|
||||
DiscordServerDesc.Text = loc.Get("About.Discord.Desc");
|
||||
GithubButton.Content = loc.Get("About.GithubButton");
|
||||
DiscordButton.Content = loc.Get("About.DiscordButton");
|
||||
|
||||
UpdateEmptyStateTexts();
|
||||
UpdateSelectedGameTexts();
|
||||
}
|
||||
|
||||
@@ -28,6 +28,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
<ItemGroup>
|
||||
<AvaloniaResource Include="..\..\assets\images\SharpEmu.ico" Link="Assets/SharpEmu.ico" />
|
||||
<AvaloniaResource Include="..\..\assets\images\github.png" Link="Assets/github.png" />
|
||||
<AvaloniaResource Include="..\..\assets\images\discord.png" Link="Assets/discord.png" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
Binary file not shown.
@@ -0,0 +1,31 @@
|
||||
// Copyright (C) 2026 SharpEmu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
namespace SharpEmu.HLE;
|
||||
|
||||
/// <summary>
|
||||
/// Lets host-facing libraries (VideoOut, AudioOut) request cooperative guest
|
||||
/// shutdown without taking a dependency on SharpEmu.Core.
|
||||
/// </summary>
|
||||
public static class HostSessionControl
|
||||
{
|
||||
private static Action<string>? _shutdownHandler;
|
||||
|
||||
public static void SetShutdownHandler(Action<string>? handler)
|
||||
{
|
||||
Volatile.Write(ref _shutdownHandler, handler);
|
||||
}
|
||||
|
||||
public static void RequestShutdown(string reason)
|
||||
{
|
||||
try
|
||||
{
|
||||
Volatile.Read(ref _shutdownHandler)?.Invoke(reason);
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Console.Error.WriteLine(
|
||||
$"[LOADER][WARN] Host shutdown handler failed: {exception.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,4 +8,6 @@ public interface ICpuMemory
|
||||
bool TryRead(ulong virtualAddress, Span<byte> destination);
|
||||
|
||||
bool TryWrite(ulong virtualAddress, ReadOnlySpan<byte> source);
|
||||
|
||||
bool TryCompare(ulong virtualAddress, ReadOnlySpan<byte> expected) => false;
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ public static class AgcExports
|
||||
private static readonly HashSet<uint> _tracedSubmittedDrawOpcodes = new();
|
||||
private static readonly Dictionary<(ulong Ps, ulong State, Gen5PixelOutputKind Output), byte[]> _pixelSpirvCache = new();
|
||||
private static readonly Dictionary<
|
||||
(ulong Es, ulong EsState, ulong Ps, ulong PsState, Gen5PixelOutputKind Output),
|
||||
(ulong Es, ulong EsState, ulong Ps, ulong PsState, Gen5PixelOutputKind Output, uint Attributes),
|
||||
(byte[] Vertex, byte[] Pixel)> _graphicsSpirvCache = new();
|
||||
private static readonly Dictionary<
|
||||
(ulong Cs, ulong State, uint LocalX, uint LocalY, uint LocalZ),
|
||||
@@ -2019,8 +2019,16 @@ public static class AgcExports
|
||||
var gpuState = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
|
||||
lock (gpuState.Gate)
|
||||
{
|
||||
ParseSubmittedDcb(ctx, gpuState, gpuState.Graphics, commandAddress, dwordCount, tracePackets);
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
Gen5ShaderScalarEvaluator.BeginGlobalMemoryReadScope();
|
||||
try
|
||||
{
|
||||
ParseSubmittedDcb(ctx, gpuState, gpuState.Graphics, commandAddress, dwordCount, tracePackets);
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Gen5ShaderScalarEvaluator.EndGlobalMemoryReadScope();
|
||||
}
|
||||
}
|
||||
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
@@ -2050,27 +2058,35 @@ public static class AgcExports
|
||||
var gpuState = _submittedGpuStates.GetValue(ctx.Memory, static _ => new SubmittedGpuState());
|
||||
lock (gpuState.Gate)
|
||||
{
|
||||
for (uint i = 0; i < bufferCount; i++)
|
||||
Gen5ShaderScalarEvaluator.BeginGlobalMemoryReadScope();
|
||||
try
|
||||
{
|
||||
if (!ctx.TryReadUInt64(addressArray + i * 8, out var commandAddress) ||
|
||||
commandAddress == 0 ||
|
||||
!ctx.TryReadUInt32(sizeArray + i * 4, out var dwordCount) ||
|
||||
dwordCount == 0)
|
||||
for (uint i = 0; i < bufferCount; i++)
|
||||
{
|
||||
continue;
|
||||
if (!ctx.TryReadUInt64(addressArray + i * 8, out var commandAddress) ||
|
||||
commandAddress == 0 ||
|
||||
!ctx.TryReadUInt32(sizeArray + i * 4, out var dwordCount) ||
|
||||
dwordCount == 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (tracePackets)
|
||||
{
|
||||
TraceAgc(
|
||||
$"agc.driver_submit_multi_dcbs index={i}/{bufferCount} " +
|
||||
$"addr=0x{commandAddress:X16} dwords={dwordCount}");
|
||||
}
|
||||
|
||||
ParseSubmittedDcb(ctx, gpuState, gpuState.Graphics, commandAddress, dwordCount, tracePackets);
|
||||
}
|
||||
|
||||
if (tracePackets)
|
||||
{
|
||||
TraceAgc(
|
||||
$"agc.driver_submit_multi_dcbs index={i}/{bufferCount} " +
|
||||
$"addr=0x{commandAddress:X16} dwords={dwordCount}");
|
||||
}
|
||||
|
||||
ParseSubmittedDcb(ctx, gpuState, gpuState.Graphics, commandAddress, dwordCount, tracePackets);
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Gen5ShaderScalarEvaluator.EndGlobalMemoryReadScope();
|
||||
}
|
||||
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
}
|
||||
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
@@ -2118,8 +2134,16 @@ public static class AgcExports
|
||||
gpuState.ComputeQueues.Add(ownerHandle, queueState);
|
||||
}
|
||||
|
||||
ParseSubmittedDcb(ctx, gpuState, queueState, commandAddress, dwordCount, tracePackets);
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
Gen5ShaderScalarEvaluator.BeginGlobalMemoryReadScope();
|
||||
try
|
||||
{
|
||||
ParseSubmittedDcb(ctx, gpuState, queueState, commandAddress, dwordCount, tracePackets);
|
||||
DrainResumableDcbs(ctx, gpuState, tracePackets);
|
||||
}
|
||||
finally
|
||||
{
|
||||
Gen5ShaderScalarEvaluator.EndGlobalMemoryReadScope();
|
||||
}
|
||||
}
|
||||
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
@@ -3418,7 +3442,8 @@ public static class AgcExports
|
||||
exportState,
|
||||
out var exportEvaluation,
|
||||
out error,
|
||||
resolveVertexInputs: true) ||
|
||||
resolveVertexInputs: true,
|
||||
vertexRecordLimit: indexed ? null : vertexCount) ||
|
||||
!Gen5ShaderTranslator.TryCreateState(
|
||||
ctx,
|
||||
pixelShaderAddress,
|
||||
@@ -3442,14 +3467,19 @@ public static class AgcExports
|
||||
HasPixelColorExport(pixelState, target.Slot))
|
||||
.ToArray();
|
||||
var outputKind = GetPixelOutputKind(renderTargets.FirstOrDefault().NumberType);
|
||||
var exportStateFingerprint = ComputeShaderStateFingerprint(exportEvaluation);
|
||||
var pixelStateFingerprint = ComputeShaderStateFingerprint(pixelEvaluation);
|
||||
var attributeCount = GetInterpolatedAttributeCount(pixelState);
|
||||
var exportStateFingerprint = ComputeShaderStructureFingerprint(exportEvaluation);
|
||||
var pixelStateFingerprint = ComputeShaderStructureFingerprint(pixelEvaluation);
|
||||
var shaderKey = (
|
||||
exportShaderAddress,
|
||||
exportStateFingerprint,
|
||||
pixelShaderAddress,
|
||||
pixelStateFingerprint,
|
||||
outputKind);
|
||||
outputKind,
|
||||
attributeCount);
|
||||
var totalGlobalBuffers =
|
||||
pixelEvaluation.GlobalMemoryBindings.Count +
|
||||
exportEvaluation.GlobalMemoryBindings.Count;
|
||||
(byte[] Vertex, byte[] Pixel) compiled;
|
||||
lock (_submitTraceGate)
|
||||
{
|
||||
@@ -3458,9 +3488,6 @@ public static class AgcExports
|
||||
|
||||
if (compiled.Vertex is null || compiled.Pixel is null)
|
||||
{
|
||||
var totalGlobalBuffers =
|
||||
pixelEvaluation.GlobalMemoryBindings.Count +
|
||||
exportEvaluation.GlobalMemoryBindings.Count;
|
||||
if (!Gen5SpirvTranslator.TryCompilePixelShader(
|
||||
pixelState,
|
||||
pixelEvaluation,
|
||||
@@ -3468,16 +3495,18 @@ public static class AgcExports
|
||||
out var pixelShader,
|
||||
out error,
|
||||
globalBufferBase: 0,
|
||||
totalGlobalBufferCount: totalGlobalBuffers,
|
||||
imageBindingBase: 0) ||
|
||||
totalGlobalBufferCount: totalGlobalBuffers + 2,
|
||||
imageBindingBase: 0,
|
||||
scalarRegisterBufferIndex: totalGlobalBuffers) ||
|
||||
!Gen5SpirvTranslator.TryCompileVertexShader(
|
||||
exportState,
|
||||
exportEvaluation,
|
||||
out var vertexShader,
|
||||
out error,
|
||||
globalBufferBase: pixelEvaluation.GlobalMemoryBindings.Count,
|
||||
totalGlobalBufferCount: totalGlobalBuffers,
|
||||
imageBindingBase: pixelEvaluation.ImageBindings.Count))
|
||||
totalGlobalBufferCount: totalGlobalBuffers + 2,
|
||||
imageBindingBase: pixelEvaluation.ImageBindings.Count,
|
||||
scalarRegisterBufferIndex: totalGlobalBuffers + 1))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -3529,6 +3558,8 @@ public static class AgcExports
|
||||
|
||||
var globalMemoryBindings = pixelEvaluation.GlobalMemoryBindings
|
||||
.Concat(exportEvaluation.GlobalMemoryBindings)
|
||||
.Append(CreateScalarRegisterBinding(pixelEvaluation))
|
||||
.Append(CreateScalarRegisterBinding(exportEvaluation))
|
||||
.ToArray();
|
||||
IReadOnlyList<Gen5VertexInputBinding> vertexInputs =
|
||||
exportEvaluation.VertexInputs ?? [];
|
||||
@@ -3539,7 +3570,7 @@ public static class AgcExports
|
||||
primitiveType,
|
||||
compiled.Vertex,
|
||||
compiled.Pixel,
|
||||
GetInterpolatedAttributeCount(pixelState),
|
||||
attributeCount,
|
||||
vertexCount,
|
||||
state.InstanceCount,
|
||||
indexed ? CreateVulkanIndexBuffer(ctx, state, vertexCount) : null,
|
||||
@@ -3651,6 +3682,88 @@ public static class AgcExports
|
||||
return (uint)(maxAttribute + 1);
|
||||
}
|
||||
|
||||
private const int ShaderScalarRegisterCount = 256;
|
||||
|
||||
private static Gen5GlobalMemoryBinding CreateScalarRegisterBinding(
|
||||
Gen5ShaderEvaluation evaluation)
|
||||
{
|
||||
var data = new byte[ShaderScalarRegisterCount * sizeof(uint)];
|
||||
var registers = evaluation.InitialScalarRegisters;
|
||||
var count = Math.Min(registers.Count, ShaderScalarRegisterCount);
|
||||
for (var index = 0; index < count; index++)
|
||||
{
|
||||
var value = registers[index];
|
||||
var offset = index * sizeof(uint);
|
||||
data[offset] = (byte)value;
|
||||
data[offset + 1] = (byte)(value >> 8);
|
||||
data[offset + 2] = (byte)(value >> 16);
|
||||
data[offset + 3] = (byte)(value >> 24);
|
||||
}
|
||||
|
||||
return new Gen5GlobalMemoryBinding(0, 0, [], data);
|
||||
}
|
||||
|
||||
private static ulong ComputeShaderStructureFingerprint(Gen5ShaderEvaluation evaluation)
|
||||
{
|
||||
const ulong offsetBasis = 14695981039346656037UL;
|
||||
const ulong prime = 1099511628211UL;
|
||||
var hash = offsetBasis;
|
||||
void Mix(ulong value) => hash = (hash ^ value) * prime;
|
||||
|
||||
Mix((ulong)evaluation.GlobalMemoryBindings.Count);
|
||||
foreach (var binding in evaluation.GlobalMemoryBindings)
|
||||
{
|
||||
Mix(binding.ScalarAddress);
|
||||
Mix((ulong)binding.InstructionPcs.Count);
|
||||
foreach (var pc in binding.InstructionPcs)
|
||||
{
|
||||
Mix(pc);
|
||||
}
|
||||
}
|
||||
|
||||
Mix((ulong)evaluation.ImageBindings.Count);
|
||||
foreach (var image in evaluation.ImageBindings)
|
||||
{
|
||||
Mix(image.Pc);
|
||||
Mix((ulong)(uint)image.Opcode.GetHashCode());
|
||||
foreach (var word in image.ResourceDescriptor)
|
||||
{
|
||||
Mix(word);
|
||||
}
|
||||
|
||||
foreach (var word in image.SamplerDescriptor)
|
||||
{
|
||||
Mix(word);
|
||||
}
|
||||
|
||||
Mix(image.MipLevel ?? uint.MaxValue);
|
||||
}
|
||||
|
||||
if (evaluation.VertexInputs is { } vertexInputs)
|
||||
{
|
||||
Mix((ulong)vertexInputs.Count);
|
||||
foreach (var input in vertexInputs)
|
||||
{
|
||||
Mix(input.Pc);
|
||||
Mix(input.Location);
|
||||
Mix(input.ComponentCount);
|
||||
Mix(input.DataFormat);
|
||||
Mix(input.NumberFormat);
|
||||
Mix(input.Stride);
|
||||
}
|
||||
}
|
||||
|
||||
if (evaluation.ComputeSystemRegisters is { } computeSystemRegisters)
|
||||
{
|
||||
Mix(computeSystemRegisters.WorkGroupXRegister ?? uint.MaxValue);
|
||||
Mix(computeSystemRegisters.WorkGroupYRegister ?? uint.MaxValue);
|
||||
Mix(computeSystemRegisters.WorkGroupZRegister ?? uint.MaxValue);
|
||||
Mix(computeSystemRegisters.ThreadGroupSizeRegister ?? uint.MaxValue);
|
||||
}
|
||||
|
||||
return hash;
|
||||
}
|
||||
|
||||
private static ulong ComputeShaderStateFingerprint(Gen5ShaderEvaluation evaluation)
|
||||
{
|
||||
const ulong offsetBasis = 14695981039346656037UL;
|
||||
|
||||
@@ -13,6 +13,24 @@ internal static class Gen5ShaderScalarEvaluator
|
||||
private const int ImageDescriptorDwords = 8;
|
||||
private const int SamplerDescriptorDwords = 4;
|
||||
private const int MaxGlobalMemoryBindingBytes = 16 * 1024 * 1024;
|
||||
private static readonly int DefaultGlobalMemoryBindingBytes =
|
||||
int.TryParse(
|
||||
Environment.GetEnvironmentVariable("SHARPEMU_GLOBAL_BINDING_BYTES"),
|
||||
out var configured) && configured >= sizeof(uint)
|
||||
? Math.Min(configured, MaxGlobalMemoryBindingBytes)
|
||||
: 1 * 1024 * 1024;
|
||||
|
||||
internal static long GlobalMemoryReadCount;
|
||||
internal static long GlobalMemoryReadBytes;
|
||||
internal static long GlobalMemoryReadCacheHits;
|
||||
internal static long GlobalMemoryReadPvmBytes;
|
||||
internal static long GlobalMemoryReadLibcBytes;
|
||||
internal static long GlobalMemoryReadReuses;
|
||||
|
||||
private const long CrossFrameReadCacheMaxBytes = 1024L * 1024 * 1024;
|
||||
private static readonly object _crossFrameReadGate = new();
|
||||
private static readonly Dictionary<(ulong BaseAddress, int SizeBytes), byte[]> _crossFrameReadCache = new();
|
||||
private static long _crossFrameReadCacheBytes;
|
||||
private const ulong RdnaWaveMask = 0xFFFF_FFFFUL;
|
||||
|
||||
private readonly record struct BufferDescriptor(
|
||||
@@ -44,7 +62,8 @@ internal static class Gen5ShaderScalarEvaluator
|
||||
Gen5ShaderState state,
|
||||
out Gen5ShaderEvaluation evaluation,
|
||||
out string error,
|
||||
bool resolveVertexInputs = false)
|
||||
bool resolveVertexInputs = false,
|
||||
uint? vertexRecordLimit = null)
|
||||
{
|
||||
evaluation = default!;
|
||||
error = string.Empty;
|
||||
@@ -255,10 +274,28 @@ internal static class Gen5ShaderScalarEvaluator
|
||||
if (resolveVertexInputs &&
|
||||
IsVertexFetchCandidate(instruction, bufferMemory, bufferDescriptor))
|
||||
{
|
||||
var vertexReadSize = bufferDescriptor.SizeBytes;
|
||||
if (vertexRecordLimit is { } recordLimit &&
|
||||
instruction.Sources.Count > 2 &&
|
||||
TryEvaluateScalarOperand(
|
||||
instruction.Sources[2],
|
||||
scalarRegisters,
|
||||
out var scalarOffset))
|
||||
{
|
||||
var bindingOffset = unchecked((uint)bufferMemory.OffsetBytes + scalarOffset);
|
||||
var requiredBytes =
|
||||
(ulong)bindingOffset +
|
||||
(ulong)(Math.Max(recordLimit, 1u) - 1u) * bufferDescriptor.Stride +
|
||||
(ulong)bufferMemory.DwordCount * sizeof(uint);
|
||||
vertexReadSize = Math.Min(
|
||||
bufferDescriptor.SizeBytes,
|
||||
Math.Max(requiredBytes, sizeof(uint)));
|
||||
}
|
||||
|
||||
if (!TryReadGlobalMemory(
|
||||
ctx,
|
||||
bufferDescriptor.BaseAddress,
|
||||
bufferDescriptor.SizeBytes,
|
||||
vertexReadSize,
|
||||
out var vertexData))
|
||||
{
|
||||
error =
|
||||
@@ -533,22 +570,29 @@ internal static class Gen5ShaderScalarEvaluator
|
||||
return false;
|
||||
}
|
||||
|
||||
[ThreadStatic]
|
||||
private static Dictionary<(ulong BaseAddress, int SizeBytes), byte[]>? _globalMemoryReadCache;
|
||||
|
||||
internal static void BeginGlobalMemoryReadScope()
|
||||
{
|
||||
_globalMemoryReadCache = new Dictionary<(ulong, int), byte[]>();
|
||||
}
|
||||
|
||||
internal static void EndGlobalMemoryReadScope()
|
||||
{
|
||||
_globalMemoryReadCache = null;
|
||||
}
|
||||
|
||||
private static bool TryReadGlobalMemory(
|
||||
CpuContext ctx,
|
||||
ulong baseAddress,
|
||||
out byte[] data)
|
||||
{
|
||||
for (var size = MaxGlobalMemoryBindingBytes; size >= 4096; size >>= 1)
|
||||
{
|
||||
data = GC.AllocateUninitializedArray<byte>(size);
|
||||
if (ctx.Memory.TryRead(baseAddress, data))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
data = [];
|
||||
return false;
|
||||
return TryReadGlobalMemory(
|
||||
ctx,
|
||||
baseAddress,
|
||||
(ulong)DefaultGlobalMemoryBindingBytes,
|
||||
out data);
|
||||
}
|
||||
|
||||
private static bool TryReadGlobalMemory(
|
||||
@@ -570,13 +614,74 @@ internal static class Gen5ShaderScalarEvaluator
|
||||
return false;
|
||||
}
|
||||
|
||||
var cache = _globalMemoryReadCache;
|
||||
var cacheKey = (baseAddress, (int)cappedSize);
|
||||
if (cache is not null && cache.TryGetValue(cacheKey, out var cached))
|
||||
{
|
||||
Interlocked.Increment(ref GlobalMemoryReadCacheHits);
|
||||
data = cached;
|
||||
return true;
|
||||
}
|
||||
|
||||
byte[]? previous;
|
||||
lock (_crossFrameReadGate)
|
||||
{
|
||||
_crossFrameReadCache.TryGetValue(cacheKey, out previous);
|
||||
}
|
||||
|
||||
if (previous is not null && ctx.Memory.TryCompare(baseAddress, previous))
|
||||
{
|
||||
Interlocked.Increment(ref GlobalMemoryReadReuses);
|
||||
if (cache is not null)
|
||||
{
|
||||
cache[cacheKey] = previous;
|
||||
}
|
||||
|
||||
data = previous;
|
||||
return true;
|
||||
}
|
||||
|
||||
var candidateSize = (int)cappedSize;
|
||||
while (candidateSize >= sizeof(uint))
|
||||
{
|
||||
data = GC.AllocateUninitializedArray<byte>(candidateSize);
|
||||
if (ctx.Memory.TryRead(baseAddress, data) ||
|
||||
var readFromPvm = ctx.Memory.TryRead(baseAddress, data);
|
||||
if (readFromPvm ||
|
||||
KernelMemoryCompatExports.TryReadTrackedLibcHeap(baseAddress, data))
|
||||
{
|
||||
Interlocked.Increment(ref GlobalMemoryReadCount);
|
||||
Interlocked.Add(ref GlobalMemoryReadBytes, data.Length);
|
||||
if (readFromPvm)
|
||||
{
|
||||
Interlocked.Add(ref GlobalMemoryReadPvmBytes, data.Length);
|
||||
}
|
||||
else
|
||||
{
|
||||
Interlocked.Add(ref GlobalMemoryReadLibcBytes, data.Length);
|
||||
}
|
||||
|
||||
if (cache is not null)
|
||||
{
|
||||
cache[cacheKey] = data;
|
||||
}
|
||||
|
||||
lock (_crossFrameReadGate)
|
||||
{
|
||||
if (_crossFrameReadCache.TryGetValue(cacheKey, out var replaced))
|
||||
{
|
||||
_crossFrameReadCacheBytes -= replaced.Length;
|
||||
}
|
||||
|
||||
if (_crossFrameReadCacheBytes + data.Length > CrossFrameReadCacheMaxBytes)
|
||||
{
|
||||
_crossFrameReadCache.Clear();
|
||||
_crossFrameReadCacheBytes = 0;
|
||||
}
|
||||
|
||||
_crossFrameReadCache[cacheKey] = data;
|
||||
_crossFrameReadCacheBytes += data.Length;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -802,8 +802,15 @@ internal static class Gen5ShaderTranslator
|
||||
0x14 => "VCmpxGtF32",
|
||||
0x15 => "VCmpxLgF32",
|
||||
0x16 => "VCmpxGeF32",
|
||||
0x17 => "VCmpxOF32",
|
||||
0x18 => "VCmpxUF32",
|
||||
0x19 => "VCmpxNgeF32",
|
||||
0x1A => "VCmpxNlgF32",
|
||||
0x1B => "VCmpxNgtF32",
|
||||
0x1C => "VCmpxNleF32",
|
||||
0x1D => "VCmpxNeqF32",
|
||||
0x1E => "VCmpxNltF32",
|
||||
0x1F => "VCmpxTruF32",
|
||||
0x80 => "VCmpFI32",
|
||||
0x81 => "VCmpLtI32",
|
||||
0x82 => "VCmpEqI32",
|
||||
|
||||
@@ -861,6 +861,25 @@ internal static partial class Gen5SpirvTranslator
|
||||
{
|
||||
condition = _module.ConstantBool(true);
|
||||
}
|
||||
else if (opcode is "VCmpOF32" or "VCmpxOF32" or "VCmpUF32" or "VCmpxUF32")
|
||||
{
|
||||
// The ordered/unordered predicates only test whether either
|
||||
// operand is NaN. SPIR-V's OpOrdered/OpUnordered are Kernel-only,
|
||||
// so build the same result from OpIsNan, which needs no extra
|
||||
// capability: unordered = isnan(a) || isnan(b), ordered = !that.
|
||||
var left = GetFloatSource(instruction, 0);
|
||||
var right = GetFloatSource(instruction, 1);
|
||||
var nanLeft = _module.AddInstruction(SpirvOp.IsNan, _boolType, left);
|
||||
var nanRight = _module.AddInstruction(SpirvOp.IsNan, _boolType, right);
|
||||
var unordered = _module.AddInstruction(
|
||||
SpirvOp.LogicalOr,
|
||||
_boolType,
|
||||
nanLeft,
|
||||
nanRight);
|
||||
condition = opcode is "VCmpUF32" or "VCmpxUF32"
|
||||
? unordered
|
||||
: _module.AddInstruction(SpirvOp.LogicalNot, _boolType, unordered);
|
||||
}
|
||||
else if (opcode is not ("VCmpClassF32" or "VCmpxClassF32") &&
|
||||
opcode.EndsWith("F32", StringComparison.Ordinal))
|
||||
{
|
||||
@@ -875,6 +894,7 @@ internal static partial class Gen5SpirvTranslator
|
||||
"VCmpLgF32" or "VCmpxLgF32" => SpirvOp.FOrdNotEqual,
|
||||
"VCmpGeF32" or "VCmpxGeF32" => SpirvOp.FOrdGreaterThanEqual,
|
||||
"VCmpNeqF32" or "VCmpxNeqF32" => SpirvOp.FUnordNotEqual,
|
||||
"VCmpNlgF32" or "VCmpxNlgF32" => SpirvOp.FUnordEqual,
|
||||
"VCmpNltF32" or "VCmpxNltF32" => SpirvOp.FUnordGreaterThanEqual,
|
||||
"VCmpNleF32" or "VCmpxNleF32" => SpirvOp.FUnordGreaterThan,
|
||||
"VCmpNgtF32" or "VCmpxNgtF32" => SpirvOp.FUnordLessThanEqual,
|
||||
@@ -925,7 +945,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
condition = _module.AddInstruction(operation, _boolType, left, right);
|
||||
}
|
||||
|
||||
StoreWaveMask(106, condition);
|
||||
// On gfx10, VCmpx writes EXEC only and preserves VCC; the sdst
|
||||
// operand was removed from the cmpx encodings on this generation.
|
||||
if (opcode.StartsWith("VCmpx", StringComparison.Ordinal))
|
||||
{
|
||||
var active = _module.AddInstruction(
|
||||
@@ -935,6 +956,10 @@ internal static partial class Gen5SpirvTranslator
|
||||
condition);
|
||||
StoreWaveMask(126, active);
|
||||
}
|
||||
else
|
||||
{
|
||||
StoreWaveMask(106, condition);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
out string error,
|
||||
int globalBufferBase = 0,
|
||||
int totalGlobalBufferCount = -1,
|
||||
int imageBindingBase = 0)
|
||||
int imageBindingBase = 0,
|
||||
int scalarRegisterBufferIndex = -1)
|
||||
{
|
||||
var context = new CompilationContext(
|
||||
Gen5SpirvStage.Pixel,
|
||||
@@ -30,7 +31,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
1,
|
||||
globalBufferBase,
|
||||
totalGlobalBufferCount,
|
||||
imageBindingBase);
|
||||
imageBindingBase,
|
||||
scalarRegisterBufferIndex);
|
||||
return context.TryCompile(out shader, out error);
|
||||
}
|
||||
|
||||
@@ -41,7 +43,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
out string error,
|
||||
int globalBufferBase = 0,
|
||||
int totalGlobalBufferCount = -1,
|
||||
int imageBindingBase = 0)
|
||||
int imageBindingBase = 0,
|
||||
int scalarRegisterBufferIndex = -1)
|
||||
{
|
||||
var context = new CompilationContext(
|
||||
Gen5SpirvStage.Vertex,
|
||||
@@ -53,7 +56,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
1,
|
||||
globalBufferBase,
|
||||
totalGlobalBufferCount,
|
||||
imageBindingBase);
|
||||
imageBindingBase,
|
||||
scalarRegisterBufferIndex);
|
||||
return context.TryCompile(out shader, out error);
|
||||
}
|
||||
|
||||
@@ -76,7 +80,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
Math.Max(localSizeZ, 1),
|
||||
0,
|
||||
-1,
|
||||
0);
|
||||
0,
|
||||
-1);
|
||||
return context.TryCompile(out shader, out error);
|
||||
}
|
||||
|
||||
@@ -93,6 +98,7 @@ internal static partial class Gen5SpirvTranslator
|
||||
private readonly int _globalBufferBase;
|
||||
private readonly int _totalGlobalBufferCount;
|
||||
private readonly int _imageBindingBase;
|
||||
private readonly int _scalarRegisterBufferIndex;
|
||||
private readonly List<uint> _interfaces = [];
|
||||
private readonly Dictionary<uint, uint> _pixelInputs = [];
|
||||
private readonly Dictionary<uint, uint> _vertexOutputs = [];
|
||||
@@ -167,7 +173,8 @@ internal static partial class Gen5SpirvTranslator
|
||||
uint localSizeZ,
|
||||
int globalBufferBase,
|
||||
int totalGlobalBufferCount,
|
||||
int imageBindingBase)
|
||||
int imageBindingBase,
|
||||
int scalarRegisterBufferIndex)
|
||||
{
|
||||
_stage = stage;
|
||||
_state = state;
|
||||
@@ -181,6 +188,7 @@ internal static partial class Gen5SpirvTranslator
|
||||
? evaluation.GlobalMemoryBindings.Count
|
||||
: totalGlobalBufferCount;
|
||||
_imageBindingBase = imageBindingBase;
|
||||
_scalarRegisterBufferIndex = scalarRegisterBufferIndex;
|
||||
}
|
||||
|
||||
public bool TryCompile(out Gen5SpirvShader shader, out string error)
|
||||
@@ -767,15 +775,25 @@ internal static partial class Gen5SpirvTranslator
|
||||
|
||||
private void EmitInitialState()
|
||||
{
|
||||
for (uint index = 0;
|
||||
index < _evaluation.InitialScalarRegisters.Count &&
|
||||
index < ScalarRegisterCount;
|
||||
index++)
|
||||
if (_scalarRegisterBufferIndex >= 0)
|
||||
{
|
||||
var value = _evaluation.InitialScalarRegisters[(int)index];
|
||||
if (value != 0)
|
||||
for (uint index = 0; index < ScalarRegisterCount; index++)
|
||||
{
|
||||
StoreS(index, UInt(value));
|
||||
StoreS(index, LoadBufferWord(_scalarRegisterBufferIndex, UInt(index)));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (uint index = 0;
|
||||
index < _evaluation.InitialScalarRegisters.Count &&
|
||||
index < ScalarRegisterCount;
|
||||
index++)
|
||||
{
|
||||
var value = _evaluation.InitialScalarRegisters[(int)index];
|
||||
if (value != 0)
|
||||
{
|
||||
StoreS(index, UInt(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -213,6 +213,17 @@ public static class AudioOutExports
|
||||
: (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
|
||||
}
|
||||
|
||||
public static void ShutdownAllPorts()
|
||||
{
|
||||
foreach (var handle in Ports.Keys)
|
||||
{
|
||||
if (Ports.TryRemove(handle, out var port))
|
||||
{
|
||||
port.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static bool TryGetFormat(
|
||||
int rawFormat,
|
||||
out int channels,
|
||||
|
||||
@@ -35,6 +35,17 @@ public static class AvPlayerExports
|
||||
return unchecked((int)handle);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "KMcEa+rHsIo",
|
||||
ExportName = "sceAvPlayerAddSource",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceAvPlayer")]
|
||||
public static int AvPlayerAddSource(CpuContext ctx)
|
||||
{
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
return (int)OrbisGen2Result.ORBIS_GEN2_OK;
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "JdksQu8pNdQ",
|
||||
ExportName = "sceAvPlayerGetVideoDataEx",
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
using SharpEmu.HLE;
|
||||
using System.Buffers.Binary;
|
||||
using System.Threading;
|
||||
|
||||
namespace SharpEmu.Libs.CommonDialog;
|
||||
@@ -10,10 +11,21 @@ public static class MsgDialogExports
|
||||
{
|
||||
private const int StatusNone = 0;
|
||||
private const int StatusInitialized = 1;
|
||||
private const int StatusRunning = 2;
|
||||
private const int StatusFinished = 3;
|
||||
private const int ResultSize = 0x20;
|
||||
|
||||
private static int _initialized;
|
||||
private const int ErrorOk = 0;
|
||||
private const int ErrorNotInitialized = unchecked((int)0x80B80003);
|
||||
private const int ErrorNotFinished = unchecked((int)0x80B80005);
|
||||
private const int ErrorBusy = unchecked((int)0x80B80007);
|
||||
private const int ErrorNotRunning = unchecked((int)0x80B8000B);
|
||||
private const int ErrorArgNull = unchecked((int)0x80B8000D);
|
||||
|
||||
// Result buffer layout follows the common dialog convention: mode at +0x00,
|
||||
// result at +0x04, buttonId at +0x08. The affirmative button (OK/YES) is 1.
|
||||
private const int ResultSize = 0x20;
|
||||
private const int ButtonIdAffirmative = 1;
|
||||
|
||||
private static int _status;
|
||||
|
||||
[SysAbiExport(
|
||||
@@ -24,11 +36,10 @@ public static class MsgDialogExports
|
||||
public static int MsgDialogInitialize(CpuContext ctx)
|
||||
{
|
||||
// Treat repeated initialization as success. The dialog service is process-global in
|
||||
// this HLE implementation and has no per-call resources to recreate.
|
||||
Interlocked.Exchange(ref _initialized, 1);
|
||||
Interlocked.Exchange(ref _status, StatusInitialized);
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
return (int)OrbisGen2Result.ORBIS_GEN2_OK;
|
||||
// this HLE implementation and has no per-call resources to recreate. Only promote
|
||||
// from NONE so re-initializing mid-flow cannot clobber a running/finished dialog.
|
||||
Interlocked.CompareExchange(ref _status, StatusInitialized, StatusNone);
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
@@ -38,9 +49,12 @@ public static class MsgDialogExports
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogTerminate(CpuContext ctx)
|
||||
{
|
||||
Interlocked.Exchange(ref _initialized, 0);
|
||||
Interlocked.Exchange(ref _status, StatusNone);
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_OK);
|
||||
if (Interlocked.Exchange(ref _status, StatusNone) == StatusNone)
|
||||
{
|
||||
return ctx.SetReturn(ErrorNotInitialized);
|
||||
}
|
||||
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
@@ -50,13 +64,29 @@ public static class MsgDialogExports
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogOpen(CpuContext ctx)
|
||||
{
|
||||
LogDialogMessage(ctx, ctx[CpuRegister.Rdi]);
|
||||
var paramAddress = ctx[CpuRegister.Rdi];
|
||||
if (paramAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(ErrorArgNull);
|
||||
}
|
||||
|
||||
// There is no host popup to actually show. Complete immediately with "finished" so a
|
||||
// guest polling loop (GetStatus/UpdateStatus -> GetResult -> Close) sees a dismissed
|
||||
// dialog on its very first poll instead of spinning forever waiting for user input.
|
||||
Interlocked.Exchange(ref _status, StatusFinished);
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_OK);
|
||||
var status = Volatile.Read(ref _status);
|
||||
if (status == StatusNone)
|
||||
{
|
||||
return ctx.SetReturn(ErrorNotInitialized);
|
||||
}
|
||||
|
||||
if (status == StatusRunning)
|
||||
{
|
||||
return ctx.SetReturn(ErrorBusy);
|
||||
}
|
||||
|
||||
LogDialogMessage(ctx, paramAddress);
|
||||
|
||||
// There is no host popup to actually show. Enter RUNNING so close/cancel paths see
|
||||
// a live dialog; the guest's next status poll auto-dismisses it (see PollStatus).
|
||||
Interlocked.Exchange(ref _status, StatusRunning);
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
// Best-effort extraction of the dialog text so fatal-error popups are visible in the
|
||||
@@ -65,12 +95,6 @@ public static class MsgDialogExports
|
||||
// level deep, then a second level for nested sub-param structs.
|
||||
private static void LogDialogMessage(CpuContext ctx, ulong paramAddress)
|
||||
{
|
||||
if (paramAddress == 0)
|
||||
{
|
||||
Console.Error.WriteLine("[LOADER][INFO] sceMsgDialogOpen: param=NULL");
|
||||
return;
|
||||
}
|
||||
|
||||
Console.Error.WriteLine($"[LOADER][INFO] sceMsgDialogOpen: param=0x{paramAddress:X12}");
|
||||
|
||||
Span<byte> head = stackalloc byte[0xA0];
|
||||
@@ -134,14 +158,24 @@ public static class MsgDialogExports
|
||||
ExportName = "sceMsgDialogGetStatus",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogGetStatus(CpuContext ctx) => SetReturn(ctx, Volatile.Read(ref _status));
|
||||
public static int MsgDialogGetStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "6fIC3XKt2k0",
|
||||
ExportName = "sceMsgDialogUpdateStatus",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogUpdateStatus(CpuContext ctx) => SetReturn(ctx, Volatile.Read(ref _status));
|
||||
public static int MsgDialogUpdateStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
|
||||
|
||||
// With no host UI the dialog cannot wait for user input: the first status poll after
|
||||
// Open observes the dialog as already dismissed. Advancing on both UpdateStatus and
|
||||
// GetStatus keeps every guest polling pattern free of infinite RUNNING loops, while
|
||||
// an Open -> Close sequence with no poll in between still exercises the close path.
|
||||
private static int PollStatus()
|
||||
{
|
||||
Interlocked.CompareExchange(ref _status, StatusFinished, StatusRunning);
|
||||
return Volatile.Read(ref _status);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "Lr8ovHH9l6A",
|
||||
@@ -153,17 +187,27 @@ public static class MsgDialogExports
|
||||
var resultAddress = ctx[CpuRegister.Rdi];
|
||||
if (resultAddress == 0)
|
||||
{
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_INVALID_ARGUMENT);
|
||||
return ctx.SetReturn(ErrorArgNull);
|
||||
}
|
||||
|
||||
if (Volatile.Read(ref _status) != StatusFinished)
|
||||
{
|
||||
return ctx.SetReturn(ErrorNotFinished);
|
||||
}
|
||||
|
||||
// Report the affirmative button so yes/no prompts take the confirming branch;
|
||||
// buttonId 0 is the "invalid" sentinel and games may treat it as an error.
|
||||
Span<byte> result = stackalloc byte[ResultSize];
|
||||
result.Clear();
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x04..], 0);
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x08..], ButtonIdAffirmative);
|
||||
|
||||
if (!ctx.Memory.TryWrite(resultAddress, result))
|
||||
{
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
|
||||
}
|
||||
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_OK);
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
@@ -173,13 +217,44 @@ public static class MsgDialogExports
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogClose(CpuContext ctx)
|
||||
{
|
||||
Interlocked.Exchange(ref _status, StatusFinished);
|
||||
return SetReturn(ctx, (int)OrbisGen2Result.ORBIS_GEN2_OK);
|
||||
if (Interlocked.CompareExchange(ref _status, StatusFinished, StatusRunning) != StatusRunning)
|
||||
{
|
||||
return ctx.SetReturn(ErrorNotRunning);
|
||||
}
|
||||
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
private static int SetReturn(CpuContext ctx, int result)
|
||||
[SysAbiExport(
|
||||
Nid = "wTpfglkmv34",
|
||||
ExportName = "sceMsgDialogProgressBarSetValue",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogProgressBarSetValue(CpuContext ctx) => ProgressBarNoOp(ctx);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "Gc5k1qcK4fs",
|
||||
ExportName = "sceMsgDialogProgressBarInc",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogProgressBarInc(CpuContext ctx) => ProgressBarNoOp(ctx);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "6H-71OdrpXM",
|
||||
ExportName = "sceMsgDialogProgressBarSetMsg",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceMsgDialog")]
|
||||
public static int MsgDialogProgressBarSetMsg(CpuContext ctx) => ProgressBarNoOp(ctx);
|
||||
|
||||
// There is no visible bar to update. Accept the call whenever the service is alive so
|
||||
// save/install loops that report progress do not abort on an unexpected error.
|
||||
private static int ProgressBarNoOp(CpuContext ctx)
|
||||
{
|
||||
ctx[CpuRegister.Rax] = unchecked((ulong)result);
|
||||
return result;
|
||||
if (Volatile.Read(ref _status) == StatusNone)
|
||||
{
|
||||
return ctx.SetReturn(ErrorNotInitialized);
|
||||
}
|
||||
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
using System.Collections.Concurrent;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
using SharpEmu.HLE;
|
||||
using SharpEmu.Libs.Fiber;
|
||||
@@ -33,6 +34,11 @@ public static class KernelEventFlagCompatExports
|
||||
public object Gate { get; } = new();
|
||||
}
|
||||
|
||||
private sealed class EventFlagWaiter
|
||||
{
|
||||
public OrbisGen2Result? Result { get; set; }
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "BpFoboUJoZU",
|
||||
ExportName = "sceKernelCreateEventFlag",
|
||||
@@ -233,9 +239,47 @@ public static class KernelEventFlagCompatExports
|
||||
|
||||
if (timeoutAddress != 0)
|
||||
{
|
||||
if (timeoutUsec == 0)
|
||||
{
|
||||
_ = ctx.TryWriteUInt32(timeoutAddress, 0);
|
||||
_ = TryWriteResultPattern(ctx, resultAddress, state.Bits);
|
||||
TraceEventFlag($"wait-timeout handle=0x{handle:X16} pattern=0x{pattern:X16} timeout=0 ret=0x{returnRip:X16}");
|
||||
return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
|
||||
}
|
||||
|
||||
var deadline = GuestThreadExecution.ComputeDeadlineTimestamp(
|
||||
TimeSpan.FromTicks((long)timeoutUsec * 10L));
|
||||
var timedWaiter = new EventFlagWaiter();
|
||||
if (GuestThreadExecution.RequestCurrentThreadBlock(
|
||||
ctx,
|
||||
"sceKernelWaitEventFlag",
|
||||
GetEventFlagWakeKey(handle),
|
||||
resumeHandler: () => CompleteBlockedTimedWait(
|
||||
ctx,
|
||||
state,
|
||||
timedWaiter,
|
||||
pattern,
|
||||
waitMode,
|
||||
resultAddress,
|
||||
timeoutAddress,
|
||||
deadline),
|
||||
wakeHandler: () => TryCompleteBlockedTimedWait(
|
||||
ctx,
|
||||
state,
|
||||
timedWaiter,
|
||||
pattern,
|
||||
waitMode,
|
||||
resultAddress),
|
||||
blockDeadlineTimestamp: deadline))
|
||||
{
|
||||
state.WaitingThreads++;
|
||||
TraceEventFlag($"wait-block-timed handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} waiters={state.WaitingThreads} ret=0x{returnRip:X16}");
|
||||
return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_OK);
|
||||
}
|
||||
|
||||
_ = ctx.TryWriteUInt32(timeoutAddress, 0);
|
||||
_ = TryWriteResultPattern(ctx, resultAddress, state.Bits);
|
||||
TraceEventFlag($"wait-timeout handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} ret=0x{returnRip:X16}");
|
||||
TraceEventFlag($"wait-timeout-host handle=0x{handle:X16} pattern=0x{pattern:X16} timeout={timeoutUsec} ret=0x{returnRip:X16}");
|
||||
return ctx.SetReturn(OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT);
|
||||
}
|
||||
|
||||
@@ -446,6 +490,92 @@ public static class KernelEventFlagCompatExports
|
||||
}
|
||||
}
|
||||
|
||||
private static bool TryCompleteBlockedTimedWait(
|
||||
CpuContext ctx,
|
||||
EventFlagState state,
|
||||
EventFlagWaiter waiter,
|
||||
ulong pattern,
|
||||
uint waitMode,
|
||||
ulong resultAddress)
|
||||
{
|
||||
lock (state.Gate)
|
||||
{
|
||||
if (waiter.Result is not null)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!IsSatisfied(state.Bits, pattern, waitMode))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
|
||||
? OrbisGen2Result.ORBIS_GEN2_OK
|
||||
: OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
|
||||
if (waiter.Result == OrbisGen2Result.ORBIS_GEN2_OK)
|
||||
{
|
||||
ApplyClearMode(state, pattern, waitMode);
|
||||
}
|
||||
|
||||
state.WaitingThreads = Math.Max(0, state.WaitingThreads - 1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private static int CompleteBlockedTimedWait(
|
||||
CpuContext ctx,
|
||||
EventFlagState state,
|
||||
EventFlagWaiter waiter,
|
||||
ulong pattern,
|
||||
uint waitMode,
|
||||
ulong resultAddress,
|
||||
ulong timeoutAddress,
|
||||
long deadlineTimestamp)
|
||||
{
|
||||
lock (state.Gate)
|
||||
{
|
||||
if (waiter.Result is null)
|
||||
{
|
||||
if (IsSatisfied(state.Bits, pattern, waitMode))
|
||||
{
|
||||
waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
|
||||
? OrbisGen2Result.ORBIS_GEN2_OK
|
||||
: OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
|
||||
if (waiter.Result == OrbisGen2Result.ORBIS_GEN2_OK)
|
||||
{
|
||||
ApplyClearMode(state, pattern, waitMode);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
waiter.Result = TryWriteResultPattern(ctx, resultAddress, state.Bits)
|
||||
? OrbisGen2Result.ORBIS_GEN2_ERROR_TIMED_OUT
|
||||
: OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT;
|
||||
}
|
||||
|
||||
state.WaitingThreads = Math.Max(0, state.WaitingThreads - 1);
|
||||
}
|
||||
}
|
||||
|
||||
if (waiter.Result == OrbisGen2Result.ORBIS_GEN2_OK)
|
||||
{
|
||||
var remainingTicks = deadlineTimestamp - Stopwatch.GetTimestamp();
|
||||
var remainingMicros = remainingTicks <= 0
|
||||
? 0u
|
||||
: (uint)Math.Min(
|
||||
uint.MaxValue,
|
||||
remainingTicks / (double)Stopwatch.Frequency * 1_000_000d);
|
||||
_ = ctx.TryWriteUInt32(timeoutAddress, remainingMicros);
|
||||
}
|
||||
else
|
||||
{
|
||||
_ = ctx.TryWriteUInt32(timeoutAddress, 0);
|
||||
}
|
||||
|
||||
return (int)waiter.Result.Value;
|
||||
}
|
||||
|
||||
private static string GetEventFlagWakeKey(ulong handle) =>
|
||||
$"event_flag:0x{handle:X16}";
|
||||
|
||||
|
||||
@@ -200,6 +200,40 @@ public static class KernelMemoryCompatExports
|
||||
}
|
||||
}
|
||||
|
||||
public static bool TryUnregisterGuestPathMount(string guestMountPoint)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(guestMountPoint))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var normalizedMountPoint = NormalizeGuestStatCachePath(guestMountPoint);
|
||||
if (normalizedMountPoint is null || normalizedMountPoint == "/")
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
var removed = false;
|
||||
lock (_guestMountGate)
|
||||
{
|
||||
removed = _guestMounts.Remove(normalizedMountPoint);
|
||||
}
|
||||
|
||||
if (!removed)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
lock (_statCacheGate)
|
||||
{
|
||||
_negativeStatCache.RemoveWhere(path =>
|
||||
string.Equals(path, normalizedMountPoint, StringComparison.OrdinalIgnoreCase) ||
|
||||
path.StartsWith(normalizedMountPoint + "/", StringComparison.OrdinalIgnoreCase));
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
internal static bool TryAllocateHleData(
|
||||
CpuContext ctx,
|
||||
ulong length,
|
||||
@@ -6947,15 +6981,4 @@ public static class KernelMemoryCompatExports
|
||||
sum = left + right;
|
||||
return sum >= left;
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "KMcEa+rHsIo",
|
||||
ExportName = "sceKernelMapMemory",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libKernel")]
|
||||
public static int KernelMapMemory(CpuContext ctx)
|
||||
{
|
||||
ctx[CpuRegister.Rax] = 0;
|
||||
return (int)OrbisGen2Result.ORBIS_GEN2_OK;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -237,6 +237,27 @@ public static class Ngs2Exports
|
||||
LibraryName = "libSceNgs2")]
|
||||
public static int Ngs2PanInit(CpuContext ctx) => ctx.SetReturn(0);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "1WsleK-MTkE",
|
||||
ExportName = "sceNgs2GeomCalcListener",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNgs2")]
|
||||
public static int Ngs2GeomCalcListener(CpuContext ctx) => ctx.SetReturn(0);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "0lbbayqDNoE",
|
||||
ExportName = "sceNgs2GeomResetSourceParam",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNgs2")]
|
||||
public static int Ngs2GeomResetSourceParam(CpuContext ctx) => ctx.SetReturn(0);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "7Lcfo8SmpsU",
|
||||
ExportName = "sceNgs2GeomResetListenerParam",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNgs2")]
|
||||
public static int Ngs2GeomResetListenerParam(CpuContext ctx) => ctx.SetReturn(0);
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "i0VnXM-C9fc",
|
||||
ExportName = "sceNgs2SystemRender",
|
||||
|
||||
@@ -59,7 +59,7 @@ public static class NpManagerExports
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "rbknaUjpqWo",
|
||||
ExportName = "sceNpGetOnlineIdA",
|
||||
ExportName = "sceNpGetAccountIdA",
|
||||
Target = Generation.Gen5,
|
||||
LibraryName = "libSceNpManager")]
|
||||
public static int NpGetOnlineIdA(CpuContext ctx)
|
||||
|
||||
@@ -9,7 +9,10 @@ namespace SharpEmu.Libs.Np;
|
||||
public static class NpUniversalDataSystemExports
|
||||
{
|
||||
private const int NpUniversalDataSystemErrorInvalidArgument = unchecked((int)0x80553102);
|
||||
private static readonly object _eventGate = new();
|
||||
private static readonly HashSet<int> _createdEvents = [];
|
||||
private static int _nextHandle = 1;
|
||||
private static int _nextEvent = 1;
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "sjaobBgqeB4",
|
||||
@@ -67,6 +70,114 @@ public static class NpUniversalDataSystemExports
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "p+GcLqwpL9M",
|
||||
ExportName = "sceNpUniversalDataSystemCreateEvent",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpUniversalDataSystem")]
|
||||
public static int NpUniversalDataSystemCreateEvent(CpuContext ctx)
|
||||
{
|
||||
var parameterAddress = ctx[CpuRegister.Rdi];
|
||||
if (parameterAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
|
||||
}
|
||||
|
||||
var eventId = Interlocked.Increment(ref _nextEvent);
|
||||
lock (_eventGate)
|
||||
{
|
||||
_createdEvents.Add(eventId);
|
||||
}
|
||||
|
||||
if (ctx.TryWriteInt32(ctx[CpuRegister.Rdx], eventId, checkNil: true) ||
|
||||
ctx.TryWriteInt32(ctx[CpuRegister.Rcx], eventId, checkNil: true))
|
||||
{
|
||||
return ctx.SetReturn(0, typeof(long));
|
||||
}
|
||||
|
||||
lock (_eventGate)
|
||||
{
|
||||
_createdEvents.Remove(eventId);
|
||||
}
|
||||
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "wG+84pnNIuo",
|
||||
ExportName = "sceNpUniversalDataSystemDestroyEvent",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpUniversalDataSystem")]
|
||||
public static int NpUniversalDataSystemDestroyEvent(CpuContext ctx)
|
||||
{
|
||||
var eventId = unchecked((int)ctx[CpuRegister.Rdi]);
|
||||
lock (_eventGate)
|
||||
{
|
||||
_createdEvents.Remove(eventId);
|
||||
}
|
||||
|
||||
return ctx.SetReturn(0, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "MfDb+4Nln64",
|
||||
ExportName = "sceNpUniversalDataSystemEventPropertyObjectSetString",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpUniversalDataSystem")]
|
||||
public static int NpUniversalDataSystemEventPropertyObjectSetString(CpuContext ctx)
|
||||
{
|
||||
var propertyObjectAddress = ctx[CpuRegister.Rsi];
|
||||
var valueAddress = ctx[CpuRegister.Rdx];
|
||||
if (propertyObjectAddress == 0 || valueAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
|
||||
}
|
||||
|
||||
Span<byte> probe = stackalloc byte[1];
|
||||
return ctx.Memory.TryRead(propertyObjectAddress, probe) &&
|
||||
ctx.Memory.TryRead(valueAddress, probe)
|
||||
? ctx.SetReturn(0, typeof(long))
|
||||
: ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "Wxbg5x3pTXA",
|
||||
ExportName = "sceNpUniversalDataSystemEventPropertyObjectSetArray",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpUniversalDataSystem")]
|
||||
public static int NpUniversalDataSystemEventPropertyObjectSetArray(CpuContext ctx)
|
||||
{
|
||||
var propertyObjectAddress = ctx[CpuRegister.Rsi];
|
||||
var valueAddress = ctx[CpuRegister.Rdx];
|
||||
if (propertyObjectAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(NpUniversalDataSystemErrorInvalidArgument, typeof(long));
|
||||
}
|
||||
|
||||
Span<byte> probe = stackalloc byte[1];
|
||||
if (!ctx.Memory.TryRead(propertyObjectAddress, probe))
|
||||
{
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
|
||||
}
|
||||
|
||||
if (valueAddress != 0 && !ctx.Memory.TryRead(valueAddress, probe))
|
||||
{
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT, typeof(long));
|
||||
}
|
||||
|
||||
return ctx.SetReturn(0, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "CzkKf7ahIyU",
|
||||
ExportName = "sceNpUniversalDataSystemPostEvent",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpUniversalDataSystem")]
|
||||
public static int NpUniversalDataSystemPostEvent(CpuContext ctx)
|
||||
{
|
||||
return ctx.SetReturn(0, typeof(long));
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "tpFJ8LIKvPw",
|
||||
ExportName = "sceNpUniversalDataSystemRegisterContext",
|
||||
|
||||
@@ -33,7 +33,7 @@ public static class NpWebApi2Exports
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "WV1GwM32NgY",
|
||||
ExportName = "sceNpWebApi2InitializeForToolkit",
|
||||
ExportName = "sceNpWebApi2PushEventCreateHandle",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceNpWebApi2")]
|
||||
public static int NpWebApi2InitializeAlt(CpuContext ctx)
|
||||
|
||||
@@ -28,6 +28,7 @@ public static class PadExports
|
||||
private static PadState _cachedInputState;
|
||||
|
||||
private static bool _initialized;
|
||||
private static int _controlsAnnouncementLogged;
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "hv1luiJrqQM",
|
||||
@@ -70,11 +71,15 @@ public static class PadExports
|
||||
|
||||
DualSenseReader.EnsureStarted();
|
||||
XInputReader.EnsureStarted();
|
||||
Console.Error.WriteLine(DualSenseReader.TryGetState(out _)
|
||||
? "[LOADER][INFO] Controls: DualSense connected (keyboard fallback also active)."
|
||||
: XInputReader.TryGetState(out _)
|
||||
? "[LOADER][INFO] Controls: Xbox controller connected (keyboard fallback also active)."
|
||||
: "[LOADER][INFO] Keyboard controls: Arrow keys = D-pad, WASD = left stick, IJKL = right stick, Z/Enter = Cross, X/Esc = Circle, C = Square, V = Triangle, Q = L1, E = R1, R = L2, F = R2, Tab/Backspace = Options. A DualSense or Xbox controller will be used automatically when plugged in.");
|
||||
if (Interlocked.Exchange(ref _controlsAnnouncementLogged, 1) == 0)
|
||||
{
|
||||
Console.Error.WriteLine(DualSenseReader.TryGetState(out _)
|
||||
? "[LOADER][INFO] Controls: DualSense connected (keyboard fallback also active)."
|
||||
: XInputReader.TryGetState(out _)
|
||||
? "[LOADER][INFO] Controls: Xbox controller connected (keyboard fallback also active)."
|
||||
: "[LOADER][INFO] Keyboard controls: Arrow keys = D-pad, WASD = left stick, IJKL = right stick, Z/Enter = Cross, X/Esc = Circle, C = Square, V = Triangle, Q = L1, E = R1, R = L2, F = R2, Tab/Backspace = Options. A DualSense or Xbox controller will be used automatically when plugged in.");
|
||||
}
|
||||
|
||||
return ctx.SetReturn(PrimaryPadHandle);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ public static class SaveDataDialogExports
|
||||
private const int ErrorArgNull = unchecked((int)0x80B8000D);
|
||||
|
||||
private const int ResultSize = 0x48;
|
||||
private const int ButtonIdAffirmative = 1;
|
||||
private static int _status;
|
||||
private static int _lastMode;
|
||||
private static ulong _lastUserData;
|
||||
@@ -61,10 +62,10 @@ public static class SaveDataDialogExports
|
||||
_lastMode = TryReadInt32(ctx, paramAddress, out var mode) ? mode : 0;
|
||||
_lastUserData = ctx.TryReadUInt64(paramAddress + 0xC8, out var userData) ? userData : 0;
|
||||
|
||||
// There is no host save dialog yet. Complete immediately with OK so
|
||||
// guest polling sees a finished dialog instead of spinning forever.
|
||||
Interlocked.Exchange(ref _status, StatusFinished);
|
||||
TraceSaveDataDialog($"open mode={_lastMode} userData=0x{_lastUserData:X16} -> finished");
|
||||
// There is no host save dialog yet. Enter RUNNING so the close path sees a live
|
||||
// dialog; the guest's next status poll auto-dismisses it (see PollStatus).
|
||||
Interlocked.Exchange(ref _status, StatusRunning);
|
||||
TraceSaveDataDialog($"open mode={_lastMode} userData=0x{_lastUserData:X16} -> running");
|
||||
return ctx.SetReturn(ErrorOk);
|
||||
}
|
||||
|
||||
@@ -73,14 +74,24 @@ public static class SaveDataDialogExports
|
||||
ExportName = "sceSaveDataDialogGetStatus",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceSaveDataDialog")]
|
||||
public static int SaveDataDialogGetStatus(CpuContext ctx) => ctx.SetReturn(Volatile.Read(ref _status));
|
||||
public static int SaveDataDialogGetStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "KK3Bdg1RWK0",
|
||||
ExportName = "sceSaveDataDialogUpdateStatus",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceSaveDataDialog")]
|
||||
public static int SaveDataDialogUpdateStatus(CpuContext ctx) => ctx.SetReturn(Volatile.Read(ref _status));
|
||||
public static int SaveDataDialogUpdateStatus(CpuContext ctx) => ctx.SetReturn(PollStatus());
|
||||
|
||||
// With no host UI the dialog cannot wait for user input: the first status poll after
|
||||
// Open observes the dialog as already dismissed. Advancing on both UpdateStatus and
|
||||
// GetStatus keeps every guest polling pattern free of infinite RUNNING loops, while
|
||||
// an Open -> Close sequence with no poll in between still exercises the close path.
|
||||
private static int PollStatus()
|
||||
{
|
||||
Interlocked.CompareExchange(ref _status, StatusFinished, StatusRunning);
|
||||
return Volatile.Read(ref _status);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "en7gNVnh878",
|
||||
@@ -107,11 +118,13 @@ public static class SaveDataDialogExports
|
||||
return ctx.SetReturn(ErrorNotFinished);
|
||||
}
|
||||
|
||||
// Report the affirmative button so save prompts take the confirming branch;
|
||||
// buttonId 0 is the "invalid" sentinel and games may treat it as an error.
|
||||
Span<byte> result = stackalloc byte[ResultSize];
|
||||
result.Clear();
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x00..], _lastMode);
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x04..], 0);
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x08..], 0);
|
||||
BinaryPrimitives.WriteInt32LittleEndian(result[0x08..], ButtonIdAffirmative);
|
||||
BinaryPrimitives.WriteUInt64LittleEndian(result[0x20..], _lastUserData);
|
||||
|
||||
if (!ctx.Memory.TryWrite(resultAddress, result))
|
||||
|
||||
@@ -31,6 +31,7 @@ public static class SaveDataExports
|
||||
private const int MountResultSize = 0x40;
|
||||
private static readonly object _stateGate = new();
|
||||
private static readonly HashSet<int> _transactionResources = [];
|
||||
private static readonly HashSet<int> _preparedTransactionResources = [];
|
||||
private static string? _titleId;
|
||||
private static int _nextTransactionResource;
|
||||
|
||||
@@ -40,6 +41,7 @@ public static class SaveDataExports
|
||||
{
|
||||
_titleId = string.IsNullOrWhiteSpace(titleId) ? null : SanitizePathSegment(titleId.Trim());
|
||||
_transactionResources.Clear();
|
||||
_preparedTransactionResources.Clear();
|
||||
_nextTransactionResource = 0;
|
||||
}
|
||||
}
|
||||
@@ -278,12 +280,104 @@ public static class SaveDataExports
|
||||
lock (_stateGate)
|
||||
{
|
||||
_transactionResources.Remove(resource);
|
||||
_preparedTransactionResources.Remove(resource);
|
||||
}
|
||||
|
||||
TraceSaveData($"delete_transaction_resource resource={resource}");
|
||||
return ctx.SetReturn(0);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "sDCBrmc61XU",
|
||||
ExportName = "sceSaveDataPrepare",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceSaveData")]
|
||||
public static int SaveDataPrepare(CpuContext ctx)
|
||||
{
|
||||
var mountPointAddress = ctx[CpuRegister.Rdi];
|
||||
var resource = unchecked((int)ctx[CpuRegister.Rdx]);
|
||||
if (mountPointAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(OrbisSaveDataErrorParameter);
|
||||
}
|
||||
|
||||
if (!TryReadFixedAscii(ctx, mountPointAddress, 16, out var mountPoint))
|
||||
{
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(mountPoint))
|
||||
{
|
||||
return ctx.SetReturn(OrbisSaveDataErrorParameter);
|
||||
}
|
||||
|
||||
lock (_stateGate)
|
||||
{
|
||||
if (resource != 0)
|
||||
{
|
||||
_preparedTransactionResources.Add(resource);
|
||||
}
|
||||
}
|
||||
|
||||
TraceSaveData($"prepare mount_point={mountPoint} resource={resource}");
|
||||
return ctx.SetReturn(0);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "ie7qhZ4X0Cc",
|
||||
ExportName = "sceSaveDataCommit",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceSaveData")]
|
||||
public static int SaveDataCommit(CpuContext ctx)
|
||||
{
|
||||
var commitAddress = ctx[CpuRegister.Rdi];
|
||||
if (commitAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(OrbisSaveDataErrorParameter);
|
||||
}
|
||||
|
||||
lock (_stateGate)
|
||||
{
|
||||
_preparedTransactionResources.Clear();
|
||||
}
|
||||
|
||||
TraceSaveData($"commit commit=0x{commitAddress:X16}");
|
||||
return ctx.SetReturn(0);
|
||||
}
|
||||
|
||||
[SysAbiExport(
|
||||
Nid = "uW4vfTwMQVo",
|
||||
ExportName = "sceSaveDataUmount2",
|
||||
Target = Generation.Gen4 | Generation.Gen5,
|
||||
LibraryName = "libSceSaveData")]
|
||||
public static int SaveDataUmount2(CpuContext ctx)
|
||||
{
|
||||
var mountPointAddress = ctx[CpuRegister.Rdi];
|
||||
if (mountPointAddress == 0)
|
||||
{
|
||||
mountPointAddress = ctx[CpuRegister.Rsi];
|
||||
}
|
||||
|
||||
if (mountPointAddress == 0)
|
||||
{
|
||||
return ctx.SetReturn(OrbisSaveDataErrorParameter);
|
||||
}
|
||||
|
||||
if (!TryReadFixedAscii(ctx, mountPointAddress, 16, out var mountPoint))
|
||||
{
|
||||
return ctx.SetReturn((int)OrbisGen2Result.ORBIS_GEN2_ERROR_MEMORY_FAULT);
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(mountPoint))
|
||||
{
|
||||
return ctx.SetReturn(OrbisSaveDataErrorParameter);
|
||||
}
|
||||
|
||||
var unmounted = KernelMemoryCompatExports.TryUnregisterGuestPathMount(mountPoint);
|
||||
TraceSaveData($"umount2 mount_point={mountPoint} unregistered={unmounted}");
|
||||
return ctx.SetReturn(0);
|
||||
}
|
||||
|
||||
private static bool TryReadSearchCond(CpuContext ctx, ulong address, out SearchCond cond)
|
||||
{
|
||||
cond = default;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
using SharpEmu.HLE;
|
||||
using SharpEmu.Libs.Audio;
|
||||
using SharpEmu.Libs.Kernel;
|
||||
using SharpEmu.Logging;
|
||||
using System.Buffers.Binary;
|
||||
@@ -52,6 +53,8 @@ public static class VideoOutExports
|
||||
private const int VblankWaitTimeoutMilliseconds = 100;
|
||||
private static Thread? _vblankPumpThread;
|
||||
private static int _vblankPumpStarted;
|
||||
private static volatile int _vblankPumpStopRequested;
|
||||
private static volatile int _presentationWindowCloseNotified;
|
||||
|
||||
private static readonly object _vblankEdgeGate = new();
|
||||
private static ulong _vblankEdgeSequence;
|
||||
@@ -80,7 +83,7 @@ public static class VideoOutExports
|
||||
var intervalTicks = Math.Max(1L, (long)(Stopwatch.Frequency / VblankHz));
|
||||
var nextEdge = Stopwatch.GetTimestamp() + intervalTicks;
|
||||
|
||||
while (true)
|
||||
while (_vblankPumpStopRequested == 0)
|
||||
{
|
||||
WaitUntilTimestamp(nextEdge);
|
||||
PumpVblanks();
|
||||
@@ -97,6 +100,59 @@ public static class VideoOutExports
|
||||
}
|
||||
}
|
||||
|
||||
public static void NotifyPresentationWindowClosed()
|
||||
{
|
||||
if (Interlocked.Exchange(ref _presentationWindowCloseNotified, 1) != 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Console.Error.WriteLine("[LOADER][INFO] VideoOut presentation window closed");
|
||||
RequestHostShutdown("videoout-window-closed");
|
||||
}
|
||||
|
||||
public static void NotifyHostInterrupt()
|
||||
{
|
||||
if (Interlocked.Exchange(ref _presentationWindowCloseNotified, 1) != 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Console.Error.WriteLine("[LOADER][INFO] Host interrupt requested");
|
||||
RequestHostShutdown("host-interrupt");
|
||||
}
|
||||
|
||||
private static void RequestHostShutdown(string reason)
|
||||
{
|
||||
AudioOutExports.ShutdownAllPorts();
|
||||
StopVblankPump();
|
||||
HostSessionControl.RequestShutdown(reason);
|
||||
ScheduleProcessExitIfGuestDoesNotStop();
|
||||
}
|
||||
|
||||
private static void ScheduleProcessExitIfGuestDoesNotStop()
|
||||
{
|
||||
ThreadPool.QueueUserWorkItem(static _ =>
|
||||
{
|
||||
Thread.Sleep(2000);
|
||||
Environment.Exit(0);
|
||||
});
|
||||
}
|
||||
|
||||
public static void StopVblankPump()
|
||||
{
|
||||
if (Interlocked.Exchange(ref _vblankPumpStopRequested, 1) != 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var thread = _vblankPumpThread;
|
||||
if (thread is { IsAlive: true })
|
||||
{
|
||||
thread.Join(TimeSpan.FromSeconds(2));
|
||||
}
|
||||
}
|
||||
|
||||
private static void WaitUntilTimestamp(long deadlineTicks)
|
||||
{
|
||||
var spinThresholdTicks = Stopwatch.Frequency * 2L / 1000L;
|
||||
|
||||
@@ -9,6 +9,7 @@ using Silk.NET.Vulkan;
|
||||
using Silk.NET.Vulkan.Extensions.KHR;
|
||||
using Silk.NET.Vulkan.Extensions.EXT;
|
||||
using Silk.NET.Windowing;
|
||||
using System.Diagnostics;
|
||||
using System.Numerics;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
@@ -277,6 +278,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
TranslatedDraw: null,
|
||||
RequiredGuestWorkSequence: _enqueuedGuestWorkSequence,
|
||||
IsSplash: false);
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
Console.Error.WriteLine("[LOADER][INFO] Vulkan VideoOut hid splash");
|
||||
}
|
||||
}
|
||||
@@ -310,6 +312,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
TranslatedDraw: null,
|
||||
RequiredGuestWorkSequence: _enqueuedGuestWorkSequence,
|
||||
IsSplash: false);
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
if (_thread is not null)
|
||||
{
|
||||
return;
|
||||
@@ -359,6 +362,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
TranslatedDraw: null,
|
||||
RequiredGuestWorkSequence: _enqueuedGuestWorkSequence,
|
||||
IsSplash: false);
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
if (_thread is not null)
|
||||
{
|
||||
return;
|
||||
@@ -429,6 +433,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
renderState ?? VulkanGuestRenderState.Default),
|
||||
RequiredGuestWorkSequence: _enqueuedGuestWorkSequence,
|
||||
IsSplash: false);
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
if (_thread is not null)
|
||||
{
|
||||
return;
|
||||
@@ -643,6 +648,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
RequiredGuestWorkSequence: 0,
|
||||
IsSplash: false,
|
||||
GuestImageAddress: address);
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
if (_thread is not null)
|
||||
{
|
||||
return true;
|
||||
@@ -883,6 +889,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
|
||||
_pendingGuestWork.Enqueue(work);
|
||||
_enqueuedGuestWorkSequence++;
|
||||
System.Threading.Monitor.PulseAll(_gate);
|
||||
}
|
||||
|
||||
private static bool TryTakeGuestWork(out object work)
|
||||
@@ -923,6 +930,13 @@ internal static unsafe class VulkanVideoPresenter
|
||||
|
||||
private readonly IWindow _window;
|
||||
private const int MaxInFlightGuestSubmissions = 8;
|
||||
private const double PerformanceHudSampleSeconds = 0.5;
|
||||
private const uint ThreadQueryLimitedInformation = 0x0800;
|
||||
private static readonly bool _performanceHudEnabled =
|
||||
!string.Equals(
|
||||
Environment.GetEnvironmentVariable("SHARPEMU_PERF_HUD"),
|
||||
"0",
|
||||
StringComparison.Ordinal);
|
||||
private Vk _vk = null!;
|
||||
private KhrSurface _surfaceApi = null!;
|
||||
private KhrSwapchain _swapchainApi = null!;
|
||||
@@ -961,6 +975,17 @@ internal static unsafe class VulkanVideoPresenter
|
||||
private DeviceMemory _stagingMemory;
|
||||
private ulong _stagingSize;
|
||||
private long _presentedSequence;
|
||||
private long _performanceHudLastTimestamp;
|
||||
private TimeSpan _performanceHudLastProcessCpu;
|
||||
private long _performanceHudPresentedFrames;
|
||||
private long _performanceHudLastPresentedFrames;
|
||||
private long _performanceHudLastReadCount;
|
||||
private long _performanceHudLastReadBytes;
|
||||
private long _performanceHudLastReadHits;
|
||||
private long _performanceHudLastReadPvmBytes;
|
||||
private long _performanceHudLastReadLibcBytes;
|
||||
private readonly Dictionary<int, TimeSpan> _performanceHudThreadCpu = [];
|
||||
private readonly Dictionary<int, string> _performanceHudThreadNames = [];
|
||||
private bool _vulkanReady;
|
||||
private bool _firstFramePresented;
|
||||
private bool _firstGuestDrawPresented;
|
||||
@@ -1121,13 +1146,21 @@ internal static unsafe class VulkanVideoPresenter
|
||||
options.Size = new Vector2D<int>((int)DefaultWindowWidth, (int)DefaultWindowHeight);
|
||||
options.Title = VideoOutExports.GetWindowTitle();
|
||||
options.WindowBorder = WindowBorder.Fixed;
|
||||
options.VSync = true;
|
||||
options.FramesPerSecond = 60;
|
||||
options.UpdatesPerSecond = 60;
|
||||
// FIFO already provides the presentation clock. Throttling Silk's render loop
|
||||
// as well can miss alternating vblanks and collapse delivery to 30 FPS or less.
|
||||
options.VSync = false;
|
||||
options.FramesPerSecond = 0;
|
||||
options.UpdatesPerSecond = 0;
|
||||
_window = Window.Create(options);
|
||||
_window.Load += Initialize;
|
||||
_window.Render += Render;
|
||||
_window.Closing += DisposeVulkan;
|
||||
_window.Closing += OnWindowClosing;
|
||||
}
|
||||
|
||||
private void OnWindowClosing()
|
||||
{
|
||||
VideoOutExports.NotifyPresentationWindowClosed();
|
||||
DisposeVulkan();
|
||||
}
|
||||
|
||||
public void Run() => _window.Run();
|
||||
@@ -1883,6 +1916,30 @@ internal static unsafe class VulkanVideoPresenter
|
||||
var surfaceFormat = ChooseSurfaceFormat(formats);
|
||||
_swapchainFormat = surfaceFormat.Format;
|
||||
_extent = ChooseExtent(capabilities);
|
||||
uint presentModeCount = 0;
|
||||
Check(
|
||||
_surfaceApi.GetPhysicalDeviceSurfacePresentModes(
|
||||
_physicalDevice,
|
||||
_surface,
|
||||
&presentModeCount,
|
||||
null),
|
||||
"vkGetPhysicalDeviceSurfacePresentModesKHR");
|
||||
var presentModes = new PresentModeKHR[presentModeCount];
|
||||
fixed (PresentModeKHR* presentModePointer = presentModes)
|
||||
{
|
||||
Check(
|
||||
_surfaceApi.GetPhysicalDeviceSurfacePresentModes(
|
||||
_physicalDevice,
|
||||
_surface,
|
||||
&presentModeCount,
|
||||
presentModePointer),
|
||||
"vkGetPhysicalDeviceSurfacePresentModesKHR");
|
||||
}
|
||||
|
||||
var presentMode = presentModes.Contains(PresentModeKHR.MailboxKhr)
|
||||
? PresentModeKHR.MailboxKhr
|
||||
: PresentModeKHR.FifoKhr;
|
||||
Console.Error.WriteLine($"[LOADER][INFO] Vulkan present mode: {presentMode}");
|
||||
var imageCount = capabilities.MinImageCount + 1;
|
||||
if (capabilities.MaxImageCount != 0)
|
||||
{
|
||||
@@ -1906,7 +1963,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
ImageSharingMode = SharingMode.Exclusive,
|
||||
PreTransform = capabilities.CurrentTransform,
|
||||
CompositeAlpha = compositeAlpha,
|
||||
PresentMode = PresentModeKHR.FifoKhr,
|
||||
PresentMode = presentMode,
|
||||
Clipped = true,
|
||||
};
|
||||
|
||||
@@ -5260,6 +5317,219 @@ internal static unsafe class VulkanVideoPresenter
|
||||
_ => 0,
|
||||
};
|
||||
|
||||
private void UpdatePerformanceHud()
|
||||
{
|
||||
if (!_performanceHudEnabled || !OperatingSystem.IsWindows())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var now = Stopwatch.GetTimestamp();
|
||||
if (_performanceHudLastTimestamp != 0 &&
|
||||
Stopwatch.GetElapsedTime(_performanceHudLastTimestamp, now).TotalSeconds <
|
||||
PerformanceHudSampleSeconds)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
using var process = Process.GetCurrentProcess();
|
||||
var processCpu = process.TotalProcessorTime;
|
||||
var currentThreadCpu = new Dictionary<int, TimeSpan>();
|
||||
var currentThreadIds = new HashSet<int>();
|
||||
var hottestThreadId = 0;
|
||||
var hottestThreadCpuSeconds = 0.0;
|
||||
|
||||
foreach (ProcessThread thread in process.Threads)
|
||||
{
|
||||
using (thread)
|
||||
{
|
||||
try
|
||||
{
|
||||
var threadId = thread.Id;
|
||||
var cpu = thread.TotalProcessorTime;
|
||||
currentThreadIds.Add(threadId);
|
||||
currentThreadCpu[threadId] = cpu;
|
||||
if (_performanceHudThreadCpu.TryGetValue(threadId, out var previousCpu))
|
||||
{
|
||||
var deltaSeconds = Math.Max(0.0, (cpu - previousCpu).TotalSeconds);
|
||||
if (deltaSeconds > hottestThreadCpuSeconds)
|
||||
{
|
||||
hottestThreadCpuSeconds = deltaSeconds;
|
||||
hottestThreadId = threadId;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (InvalidOperationException)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (_performanceHudLastTimestamp != 0)
|
||||
{
|
||||
var elapsedSeconds = Math.Max(
|
||||
Stopwatch.GetElapsedTime(_performanceHudLastTimestamp, now).TotalSeconds,
|
||||
0.001);
|
||||
var processCpuPercent = Math.Max(
|
||||
0.0,
|
||||
(processCpu - _performanceHudLastProcessCpu).TotalSeconds /
|
||||
elapsedSeconds /
|
||||
Math.Max(Environment.ProcessorCount, 1) *
|
||||
100.0);
|
||||
var hottestThreadPercent = hottestThreadCpuSeconds / elapsedSeconds * 100.0;
|
||||
var presentedFrames = _performanceHudPresentedFrames;
|
||||
var fps = (presentedFrames - _performanceHudLastPresentedFrames) / elapsedSeconds;
|
||||
var hotName = hottestThreadId == 0
|
||||
? "idle"
|
||||
: GetPerformanceThreadName(hottestThreadId);
|
||||
long guestBacklog;
|
||||
int queuedGuestWork;
|
||||
lock (_gate)
|
||||
{
|
||||
guestBacklog = Math.Max(
|
||||
0,
|
||||
_enqueuedGuestWorkSequence - _completedGuestWorkSequence);
|
||||
queuedGuestWork = _pendingGuestWork.Count;
|
||||
}
|
||||
|
||||
var gpuInFlight = _pendingGuestSubmissions.Count +
|
||||
(_presentationInFlight ? 1 : 0);
|
||||
var readCount = Interlocked.Read(
|
||||
ref Agc.Gen5ShaderScalarEvaluator.GlobalMemoryReadCount);
|
||||
var readBytes = Interlocked.Read(
|
||||
ref Agc.Gen5ShaderScalarEvaluator.GlobalMemoryReadBytes);
|
||||
var readHits = Interlocked.Read(
|
||||
ref Agc.Gen5ShaderScalarEvaluator.GlobalMemoryReadCacheHits);
|
||||
var readPvmBytes = Interlocked.Read(
|
||||
ref Agc.Gen5ShaderScalarEvaluator.GlobalMemoryReadPvmBytes);
|
||||
var readLibcBytes = Interlocked.Read(
|
||||
ref Agc.Gen5ShaderScalarEvaluator.GlobalMemoryReadLibcBytes);
|
||||
var readsPerSecond =
|
||||
(readCount - _performanceHudLastReadCount) / elapsedSeconds;
|
||||
var readMbPerSecond =
|
||||
(readBytes - _performanceHudLastReadBytes) /
|
||||
elapsedSeconds /
|
||||
(1024.0 * 1024.0);
|
||||
var readHitsPerSecond =
|
||||
(readHits - _performanceHudLastReadHits) / elapsedSeconds;
|
||||
var readPvmMbPerSecond =
|
||||
(readPvmBytes - _performanceHudLastReadPvmBytes) /
|
||||
elapsedSeconds /
|
||||
(1024.0 * 1024.0);
|
||||
var readLibcMbPerSecond =
|
||||
(readLibcBytes - _performanceHudLastReadLibcBytes) /
|
||||
elapsedSeconds /
|
||||
(1024.0 * 1024.0);
|
||||
_performanceHudLastReadCount = readCount;
|
||||
_performanceHudLastReadBytes = readBytes;
|
||||
_performanceHudLastReadHits = readHits;
|
||||
_performanceHudLastReadPvmBytes = readPvmBytes;
|
||||
_performanceHudLastReadLibcBytes = readLibcBytes;
|
||||
_window.Title =
|
||||
$"FPS {fps:0.0} CPU {processCpuPercent:0}% | " +
|
||||
$"HOT {hotName}#{hottestThreadId} {hottestThreadPercent:0}% | " +
|
||||
$"WORK {guestBacklog} (q{queuedGuestWork}/gpu{gpuInFlight}) | " +
|
||||
$"RD {readsPerSecond:0}/s {readMbPerSecond:0}MB/s h{readHitsPerSecond:0}/s " +
|
||||
$"P{readPvmMbPerSecond:0} L{readLibcMbPerSecond:0} | " +
|
||||
VideoOutExports.GetWindowTitle();
|
||||
_performanceHudLastPresentedFrames = presentedFrames;
|
||||
}
|
||||
|
||||
_performanceHudThreadCpu.Clear();
|
||||
foreach (var (threadId, cpu) in currentThreadCpu)
|
||||
{
|
||||
_performanceHudThreadCpu[threadId] = cpu;
|
||||
}
|
||||
|
||||
foreach (var staleThreadId in _performanceHudThreadNames.Keys
|
||||
.Where(threadId => !currentThreadIds.Contains(threadId))
|
||||
.ToArray())
|
||||
{
|
||||
_performanceHudThreadNames.Remove(staleThreadId);
|
||||
}
|
||||
|
||||
_performanceHudLastProcessCpu = processCpu;
|
||||
_performanceHudLastTimestamp = now;
|
||||
}
|
||||
catch (Exception exception) when (
|
||||
exception is InvalidOperationException or System.ComponentModel.Win32Exception)
|
||||
{
|
||||
_performanceHudLastTimestamp = now;
|
||||
}
|
||||
}
|
||||
|
||||
private string GetPerformanceThreadName(int threadId)
|
||||
{
|
||||
if (_performanceHudThreadNames.TryGetValue(threadId, out var cached))
|
||||
{
|
||||
return cached;
|
||||
}
|
||||
|
||||
var name = "tid";
|
||||
var handle = OpenThread(ThreadQueryLimitedInformation, false, (uint)threadId);
|
||||
if (handle != 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (GetThreadDescription(handle, out var description) >= 0 && description != 0)
|
||||
{
|
||||
try
|
||||
{
|
||||
var described = Marshal.PtrToStringUni(description);
|
||||
if (!string.IsNullOrWhiteSpace(described))
|
||||
{
|
||||
name = described.Length <= 28 ? described : described[..28];
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
LocalFree(description);
|
||||
}
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
CloseHandle(handle);
|
||||
}
|
||||
}
|
||||
|
||||
_performanceHudThreadNames[threadId] = name;
|
||||
return name;
|
||||
}
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
private static extern nint OpenThread(uint desiredAccess, bool inheritHandle, uint threadId);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
private static extern int GetThreadDescription(nint thread, out nint description);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
private static extern nint LocalFree(nint memory);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
[return: MarshalAs(System.Runtime.InteropServices.UnmanagedType.Bool)]
|
||||
private static extern bool CloseHandle(nint handle);
|
||||
|
||||
private void WaitForRenderWork()
|
||||
{
|
||||
var gpuWorkInFlight = _pendingGuestSubmissions.Count > 0 || _presentationInFlight;
|
||||
lock (_gate)
|
||||
{
|
||||
if (_closed ||
|
||||
_pendingGuestWork.Count > 0 ||
|
||||
(_latestPresentation is { } latest &&
|
||||
latest.Sequence != _presentedSequence &&
|
||||
latest.RequiredGuestWorkSequence <= _completedGuestWorkSequence))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
System.Threading.Monitor.Wait(_gate, gpuWorkInFlight ? 1 : 8);
|
||||
}
|
||||
}
|
||||
|
||||
private void Render(double _)
|
||||
{
|
||||
if (!_vulkanReady)
|
||||
@@ -5267,6 +5537,9 @@ internal static unsafe class VulkanVideoPresenter
|
||||
return;
|
||||
}
|
||||
|
||||
WaitForRenderWork();
|
||||
UpdatePerformanceHud();
|
||||
|
||||
_commandBuffer = _presentationCommandBuffer;
|
||||
if (!_deviceLost)
|
||||
{
|
||||
@@ -5530,6 +5803,7 @@ internal static unsafe class VulkanVideoPresenter
|
||||
CheckSwapchainResult(presentResult, "vkQueuePresentKHR");
|
||||
recreateAfterPresent |= presentResult == Result.SuboptimalKhr;
|
||||
VideoOutExports.ReportPresentedFrame();
|
||||
_performanceHudPresentedFrames++;
|
||||
if (_swapchainReadbackPending)
|
||||
{
|
||||
CompletePendingPresentation(wait: true);
|
||||
@@ -6219,59 +6493,34 @@ internal static unsafe class VulkanVideoPresenter
|
||||
offsets);
|
||||
}
|
||||
|
||||
const uint maxPixelsPerDraw = 512 * 512;
|
||||
var rowsPerDraw = Math.Max(
|
||||
1u,
|
||||
Math.Min(drawScissor.Height, maxPixelsPerDraw / Math.Max(drawScissor.Width, 1u)));
|
||||
var drawCount = 0u;
|
||||
for (var y = 0u; y < drawScissor.Height; y += rowsPerDraw)
|
||||
var scissor = new Rect2D(
|
||||
new Offset2D(drawScissor.X, drawScissor.Y),
|
||||
new Extent2D(drawScissor.Width, drawScissor.Height));
|
||||
_vk.CmdSetScissor(_commandBuffer, 0, 1, &scissor);
|
||||
|
||||
if (resources.IndexBuffer.Handle != 0)
|
||||
{
|
||||
var scissor = new Rect2D(
|
||||
new Offset2D(
|
||||
drawScissor.X,
|
||||
checked(drawScissor.Y + (int)y)),
|
||||
new Extent2D(
|
||||
drawScissor.Width,
|
||||
Math.Min(rowsPerDraw, drawScissor.Height - y)));
|
||||
_vk.CmdSetScissor(_commandBuffer, 0, 1, &scissor);
|
||||
|
||||
if (resources.IndexBuffer.Handle != 0)
|
||||
{
|
||||
_vk.CmdBindIndexBuffer(
|
||||
_commandBuffer,
|
||||
resources.IndexBuffer,
|
||||
0,
|
||||
resources.Index32Bit ? IndexType.Uint32 : IndexType.Uint16);
|
||||
_vk.CmdDrawIndexed(
|
||||
_commandBuffer,
|
||||
resources.VertexCount,
|
||||
resources.InstanceCount,
|
||||
0,
|
||||
0,
|
||||
0);
|
||||
}
|
||||
else
|
||||
{
|
||||
_vk.CmdDraw(
|
||||
_commandBuffer,
|
||||
resources.VertexCount,
|
||||
resources.InstanceCount,
|
||||
0,
|
||||
0);
|
||||
}
|
||||
|
||||
drawCount++;
|
||||
_vk.CmdBindIndexBuffer(
|
||||
_commandBuffer,
|
||||
resources.IndexBuffer,
|
||||
0,
|
||||
resources.Index32Bit ? IndexType.Uint32 : IndexType.Uint16);
|
||||
_vk.CmdDrawIndexed(
|
||||
_commandBuffer,
|
||||
resources.VertexCount,
|
||||
resources.InstanceCount,
|
||||
0,
|
||||
0,
|
||||
0);
|
||||
}
|
||||
|
||||
if (drawCount > 1)
|
||||
else
|
||||
{
|
||||
TraceVulkanShader(
|
||||
$"vk.graphics_chunked target={extent.Width}x{extent.Height} " +
|
||||
$"draws={drawCount} rows={rowsPerDraw} " +
|
||||
$"scissor={drawScissor.X},{drawScissor.Y},{drawScissor.Width}x{drawScissor.Height} " +
|
||||
$"viewport={drawViewport.X:0.###},{drawViewport.Y:0.###}," +
|
||||
$"{drawViewport.Width:0.###}x{drawViewport.Height:0.###} " +
|
||||
$"name={resources.DebugName}");
|
||||
_vk.CmdDraw(
|
||||
_commandBuffer,
|
||||
resources.VertexCount,
|
||||
resources.InstanceCount,
|
||||
0,
|
||||
0);
|
||||
}
|
||||
_vk.CmdEndRenderPass(_commandBuffer);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,412 @@
|
||||
// Copyright (C) 2026 SharpEmu Emulator Project
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
// Executes the SharpEmu-emitted "exec" conformance shader on a real Vulkan
|
||||
// device and compares the buffer results against CPU-computed expected values.
|
||||
//
|
||||
// The shader (exec-cs.spv, produced by SharpEmu.Tools.ShaderDump) was
|
||||
// translated by SharpEmu from hand-assembled Gen5 instruction words and stores
|
||||
// results to guestBuffers[0]:
|
||||
// [0] v_fmac_f32 -> fma(1.5f, 2.25f, 10.0f)
|
||||
// [1] v_mul_hi_i32 -> high 32 bits of (int)0x7FFFFFFF * (int)0x00010003
|
||||
// [2] v_mul_lo_i32 -> low 32 bits of the same product
|
||||
// [3] store attempted with EXEC=0 -> must NOT land (sentinel remains)
|
||||
// [4] store after EXEC restored -> 1.5f (0x3FC00000)
|
||||
// Every other word of the buffer must still hold the sentinel afterwards.
|
||||
//
|
||||
// Creating the compute pipeline doubles as a driver-acceptance check for the
|
||||
// emitted SPIR-V; the dispatch then verifies the arithmetic numerically.
|
||||
//
|
||||
// Usage: SharpEmu.Tools.GpuConformance <path-to-exec-cs.spv>
|
||||
|
||||
using Silk.NET.Core.Native;
|
||||
using Silk.NET.Vulkan;
|
||||
|
||||
const uint Sentinel = 0xCAFEBABE;
|
||||
|
||||
// Must match the 64-byte global-memory binding ShaderDump constructs for the
|
||||
// exec program.
|
||||
const ulong BufferSize = 64;
|
||||
|
||||
var expectedFma = BitConverter.SingleToUInt32Bits(
|
||||
MathF.FusedMultiplyAdd(1.5f, 2.25f, 10.0f));
|
||||
var product = (long)0x7FFFFFFF * 0x00010003;
|
||||
var expectedHi = (uint)(product >> 32);
|
||||
var expectedLo = (uint)product;
|
||||
var expectedRestored = BitConverter.SingleToUInt32Bits(1.5f);
|
||||
|
||||
unsafe
|
||||
{
|
||||
var spvPath = args.Length > 0
|
||||
? args[0]
|
||||
: throw new InvalidOperationException(
|
||||
"usage: SharpEmu.Tools.GpuConformance <path-to-exec-cs.spv>");
|
||||
var code = File.ReadAllBytes(spvPath);
|
||||
|
||||
var vk = Vk.GetApi();
|
||||
|
||||
var appName = (byte*)SilkMarshal.StringToPtr("SharpEmuGpuConformance");
|
||||
var appInfo = new ApplicationInfo
|
||||
{
|
||||
SType = StructureType.ApplicationInfo,
|
||||
PApplicationName = appName,
|
||||
ApiVersion = Vk.Version13,
|
||||
};
|
||||
var instanceInfo = new InstanceCreateInfo
|
||||
{
|
||||
SType = StructureType.InstanceCreateInfo,
|
||||
PApplicationInfo = &appInfo,
|
||||
};
|
||||
Check(vk.CreateInstance(in instanceInfo, null, out var instance), "vkCreateInstance");
|
||||
|
||||
uint deviceCount = 0;
|
||||
vk.EnumeratePhysicalDevices(instance, &deviceCount, null);
|
||||
if (deviceCount == 0)
|
||||
{
|
||||
Console.WriteLine("no Vulkan devices found");
|
||||
return;
|
||||
}
|
||||
|
||||
var physicalDevices = new PhysicalDevice[deviceCount];
|
||||
fixed (PhysicalDevice* pDevices = physicalDevices)
|
||||
{
|
||||
vk.EnumeratePhysicalDevices(instance, &deviceCount, pDevices);
|
||||
}
|
||||
|
||||
// Prefer the first discrete GPU; fall back to the first device.
|
||||
var physical = physicalDevices[0];
|
||||
foreach (var candidate in physicalDevices)
|
||||
{
|
||||
vk.GetPhysicalDeviceProperties(candidate, out var props);
|
||||
if (props.DeviceType == PhysicalDeviceType.DiscreteGpu)
|
||||
{
|
||||
physical = candidate;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
vk.GetPhysicalDeviceProperties(physical, out var chosenProps);
|
||||
Console.WriteLine(
|
||||
$"executing on: {SilkMarshal.PtrToString((nint)chosenProps.DeviceName)}");
|
||||
|
||||
uint familyCount = 0;
|
||||
vk.GetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, null);
|
||||
var families = new QueueFamilyProperties[familyCount];
|
||||
fixed (QueueFamilyProperties* pFamilies = families)
|
||||
{
|
||||
vk.GetPhysicalDeviceQueueFamilyProperties(physical, &familyCount, pFamilies);
|
||||
}
|
||||
|
||||
uint? computeFamilyFound = null;
|
||||
for (uint index = 0; index < familyCount; index++)
|
||||
{
|
||||
if (families[index].QueueFlags.HasFlag(QueueFlags.ComputeBit))
|
||||
{
|
||||
computeFamilyFound = index;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
var computeFamily = computeFamilyFound
|
||||
?? throw new InvalidOperationException("device has no compute-capable queue family");
|
||||
|
||||
// The emitted SPIR-V declares the Int64 capability.
|
||||
vk.GetPhysicalDeviceFeatures(physical, out var supportedFeatures);
|
||||
if (!supportedFeatures.ShaderInt64)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"device does not support shaderInt64, which the emitted SPIR-V requires");
|
||||
}
|
||||
|
||||
var priority = 1f;
|
||||
var queueInfo = new DeviceQueueCreateInfo
|
||||
{
|
||||
SType = StructureType.DeviceQueueCreateInfo,
|
||||
QueueFamilyIndex = computeFamily,
|
||||
QueueCount = 1,
|
||||
PQueuePriorities = &priority,
|
||||
};
|
||||
var features = new PhysicalDeviceFeatures { ShaderInt64 = true };
|
||||
var deviceInfo = new DeviceCreateInfo
|
||||
{
|
||||
SType = StructureType.DeviceCreateInfo,
|
||||
QueueCreateInfoCount = 1,
|
||||
PQueueCreateInfos = &queueInfo,
|
||||
PEnabledFeatures = &features,
|
||||
};
|
||||
Check(vk.CreateDevice(physical, in deviceInfo, null, out var device), "vkCreateDevice");
|
||||
vk.GetDeviceQueue(device, computeFamily, 0, out var queue);
|
||||
|
||||
// Storage buffer, host-visible so the CPU can prefill and read back.
|
||||
var bufferInfo = new BufferCreateInfo
|
||||
{
|
||||
SType = StructureType.BufferCreateInfo,
|
||||
Size = BufferSize,
|
||||
Usage = BufferUsageFlags.StorageBufferBit,
|
||||
SharingMode = SharingMode.Exclusive,
|
||||
};
|
||||
Check(vk.CreateBuffer(device, in bufferInfo, null, out var buffer), "vkCreateBuffer");
|
||||
vk.GetBufferMemoryRequirements(device, buffer, out var requirements);
|
||||
vk.GetPhysicalDeviceMemoryProperties(physical, out var memoryProperties);
|
||||
|
||||
uint memoryType = uint.MaxValue;
|
||||
for (var index = 0; index < memoryProperties.MemoryTypeCount; index++)
|
||||
{
|
||||
var flags = memoryProperties.MemoryTypes[index].PropertyFlags;
|
||||
if ((requirements.MemoryTypeBits & (1u << index)) != 0 &&
|
||||
flags.HasFlag(MemoryPropertyFlags.HostVisibleBit) &&
|
||||
flags.HasFlag(MemoryPropertyFlags.HostCoherentBit))
|
||||
{
|
||||
memoryType = (uint)index;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (memoryType == uint.MaxValue)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
"no host-visible, host-coherent memory type available for the readback buffer");
|
||||
}
|
||||
|
||||
var allocateInfo = new MemoryAllocateInfo
|
||||
{
|
||||
SType = StructureType.MemoryAllocateInfo,
|
||||
AllocationSize = requirements.Size,
|
||||
MemoryTypeIndex = memoryType,
|
||||
};
|
||||
Check(vk.AllocateMemory(device, in allocateInfo, null, out var memory), "vkAllocateMemory");
|
||||
Check(vk.BindBufferMemory(device, buffer, memory, 0), "vkBindBufferMemory");
|
||||
|
||||
void* mapped;
|
||||
Check(vk.MapMemory(device, memory, 0, BufferSize, 0, &mapped), "vkMapMemory");
|
||||
var words = (uint*)mapped;
|
||||
for (var index = 0; index < (int)(BufferSize / sizeof(uint)); index++)
|
||||
{
|
||||
words[index] = Sentinel;
|
||||
}
|
||||
|
||||
// SharpEmu emits all guest buffers as one descriptor array at set 0,
|
||||
// binding 0; this conformance shader uses a single buffer.
|
||||
ShaderModule module;
|
||||
fixed (byte* pCode = code)
|
||||
{
|
||||
var moduleInfo = new ShaderModuleCreateInfo
|
||||
{
|
||||
SType = StructureType.ShaderModuleCreateInfo,
|
||||
CodeSize = (nuint)code.Length,
|
||||
PCode = (uint*)pCode,
|
||||
};
|
||||
Check(vk.CreateShaderModule(device, in moduleInfo, null, out module), "vkCreateShaderModule");
|
||||
}
|
||||
|
||||
var layoutBinding = new DescriptorSetLayoutBinding
|
||||
{
|
||||
Binding = 0,
|
||||
DescriptorType = DescriptorType.StorageBuffer,
|
||||
DescriptorCount = 1,
|
||||
StageFlags = ShaderStageFlags.ComputeBit,
|
||||
};
|
||||
var setLayoutInfo = new DescriptorSetLayoutCreateInfo
|
||||
{
|
||||
SType = StructureType.DescriptorSetLayoutCreateInfo,
|
||||
BindingCount = 1,
|
||||
PBindings = &layoutBinding,
|
||||
};
|
||||
Check(
|
||||
vk.CreateDescriptorSetLayout(device, in setLayoutInfo, null, out var setLayout),
|
||||
"vkCreateDescriptorSetLayout");
|
||||
|
||||
var pipelineLayoutInfo = new PipelineLayoutCreateInfo
|
||||
{
|
||||
SType = StructureType.PipelineLayoutCreateInfo,
|
||||
SetLayoutCount = 1,
|
||||
PSetLayouts = &setLayout,
|
||||
};
|
||||
Check(
|
||||
vk.CreatePipelineLayout(device, in pipelineLayoutInfo, null, out var pipelineLayout),
|
||||
"vkCreatePipelineLayout");
|
||||
|
||||
var entryName = (byte*)SilkMarshal.StringToPtr("main");
|
||||
var pipelineInfo = new ComputePipelineCreateInfo
|
||||
{
|
||||
SType = StructureType.ComputePipelineCreateInfo,
|
||||
Stage = new PipelineShaderStageCreateInfo
|
||||
{
|
||||
SType = StructureType.PipelineShaderStageCreateInfo,
|
||||
Stage = ShaderStageFlags.ComputeBit,
|
||||
Module = module,
|
||||
PName = entryName,
|
||||
},
|
||||
Layout = pipelineLayout,
|
||||
};
|
||||
Check(
|
||||
vk.CreateComputePipelines(device, default, 1, in pipelineInfo, null, out var pipeline),
|
||||
"vkCreateComputePipelines");
|
||||
Console.WriteLine("driver accepted the SPIR-V (pipeline created)");
|
||||
|
||||
var poolSize = new DescriptorPoolSize
|
||||
{
|
||||
Type = DescriptorType.StorageBuffer,
|
||||
DescriptorCount = 1,
|
||||
};
|
||||
var poolInfo = new DescriptorPoolCreateInfo
|
||||
{
|
||||
SType = StructureType.DescriptorPoolCreateInfo,
|
||||
MaxSets = 1,
|
||||
PoolSizeCount = 1,
|
||||
PPoolSizes = &poolSize,
|
||||
};
|
||||
Check(vk.CreateDescriptorPool(device, in poolInfo, null, out var pool), "vkCreateDescriptorPool");
|
||||
|
||||
var setAllocateInfo = new DescriptorSetAllocateInfo
|
||||
{
|
||||
SType = StructureType.DescriptorSetAllocateInfo,
|
||||
DescriptorPool = pool,
|
||||
DescriptorSetCount = 1,
|
||||
PSetLayouts = &setLayout,
|
||||
};
|
||||
Check(vk.AllocateDescriptorSets(device, in setAllocateInfo, out var descriptorSet), "vkAllocateDescriptorSets");
|
||||
|
||||
var descriptorBuffer = new DescriptorBufferInfo
|
||||
{
|
||||
Buffer = buffer,
|
||||
Offset = 0,
|
||||
Range = BufferSize,
|
||||
};
|
||||
var write = new WriteDescriptorSet
|
||||
{
|
||||
SType = StructureType.WriteDescriptorSet,
|
||||
DstSet = descriptorSet,
|
||||
DstBinding = 0,
|
||||
DstArrayElement = 0,
|
||||
DescriptorCount = 1,
|
||||
DescriptorType = DescriptorType.StorageBuffer,
|
||||
PBufferInfo = &descriptorBuffer,
|
||||
};
|
||||
vk.UpdateDescriptorSets(device, 1, in write, 0, null);
|
||||
|
||||
var commandPoolInfo = new CommandPoolCreateInfo
|
||||
{
|
||||
SType = StructureType.CommandPoolCreateInfo,
|
||||
QueueFamilyIndex = computeFamily,
|
||||
};
|
||||
Check(vk.CreateCommandPool(device, in commandPoolInfo, null, out var commandPool), "vkCreateCommandPool");
|
||||
|
||||
var commandBufferInfo = new CommandBufferAllocateInfo
|
||||
{
|
||||
SType = StructureType.CommandBufferAllocateInfo,
|
||||
CommandPool = commandPool,
|
||||
Level = CommandBufferLevel.Primary,
|
||||
CommandBufferCount = 1,
|
||||
};
|
||||
Check(vk.AllocateCommandBuffers(device, in commandBufferInfo, out var commandBuffer), "vkAllocateCommandBuffers");
|
||||
|
||||
var beginInfo = new CommandBufferBeginInfo
|
||||
{
|
||||
SType = StructureType.CommandBufferBeginInfo,
|
||||
};
|
||||
Check(vk.BeginCommandBuffer(commandBuffer, in beginInfo), "vkBeginCommandBuffer");
|
||||
vk.CmdBindPipeline(commandBuffer, PipelineBindPoint.Compute, pipeline);
|
||||
vk.CmdBindDescriptorSets(
|
||||
commandBuffer,
|
||||
PipelineBindPoint.Compute,
|
||||
pipelineLayout,
|
||||
0,
|
||||
1,
|
||||
in descriptorSet,
|
||||
0,
|
||||
null);
|
||||
vk.CmdDispatch(commandBuffer, 1, 1, 1);
|
||||
var barrier = new MemoryBarrier
|
||||
{
|
||||
SType = StructureType.MemoryBarrier,
|
||||
SrcAccessMask = AccessFlags.ShaderWriteBit,
|
||||
DstAccessMask = AccessFlags.HostReadBit,
|
||||
};
|
||||
vk.CmdPipelineBarrier(
|
||||
commandBuffer,
|
||||
PipelineStageFlags.ComputeShaderBit,
|
||||
PipelineStageFlags.HostBit,
|
||||
0,
|
||||
1,
|
||||
in barrier,
|
||||
0,
|
||||
null,
|
||||
0,
|
||||
null);
|
||||
Check(vk.EndCommandBuffer(commandBuffer), "vkEndCommandBuffer");
|
||||
|
||||
var submitInfo = new SubmitInfo
|
||||
{
|
||||
SType = StructureType.SubmitInfo,
|
||||
CommandBufferCount = 1,
|
||||
PCommandBuffers = &commandBuffer,
|
||||
};
|
||||
Check(vk.QueueSubmit(queue, 1, in submitInfo, default), "vkQueueSubmit");
|
||||
Check(vk.QueueWaitIdle(queue), "vkQueueWaitIdle");
|
||||
|
||||
var results = new (string Name, uint Actual, uint Expected)[]
|
||||
{
|
||||
("v_fmac_f32 fma(1.5, 2.25, 10.0)", words[0], expectedFma),
|
||||
("v_mul_hi_i32 hi(0x7FFFFFFF*0x10003)", words[1], expectedHi),
|
||||
("v_mul_lo_i32 lo(0x7FFFFFFF*0x10003)", words[2], expectedLo),
|
||||
("exec=0 store suppressed (offset 12 sentinel)", words[3], Sentinel),
|
||||
("store after exec restore (offset 16)", words[4], expectedRestored),
|
||||
};
|
||||
var failures = 0;
|
||||
foreach (var (name, actual, expected) in results)
|
||||
{
|
||||
var status = actual == expected ? "PASS" : "FAIL";
|
||||
if (actual != expected)
|
||||
{
|
||||
failures++;
|
||||
}
|
||||
|
||||
Console.WriteLine($"{status} {name}: gpu=0x{actual:X8} expected=0x{expected:X8}");
|
||||
}
|
||||
|
||||
var totalWords = (int)(BufferSize / sizeof(uint));
|
||||
var trailingClobbered = 0;
|
||||
for (var index = results.Length; index < totalWords; index++)
|
||||
{
|
||||
if (words[index] != Sentinel)
|
||||
{
|
||||
trailingClobbered++;
|
||||
Console.WriteLine(
|
||||
$"FAIL trailing word [{index}] clobbered: gpu=0x{words[index]:X8} expected=0x{Sentinel:X8}");
|
||||
}
|
||||
}
|
||||
|
||||
failures += trailingClobbered;
|
||||
if (trailingClobbered == 0)
|
||||
{
|
||||
Console.WriteLine(
|
||||
$"PASS trailing words [{results.Length}..{totalWords - 1}] intact (sentinel)");
|
||||
}
|
||||
|
||||
Console.WriteLine(failures == 0
|
||||
? "RESULT: all values match"
|
||||
: $"RESULT: {failures} mismatch(es)");
|
||||
|
||||
vk.DestroyCommandPool(device, commandPool, null);
|
||||
vk.DestroyDescriptorPool(device, pool, null);
|
||||
vk.DestroyPipeline(device, pipeline, null);
|
||||
vk.DestroyPipelineLayout(device, pipelineLayout, null);
|
||||
vk.DestroyDescriptorSetLayout(device, setLayout, null);
|
||||
vk.DestroyShaderModule(device, module, null);
|
||||
vk.UnmapMemory(device, memory);
|
||||
vk.FreeMemory(device, memory, null);
|
||||
vk.DestroyBuffer(device, buffer, null);
|
||||
vk.DestroyDevice(device, null);
|
||||
vk.DestroyInstance(instance, null);
|
||||
|
||||
Environment.ExitCode = failures == 0 ? 0 : 1;
|
||||
|
||||
static void Check(Result result, string what)
|
||||
{
|
||||
if (result != Result.Success)
|
||||
{
|
||||
throw new InvalidOperationException($"{what} failed: {result}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
<!--
|
||||
Copyright (C) 2026 SharpEmu Emulator Project
|
||||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
-->
|
||||
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
<!-- Standalone dev tool: opt out of the repo-wide lock-file requirement
|
||||
so no packages.lock.json is generated or committed for it. -->
|
||||
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Silk.NET.Vulkan" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -201,8 +201,8 @@ foreach (var (name, expectTranslate, words) in testPrograms)
|
||||
null,
|
||||
null)!;
|
||||
|
||||
object?[] compileArgs = [state, evaluation, null, null, 0, -1, 0];
|
||||
if ((bool)tryCompile.Invoke(null, compileArgs)!)
|
||||
var compileArgs = PadWithDefaults(tryCompile, [state, evaluation, null, null]);
|
||||
if ((bool)tryCompile.Invoke(null, BindingFlags.OptionalParamBinding, null, compileArgs, null)!)
|
||||
{
|
||||
var shader = compileArgs[2]!;
|
||||
var spirv = (byte[])shader.GetType().GetProperty("Spirv")!.GetValue(shader)!;
|
||||
@@ -216,8 +216,8 @@ foreach (var (name, expectTranslate, words) in testPrograms)
|
||||
Console.WriteLine($"[{name}] emit: FAILED ({compileArgs[3]})");
|
||||
}
|
||||
|
||||
object?[] computeArgs = [state, evaluation, 1u, 1u, 1u, null, null];
|
||||
if ((bool)tryCompileCompute.Invoke(null, computeArgs)!)
|
||||
var computeArgs = PadWithDefaults(tryCompileCompute, [state, evaluation, 1u, 1u, 1u, null, null]);
|
||||
if ((bool)tryCompileCompute.Invoke(null, BindingFlags.OptionalParamBinding, null, computeArgs, null)!)
|
||||
{
|
||||
var shader = computeArgs[5]!;
|
||||
var spirv = (byte[])shader.GetType().GetProperty("Spirv")!.GetValue(shader)!;
|
||||
@@ -237,6 +237,37 @@ Console.WriteLine(failures == 0
|
||||
: $"RESULT: {failures} unexpected outcome(s)");
|
||||
Environment.ExitCode = failures == 0 ? 0 : 1;
|
||||
|
||||
// Reflection Invoke does not apply C# default parameter values, so a newly
|
||||
// added optional parameter on a translator entry point would otherwise throw
|
||||
// TargetParameterCountException. Type.Missing + OptionalParamBinding lets the
|
||||
// runtime substitute the declared defaults; only a new *required* parameter
|
||||
// should force a tool update.
|
||||
static object?[] PadWithDefaults(MethodInfo method, object?[] arguments)
|
||||
{
|
||||
var parameters = method.GetParameters();
|
||||
if (arguments.Length > parameters.Length)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"{method.DeclaringType?.Name}.{method.Name} takes fewer parameters than the tool supplies");
|
||||
}
|
||||
|
||||
var padded = new object?[parameters.Length];
|
||||
arguments.CopyTo(padded, 0);
|
||||
for (var i = arguments.Length; i < padded.Length; i++)
|
||||
{
|
||||
if (!parameters[i].IsOptional)
|
||||
{
|
||||
throw new InvalidOperationException(
|
||||
$"{method.DeclaringType?.Name}.{method.Name} gained a required parameter " +
|
||||
$"'{parameters[i].Name}' — the tool needs updating");
|
||||
}
|
||||
|
||||
padded[i] = Type.Missing;
|
||||
}
|
||||
|
||||
return padded;
|
||||
}
|
||||
|
||||
internal sealed class FakeMemory : ICpuMemory
|
||||
{
|
||||
private readonly List<(ulong Base, byte[] Data)> _regions = [];
|
||||
|
||||
Reference in New Issue
Block a user