mirror of
https://github.com/Vita3K/Vita3K.git
synced 2026-07-11 01:34:23 +02:00
Fix CI: clang-format + substitute_sym on non-Apple platforms
This commit is contained in:
Vendored
+1
-1
Submodule external/substitute updated: 703858b082...e9f3276299
@@ -43,7 +43,7 @@ struct CPUState {
|
||||
// Exception handler support (kubridge abort handlers)
|
||||
// These are set by the page fault callback (signal-safe atomics)
|
||||
// and consumed by run_loop after HaltExecution returns.
|
||||
std::atomic<bool> abort_pending{false};
|
||||
std::atomic<uint32_t> abort_fault_addr{0};
|
||||
std::atomic<bool> abort_is_write{false};
|
||||
std::atomic<bool> abort_pending{ false };
|
||||
std::atomic<uint32_t> abort_fault_addr{ 0 };
|
||||
std::atomic<bool> abort_is_write{ false };
|
||||
};
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <atomic>
|
||||
|
||||
static std::atomic<int> pls_key_counter{1};
|
||||
static std::atomic<int> pls_key_counter{ 1 };
|
||||
|
||||
EXPORT(int, ksceKernelCreateProcessLocalStorage, const char *name, SceSize size) {
|
||||
// Return a unique key for this PLS entry.
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <module/module.h>
|
||||
#include <kernel/types.h>
|
||||
#include <module/module.h>
|
||||
|
||||
struct SceKernelAllocMemBlockKernelOpt {
|
||||
SceSize size;
|
||||
|
||||
@@ -145,7 +145,7 @@ EXPORT(SceUID, kuKernelMemReserve, Ptr<Ptr<void>> addr, SceSize size, SceKernelM
|
||||
|
||||
// kuKernelMemCommit — commit physical pages to a reserved range.
|
||||
// Memory is already committed at Reserve time. Apply requested protection.
|
||||
// When baseBlock mirroring is required, this should use add_external_mapping().
|
||||
// When baseBlock mirroring is required, this should use add_external_mapping().
|
||||
EXPORT(int, kuKernelMemCommit, Ptr<void> addr, SceSize len, uint32_t prot, Ptr<KuKernelMemCommitOpt> pOpt) {
|
||||
if (!addr || len == 0)
|
||||
return RET_ERROR(SCE_KERNEL_ERROR_INVALID_ARGUMENT);
|
||||
|
||||
@@ -212,7 +212,6 @@ static Address find_import_stub_in_module(EmuEnvState &emuenv, const char *modul
|
||||
// This is for IMPORT hooks where target_addr points to a 12-byte import stub.
|
||||
static SceUID create_hook(EmuEnvState &emuenv, TaihenState *state, SceUID thread_id,
|
||||
Address target_addr, Address hook_func) {
|
||||
|
||||
uint32_t *stub = Ptr<uint32_t>(target_addr).get(emuenv.mem);
|
||||
|
||||
// Determine what the "original function" address is
|
||||
@@ -295,7 +294,6 @@ static void write_arm_stub(uint32_t *dest, Address target) {
|
||||
// Returns hook UID on success, TAI_ERROR_HOOK_ERROR if function can't be hooked.
|
||||
static SceUID create_inline_hook(EmuEnvState &emuenv, TaihenState *state, SceUID thread_id,
|
||||
Address func_addr, Address hook_func, uint32_t func_nid = 0) {
|
||||
|
||||
bool is_thumb = (func_addr & 1) != 0;
|
||||
Address code_addr = func_addr & ~1u;
|
||||
const void *code_host = Ptr<const void>(code_addr).get(emuenv.mem);
|
||||
@@ -413,7 +411,6 @@ static SceUID create_inline_hook(EmuEnvState &emuenv, TaihenState *state, SceUID
|
||||
// Falls back to stub patching if prologue contains PC-relative instructions.
|
||||
static SceUID create_export_hook(EmuEnvState &emuenv, TaihenState *state, SceUID thread_id,
|
||||
uint32_t func_nid, Address original_addr, Address hook_func) {
|
||||
|
||||
// Try inline hook first
|
||||
SceUID uid = create_inline_hook(emuenv, state, thread_id, original_addr, hook_func, func_nid);
|
||||
if (uid >= 0) {
|
||||
@@ -788,8 +785,8 @@ struct TaiInjectArgs {
|
||||
SceUID modid;
|
||||
int segidx;
|
||||
uint32_t offset;
|
||||
int thumb; // unused for inject, but present in struct
|
||||
Address source; // Ptr in guest memory
|
||||
int thumb; // unused for inject, but present in struct
|
||||
Address source; // Ptr in guest memory
|
||||
uint32_t source_size;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user