diff options
author | Liam <byteslice@airmail.cc> | 2023-03-07 18:01:07 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-03-13 03:09:09 +0100 |
commit | ac6cbb7134d71134e4beae91361a78fa68202c22 (patch) | |
tree | 19ac300007ee99c87138203809005fb708257b21 /src/core/hle/kernel/svc_generator.py | |
parent | kernel: convert KResourceLimit (diff) | |
download | yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar.gz yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar.bz2 yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar.lz yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar.xz yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.tar.zst yuzu-ac6cbb7134d71134e4beae91361a78fa68202c22.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/svc_generator.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/svc_generator.py b/src/core/hle/kernel/svc_generator.py index 0cce69e85..7fcbb1ba1 100644 --- a/src/core/hle/kernel/svc_generator.py +++ b/src/core/hle/kernel/svc_generator.py @@ -460,7 +460,7 @@ def emit_wrapper(wrapped_fn, suffix, register_info, arguments, byte_size): call_arguments = ["system"] for arg in arguments: if arg.is_output and not arg.is_outptr: - call_arguments.append(f"&{arg.var_name}") + call_arguments.append(f"std::addressof({arg.var_name})") else: call_arguments.append(arg.var_name) @@ -574,9 +574,9 @@ static To Convert(const From& from) { To to{}; if constexpr (sizeof(To) >= sizeof(From)) { - std::memcpy(&to, &from, sizeof(From)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(From)); } else { - std::memcpy(&to, &from, sizeof(To)); + std::memcpy(std::addressof(to), std::addressof(from), sizeof(To)); } return to; |