feat(libs): define vabi macros + add to declarations

core/libs/prx/libReactNative.Modules.Vsh.WebAppLauncher/Export.cpp

@@ -5,25 +5,25 @@
 
 extern "C" {
 
-int ErrorDialogClose(void) {
+int APS5_VABI ErrorDialogClose(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int ErrorDialogOpen(const void* param) {
+int APS5_VABI ErrorDialogOpen(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int ShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
+int APS5_VABI ShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
  (void)feature_flag;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
+int APS5_VABI ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
  (void)heap_size;
  (void)thread_priority;
  (void)affinity_mask;
@@ -31,19 +31,19 @@ int ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mas
  return 0;
 }
 
-int ShareTerminate(void) {
+int APS5_VABI ShareTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int SystemServiceParamGetInt(int param_id, int* value) {
+int APS5_VABI SystemServiceParamGetInt(int param_id, int* value) {
  (void)param_id;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int SystemServiceParamGetString(int param_id, char* buf, size_t buf_size) {
+int APS5_VABI SystemServiceParamGetString(int param_id, char* buf, size_t buf_size) {
  (void)param_id;
  (void)buf;
  (void)buf_size;

core/libs/prx/libReactNative.Modules.Vsh/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int RemotePlayGetConnectionStatus(int user_id, int* status) {
+int APS5_VABI RemotePlayGetConnectionStatus(int user_id, int* status) {
  (void)user_id;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int ShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
+int APS5_VABI ShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
  (void)feature_flag;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
+int APS5_VABI ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
  (void)heap_size;
  (void)thread_priority;
  (void)affinity_mask;
@@ -27,7 +27,7 @@ int ShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mas
  return 0;
 }
 
-int ShareTerminate(void) {
+int APS5_VABI ShareTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceAcm/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceAcmBatchStartBuffer(AcmContextId context, const void* batch_commands, size_t batch_size, AcmBatchError* batch_error, AcmBatchId* batch) {
+int APS5_VABI sceAcmBatchStartBuffer(AcmContextId context, const void* batch_commands, size_t batch_size, AcmBatchError* batch_error, AcmBatchId* batch) {
  (void)context;
  (void)batch_commands;
  (void)batch_size;
@@ -15,7 +15,7 @@ int sceAcmBatchStartBuffer(AcmContextId context, const void* batch_commands, siz
  return 0;
 }
 
-int sceAcmBatchStartBuffers(AcmContextId context, uint32_t batch_info_count, const AcmBatchInfo* const batch_info[], AcmBatchError* batch_error, AcmBatchId* batch) {
+int APS5_VABI sceAcmBatchStartBuffers(AcmContextId context, uint32_t batch_info_count, const AcmBatchInfo* const batch_info[], AcmBatchError* batch_error, AcmBatchId* batch) {
  (void)context;
  (void)batch_info_count;
  (void)batch_info;
@@ -25,7 +25,7 @@ int sceAcmBatchStartBuffers(AcmContextId context, uint32_t batch_info_count, con
  return 0;
 }
 
-int sceAcmBatchWait(AcmContextId context, AcmBatchId batch, uint32_t timeout) {
+int APS5_VABI sceAcmBatchWait(AcmContextId context, AcmBatchId batch, uint32_t timeout) {
  (void)context;
  (void)batch;
  (void)timeout;
@@ -33,13 +33,13 @@ int sceAcmBatchWait(AcmContextId context, AcmBatchId batch, uint32_t timeout) {
  return 0;
 }
 
-int sceAcmContextCreate(AcmContextId* context) {
+int APS5_VABI sceAcmContextCreate(AcmContextId* context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAcmContextDestroy(AcmContextId context) {
+int APS5_VABI sceAcmContextDestroy(AcmContextId context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceAgc/Acb/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t* sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles){
+uint32_t* APS5_VABI sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
  (void)buf;
  (void)gcr_cntl;
  (void)base;
@@ -15,12 +15,12 @@ uint32_t* sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volat
  return nullptr;
 }
 
-uint32_t sceAgcAcbAcquireMemGetSize(void){
+uint32_t APS5_VABI sceAgcAcbAcquireMemGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords){
+uint32_t* APS5_VABI sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
  (void)buf;
  (void)address;
  (void)num_dwords;
@@ -28,12 +28,12 @@ uint32_t* sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address
  return nullptr;
 }
 
-uint32_t sceAgcAcbCondExecGetSize(void){
+uint32_t APS5_VABI sceAgcAcbCondExecGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm){
+uint32_t* APS5_VABI sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -47,7 +47,7 @@ uint32_t* sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_p
  return nullptr;
 }
 
-uint32_t* sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* indirect_args, uint32_t modifier){
+uint32_t* APS5_VABI sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* indirect_args, uint32_t modifier) {
  (void)buf;
  (void)indirect_args;
  (void)modifier;
@@ -55,7 +55,7 @@ uint32_t* sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* ind
  return nullptr;
 }
 
-uint32_t* sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm){
+uint32_t* APS5_VABI sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -70,7 +70,7 @@ uint32_t* sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_po
  return nullptr;
 }
 
-uint32_t* sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address){
+uint32_t* APS5_VABI sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
  (void)buf;
  (void)event_type;
  (void)address;
@@ -78,18 +78,18 @@ uint32_t* sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const vola
  return nullptr;
 }
 
-uint32_t sceAgcAcbJumpGetSize(void){
+uint32_t APS5_VABI sceAgcAcbJumpGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbPopMarker(CommandBuffer* buf){
+uint32_t* APS5_VABI sceAgcAcbPopMarker(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color){
+uint32_t* APS5_VABI sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -97,14 +97,14 @@ uint32_t* sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t colo
  return nullptr;
 }
 
-uint32_t* sceAgcAcbResetQueue(CommandBuffer* buf, uint32_t op){
+uint32_t* APS5_VABI sceAgcAcbResetQueue(CommandBuffer* buf, uint32_t op) {
  (void)buf;
  (void)op;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color){
+uint32_t* APS5_VABI sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -112,7 +112,7 @@ uint32_t* sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color
  return nullptr;
 }
 
-uint32_t* sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles){
+uint32_t* APS5_VABI sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
  (void)buf;
  (void)size;
  (void)compare_function;
@@ -125,7 +125,7 @@ uint32_t* sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_
  return nullptr;
 }
 
-uint32_t* sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm){
+uint32_t* APS5_VABI sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)cache_policy;
@@ -137,12 +137,12 @@ uint32_t* sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_poli
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
-std::uint64_t sceAgcAcbCopyDataGetSize() {
+std::uint64_t APS5_VABI sceAgcAcbCopyDataGetSize() {
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-std::uint32_t* sceAgcAcbJump(CommandBuffer* buf, std::uint8_t cachePolicy, const std::uint32_t* target, std::uint32_t sizeInDwords) {
+std::uint32_t* APS5_VABI sceAgcAcbJump(CommandBuffer* buf, std::uint8_t cachePolicy, const std::uint32_t* target, std::uint32_t sizeInDwords) {
     (void)buf;
     (void)cachePolicy;
     (void)target;
@@ -151,7 +151,7 @@ std::uint32_t* sceAgcAcbJump(CommandBuffer* buf, std::uint8_t cachePolicy, const
     return 0;
 }
 
-std::uint64_t sceAgcAcbWaitOnAddressGetSize(std::uint8_t size) {
+std::uint64_t APS5_VABI sceAgcAcbWaitOnAddressGetSize(std::uint8_t size) {
     (void)size;
     NotImplemented_nid_no_patch(__func__);
     return 0;

core/libs/prx/libSceAgc/Cb/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t* sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_function, const volatile uint64_t* compare_addr, uint64_t mask, uint64_t reference, uint8_t cache_policy1, const volatile uint32_t* buffer1, uint32_t size_in_dwords1, uint8_t cache_policy2, const volatile uint32_t* buffer2, uint32_t size_in_dwords2){
+uint32_t* APS5_VABI sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_function, const volatile uint64_t* compare_addr, uint64_t mask, uint64_t reference, uint8_t cache_policy1, const volatile uint32_t* buffer1, uint32_t size_in_dwords1, uint8_t cache_policy2, const volatile uint32_t* buffer2, uint32_t size_in_dwords2) {
  (void)buf;
  (void)mode;
  (void)compare_function;
@@ -22,7 +22,7 @@ uint32_t* sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_funct
  return nullptr;
 }
 
-uint32_t* sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t thread_group_y, uint32_t thread_group_z, uint32_t modifier){
+uint32_t* APS5_VABI sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t thread_group_y, uint32_t thread_group_z, uint32_t modifier) {
  (void)buf;
  (void)thread_group_x;
  (void)thread_group_y;
@@ -32,30 +32,30 @@ uint32_t* sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t
  return nullptr;
 }
 
-uint32_t sceAgcCbDispatchGetSize(void){
+uint32_t APS5_VABI sceAgcCbDispatchGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbNop_nid_postfix(CommandBuffer* buf, uint32_t size_in_dwords){
+uint32_t* APS5_VABI sceAgcCbNop_nid_postfix(CommandBuffer* buf, uint32_t size_in_dwords) {
  (void)buf;
  (void)size_in_dwords;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcCbNopGetSize(uint32_t size_in_dwords){
+uint32_t APS5_VABI sceAgcCbNopGetSize(uint32_t size_in_dwords) {
  (void)size_in_dwords;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceAgcCbQueueEndOfPipeActionGetSize(void){
+uint32_t APS5_VABI sceAgcCbQueueEndOfPipeActionGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cntl, uint8_t dst, uint8_t cache_policy, const volatile Label* address, uint8_t data_sel, uint64_t data, uint16_t gds_offset, uint16_t gds_size, uint8_t interrupt, uint32_t interrupt_ctx_id){
+uint32_t* APS5_VABI sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cntl, uint8_t dst, uint8_t cache_policy, const volatile Label* address, uint8_t data_sel, uint64_t data, uint16_t gds_offset, uint16_t gds_size, uint8_t interrupt, uint32_t interrupt_ctx_id) {
  (void)buf;
  (void)action;
  (void)gcr_cntl;
@@ -72,7 +72,7 @@ uint32_t* sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cn
  return nullptr;
 }
 
-uint32_t* sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset, const uint32_t* values, uint32_t num_values){
+uint32_t* APS5_VABI sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset, const uint32_t* values, uint32_t num_values) {
  (void)buf;
  (void)offset;
  (void)values;
@@ -81,20 +81,20 @@ uint32_t* sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset,
  return nullptr;
 }
 
-uint32_t sceAgcCbSetShRegisterRangeDirectGetSize(uint32_t num_values){
+uint32_t APS5_VABI sceAgcCbSetShRegisterRangeDirectGetSize(uint32_t num_values) {
  (void)num_values;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbSetShRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs){
+uint32_t* APS5_VABI sceAgcCbSetShRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
-std::uint32_t* sceAgcCbSetUcRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, std::uint32_t numRegs) {
+std::uint32_t* APS5_VABI sceAgcCbSetUcRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, std::uint32_t numRegs) {
     (void)buf;
     (void)regs;
     (void)numRegs;

core/libs/prx/libSceAgc/DcbDraw/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t* sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)index_addr;
@@ -14,12 +14,12 @@ uint32_t* sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const vol
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDrawIndexGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)modifier;
@@ -27,12 +27,12 @@ uint32_t* sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint6
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexAutoGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDrawIndexAutoGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)modifier;
@@ -40,7 +40,7 @@ uint32_t* sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t count_indirect, uint32_t max_count_or_count, const volatile void* count_addr, uint32_t stride_in_bytes, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t count_indirect, uint32_t max_count_or_count, const volatile void* count_addr, uint32_t stride_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)count_indirect;
@@ -52,7 +52,7 @@ uint32_t* sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offs
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, const volatile void* object_ids, uint32_t instance_count, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, const volatile void* object_ids, uint32_t instance_count, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)index_addr;
@@ -63,12 +63,12 @@ uint32_t* sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_co
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexMultiInstancedGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDrawIndexMultiInstancedGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, uint32_t index_count, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, uint32_t index_count, uint64_t modifier) {
  (void)buf;
  (void)index_offset;
  (void)index_count;
@@ -77,12 +77,12 @@ uint32_t* sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, ui
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexOffsetGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDrawIndexOffsetGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier){
+uint32_t* APS5_VABI sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)modifier;
@@ -90,26 +90,26 @@ uint32_t* sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_byte
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndirectGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDrawIndirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetIndexBuffer(CommandBuffer* buf, uint64_t index_addr){
+uint32_t* APS5_VABI sceAgcDcbSetIndexBuffer(CommandBuffer* buf, uint64_t index_addr) {
  (void)buf;
  (void)index_addr;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetIndexCount(CommandBuffer* buf, uint32_t index_count){
+uint32_t* APS5_VABI sceAgcDcbSetIndexCount(CommandBuffer* buf, uint32_t index_count) {
  (void)buf;
  (void)index_count;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t cache_policy){
+uint32_t* APS5_VABI sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t cache_policy) {
  (void)buf;
  (void)index_size;
  (void)cache_policy;
@@ -117,19 +117,19 @@ uint32_t* sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetNumInstances(CommandBuffer* buf, uint32_t num_instances){
+uint32_t* APS5_VABI sceAgcDcbSetNumInstances(CommandBuffer* buf, uint32_t num_instances) {
  (void)buf;
  (void)num_instances;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbSetNumInstancesGetSize(void){
+uint32_t APS5_VABI sceAgcDcbSetNumInstancesGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type, const volatile void* indirect_base_addr){
+uint32_t* APS5_VABI sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type, const volatile void* indirect_base_addr) {
  (void)buf;
  (void)shader_type;
  (void)indirect_base_addr;
@@ -137,7 +137,7 @@ uint32_t* sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type,
  return nullptr;
 }
 
-uint32_t* sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const volatile void* buffer, uint32_t buffer_size_in_bytes, uint32_t reset_count, uint8_t force_reset, uint8_t report_and_reset, uint32_t reporting_interval_in_100k_clocks){
+uint32_t* APS5_VABI sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const volatile void* buffer, uint32_t buffer_size_in_bytes, uint32_t reset_count, uint8_t force_reset, uint8_t report_and_reset, uint32_t reporting_interval_in_100k_clocks) {
  (void)buf;
  (void)cache_policy;
  (void)buffer;
@@ -149,7 +149,7 @@ uint32_t* sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const v
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
-std::uint32_t* sceAgcDcbDrawIndirectMulti(CommandBuffer* buf, std::uint32_t dataOffsetInBytes, std::uint32_t countIndirect, std::uint32_t maxCountOrCount, const volatile void* countAddr, std::uint32_t strideInBytes, std::uint64_t modifier) {
+std::uint32_t* APS5_VABI sceAgcDcbDrawIndirectMulti(CommandBuffer* buf, std::uint32_t dataOffsetInBytes, std::uint32_t countIndirect, std::uint32_t maxCountOrCount, const volatile void* countAddr, std::uint32_t strideInBytes, std::uint64_t modifier) {
     (void)buf;
     (void)dataOffsetInBytes;
     (void)countIndirect;

core/libs/prx/libSceAgc/DcbFlow/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t* sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db_op, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles){
+uint32_t* APS5_VABI sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db_op, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
  (void)buf;
  (void)engine;
  (void)cb_db_op;
@@ -17,12 +17,12 @@ uint32_t* sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db
  return nullptr;
 }
 
-uint32_t sceAgcDcbAcquireMemGetSize(void){
+uint32_t APS5_VABI sceAgcDcbAcquireMemGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords){
+uint32_t* APS5_VABI sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
  (void)buf;
  (void)address;
  (void)num_dwords;
@@ -30,12 +30,12 @@ uint32_t* sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address
  return nullptr;
 }
 
-uint32_t sceAgcDcbCondExecGetSize(void){
+uint32_t APS5_VABI sceAgcDcbCondExecGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm){
+uint32_t* APS5_VABI sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -49,7 +49,7 @@ uint32_t* sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_p
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm, uint8_t block_engine){
+uint32_t* APS5_VABI sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm, uint8_t block_engine) {
  (void)buf;
  (void)engine;
  (void)dst;
@@ -66,7 +66,7 @@ uint32_t* sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t flags){
+uint32_t* APS5_VABI sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t flags) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)flags;
@@ -74,12 +74,12 @@ uint32_t* sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_
  return nullptr;
 }
 
-uint32_t sceAgcDcbDispatchIndirectGetSize(void){
+uint32_t APS5_VABI sceAgcDcbDispatchIndirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address){
+uint32_t* APS5_VABI sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
  (void)buf;
  (void)event_type;
  (void)address;
@@ -87,7 +87,7 @@ uint32_t* sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const vola
  return nullptr;
 }
 
-uint32_t* sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy, const uint32_t* target, uint32_t size_in_dwords){
+uint32_t* APS5_VABI sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy, const uint32_t* target, uint32_t size_in_dwords) {
  (void)buf;
  (void)mode;
  (void)cache_policy;
@@ -97,12 +97,12 @@ uint32_t* sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy,
  return nullptr;
 }
 
-uint32_t sceAgcDcbJumpGetSize(void){
+uint32_t APS5_VABI sceAgcDcbJumpGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state){
+uint32_t* APS5_VABI sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state) {
  (void)buf;
  (void)op;
  (void)state;
@@ -110,25 +110,25 @@ uint32_t* sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state){
  return nullptr;
 }
 
-uint32_t* sceAgcDcbRewind(CommandBuffer* buf, uint32_t initial_state){
+uint32_t* APS5_VABI sceAgcDcbRewind(CommandBuffer* buf, uint32_t initial_state) {
  (void)buf;
  (void)initial_state;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbRewindGetSize(void){
+uint32_t APS5_VABI sceAgcDcbRewindGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbStallCommandBufferParser(CommandBuffer* buf){
+uint32_t* APS5_VABI sceAgcDcbStallCommandBufferParser(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t op, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles){
+uint32_t* APS5_VABI sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t op, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
  (void)buf;
  (void)size;
  (void)compare_function;
@@ -142,13 +142,13 @@ uint32_t* sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_
  return nullptr;
 }
 
-uint32_t sceAgcDcbWaitOnAddressGetSize(uint32_t size){
+uint32_t APS5_VABI sceAgcDcbWaitOnAddressGetSize(uint32_t size) {
  (void)size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_out_handle, uint32_t display_buffer_index){
+uint32_t* APS5_VABI sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_out_handle, uint32_t display_buffer_index) {
  (void)buf;
  (void)video_out_handle;
  (void)display_buffer_index;
@@ -156,7 +156,7 @@ uint32_t* sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_
  return nullptr;
 }
 
-uint32_t* sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm){
+uint32_t* APS5_VABI sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)cache_policy;
@@ -169,18 +169,18 @@ uint32_t* sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_poli
  return nullptr;
 }
 
-uint32_t sceAgcDcbWriteDataGetSize(uint32_t num_dwords){
+uint32_t APS5_VABI sceAgcDcbWriteDataGetSize(uint32_t num_dwords) {
  (void)num_dwords;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
-std::uint64_t sceAgcDcbEventWriteGetSize(std::uint8_t eventType) {
+std::uint64_t APS5_VABI sceAgcDcbEventWriteGetSize(std::uint8_t eventType) {
     (void)eventType;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-std::uint64_t sceAgcDcbCopyDataGetSize() {
+std::uint64_t APS5_VABI sceAgcDcbCopyDataGetSize() {
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }

core/libs/prx/libSceAgc/DcbState/Export.cpp

@@ -5,19 +5,19 @@
 
 extern "C" {
 
-uint32_t* sceAgcDcbSetCxRegisterDirect(CommandBuffer* buf, ShaderRegister reg){
+uint32_t* APS5_VABI sceAgcDcbSetCxRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbSetCxRegisterDirectGetSize(void){
+uint32_t APS5_VABI sceAgcDcbSetCxRegisterDirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs){
+uint32_t* APS5_VABI sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -25,14 +25,14 @@ uint32_t* sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetShRegisterDirect(CommandBuffer* buf, ShaderRegister reg){
+uint32_t* APS5_VABI sceAgcDcbSetShRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs){
+uint32_t* APS5_VABI sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -40,14 +40,14 @@ uint32_t* sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetUcRegisterDirect(CommandBuffer* buf, ShaderRegister reg){
+uint32_t* APS5_VABI sceAgcDcbSetUcRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs){
+uint32_t* APS5_VABI sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -55,20 +55,20 @@ uint32_t* sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbContextStateOp(CommandBuffer* buf, uint32_t operation){
+uint32_t* APS5_VABI sceAgcDcbContextStateOp(CommandBuffer* buf, uint32_t operation) {
  (void)buf;
  (void)operation;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint64_t sceAgcDcbContextStateOpGetSize(uint32_t operation){
+uint64_t APS5_VABI sceAgcDcbContextStateOpGetSize(uint32_t operation) {
  (void)operation;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_t display_buffer_index, uint32_t flip_mode, int64_t flip_arg){
+uint32_t* APS5_VABI sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_t display_buffer_index, uint32_t flip_mode, int64_t flip_arg) {
  (void)buf;
  (void)video_out_handle;
  (void)display_buffer_index;
@@ -78,7 +78,7 @@ uint32_t* sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t op, uint8_t wait_op, const volatile void* address, uint32_t count_in_dwords){
+uint32_t* APS5_VABI sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t op, uint8_t wait_op, const volatile void* address, uint32_t count_in_dwords) {
  (void)buf;
  (void)condition;
  (void)op;
@@ -89,7 +89,7 @@ uint32_t* sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color){
+uint32_t* APS5_VABI sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -97,13 +97,13 @@ uint32_t* sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color
  return nullptr;
 }
 
-uint32_t* sceAgcDcbPopMarker(CommandBuffer* buf){
+uint32_t* APS5_VABI sceAgcDcbPopMarker(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color){
+uint32_t* APS5_VABI sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -111,7 +111,7 @@ uint32_t* sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t colo
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, uint32_t workload_id){
+uint32_t* APS5_VABI sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, uint32_t workload_id) {
  (void)buf;
  (void)stream_id;
  (void)workload_id;
@@ -119,7 +119,7 @@ uint32_t* sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, u
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetWorkloadsActive(CommandBuffer* buf, uint32_t stream_id, const uint32_t* workload_ids, uint32_t workload_count){
+uint32_t* APS5_VABI sceAgcDcbSetWorkloadsActive(CommandBuffer* buf, uint32_t stream_id, const uint32_t* workload_ids, uint32_t workload_count) {
  (void)buf;
  (void)stream_id;
  (void)workload_ids;

core/libs/prx/libSceAgc/Misc/Export.cpp

@@ -5,25 +5,25 @@
 
 extern "C" {
 
-uint32_t sceAgcGetPacketSize(uint32_t* packet){
+uint32_t APS5_VABI sceAgcGetPacketSize(uint32_t* packet) {
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void* sceAgcGetRegisterDefaults2(uint32_t ver){
+void* APS5_VABI sceAgcGetRegisterDefaults2(uint32_t ver) {
  (void)ver;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-void* sceAgcGetRegisterDefaults2Internal(uint32_t ver){
+void* APS5_VABI sceAgcGetRegisterDefaults2Internal(uint32_t ver) {
  (void)ver;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type){
+int APS5_VABI sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type) {
  (void)addr;
  (void)cmd;
  (void)type;
@@ -31,12 +31,12 @@ int sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type){
  return 0;
 }
 
-int sceAgcSuspendPoint(void){
+int APS5_VABI sceAgcSuspendPoint(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcInit_nid_postfix(uint32_t* state, uint32_t ver){
+int APS5_VABI sceAgcInit_nid_postfix(uint32_t* state, uint32_t ver) {
  (void)state;
  (void)ver;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAgc/Patch/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceAgcDmaDataPatchSetDstAddressOrOffset(uint32_t* cmd, uint64_t dst_address_or_offset){
+int APS5_VABI sceAgcDmaDataPatchSetDstAddressOrOffset(uint32_t* cmd, uint64_t dst_address_or_offset) {
  (void)cmd;
  (void)dst_address_or_offset;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDmaDataPatchSetSrcAddressOrOffsetOrImmediate(uint32_t* cmd, uint64_t src_address_or_offset_or_immediate){
+int APS5_VABI sceAgcDmaDataPatchSetSrcAddressOrOffsetOrImmediate(uint32_t* cmd, uint64_t src_address_or_offset_or_immediate) {
  (void)cmd;
  (void)src_address_or_offset_or_immediate;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uint32_t size_in_dwords){
+int APS5_VABI sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uint32_t size_in_dwords) {
  (void)cmd;
  (void)target;
  (void)size_in_dwords;
@@ -27,14 +27,14 @@ int sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uin
  return 0;
 }
 
-int sceAgcQueueEndOfPipeActionPatchAddress(uint32_t* cmd, const volatile Label* address){
+int APS5_VABI sceAgcQueueEndOfPipeActionPatchAddress(uint32_t* cmd, const volatile Label* address) {
  (void)cmd;
  (void)address;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint32_t data_sel, uint64_t data){
+int APS5_VABI sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint32_t data_sel, uint64_t data) {
  (void)cmd;
  (void)context_id;
  (void)data_sel;
@@ -43,111 +43,111 @@ int sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint
  return 0;
 }
 
-int sceAgcRewindPatchSetRewindState(uint32_t* cmd, uint8_t state){
+int APS5_VABI sceAgcRewindPatchSetRewindState(uint32_t* cmd, uint8_t state) {
  (void)cmd;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcWaitRegMemPatchAddress(uint32_t* cmd, const volatile void* address){
+int APS5_VABI sceAgcWaitRegMemPatchAddress(uint32_t* cmd, const volatile void* address) {
  (void)cmd;
  (void)address;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcWaitRegMemPatchReference(uint32_t* cmd, uint64_t reference){
+int APS5_VABI sceAgcWaitRegMemPatchReference(uint32_t* cmd, uint64_t reference) {
  (void)cmd;
  (void)reference;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcCondExecPatchSetCommandAddress(uint32_t* cmd, const volatile uint32_t* command){
+int APS5_VABI sceAgcCondExecPatchSetCommandAddress(uint32_t* cmd, const volatile uint32_t* command) {
  (void)cmd;
  (void)command;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcCondExecPatchSetEnd(uint32_t* cmd, const volatile uint32_t* buffer){
+int APS5_VABI sceAgcCondExecPatchSetEnd(uint32_t* cmd, const volatile uint32_t* buffer) {
  (void)cmd;
  (void)buffer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetCxRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs){
+int APS5_VABI sceAgcSetCxRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetCxRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetShRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs){
+int APS5_VABI sceAgcSetShRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetShRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetUcRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs){
+int APS5_VABI sceAgcSetUcRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs){
+int APS5_VABI sceAgcSetUcRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
-int sceAgcAsyncCondExecPatchSetCommandAddress(std::uint32_t* cmd, const volatile std::uint32_t* command) {
+int APS5_VABI sceAgcAsyncCondExecPatchSetCommandAddress(std::uint32_t* cmd, const volatile std::uint32_t* command) {
     (void)cmd;
     (void)command;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceAgcAsyncCondExecPatchSetEnd(std::uint32_t* cmd, const volatile std::uint32_t* buffer) {
+int APS5_VABI sceAgcAsyncCondExecPatchSetEnd(std::uint32_t* cmd, const volatile std::uint32_t* buffer) {
     (void)cmd;
     (void)buffer;
     NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAgc/Predication/Export.cpp

@@ -5,14 +5,14 @@
 
 extern "C" {
 
-int sceAgcSetPacketPredication(uint32_t* packet, uint32_t predication){
+int APS5_VABI sceAgcSetPacketPredication(uint32_t* packet, uint32_t predication) {
  (void)packet;
  (void)predication;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetRangePredication(uint32_t* start, const volatile uint32_t* end, uint32_t predication){
+int APS5_VABI sceAgcSetRangePredication(uint32_t* start, const volatile uint32_t* end, uint32_t predication) {
  (void)start;
  (void)end;
  (void)predication;

core/libs/prx/libSceAgc/Shader/Export.cpp

@@ -8,7 +8,7 @@
 
 extern "C" {
 
-int sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
+int APS5_VABI sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
     constexpr auto fn = __func__;
     if (dst == nullptr) {
         throw std::runtime_error(std::string(fn) + ": dst is null");
@@ -62,7 +62,7 @@ int sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
     return 0;
 }
 
-int sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, const Shader* hs, const Shader* gs, std::uint32_t prim_type) {
+int APS5_VABI sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, const Shader* hs, const Shader* gs, std::uint32_t prim_type) {
     if (cx_regs == nullptr && uc_regs == nullptr) {
         return 0;
     }
@@ -102,7 +102,7 @@ int sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, cons
     return 0;
 }
 
-int sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, std::uint32_t prim_type) {
+int APS5_VABI sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, std::uint32_t prim_type) {
     if (cx_regs != nullptr && (cx_regs[0].value & (ShaderRegs::VGT_SHADER_STAGES_GS_BIT | ShaderRegs::VGT_SHADER_STAGES_NGG_BIT)) == 0) {
         cx_regs[1].value &= ~0x7u;
         cx_regs[1].value |= GraphicsPrimTypeToGsOut(prim_type);
@@ -117,7 +117,7 @@ int sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, std:
     return 0;
 }
 
-int sceAgcCreateInterpolantMapping(ShaderRegister* regs, const Shader* gs, const Shader* ps) {
+int APS5_VABI sceAgcCreateInterpolantMapping(ShaderRegister* regs, const Shader* gs, const Shader* ps) {
     constexpr auto fn = __func__;
     if (regs == nullptr) {
         throw std::runtime_error(std::string(fn) + ": regs is null");

core/libs/prx/libSceAgcDriver/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceAgcDriverAddEqEvent(KernelEqueue eq, int id, void* udata) {
+int APS5_VABI sceAgcDriverAddEqEvent(KernelEqueue eq, int id, void* udata) {
  (void)eq;
  (void)id;
  (void)udata;
@@ -13,59 +13,59 @@ int sceAgcDriverAddEqEvent(KernelEqueue eq, int id, void* udata) {
  return 0;
 }
 
-int sceAgcDriverDeleteEqEvent(KernelEqueue eq, int id) {
+int APS5_VABI sceAgcDriverDeleteEqEvent(KernelEqueue eq, int id) {
  (void)eq;
  (void)id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceAgcDriverGetEqContextId(const KernelEvent* ev) {
+uint32_t APS5_VABI sceAgcDriverGetEqContextId(const KernelEvent* ev) {
  (void)ev;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverGetEqEventType(const KernelEvent* ev) {
+int APS5_VABI sceAgcDriverGetEqEventType(const KernelEvent* ev) {
  (void)ev;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceAgcDriverInitResourceRegistration(void) {
+uint32_t APS5_VABI sceAgcDriverInitResourceRegistration(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-bool sceAgcDriverIsCaptureInProgress(void) {
+bool APS5_VABI sceAgcDriverIsCaptureInProgress(void) {
  NotImplemented_nid_no_patch(__func__);
  return false;
 }
 
-uint32_t sceAgcDriverQueryResourceRegistrationUserMemoryRequirements(uint64_t* size_in_bytes) {
+uint32_t APS5_VABI sceAgcDriverQueryResourceRegistrationUserMemoryRequirements(uint64_t* size_in_bytes) {
  (void)size_in_bytes;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverRegisterOwner(void) {
+int APS5_VABI sceAgcDriverRegisterOwner(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverRegisterResource(void) {
+int APS5_VABI sceAgcDriverRegisterResource(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverRegisterWorkloadStream(uint32_t stream_id, const void* stream) {
+int APS5_VABI sceAgcDriverRegisterWorkloadStream(uint32_t stream_id, const void* stream) {
  (void)stream_id;
  (void)stream;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverSetHsOffchipParam(uint64_t value0, uint64_t value1, uint64_t value2) {
+int APS5_VABI sceAgcDriverSetHsOffchipParam(uint64_t value0, uint64_t value1, uint64_t value2) {
  (void)value0;
  (void)value1;
  (void)value2;
@@ -73,34 +73,34 @@ int sceAgcDriverSetHsOffchipParam(uint64_t value0, uint64_t value1, uint64_t val
  return 0;
 }
 
-int sceAgcDriverSetTFRing(const volatile void* base, uint32_t size) {
+int APS5_VABI sceAgcDriverSetTFRing(const volatile void* base, uint32_t size) {
  (void)base;
  (void)size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverSubmitAcb(uint32_t queue, const Packet* packet) {
+int APS5_VABI sceAgcDriverSubmitAcb(uint32_t queue, const Packet* packet) {
  (void)queue;
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverSubmitCommandBuffer(void* queue_context, const Packet* packet) {
+int APS5_VABI sceAgcDriverSubmitCommandBuffer(void* queue_context, const Packet* packet) {
  (void)queue_context;
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverSubmitDcb(const Packet* packet) {
+int APS5_VABI sceAgcDriverSubmitDcb(const Packet* packet) {
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverSubmitMultiAcbs(uint32_t queue, uint32_t* const* acbs, const uint32_t* sizes_in_dwords, uint32_t count) {
+int APS5_VABI sceAgcDriverSubmitMultiAcbs(uint32_t queue, uint32_t* const* acbs, const uint32_t* sizes_in_dwords, uint32_t count) {
  (void)queue;
  (void)acbs;
  (void)sizes_in_dwords;
@@ -109,7 +109,7 @@ int sceAgcDriverSubmitMultiAcbs(uint32_t queue, uint32_t* const* acbs, const uin
  return 0;
 }
 
-int sceAgcDriverSubmitMultiCommandBuffers(void* queue_context, uint32_t* const* command_buffers, const uint32_t* sizes_in_dwords, uint32_t count) {
+int APS5_VABI sceAgcDriverSubmitMultiCommandBuffers(void* queue_context, uint32_t* const* command_buffers, const uint32_t* sizes_in_dwords, uint32_t count) {
  (void)queue_context;
  (void)command_buffers;
  (void)sizes_in_dwords;
@@ -118,7 +118,7 @@ int sceAgcDriverSubmitMultiCommandBuffers(void* queue_context, uint32_t* const*
  return 0;
 }
 
-int sceAgcDriverSubmitMultiDcbs(uint32_t* const* dcb_gpu_addrs, const uint32_t* dcb_sizes_in_dwords, uint32_t count) {
+int APS5_VABI sceAgcDriverSubmitMultiDcbs(uint32_t* const* dcb_gpu_addrs, const uint32_t* dcb_sizes_in_dwords, uint32_t count) {
  (void)dcb_gpu_addrs;
  (void)dcb_sizes_in_dwords;
  (void)count;
@@ -126,32 +126,32 @@ int sceAgcDriverSubmitMultiDcbs(uint32_t* const* dcb_gpu_addrs, const uint32_t*
  return 0;
 }
 
-int sceAgcDriverUnregisterOwnerAndResources(uint32_t owner_handle) {
+int APS5_VABI sceAgcDriverUnregisterOwnerAndResources(uint32_t owner_handle) {
  (void)owner_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDriverUnregisterResource(void) {
+int APS5_VABI sceAgcDriverUnregisterResource(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
 
 // signature from name
-bool sceAgcDriverIsTraceInProgress(void) {
+bool APS5_VABI sceAgcDriverIsTraceInProgress(void) {
  NotImplemented_nid_no_patch(__func__);
  return false;
 }
 
  // signature from name
-bool sceAgcDriverIsSubmitValidationEnabled(void) {
+bool APS5_VABI sceAgcDriverIsSubmitValidationEnabled(void) {
  NotImplemented_nid_no_patch(__func__);
  return false;
 }
 
  // signature from name
-int sceAgcDriverAgrSubmitDcb(const Packet* packet) {
+int APS5_VABI sceAgcDriverAgrSubmitDcb(const Packet* packet) {
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceAgcVsh/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t* sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
+uint32_t* APS5_VABI sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
  (void)buf;
  (void)gcr_cntl;
  (void)base;
@@ -15,12 +15,12 @@ uint32_t* sceAgcAcbAcquireMem(CommandBuffer* buf, uint32_t gcr_cntl, const volat
  return nullptr;
 }
 
-uint32_t sceAgcAcbAcquireMemGetSize(void) {
+uint32_t APS5_VABI sceAgcAcbAcquireMemGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
+uint32_t* APS5_VABI sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
  (void)buf;
  (void)address;
  (void)num_dwords;
@@ -28,12 +28,12 @@ uint32_t* sceAgcAcbCondExec(CommandBuffer* buf, const volatile uint32_t* address
  return nullptr;
 }
 
-uint32_t sceAgcAcbCondExecGetSize(void) {
+uint32_t APS5_VABI sceAgcAcbCondExecGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
+uint32_t* APS5_VABI sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -47,7 +47,7 @@ uint32_t* sceAgcAcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_p
  return nullptr;
 }
 
-uint32_t* sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* indirect_args, uint32_t modifier) {
+uint32_t* APS5_VABI sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* indirect_args, uint32_t modifier) {
  (void)buf;
  (void)indirect_args;
  (void)modifier;
@@ -55,7 +55,7 @@ uint32_t* sceAgcAcbDispatchIndirect(CommandBuffer* buf, const volatile void* ind
  return nullptr;
 }
 
-uint32_t* sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm) {
+uint32_t* APS5_VABI sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -70,7 +70,7 @@ uint32_t* sceAgcAcbDmaData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_po
  return nullptr;
 }
 
-uint32_t* sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
+uint32_t* APS5_VABI sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
  (void)buf;
  (void)event_type;
  (void)address;
@@ -78,18 +78,18 @@ uint32_t* sceAgcAcbEventWrite(CommandBuffer* buf, uint8_t event_type, const vola
  return nullptr;
 }
 
-uint32_t sceAgcAcbJumpGetSize(void) {
+uint32_t APS5_VABI sceAgcAcbJumpGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcAcbPopMarker(CommandBuffer* buf) {
+uint32_t* APS5_VABI sceAgcAcbPopMarker(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
+uint32_t* APS5_VABI sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -97,14 +97,14 @@ uint32_t* sceAgcAcbPushMarker(CommandBuffer* buf, const char* str, uint32_t colo
  return nullptr;
 }
 
-uint32_t* sceAgcAcbResetQueue(CommandBuffer* buf, uint32_t op) {
+uint32_t* APS5_VABI sceAgcAcbResetQueue(CommandBuffer* buf, uint32_t op) {
  (void)buf;
  (void)op;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
+uint32_t* APS5_VABI sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -112,7 +112,7 @@ uint32_t* sceAgcAcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color
  return nullptr;
 }
 
-uint32_t* sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
+uint32_t* APS5_VABI sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
  (void)buf;
  (void)size;
  (void)compare_function;
@@ -125,7 +125,7 @@ uint32_t* sceAgcAcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_
  return nullptr;
 }
 
-uint32_t* sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
+uint32_t* APS5_VABI sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)cache_policy;
@@ -138,7 +138,7 @@ uint32_t* sceAgcAcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_poli
  return nullptr;
 }
 
-uint32_t* sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_function, const volatile uint64_t* compare_addr, uint64_t mask, uint64_t reference, uint8_t cache_policy1, const volatile uint32_t* buffer1, uint32_t size_in_dwords1, uint8_t cache_policy2, const volatile uint32_t* buffer2, uint32_t size_in_dwords2) {
+uint32_t* APS5_VABI sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_function, const volatile uint64_t* compare_addr, uint64_t mask, uint64_t reference, uint8_t cache_policy1, const volatile uint32_t* buffer1, uint32_t size_in_dwords1, uint8_t cache_policy2, const volatile uint32_t* buffer2, uint32_t size_in_dwords2) {
  (void)buf;
  (void)mode;
  (void)compare_function;
@@ -155,7 +155,7 @@ uint32_t* sceAgcCbBranch(CommandBuffer* buf, uint8_t mode, uint8_t compare_funct
  return nullptr;
 }
 
-uint32_t* sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t thread_group_y, uint32_t thread_group_z, uint32_t modifier) {
+uint32_t* APS5_VABI sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t thread_group_y, uint32_t thread_group_z, uint32_t modifier) {
  (void)buf;
  (void)thread_group_x;
  (void)thread_group_y;
@@ -165,30 +165,30 @@ uint32_t* sceAgcCbDispatch(CommandBuffer* buf, uint32_t thread_group_x, uint32_t
  return nullptr;
 }
 
-uint32_t sceAgcCbDispatchGetSize(void) {
+uint32_t APS5_VABI sceAgcCbDispatchGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbNop_nid_postfix(CommandBuffer* buf, uint32_t size_in_dwords) {
+uint32_t* APS5_VABI sceAgcCbNop_nid_postfix(CommandBuffer* buf, uint32_t size_in_dwords) {
  (void)buf;
  (void)size_in_dwords;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcCbNopGetSize(uint32_t size_in_dwords) {
+uint32_t APS5_VABI sceAgcCbNopGetSize(uint32_t size_in_dwords) {
  (void)size_in_dwords;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceAgcCbQueueEndOfPipeActionGetSize(void) {
+uint32_t APS5_VABI sceAgcCbQueueEndOfPipeActionGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cntl, uint8_t dst, uint8_t cache_policy, const volatile Label* address, uint8_t data_sel, uint64_t data, uint16_t gds_offset, uint16_t gds_size, uint8_t interrupt, uint32_t interrupt_ctx_id) {
+uint32_t* APS5_VABI sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cntl, uint8_t dst, uint8_t cache_policy, const volatile Label* address, uint8_t data_sel, uint64_t data, uint16_t gds_offset, uint16_t gds_size, uint8_t interrupt, uint32_t interrupt_ctx_id) {
  (void)buf;
  (void)action;
  (void)gcr_cntl;
@@ -205,7 +205,7 @@ uint32_t* sceAgcCbReleaseMem(CommandBuffer* buf, uint8_t action, uint16_t gcr_cn
  return nullptr;
 }
 
-uint32_t* sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset, const uint32_t* values, uint32_t num_values) {
+uint32_t* APS5_VABI sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset, const uint32_t* values, uint32_t num_values) {
  (void)buf;
  (void)offset;
  (void)values;
@@ -214,13 +214,13 @@ uint32_t* sceAgcCbSetShRegisterRangeDirect(CommandBuffer* buf, uint32_t offset,
  return nullptr;
 }
 
-uint32_t sceAgcCbSetShRegisterRangeDirectGetSize(uint32_t num_values) {
+uint32_t APS5_VABI sceAgcCbSetShRegisterRangeDirectGetSize(uint32_t num_values) {
  (void)num_values;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcCbSetShRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
+uint32_t* APS5_VABI sceAgcCbSetShRegistersDirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -228,21 +228,21 @@ uint32_t* sceAgcCbSetShRegistersDirect(CommandBuffer* buf, const volatile Shader
  return nullptr;
 }
 
-int sceAgcCondExecPatchSetCommandAddress(uint32_t* cmd, const volatile uint32_t* command) {
+int APS5_VABI sceAgcCondExecPatchSetCommandAddress(uint32_t* cmd, const volatile uint32_t* command) {
  (void)cmd;
  (void)command;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcCondExecPatchSetEnd(uint32_t* cmd, const volatile uint32_t* buffer) {
+int APS5_VABI sceAgcCondExecPatchSetEnd(uint32_t* cmd, const volatile uint32_t* buffer) {
  (void)cmd;
  (void)buffer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcCreateInterpolantMapping(ShaderRegister* regs, const Shader* gs, const Shader* ps) {
+int APS5_VABI sceAgcCreateInterpolantMapping(ShaderRegister* regs, const Shader* gs, const Shader* ps) {
  (void)regs;
  (void)gs;
  (void)ps;
@@ -250,7 +250,7 @@ int sceAgcCreateInterpolantMapping(ShaderRegister* regs, const Shader* gs, const
  return 0;
 }
 
-int sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, const Shader* hs, const Shader* gs, uint32_t prim_type) {
+int APS5_VABI sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, const Shader* hs, const Shader* gs, uint32_t prim_type) {
  (void)cx_regs;
  (void)uc_regs;
  (void)hs;
@@ -260,7 +260,7 @@ int sceAgcCreatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, cons
  return 0;
 }
 
-int sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
+int APS5_VABI sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
  (void)dst;
  (void)header;
  (void)code;
@@ -268,7 +268,7 @@ int sceAgcCreateShader(Shader** dst, void* header, const volatile void* code) {
  return 0;
 }
 
-uint32_t* sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db_op, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
+uint32_t* APS5_VABI sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db_op, uint32_t gcr_cntl, const volatile void* base, uint64_t size_bytes, uint32_t poll_cycles) {
  (void)buf;
  (void)engine;
  (void)cb_db_op;
@@ -280,12 +280,12 @@ uint32_t* sceAgcDcbAcquireMem(CommandBuffer* buf, uint8_t engine, uint32_t cb_db
  return nullptr;
 }
 
-uint32_t sceAgcDcbAcquireMemGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbAcquireMemGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
+uint32_t* APS5_VABI sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address, uint32_t num_dwords) {
  (void)buf;
  (void)address;
  (void)num_dwords;
@@ -293,25 +293,25 @@ uint32_t* sceAgcDcbCondExec(CommandBuffer* buf, const volatile uint32_t* address
  return nullptr;
 }
 
-uint32_t sceAgcDcbCondExecGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbCondExecGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbContextStateOp(CommandBuffer* buf, uint32_t operation) {
+uint32_t* APS5_VABI sceAgcDcbContextStateOp(CommandBuffer* buf, uint32_t operation) {
  (void)buf;
  (void)operation;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint64_t sceAgcDcbContextStateOpGetSize(uint32_t operation) {
+uint64_t APS5_VABI sceAgcDcbContextStateOpGetSize(uint32_t operation) {
  (void)operation;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
+uint32_t* APS5_VABI sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_immediate, uint8_t item_size, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)dst_cache_policy;
@@ -325,7 +325,7 @@ uint32_t* sceAgcDcbCopyData(CommandBuffer* buf, uint8_t dst, uint8_t dst_cache_p
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t flags) {
+uint32_t* APS5_VABI sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t flags) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)flags;
@@ -333,12 +333,12 @@ uint32_t* sceAgcDcbDispatchIndirect(CommandBuffer* buf, uint32_t data_offset_in_
  return nullptr;
 }
 
-uint32_t sceAgcDcbDispatchIndirectGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDispatchIndirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm, uint8_t block_engine) {
+uint32_t* APS5_VABI sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint8_t dst_cache_policy, uint64_t dst_address_or_offset, uint8_t src, uint8_t src_cache_policy, uint64_t src_address_or_offset_or_immediate, uint32_t num_bytes, uint8_t wait_for_previous, uint8_t write_confirm, uint8_t block_engine) {
  (void)buf;
  (void)engine;
  (void)dst;
@@ -355,7 +355,7 @@ uint32_t* sceAgcDcbDmaData(CommandBuffer* buf, uint8_t engine, uint8_t dst, uint
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)index_addr;
@@ -364,7 +364,7 @@ uint32_t* sceAgcDcbDrawIndex(CommandBuffer* buf, uint32_t index_count, const vol
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)modifier;
@@ -372,17 +372,17 @@ uint32_t* sceAgcDcbDrawIndexAuto(CommandBuffer* buf, uint32_t index_count, uint6
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexAutoGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDrawIndexAutoGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceAgcDcbDrawIndexGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDrawIndexGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)modifier;
@@ -390,7 +390,7 @@ uint32_t* sceAgcDcbDrawIndexIndirect(CommandBuffer* buf, uint32_t data_offset_in
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t count_indirect, uint32_t max_count_or_count, const volatile void* count_addr, uint32_t stride_in_bytes, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint32_t count_indirect, uint32_t max_count_or_count, const volatile void* count_addr, uint32_t stride_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)count_indirect;
@@ -402,7 +402,7 @@ uint32_t* sceAgcDcbDrawIndexIndirectMulti(CommandBuffer* buf, uint32_t data_offs
  return nullptr;
 }
 
-uint32_t* sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, const volatile void* object_ids, uint32_t instance_count, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_count, const volatile void* index_addr, const volatile void* object_ids, uint32_t instance_count, uint64_t modifier) {
  (void)buf;
  (void)index_count;
  (void)index_addr;
@@ -413,12 +413,12 @@ uint32_t* sceAgcDcbDrawIndexMultiInstanced(CommandBuffer* buf, uint32_t index_co
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexMultiInstancedGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDrawIndexMultiInstancedGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, uint32_t index_count, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, uint32_t index_count, uint64_t modifier) {
  (void)buf;
  (void)index_offset;
  (void)index_count;
@@ -427,12 +427,12 @@ uint32_t* sceAgcDcbDrawIndexOffset(CommandBuffer* buf, uint32_t index_offset, ui
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndexOffsetGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDrawIndexOffsetGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
+uint32_t* APS5_VABI sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_bytes, uint64_t modifier) {
  (void)buf;
  (void)data_offset_in_bytes;
  (void)modifier;
@@ -440,12 +440,12 @@ uint32_t* sceAgcDcbDrawIndirect(CommandBuffer* buf, uint32_t data_offset_in_byte
  return nullptr;
 }
 
-uint32_t sceAgcDcbDrawIndirectGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbDrawIndirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
+uint32_t* APS5_VABI sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const volatile void* address) {
  (void)buf;
  (void)event_type;
  (void)address;
@@ -453,7 +453,7 @@ uint32_t* sceAgcDcbEventWrite(CommandBuffer* buf, uint8_t event_type, const vola
  return nullptr;
 }
 
-uint32_t* sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const volatile void* buffer, uint32_t buffer_size_in_bytes, uint32_t reset_count, uint8_t force_reset, uint8_t report_and_reset, uint32_t reporting_interval_in_100k_clocks) {
+uint32_t* APS5_VABI sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const volatile void* buffer, uint32_t buffer_size_in_bytes, uint32_t reset_count, uint8_t force_reset, uint8_t report_and_reset, uint32_t reporting_interval_in_100k_clocks) {
  (void)buf;
  (void)cache_policy;
  (void)buffer;
@@ -466,7 +466,7 @@ uint32_t* sceAgcDcbGetLodStats(CommandBuffer* buf, uint8_t cache_policy, const v
  return nullptr;
 }
 
-uint32_t* sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy, const uint32_t* target, uint32_t size_in_dwords) {
+uint32_t* APS5_VABI sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy, const uint32_t* target, uint32_t size_in_dwords) {
  (void)buf;
  (void)mode;
  (void)cache_policy;
@@ -476,18 +476,18 @@ uint32_t* sceAgcDcbJump(CommandBuffer* buf, uint8_t mode, uint8_t cache_policy,
  return nullptr;
 }
 
-uint32_t sceAgcDcbJumpGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbJumpGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbPopMarker(CommandBuffer* buf) {
+uint32_t* APS5_VABI sceAgcDcbPopMarker(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
+uint32_t* APS5_VABI sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -495,7 +495,7 @@ uint32_t* sceAgcDcbPushMarker(CommandBuffer* buf, const char* str, uint32_t colo
  return nullptr;
 }
 
-uint32_t* sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state) {
+uint32_t* APS5_VABI sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state) {
  (void)buf;
  (void)op;
  (void)state;
@@ -503,19 +503,19 @@ uint32_t* sceAgcDcbResetQueue(CommandBuffer* buf, uint32_t op, uint32_t state) {
  return nullptr;
 }
 
-uint32_t* sceAgcDcbRewind(CommandBuffer* buf, uint32_t initial_state) {
+uint32_t* APS5_VABI sceAgcDcbRewind(CommandBuffer* buf, uint32_t initial_state) {
  (void)buf;
  (void)initial_state;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbRewindGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbRewindGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type, const volatile void* indirect_base_addr) {
+uint32_t* APS5_VABI sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type, const volatile void* indirect_base_addr) {
  (void)buf;
  (void)shader_type;
  (void)indirect_base_addr;
@@ -523,19 +523,19 @@ uint32_t* sceAgcDcbSetBaseIndirectArgs(CommandBuffer* buf, uint32_t shader_type,
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetCxRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
+uint32_t* APS5_VABI sceAgcDcbSetCxRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbSetCxRegisterDirectGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbSetCxRegisterDirectGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
+uint32_t* APS5_VABI sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -543,7 +543,7 @@ uint32_t* sceAgcDcbSetCxRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_t display_buffer_index, uint32_t flip_mode, int64_t flip_arg) {
+uint32_t* APS5_VABI sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_t display_buffer_index, uint32_t flip_mode, int64_t flip_arg) {
  (void)buf;
  (void)video_out_handle;
  (void)display_buffer_index;
@@ -553,21 +553,21 @@ uint32_t* sceAgcDcbSetFlip(CommandBuffer* buf, uint32_t video_out_handle, int32_
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetIndexBuffer(CommandBuffer* buf, uint64_t index_addr) {
+uint32_t* APS5_VABI sceAgcDcbSetIndexBuffer(CommandBuffer* buf, uint64_t index_addr) {
  (void)buf;
  (void)index_addr;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetIndexCount(CommandBuffer* buf, uint32_t index_count) {
+uint32_t* APS5_VABI sceAgcDcbSetIndexCount(CommandBuffer* buf, uint32_t index_count) {
  (void)buf;
  (void)index_count;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t cache_policy) {
+uint32_t* APS5_VABI sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t cache_policy) {
  (void)buf;
  (void)index_size;
  (void)cache_policy;
@@ -575,7 +575,7 @@ uint32_t* sceAgcDcbSetIndexSize(CommandBuffer* buf, uint8_t index_size, uint8_t
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
+uint32_t* APS5_VABI sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color) {
  (void)buf;
  (void)str;
  (void)color;
@@ -583,19 +583,19 @@ uint32_t* sceAgcDcbSetMarker(CommandBuffer* buf, const char* str, uint32_t color
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetNumInstances(CommandBuffer* buf, uint32_t num_instances) {
+uint32_t* APS5_VABI sceAgcDcbSetNumInstances(CommandBuffer* buf, uint32_t num_instances) {
  (void)buf;
  (void)num_instances;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbSetNumInstancesGetSize(void) {
+uint32_t APS5_VABI sceAgcDcbSetNumInstancesGetSize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t op, uint8_t wait_op, const volatile void* address, uint32_t count_in_dwords) {
+uint32_t* APS5_VABI sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t op, uint8_t wait_op, const volatile void* address, uint32_t count_in_dwords) {
  (void)buf;
  (void)condition;
  (void)op;
@@ -606,14 +606,14 @@ uint32_t* sceAgcDcbSetPredication(CommandBuffer* buf, uint8_t condition, uint8_t
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetShRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
+uint32_t* APS5_VABI sceAgcDcbSetShRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
+uint32_t* APS5_VABI sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -621,14 +621,14 @@ uint32_t* sceAgcDcbSetShRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetUcRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
+uint32_t* APS5_VABI sceAgcDcbSetUcRegisterDirect(CommandBuffer* buf, ShaderRegister reg) {
  (void)buf;
  (void)reg;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
+uint32_t* APS5_VABI sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile ShaderRegister* regs, uint32_t num_regs) {
  (void)buf;
  (void)regs;
  (void)num_regs;
@@ -636,7 +636,7 @@ uint32_t* sceAgcDcbSetUcRegistersIndirect(CommandBuffer* buf, const volatile Sha
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, uint32_t workload_id) {
+uint32_t* APS5_VABI sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, uint32_t workload_id) {
  (void)buf;
  (void)stream_id;
  (void)workload_id;
@@ -644,7 +644,7 @@ uint32_t* sceAgcDcbSetWorkloadComplete(CommandBuffer* buf, uint32_t stream_id, u
  return nullptr;
 }
 
-uint32_t* sceAgcDcbSetWorkloadsActive(CommandBuffer* buf, uint32_t stream_id, const uint32_t* workload_ids, uint32_t workload_count) {
+uint32_t* APS5_VABI sceAgcDcbSetWorkloadsActive(CommandBuffer* buf, uint32_t stream_id, const uint32_t* workload_ids, uint32_t workload_count) {
  (void)buf;
  (void)stream_id;
  (void)workload_ids;
@@ -653,19 +653,19 @@ uint32_t* sceAgcDcbSetWorkloadsActive(CommandBuffer* buf, uint32_t stream_id, co
  return nullptr;
 }
 
-uint32_t* sceAgcDcbStallCommandBufferParser(CommandBuffer* buf) {
+uint32_t* APS5_VABI sceAgcDcbStallCommandBufferParser(CommandBuffer* buf) {
  (void)buf;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-uint32_t sceAgcDcbWaitOnAddressGetSize(uint32_t size) {
+uint32_t APS5_VABI sceAgcDcbWaitOnAddressGetSize(uint32_t size) {
  (void)size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t* sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t op, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
+uint32_t* APS5_VABI sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_function, uint8_t op, uint8_t cache_policy, const volatile void* address, uint64_t reference, uint64_t mask, uint32_t poll_cycles) {
  (void)buf;
  (void)size;
  (void)compare_function;
@@ -679,7 +679,7 @@ uint32_t* sceAgcDcbWaitRegMem(CommandBuffer* buf, uint8_t size, uint8_t compare_
  return nullptr;
 }
 
-uint32_t* sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_out_handle, uint32_t display_buffer_index) {
+uint32_t* APS5_VABI sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_out_handle, uint32_t display_buffer_index) {
  (void)buf;
  (void)video_out_handle;
  (void)display_buffer_index;
@@ -687,7 +687,7 @@ uint32_t* sceAgcDcbWaitUntilSafeForRendering(CommandBuffer* buf, uint32_t video_
  return nullptr;
 }
 
-uint32_t* sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
+uint32_t* APS5_VABI sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_policy, uint64_t address_or_offset, const void* data, uint32_t num_dwords, uint8_t increment, uint8_t write_confirm) {
  (void)buf;
  (void)dst;
  (void)cache_policy;
@@ -700,27 +700,27 @@ uint32_t* sceAgcDcbWriteData(CommandBuffer* buf, uint8_t dst, uint8_t cache_poli
  return nullptr;
 }
 
-uint32_t sceAgcDcbWriteDataGetSize(uint32_t num_dwords) {
+uint32_t APS5_VABI sceAgcDcbWriteDataGetSize(uint32_t num_dwords) {
  (void)num_dwords;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDmaDataPatchSetDstAddressOrOffset(uint32_t* cmd, uint64_t dst_address_or_offset) {
+int APS5_VABI sceAgcDmaDataPatchSetDstAddressOrOffset(uint32_t* cmd, uint64_t dst_address_or_offset) {
  (void)cmd;
  (void)dst_address_or_offset;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcDmaDataPatchSetSrcAddressOrOffsetOrImmediate(uint32_t* cmd, uint64_t src_address_or_offset_or_immediate) {
+int APS5_VABI sceAgcDmaDataPatchSetSrcAddressOrOffsetOrImmediate(uint32_t* cmd, uint64_t src_address_or_offset_or_immediate) {
  (void)cmd;
  (void)src_address_or_offset_or_immediate;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type) {
+int APS5_VABI sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type) {
  (void)addr;
  (void)cmd;
  (void)type;
@@ -728,32 +728,32 @@ int sceAgcGetDataPacketPayloadAddress(uint32_t** addr, uint32_t* cmd, int type)
  return 0;
 }
 
-uint32_t sceAgcGetPacketSize(uint32_t* packet) {
+uint32_t APS5_VABI sceAgcGetPacketSize(uint32_t* packet) {
  (void)packet;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void* sceAgcGetRegisterDefaults2(uint32_t ver) {
+void* APS5_VABI sceAgcGetRegisterDefaults2(uint32_t ver) {
  (void)ver;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-void* sceAgcGetRegisterDefaults2Internal(uint32_t ver) {
+void* APS5_VABI sceAgcGetRegisterDefaults2Internal(uint32_t ver) {
  (void)ver;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceAgcInit_nid_postfix(uint32_t* state, uint32_t ver) {
+int APS5_VABI sceAgcInit_nid_postfix(uint32_t* state, uint32_t ver) {
  (void)state;
  (void)ver;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uint32_t size_in_dwords) {
+int APS5_VABI sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uint32_t size_in_dwords) {
  (void)cmd;
  (void)target;
  (void)size_in_dwords;
@@ -761,14 +761,14 @@ int sceAgcJumpPatchSetTarget(uint32_t* cmd, const volatile uint32_t* target, uin
  return 0;
 }
 
-int sceAgcQueueEndOfPipeActionPatchAddress(uint32_t* cmd, const volatile Label* address) {
+int APS5_VABI sceAgcQueueEndOfPipeActionPatchAddress(uint32_t* cmd, const volatile Label* address) {
  (void)cmd;
  (void)address;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint32_t data_sel, uint64_t data) {
+int APS5_VABI sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint32_t data_sel, uint64_t data) {
  (void)cmd;
  (void)context_id;
  (void)data_sel;
@@ -777,42 +777,42 @@ int sceAgcQueueEndOfPipeActionPatchData(uint32_t* cmd, uint32_t context_id, uint
  return 0;
 }
 
-int sceAgcRewindPatchSetRewindState(uint32_t* cmd, uint8_t state) {
+int APS5_VABI sceAgcRewindPatchSetRewindState(uint32_t* cmd, uint8_t state) {
  (void)cmd;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetCxRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
+int APS5_VABI sceAgcSetCxRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetCxRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetCxRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetPacketPredication(uint32_t* packet, uint32_t predication) {
+int APS5_VABI sceAgcSetPacketPredication(uint32_t* packet, uint32_t predication) {
  (void)packet;
  (void)predication;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetRangePredication(uint32_t* start, const volatile uint32_t* end, uint32_t predication) {
+int APS5_VABI sceAgcSetRangePredication(uint32_t* start, const volatile uint32_t* end, uint32_t predication) {
  (void)start;
  (void)end;
  (void)predication;
@@ -820,54 +820,54 @@ int sceAgcSetRangePredication(uint32_t* start, const volatile uint32_t* end, uin
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetShRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
+int APS5_VABI sceAgcSetShRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetShRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetShRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetUcRegIndirectPatchAddRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
+int APS5_VABI sceAgcSetUcRegIndirectPatchSetAddress(uint32_t* cmd, const volatile ShaderRegister* regs) {
  (void)cmd;
  (void)regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSetUcRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
+int APS5_VABI sceAgcSetUcRegIndirectPatchSetNumRegisters(uint32_t* cmd, uint32_t num_regs) {
  (void)cmd;
  (void)num_regs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcSuspendPoint(void) {
+int APS5_VABI sceAgcSuspendPoint(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, uint32_t prim_type) {
+int APS5_VABI sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, uint32_t prim_type) {
  (void)cx_regs;
  (void)uc_regs;
  (void)prim_type;
@@ -875,14 +875,14 @@ int sceAgcUpdatePrimState(ShaderRegister* cx_regs, ShaderRegister* uc_regs, uint
  return 0;
 }
 
-int sceAgcWaitRegMemPatchAddress(uint32_t* cmd, const volatile void* address) {
+int APS5_VABI sceAgcWaitRegMemPatchAddress(uint32_t* cmd, const volatile void* address) {
  (void)cmd;
  (void)address;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAgcWaitRegMemPatchReference(uint32_t* cmd, uint64_t reference) {
+int APS5_VABI sceAgcWaitRegMemPatchReference(uint32_t* cmd, uint64_t reference) {
  (void)cmd;
  (void)reference;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAjm.native/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceAjmBatchCancel(uint32_t context, uint32_t batch) {
+int APS5_VABI sceAjmBatchCancel(uint32_t context, uint32_t batch) {
  (void)context;
  (void)batch;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
  (void)info;
  (void)error;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchInitialize(void* buffer, size_t size, AjmBatchInfo* info) {
+int APS5_VABI sceAjmBatchInitialize(void* buffer, size_t size, AjmBatchInfo* info) {
  (void)buffer;
  (void)size;
  (void)info;
@@ -27,7 +27,7 @@ int sceAjmBatchInitialize(void* buffer, size_t size, AjmBatchInfo* info) {
  return 0;
 }
 
-int sceAjmBatchJobClearContext(AjmBatchInfo* info, uint32_t instance, void* result) {
+int APS5_VABI sceAjmBatchJobClearContext(AjmBatchInfo* info, uint32_t instance, void* result) {
  (void)info;
  (void)instance;
  (void)result;
@@ -35,7 +35,7 @@ int sceAjmBatchJobClearContext(AjmBatchInfo* info, uint32_t instance, void* resu
  return 0;
 }
 
-int sceAjmBatchJobControl(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const void* sideband_input, size_t sideband_input_size, void* sideband_output, size_t sideband_output_size) {
+int APS5_VABI sceAjmBatchJobControl(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const void* sideband_input, size_t sideband_input_size, void* sideband_output, size_t sideband_output_size) {
  (void)info;
  (void)instance;
  (void)flags;
@@ -47,7 +47,7 @@ int sceAjmBatchJobControl(AjmBatchInfo* info, uint32_t instance, uint64_t flags,
  return 0;
 }
 
-int sceAjmBatchJobDecode(AjmBatchInfo* info, uint32_t instance, const void* bitstream_input, size_t bitstream_input_size, void* pcm_output, size_t pcm_output_size, void* result) {
+int APS5_VABI sceAjmBatchJobDecode(AjmBatchInfo* info, uint32_t instance, const void* bitstream_input, size_t bitstream_input_size, void* pcm_output, size_t pcm_output_size, void* result) {
  (void)info;
  (void)instance;
  (void)bitstream_input;
@@ -59,7 +59,7 @@ int sceAjmBatchJobDecode(AjmBatchInfo* info, uint32_t instance, const void* bits
  return 0;
 }
 
-int sceAjmBatchJobDecodeSingle(AjmBatchInfo* info, uint32_t instance, const void* bitstream_input, size_t bitstream_input_size, void* pcm_output, size_t pcm_output_size, void* result) {
+int APS5_VABI sceAjmBatchJobDecodeSingle(AjmBatchInfo* info, uint32_t instance, const void* bitstream_input, size_t bitstream_input_size, void* pcm_output, size_t pcm_output_size, void* result) {
  (void)info;
  (void)instance;
  (void)bitstream_input;
@@ -71,7 +71,7 @@ int sceAjmBatchJobDecodeSingle(AjmBatchInfo* info, uint32_t instance, const void
  return 0;
 }
 
-int sceAjmBatchJobDecodeSplit(AjmBatchInfo* info, uint32_t instance, const AjmBuffer* input_buffers, size_t input_buffers_num, const AjmBuffer* output_buffers, size_t output_buffers_num, void* result) {
+int APS5_VABI sceAjmBatchJobDecodeSplit(AjmBatchInfo* info, uint32_t instance, const AjmBuffer* input_buffers, size_t input_buffers_num, const AjmBuffer* output_buffers, size_t output_buffers_num, void* result) {
  (void)info;
  (void)instance;
  (void)input_buffers;
@@ -83,7 +83,7 @@ int sceAjmBatchJobDecodeSplit(AjmBatchInfo* info, uint32_t instance, const AjmBu
  return 0;
 }
 
-int sceAjmBatchJobEncode(AjmBatchInfo* info, uint32_t instance, const void* pcm_input, size_t pcm_input_size, void* bitstream_output, size_t bitstream_output_size, void* result) {
+int APS5_VABI sceAjmBatchJobEncode(AjmBatchInfo* info, uint32_t instance, const void* pcm_input, size_t pcm_input_size, void* bitstream_output, size_t bitstream_output_size, void* result) {
  (void)info;
  (void)instance;
  (void)pcm_input;
@@ -95,7 +95,7 @@ int sceAjmBatchJobEncode(AjmBatchInfo* info, uint32_t instance, const void* pcm_
  return 0;
 }
 
-int sceAjmBatchJobGetCodecInfo(AjmBatchInfo* info, uint32_t instance, void* result, size_t result_size) {
+int APS5_VABI sceAjmBatchJobGetCodecInfo(AjmBatchInfo* info, uint32_t instance, void* result, size_t result_size) {
  (void)info;
  (void)instance;
  (void)result;
@@ -104,7 +104,7 @@ int sceAjmBatchJobGetCodecInfo(AjmBatchInfo* info, uint32_t instance, void* resu
  return 0;
 }
 
-int sceAjmBatchJobGetGaplessDecode(AjmBatchInfo* info, uint32_t instance, void* result) {
+int APS5_VABI sceAjmBatchJobGetGaplessDecode(AjmBatchInfo* info, uint32_t instance, void* result) {
  (void)info;
  (void)instance;
  (void)result;
@@ -112,7 +112,7 @@ int sceAjmBatchJobGetGaplessDecode(AjmBatchInfo* info, uint32_t instance, void*
  return 0;
 }
 
-int sceAjmBatchJobGetInfo(AjmBatchInfo* info, uint32_t instance, void* result) {
+int APS5_VABI sceAjmBatchJobGetInfo(AjmBatchInfo* info, uint32_t instance, void* result) {
  (void)info;
  (void)instance;
  (void)result;
@@ -120,7 +120,7 @@ int sceAjmBatchJobGetInfo(AjmBatchInfo* info, uint32_t instance, void* result) {
  return 0;
 }
 
-int sceAjmBatchJobGetResampleInfo(AjmBatchInfo* info, uint32_t instance, void* result) {
+int APS5_VABI sceAjmBatchJobGetResampleInfo(AjmBatchInfo* info, uint32_t instance, void* result) {
  (void)info;
  (void)instance;
  (void)result;
@@ -128,7 +128,7 @@ int sceAjmBatchJobGetResampleInfo(AjmBatchInfo* info, uint32_t instance, void* r
  return 0;
 }
 
-int sceAjmBatchJobGetStatistics(AjmBatchInfo* info, float interval, void* result) {
+int APS5_VABI sceAjmBatchJobGetStatistics(AjmBatchInfo* info, float interval, void* result) {
  (void)info;
  (void)interval;
  (void)result;
@@ -136,7 +136,7 @@ int sceAjmBatchJobGetStatistics(AjmBatchInfo* info, float interval, void* result
  return 0;
 }
 
-int sceAjmBatchJobInitialize(AjmBatchInfo* info, uint32_t instance, const void* codec_parameters, size_t codec_parameters_size, void* result) {
+int APS5_VABI sceAjmBatchJobInitialize(AjmBatchInfo* info, uint32_t instance, const void* codec_parameters, size_t codec_parameters_size, void* result) {
  (void)info;
  (void)instance;
  (void)codec_parameters;
@@ -146,7 +146,7 @@ int sceAjmBatchJobInitialize(AjmBatchInfo* info, uint32_t instance, const void*
  return 0;
 }
 
-int sceAjmBatchJobRun(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const void* data_input, size_t data_input_size, void* data_output, size_t data_output_size, void* sideband_output, size_t sideband_output_size) {
+int APS5_VABI sceAjmBatchJobRun(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const void* data_input, size_t data_input_size, void* data_output, size_t data_output_size, void* sideband_output, size_t sideband_output_size) {
  (void)info;
  (void)instance;
  (void)flags;
@@ -160,7 +160,7 @@ int sceAjmBatchJobRun(AjmBatchInfo* info, uint32_t instance, uint64_t flags, con
  return 0;
 }
 
-int sceAjmBatchJobRunSplit(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const AjmBuffer* input_buffers, size_t input_buffers_num, const AjmBuffer* output_buffers, size_t output_buffers_num, void* sideband_output, size_t sideband_output_size) {
+int APS5_VABI sceAjmBatchJobRunSplit(AjmBatchInfo* info, uint32_t instance, uint64_t flags, const AjmBuffer* input_buffers, size_t input_buffers_num, const AjmBuffer* output_buffers, size_t output_buffers_num, void* sideband_output, size_t sideband_output_size) {
  (void)info;
  (void)instance;
  (void)flags;
@@ -174,7 +174,7 @@ int sceAjmBatchJobRunSplit(AjmBatchInfo* info, uint32_t instance, uint64_t flags
  return 0;
 }
 
-int sceAjmBatchJobSetGaplessDecode(AjmBatchInfo* info, uint32_t instance, const void* gapless_decode, int reset, void* result) {
+int APS5_VABI sceAjmBatchJobSetGaplessDecode(AjmBatchInfo* info, uint32_t instance, const void* gapless_decode, int reset, void* result) {
  (void)info;
  (void)instance;
  (void)gapless_decode;
@@ -184,7 +184,7 @@ int sceAjmBatchJobSetGaplessDecode(AjmBatchInfo* info, uint32_t instance, const
  return 0;
 }
 
-int sceAjmBatchJobSetResampleParameters(AjmBatchInfo* info, uint32_t instance, float ratio, uint32_t flags, void* result) {
+int APS5_VABI sceAjmBatchJobSetResampleParameters(AjmBatchInfo* info, uint32_t instance, float ratio, uint32_t flags, void* result) {
  (void)info;
  (void)instance;
  (void)ratio;
@@ -194,7 +194,7 @@ int sceAjmBatchJobSetResampleParameters(AjmBatchInfo* info, uint32_t instance, f
  return 0;
 }
 
-int sceAjmBatchJobSetResampleParametersEx(AjmBatchInfo* info, uint32_t instance, float ratio_start, float ratio_change_per_sample, uint32_t flags, void* result) {
+int APS5_VABI sceAjmBatchJobSetResampleParametersEx(AjmBatchInfo* info, uint32_t instance, float ratio_start, float ratio_change_per_sample, uint32_t flags, void* result) {
  (void)info;
  (void)instance;
  (void)ratio_start;
@@ -205,7 +205,7 @@ int sceAjmBatchJobSetResampleParametersEx(AjmBatchInfo* info, uint32_t instance,
  return 0;
 }
 
-int sceAjmBatchStart(uint32_t context, const AjmBatchInfo* info, int priority, AjmBatchError* error, uint32_t* batch) {
+int APS5_VABI sceAjmBatchStart(uint32_t context, const AjmBatchInfo* info, int priority, AjmBatchError* error, uint32_t* batch) {
  (void)context;
  (void)info;
  (void)priority;
@@ -215,7 +215,7 @@ int sceAjmBatchStart(uint32_t context, const AjmBatchInfo* info, int priority, A
  return 0;
 }
 
-int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
  (void)context;
  (void)batch;
  (void)timeout;
@@ -224,27 +224,27 @@ int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatch
  return 0;
 }
 
-int sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
+int APS5_VABI sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
  (void)config_data;
  (void)config_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmFinalize(uint32_t context) {
+int APS5_VABI sceAjmFinalize(uint32_t context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInitialize(int64_t reserved, uint32_t* context) {
+int APS5_VABI sceAjmInitialize(int64_t reserved, uint32_t* context) {
  (void)reserved;
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
+int APS5_VABI sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
  (void)context;
  (void)codec;
  (void)flags;
@@ -253,14 +253,14 @@ int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint3
  return 0;
 }
 
-int sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
+int APS5_VABI sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
  (void)context;
  (void)instance;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
+int APS5_VABI sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  (void)context;
  (void)ptr;
  (void)pages;
@@ -268,14 +268,14 @@ int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  return 0;
 }
 
-int sceAjmMemoryUnregister(uint32_t context, void* ptr) {
+int APS5_VABI sceAjmMemoryUnregister(uint32_t context, void* ptr) {
  (void)context;
  (void)ptr;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
+int APS5_VABI sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  (void)context;
  (void)codec;
  (void)reserved;
@@ -283,7 +283,7 @@ int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  return 0;
 }
 
-int sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
+int APS5_VABI sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
  (void)context;
  (void)codec;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAjm/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceAjmBatchCancel(uint32_t context, uint32_t batch) {
+int APS5_VABI sceAjmBatchCancel(uint32_t context, uint32_t batch) {
  (void)context;
  (void)batch;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
  (void)info;
  (void)error;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
  (void)context;
  (void)batch;
  (void)timeout;
@@ -28,27 +28,27 @@ int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatch
  return 0;
 }
 
-int sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
+int APS5_VABI sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
  (void)config_data;
  (void)config_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmFinalize(uint32_t context) {
+int APS5_VABI sceAjmFinalize(uint32_t context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInitialize(int64_t reserved, uint32_t* context) {
+int APS5_VABI sceAjmInitialize(int64_t reserved, uint32_t* context) {
  (void)reserved;
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
+int APS5_VABI sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
  (void)context;
  (void)codec;
  (void)flags;
@@ -57,14 +57,14 @@ int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint3
  return 0;
 }
 
-int sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
+int APS5_VABI sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
  (void)context;
  (void)instance;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
+int APS5_VABI sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  (void)context;
  (void)ptr;
  (void)pages;
@@ -72,14 +72,14 @@ int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  return 0;
 }
 
-int sceAjmMemoryUnregister(uint32_t context, void* ptr) {
+int APS5_VABI sceAjmMemoryUnregister(uint32_t context, void* ptr) {
  (void)context;
  (void)ptr;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
+int APS5_VABI sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  (void)context;
  (void)codec;
  (void)reserved;
@@ -87,7 +87,7 @@ int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  return 0;
 }
 
-int sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
+int APS5_VABI sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
  (void)context;
  (void)codec;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAjmi/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceAjmBatchCancel(uint32_t context, uint32_t batch) {
+int APS5_VABI sceAjmBatchCancel(uint32_t context, uint32_t batch) {
  (void)context;
  (void)batch;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchErrorDump(const AjmBatchInfo* info, AjmBatchError* error) {
  (void)info;
  (void)error;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
+int APS5_VABI sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatchError* error) {
  (void)context;
  (void)batch;
  (void)timeout;
@@ -28,27 +28,27 @@ int sceAjmBatchWait(uint32_t context, uint32_t batch, uint32_t timeout, AjmBatch
  return 0;
 }
 
-int sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
+int APS5_VABI sceAjmDecAt9ParseConfigData(const void* config_data, AjmDecAt9ConfigDataInfo* config_info) {
  (void)config_data;
  (void)config_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmFinalize(uint32_t context) {
+int APS5_VABI sceAjmFinalize(uint32_t context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInitialize(int64_t reserved, uint32_t* context) {
+int APS5_VABI sceAjmInitialize(int64_t reserved, uint32_t* context) {
  (void)reserved;
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
+int APS5_VABI sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint32_t* instance) {
  (void)context;
  (void)codec;
  (void)flags;
@@ -57,14 +57,14 @@ int sceAjmInstanceCreate(uint32_t context, uint32_t codec, uint64_t flags, uint3
  return 0;
 }
 
-int sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
+int APS5_VABI sceAjmInstanceDestroy(uint32_t context, uint32_t instance) {
  (void)context;
  (void)instance;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
+int APS5_VABI sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  (void)context;
  (void)ptr;
  (void)pages;
@@ -72,14 +72,14 @@ int sceAjmMemoryRegister(uint32_t context, void* ptr, size_t pages) {
  return 0;
 }
 
-int sceAjmMemoryUnregister(uint32_t context, void* ptr) {
+int APS5_VABI sceAjmMemoryUnregister(uint32_t context, void* ptr) {
  (void)context;
  (void)ptr;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
+int APS5_VABI sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  (void)context;
  (void)codec;
  (void)reserved;
@@ -87,7 +87,7 @@ int sceAjmModuleRegister(uint32_t context, uint32_t codec, int64_t reserved) {
  return 0;
 }
 
-int sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
+int APS5_VABI sceAjmModuleUnregister(uint32_t context, uint32_t codec) {
  (void)context;
  (void)codec;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAppContent/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceAppContentAddcontMount(uint32_t service_label, const NpUnifiedEntitlementLabel* entitlement_label, AppContentMountPoint* mount_point) {
+int APS5_VABI sceAppContentAddcontMount(uint32_t service_label, const NpUnifiedEntitlementLabel* entitlement_label, AppContentMountPoint* mount_point) {
  (void)service_label;
  (void)entitlement_label;
  (void)mount_point;
@@ -13,47 +13,47 @@ int sceAppContentAddcontMount(uint32_t service_label, const NpUnifiedEntitlement
  return 0;
 }
 
-int sceAppContentAddcontUnmount(const AppContentMountPoint* mount_point) {
+int APS5_VABI sceAppContentAddcontUnmount(const AppContentMountPoint* mount_point) {
  (void)mount_point;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentAppParamGetInt(uint32_t param_id, int32_t* value) {
+int APS5_VABI sceAppContentAppParamGetInt(uint32_t param_id, int32_t* value) {
  (void)param_id;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentDownloadDataGetAvailableSpaceKb(const AppContentMountPoint* mount_point, size_t* available_space_kb) {
+int APS5_VABI sceAppContentDownloadDataGetAvailableSpaceKb(const AppContentMountPoint* mount_point, size_t* available_space_kb) {
  (void)mount_point;
  (void)available_space_kb;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentInitialize(const AppContentInitParam* init_param, AppContentBootParam* boot_param) {
+int APS5_VABI sceAppContentInitialize(const AppContentInitParam* init_param, AppContentBootParam* boot_param) {
  (void)init_param;
  (void)boot_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentTemporaryDataFormat(const AppContentMountPoint* mount_point) {
+int APS5_VABI sceAppContentTemporaryDataFormat(const AppContentMountPoint* mount_point) {
  (void)mount_point;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentTemporaryDataGetAvailableSpaceKb(const AppContentMountPoint* mount_point, size_t* available_space_kb) {
+int APS5_VABI sceAppContentTemporaryDataGetAvailableSpaceKb(const AppContentMountPoint* mount_point, size_t* available_space_kb) {
  (void)mount_point;
  (void)available_space_kb;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAppContentTemporaryDataMount2(uint32_t option, AppContentMountPoint* mount_point) {
+int APS5_VABI sceAppContentTemporaryDataMount2(uint32_t option, AppContentMountPoint* mount_point) {
  (void)option;
  (void)mount_point;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceAudio/Export.cpp

@@ -6,30 +6,30 @@ extern "C" {
 
 using SceAudioOutPortId = std::int32_t;
 
-std::int32_t sceAudioOutInit(void) {
+std::int32_t APS5_VABI sceAudioOutInit(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-SceAudioOutPortId sceAudioOutOpen(std::int32_t userId, std::int32_t type, std::int32_t index, std::uint32_t len, std::uint32_t freq, std::uint32_t param) {
+SceAudioOutPortId APS5_VABI sceAudioOutOpen(std::int32_t userId, std::int32_t type, std::int32_t index, std::uint32_t len, std::uint32_t freq, std::uint32_t param) {
     (void)userId; (void)type; (void)index; (void)len; (void)freq; (void)param;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-std::int32_t sceAudioOutOutput(SceAudioOutPortId handle, const void* ptr) {
+std::int32_t APS5_VABI sceAudioOutOutput(SceAudioOutPortId handle, const void* ptr) {
     (void)handle; (void)ptr;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-std::int32_t sceAudioOutSetVolume(SceAudioOutPortId handle, std::int32_t flag, std::int32_t* vol) {
+std::int32_t APS5_VABI sceAudioOutSetVolume(SceAudioOutPortId handle, std::int32_t flag, std::int32_t* vol) {
     (void)handle; (void)flag; (void)vol;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-std::int32_t sceAudioOutClose(SceAudioOutPortId handle) {
+std::int32_t APS5_VABI sceAudioOutClose(SceAudioOutPortId handle) {
     (void)handle;
     NotImplemented_nid_no_patch(__func__);
     return 0;

core/libs/prx/libSceAudio3d/Export.cpp

@@ -5,24 +5,24 @@
 
 extern "C" {
 
-void sceAudio3dGetDefaultOpenParameters(Audio3dOpenParameters* p) {
+void APS5_VABI sceAudio3dGetDefaultOpenParameters(Audio3dOpenParameters* p) {
  (void)p;
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceAudio3dInitialize(int64_t reserved) {
+int APS5_VABI sceAudio3dInitialize(int64_t reserved) {
  (void)reserved;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudio3dPortAdvance(uint32_t port_id) {
+int APS5_VABI sceAudio3dPortAdvance(uint32_t port_id) {
  (void)port_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudio3dPortGetQueueLevel(uint32_t port_id, uint32_t* queue_level, uint32_t* queue_available) {
+int APS5_VABI sceAudio3dPortGetQueueLevel(uint32_t port_id, uint32_t* queue_level, uint32_t* queue_available) {
  (void)port_id;
  (void)queue_level;
  (void)queue_available;
@@ -30,7 +30,7 @@ int sceAudio3dPortGetQueueLevel(uint32_t port_id, uint32_t* queue_level, uint32_
  return 0;
 }
 
-int sceAudio3dPortOpen(int user_id, const Audio3dOpenParameters* parameters, uint32_t* id) {
+int APS5_VABI sceAudio3dPortOpen(int user_id, const Audio3dOpenParameters* parameters, uint32_t* id) {
  (void)user_id;
  (void)parameters;
  (void)id;
@@ -38,14 +38,14 @@ int sceAudio3dPortOpen(int user_id, const Audio3dOpenParameters* parameters, uin
  return 0;
 }
 
-int sceAudio3dPortPush(uint32_t port_id, uint32_t blocking) {
+int APS5_VABI sceAudio3dPortPush(uint32_t port_id, uint32_t blocking) {
  (void)port_id;
  (void)blocking;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudio3dPortSetAttribute(uint32_t port_id, uint32_t attribute_id, const void* attribute, size_t attribute_size) {
+int APS5_VABI sceAudio3dPortSetAttribute(uint32_t port_id, uint32_t attribute_id, const void* attribute, size_t attribute_size) {
  (void)port_id;
  (void)attribute_id;
  (void)attribute;

core/libs/prx/libSceAudioIn/Export.cpp

@@ -5,20 +5,20 @@
 
 extern "C" {
 
-int sceAudioInGetSilentState(int handle) {
+int APS5_VABI sceAudioInGetSilentState(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioInInput(int handle, void* dest) {
+int APS5_VABI sceAudioInInput(int handle, void* dest) {
  (void)handle;
  (void)dest;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioInOpen(int user_id, uint32_t type, uint32_t index, uint32_t len, uint32_t freq, uint32_t param) {
+int APS5_VABI sceAudioInOpen(int user_id, uint32_t type, uint32_t index, uint32_t len, uint32_t freq, uint32_t param) {
  (void)user_id;
  (void)type;
  (void)index;

core/libs/prx/libSceAudioOut/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceAudioOut2ContextAdvance(AudioOut2ContextHandle ctx) {
+int APS5_VABI sceAudioOut2ContextAdvance(AudioOut2ContextHandle ctx) {
  (void)ctx;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2ContextCreate(const AudioOut2ContextParam* params, void* buffer, size_t buffer_size, AudioOut2ContextHandle* ctx) {
+int APS5_VABI sceAudioOut2ContextCreate(const AudioOut2ContextParam* params, void* buffer, size_t buffer_size, AudioOut2ContextHandle* ctx) {
  (void)params;
  (void)buffer;
  (void)buffer_size;
@@ -20,13 +20,13 @@ int sceAudioOut2ContextCreate(const AudioOut2ContextParam* params, void* buffer,
  return 0;
 }
 
-int sceAudioOut2ContextDestroy(AudioOut2ContextHandle ctx) {
+int APS5_VABI sceAudioOut2ContextDestroy(AudioOut2ContextHandle ctx) {
  (void)ctx;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2ContextGetQueueLevel(AudioOut2ContextHandle ctx, uint32_t* queue_level, uint32_t* available_queues) {
+int APS5_VABI sceAudioOut2ContextGetQueueLevel(AudioOut2ContextHandle ctx, uint32_t* queue_level, uint32_t* available_queues) {
  (void)ctx;
  (void)queue_level;
  (void)available_queues;
@@ -34,27 +34,27 @@ int sceAudioOut2ContextGetQueueLevel(AudioOut2ContextHandle ctx, uint32_t* queue
  return 0;
 }
 
-int sceAudioOut2ContextPush(AudioOut2ContextHandle ctx, uint32_t blocking) {
+int APS5_VABI sceAudioOut2ContextPush(AudioOut2ContextHandle ctx, uint32_t blocking) {
  (void)ctx;
  (void)blocking;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2ContextQueryMemory(const AudioOut2ContextParam* params, size_t* memory_size) {
+int APS5_VABI sceAudioOut2ContextQueryMemory(const AudioOut2ContextParam* params, size_t* memory_size) {
  (void)params;
  (void)memory_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2ContextResetParam(AudioOut2ContextParam* params) {
+int APS5_VABI sceAudioOut2ContextResetParam(AudioOut2ContextParam* params) {
  (void)params;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2ContextSetAttributes(AudioOut2ContextHandle ctx, const AudioOut2Attribute* attributes, uint32_t num) {
+int APS5_VABI sceAudioOut2ContextSetAttributes(AudioOut2ContextHandle ctx, const AudioOut2Attribute* attributes, uint32_t num) {
  (void)ctx;
  (void)attributes;
  (void)num;
@@ -62,7 +62,7 @@ int sceAudioOut2ContextSetAttributes(AudioOut2ContextHandle ctx, const AudioOut2
  return 0;
 }
 
-int sceAudioOut2GetSpeakerArrayAmbisonicsCoefficients(AudioOut2SpeakerArrayHandle handle, uint32_t ambisonics_channel, float* coefficients, uint32_t num_coefficients) {
+int APS5_VABI sceAudioOut2GetSpeakerArrayAmbisonicsCoefficients(AudioOut2SpeakerArrayHandle handle, uint32_t ambisonics_channel, float* coefficients, uint32_t num_coefficients) {
  (void)handle;
  (void)ambisonics_channel;
  (void)coefficients;
@@ -71,7 +71,7 @@ int sceAudioOut2GetSpeakerArrayAmbisonicsCoefficients(AudioOut2SpeakerArrayHandl
  return 0;
 }
 
-int sceAudioOut2GetSpeakerArrayCoefficients(AudioOut2SpeakerArrayHandle handle, AudioOut2Position pos, float spread, float* coefficients, uint32_t num_coefficients, uint8_t height_aware, float downmix_spread_radius) {
+int APS5_VABI sceAudioOut2GetSpeakerArrayCoefficients(AudioOut2SpeakerArrayHandle handle, AudioOut2Position pos, float spread, float* coefficients, uint32_t num_coefficients, uint8_t height_aware, float downmix_spread_radius) {
  (void)handle;
  (void)pos;
  (void)spread;
@@ -83,7 +83,7 @@ int sceAudioOut2GetSpeakerArrayCoefficients(AudioOut2SpeakerArrayHandle handle,
  return 0;
 }
 
-size_t sceAudioOut2GetSpeakerArrayMemorySize(uint32_t num_speakers, uint8_t is_3d, uint8_t is_ambisonics) {
+size_t APS5_VABI sceAudioOut2GetSpeakerArrayMemorySize(uint32_t num_speakers, uint8_t is_3d, uint8_t is_ambisonics) {
  (void)num_speakers;
  (void)is_3d;
  (void)is_ambisonics;
@@ -91,25 +91,25 @@ size_t sceAudioOut2GetSpeakerArrayMemorySize(uint32_t num_speakers, uint8_t is_3
  return 0;
 }
 
-int sceAudioOut2GetSpeakerInfo(AudioOut2SpeakerInfo* info, uint32_t flags) {
+int APS5_VABI sceAudioOut2GetSpeakerInfo(AudioOut2SpeakerInfo* info, uint32_t flags) {
  (void)info;
  (void)flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2GetSystemState(AudioOut2SystemState* state) {
+int APS5_VABI sceAudioOut2GetSystemState(AudioOut2SystemState* state) {
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2Initialize(void) {
+int APS5_VABI sceAudioOut2Initialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2MasteringGetState(AudioOut2MasteringStatesHeader* state, uint32_t output, AudioOut2UserHandle user) {
+int APS5_VABI sceAudioOut2MasteringGetState(AudioOut2MasteringStatesHeader* state, uint32_t output, AudioOut2UserHandle user) {
  (void)state;
  (void)output;
  (void)user;
@@ -117,13 +117,13 @@ int sceAudioOut2MasteringGetState(AudioOut2MasteringStatesHeader* state, uint32_
  return 0;
 }
 
-int sceAudioOut2MasteringInit(uint32_t flags) {
+int APS5_VABI sceAudioOut2MasteringInit(uint32_t flags) {
  (void)flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2MasteringSetParam(const AudioOut2MasteringParamsHeader* param, uint32_t output, uint32_t flags) {
+int APS5_VABI sceAudioOut2MasteringSetParam(const AudioOut2MasteringParamsHeader* param, uint32_t output, uint32_t flags) {
  (void)param;
  (void)output;
  (void)flags;
@@ -131,12 +131,12 @@ int sceAudioOut2MasteringSetParam(const AudioOut2MasteringParamsHeader* param, u
  return 0;
 }
 
-int sceAudioOut2MasteringTerm(void) {
+int APS5_VABI sceAudioOut2MasteringTerm(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2PortCreate(AudioOut2ContextHandle ctx, const AudioOut2PortParam* params, AudioOut2PortHandle* port) {
+int APS5_VABI sceAudioOut2PortCreate(AudioOut2ContextHandle ctx, const AudioOut2PortParam* params, AudioOut2PortHandle* port) {
  (void)ctx;
  (void)params;
  (void)port;
@@ -144,20 +144,20 @@ int sceAudioOut2PortCreate(AudioOut2ContextHandle ctx, const AudioOut2PortParam*
  return 0;
 }
 
-int sceAudioOut2PortDestroy(AudioOut2PortHandle port) {
+int APS5_VABI sceAudioOut2PortDestroy(AudioOut2PortHandle port) {
  (void)port;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2PortGetState(AudioOut2PortHandle port, AudioOut2PortState* state) {
+int APS5_VABI sceAudioOut2PortGetState(AudioOut2PortHandle port, AudioOut2PortState* state) {
  (void)port;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2PortSetAttributes(AudioOut2PortHandle port, const AudioOut2Attribute* attributes, uint32_t num) {
+int APS5_VABI sceAudioOut2PortSetAttributes(AudioOut2PortHandle port, const AudioOut2Attribute* attributes, uint32_t num) {
  (void)port;
  (void)attributes;
  (void)num;
@@ -165,13 +165,13 @@ int sceAudioOut2PortSetAttributes(AudioOut2PortHandle port, const AudioOut2Attri
  return 0;
 }
 
-int sceAudioOut2SetSystemDebugState(const AudioOut2SystemDebugStateParam* param) {
+int APS5_VABI sceAudioOut2SetSystemDebugState(const AudioOut2SystemDebugStateParam* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2SpeakerArrayCreate(AudioOut2SpeakerArrayHandle* handle, const void* vbap_params, const void* ambi_params) {
+int APS5_VABI sceAudioOut2SpeakerArrayCreate(AudioOut2SpeakerArrayHandle* handle, const void* vbap_params, const void* ambi_params) {
  (void)handle;
  (void)vbap_params;
  (void)ambi_params;
@@ -179,44 +179,44 @@ int sceAudioOut2SpeakerArrayCreate(AudioOut2SpeakerArrayHandle* handle, const vo
  return 0;
 }
 
-int sceAudioOut2SpeakerArrayDestroy(AudioOut2SpeakerArrayHandle handle) {
+int APS5_VABI sceAudioOut2SpeakerArrayDestroy(AudioOut2SpeakerArrayHandle handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2UserCreate(uint32_t user_id, AudioOut2UserHandle* handle) {
+int APS5_VABI sceAudioOut2UserCreate(uint32_t user_id, AudioOut2UserHandle* handle) {
  (void)user_id;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOut2UserDestroy(AudioOut2UserHandle handle) {
+int APS5_VABI sceAudioOut2UserDestroy(AudioOut2UserHandle handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutClose(int handle) {
+int APS5_VABI sceAudioOutClose(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutGetPortState(int handle, AudioOutPortState* state) {
+int APS5_VABI sceAudioOutGetPortState(int handle, AudioOutPortState* state) {
  (void)handle;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutInit(void) {
+int APS5_VABI sceAudioOutInit(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutOpen(int user_id, int type, int index, uint32_t len, uint32_t freq, uint32_t param) {
+int APS5_VABI sceAudioOutOpen(int user_id, int type, int index, uint32_t len, uint32_t freq, uint32_t param) {
  (void)user_id;
  (void)type;
  (void)index;
@@ -227,21 +227,21 @@ int sceAudioOutOpen(int user_id, int type, int index, uint32_t len, uint32_t fre
  return 0;
 }
 
-int sceAudioOutOutput(int handle, const void* ptr) {
+int APS5_VABI sceAudioOutOutput(int handle, const void* ptr) {
  (void)handle;
  (void)ptr;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutOutputs(AudioOutOutputParam* param, uint32_t num) {
+int APS5_VABI sceAudioOutOutputs(AudioOutOutputParam* param, uint32_t num) {
  (void)param;
  (void)num;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAudioOutSetVolume(int handle, uint32_t flag, int* vol) {
+int APS5_VABI sceAudioOutSetVolume(int handle, uint32_t flag, int* vol) {
  (void)handle;
  (void)flag;
  (void)vol;

core/libs/prx/libSceAudioPropagation/Export.cpp

@@ -5,14 +5,14 @@
 
 extern "C" {
 
-int32_t sceAudioPropagationRoomCreate(AudioPropagationHandle system_handle, AudioPropagationHandle* out_room_handle) {
+int32_t APS5_VABI sceAudioPropagationRoomCreate(AudioPropagationHandle system_handle, AudioPropagationHandle* out_room_handle) {
  (void)system_handle;
  (void)out_room_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudioPropagationSystemCreate(const void* options, AudioPropagationSystemMemory* memory, AudioPropagationHandle* out_system_handle) {
+int32_t APS5_VABI sceAudioPropagationSystemCreate(const void* options, AudioPropagationSystemMemory* memory, AudioPropagationHandle* out_system_handle) {
  (void)options;
  (void)memory;
  (void)out_system_handle;
@@ -20,7 +20,7 @@ int32_t sceAudioPropagationSystemCreate(const void* options, AudioPropagationSys
  return 0;
 }
 
-int32_t sceAudioPropagationSystemGetRays(AudioPropagationHandle system_handle, void* rays, uint32_t* num_rays) {
+int32_t APS5_VABI sceAudioPropagationSystemGetRays(AudioPropagationHandle system_handle, void* rays, uint32_t* num_rays) {
  (void)system_handle;
  (void)rays;
  (void)num_rays;
@@ -28,14 +28,14 @@ int32_t sceAudioPropagationSystemGetRays(AudioPropagationHandle system_handle, v
  return 0;
 }
 
-int32_t sceAudioPropagationSystemQueryMemory(const void* options, AudioPropagationSystemMemory* out_memory) {
+int32_t APS5_VABI sceAudioPropagationSystemQueryMemory(const void* options, AudioPropagationSystemMemory* out_memory) {
  (void)options;
  (void)out_memory;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudioPropagationSystemRegisterMaterial(AudioPropagationHandle system_handle, const void* material, AudioPropagationHandle* out_material_handle) {
+int32_t APS5_VABI sceAudioPropagationSystemRegisterMaterial(AudioPropagationHandle system_handle, const void* material, AudioPropagationHandle* out_material_handle) {
  (void)system_handle;
  (void)material;
  (void)out_material_handle;
@@ -43,7 +43,7 @@ int32_t sceAudioPropagationSystemRegisterMaterial(AudioPropagationHandle system_
  return 0;
 }
 
-int32_t sceAudioPropagationSystemSetAttributes(AudioPropagationHandle system_handle, const void* attributes, uint32_t num_attributes) {
+int32_t APS5_VABI sceAudioPropagationSystemSetAttributes(AudioPropagationHandle system_handle, const void* attributes, uint32_t num_attributes) {
  (void)system_handle;
  (void)attributes;
  (void)num_attributes;

core/libs/prx/libSceAudiodec.native/Export.cpp

@@ -5,39 +5,39 @@
 
 extern "C" {
 
-int32_t sceAudiodecClearContext(int32_t handle) {
+int32_t APS5_VABI sceAudiodecClearContext(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecCreateDecoder(AudiodecCtrl* ctrl, uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecCreateDecoder(AudiodecCtrl* ctrl, uint32_t codec_type) {
  (void)ctrl;
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecDecode(int32_t handle, AudiodecCtrl* ctrl) {
+int32_t APS5_VABI sceAudiodecDecode(int32_t handle, AudiodecCtrl* ctrl) {
  (void)handle;
  (void)ctrl;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecDeleteDecoder(int32_t handle) {
+int32_t APS5_VABI sceAudiodecDeleteDecoder(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecInitLibrary(uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecInitLibrary(uint32_t codec_type) {
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecTermLibrary(uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecTermLibrary(uint32_t codec_type) {
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceAudiodec/Export.cpp

@@ -5,39 +5,39 @@
 
 extern "C" {
 
-int32_t sceAudiodecClearContext(int32_t handle) {
+int32_t APS5_VABI sceAudiodecClearContext(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecCreateDecoder(AudiodecCtrl* ctrl, uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecCreateDecoder(AudiodecCtrl* ctrl, uint32_t codec_type) {
  (void)ctrl;
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecDecode(int32_t handle, AudiodecCtrl* ctrl) {
+int32_t APS5_VABI sceAudiodecDecode(int32_t handle, AudiodecCtrl* ctrl) {
  (void)handle;
  (void)ctrl;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecDeleteDecoder(int32_t handle) {
+int32_t APS5_VABI sceAudiodecDeleteDecoder(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecInitLibrary(uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecInitLibrary(uint32_t codec_type) {
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceAudiodecTermLibrary(uint32_t codec_type) {
+int32_t APS5_VABI sceAudiodecTermLibrary(uint32_t codec_type) {
  (void)codec_type;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceAvPlayer.native/Export.cpp

@@ -5,14 +5,14 @@
 
 extern "C" {
 
-int sceAvPlayerAddSource(AvPlayerInternal* h, const char* filename) {
+int APS5_VABI sceAvPlayerAddSource(AvPlayerInternal* h, const char* filename) {
  (void)h;
  (void)filename;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* source_details) {
+int APS5_VABI sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* source_details) {
  (void)h;
  (void)uri_type;
  (void)source_details;
@@ -20,7 +20,7 @@ int sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* s
  return 0;
 }
 
-int sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_t new_stream_id) {
+int APS5_VABI sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_t new_stream_id) {
  (void)h;
  (void)old_stream_id;
  (void)new_stream_id;
@@ -28,40 +28,40 @@ int sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_
  return 0;
 }
 
-int sceAvPlayerClose(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerClose(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint64_t sceAvPlayerCurrentTime(AvPlayerInternal* h) {
+uint64_t APS5_VABI sceAvPlayerCurrentTime(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerDisableStream(AvPlayerInternal* h, uint32_t stream_id) {
+int APS5_VABI sceAvPlayerDisableStream(AvPlayerInternal* h, uint32_t stream_id) {
  (void)h;
  (void)stream_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerEnableStream(AvPlayerInternal* h, uint32_t stream_id) {
+int APS5_VABI sceAvPlayerEnableStream(AvPlayerInternal* h, uint32_t stream_id) {
  (void)h;
  (void)stream_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-Bool sceAvPlayerGetAudioData(AvPlayerInternal* h, AvPlayerFrameInfo* audio_info) {
+Bool APS5_VABI sceAvPlayerGetAudioData(AvPlayerInternal* h, AvPlayerFrameInfo* audio_info) {
  (void)h;
  (void)audio_info;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info) {
+int APS5_VABI sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info) {
  (void)h;
  (void)stream_id;
  (void)info;
@@ -69,7 +69,7 @@ int sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info
  return 0;
 }
 
-int sceAvPlayerGetStreamInfoEx(AvPlayerInternal* h, uint32_t stream_id, void* info) {
+int APS5_VABI sceAvPlayerGetStreamInfoEx(AvPlayerInternal* h, uint32_t stream_id, void* info) {
  (void)h;
  (void)stream_id;
  (void)info;
@@ -77,59 +77,59 @@ int sceAvPlayerGetStreamInfoEx(AvPlayerInternal* h, uint32_t stream_id, void* in
  return 0;
 }
 
-Bool sceAvPlayerGetVideoDataEx(AvPlayerInternal* h, AvPlayerFrameInfoEx* video_info) {
+Bool APS5_VABI sceAvPlayerGetVideoDataEx(AvPlayerInternal* h, AvPlayerFrameInfoEx* video_info) {
  (void)h;
  (void)video_info;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-AvPlayerInternal* sceAvPlayerInit(AvPlayerInitData* init) {
+AvPlayerInternal* APS5_VABI sceAvPlayerInit(AvPlayerInitData* init) {
  (void)init;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceAvPlayerInitEx(const void* init_ex, AvPlayerInternal** handle) {
+int APS5_VABI sceAvPlayerInitEx(const void* init_ex, AvPlayerInternal** handle) {
  (void)init_ex;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-Bool sceAvPlayerIsActive(AvPlayerInternal* h) {
+Bool APS5_VABI sceAvPlayerIsActive(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceAvPlayerJumpToTime(AvPlayerInternal* h, uint64_t time_ms) {
+int APS5_VABI sceAvPlayerJumpToTime(AvPlayerInternal* h, uint64_t time_ms) {
  (void)h;
  (void)time_ms;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerPause(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerPause(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerPostInit(AvPlayerInternal* h, const void* post_init) {
+int APS5_VABI sceAvPlayerPostInit(AvPlayerInternal* h, const void* post_init) {
  (void)h;
  (void)post_init;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerResume(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerResume(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetAvailableBandwidth(AvPlayerInternal* h, uint32_t start_bandwidth, uint32_t minimum_bandwidth, uint32_t maximum_bandwidth) {
+int APS5_VABI sceAvPlayerSetAvailableBandwidth(AvPlayerInternal* h, uint32_t start_bandwidth, uint32_t minimum_bandwidth, uint32_t maximum_bandwidth) {
  (void)h;
  (void)start_bandwidth;
  (void)minimum_bandwidth;
@@ -138,54 +138,54 @@ int sceAvPlayerSetAvailableBandwidth(AvPlayerInternal* h, uint32_t start_bandwid
  return 0;
 }
 
-int sceAvPlayerSetAvSyncMode(AvPlayerInternal* h, uint32_t sync_mode) {
+int APS5_VABI sceAvPlayerSetAvSyncMode(AvPlayerInternal* h, uint32_t sync_mode) {
  (void)h;
  (void)sync_mode;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetLogCallback(void* callback, void* user_data) {
+int APS5_VABI sceAvPlayerSetLogCallback(void* callback, void* user_data) {
  (void)callback;
  (void)user_data;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetLooping(AvPlayerInternal* h, Bool loop) {
+int APS5_VABI sceAvPlayerSetLooping(AvPlayerInternal* h, Bool loop) {
  (void)h;
  (void)loop;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetTrickSpeed(AvPlayerInternal* h, int32_t trick_speed) {
+int APS5_VABI sceAvPlayerSetTrickSpeed(AvPlayerInternal* h, int32_t trick_speed) {
  (void)h;
  (void)trick_speed;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStart(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStart(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStartEx(AvPlayerInternal* h, const void* start_info_ex) {
+int APS5_VABI sceAvPlayerStartEx(AvPlayerInternal* h, const void* start_info_ex) {
  (void)h;
  (void)start_info_ex;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStop(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStop(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStreamCount(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStreamCount(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceAvPlayer/Export.cpp

@@ -5,14 +5,14 @@
 
 extern "C" {
 
-int sceAvPlayerAddSource(AvPlayerInternal* h, const char* filename) {
+int APS5_VABI sceAvPlayerAddSource(AvPlayerInternal* h, const char* filename) {
  (void)h;
  (void)filename;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* source_details) {
+int APS5_VABI sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* source_details) {
  (void)h;
  (void)uri_type;
  (void)source_details;
@@ -20,7 +20,7 @@ int sceAvPlayerAddSourceEx(AvPlayerInternal* h, uint32_t uri_type, const void* s
  return 0;
 }
 
-int sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_t new_stream_id) {
+int APS5_VABI sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_t new_stream_id) {
  (void)h;
  (void)old_stream_id;
  (void)new_stream_id;
@@ -28,40 +28,40 @@ int sceAvPlayerChangeStream(AvPlayerInternal* h, uint32_t old_stream_id, uint32_
  return 0;
 }
 
-int sceAvPlayerClose(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerClose(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint64_t sceAvPlayerCurrentTime(AvPlayerInternal* h) {
+uint64_t APS5_VABI sceAvPlayerCurrentTime(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerDisableStream(AvPlayerInternal* h, uint32_t stream_id) {
+int APS5_VABI sceAvPlayerDisableStream(AvPlayerInternal* h, uint32_t stream_id) {
  (void)h;
  (void)stream_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerEnableStream(AvPlayerInternal* h, uint32_t stream_id) {
+int APS5_VABI sceAvPlayerEnableStream(AvPlayerInternal* h, uint32_t stream_id) {
  (void)h;
  (void)stream_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-Bool sceAvPlayerGetAudioData(AvPlayerInternal* h, AvPlayerFrameInfo* audio_info) {
+Bool APS5_VABI sceAvPlayerGetAudioData(AvPlayerInternal* h, AvPlayerFrameInfo* audio_info) {
  (void)h;
  (void)audio_info;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info) {
+int APS5_VABI sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info) {
  (void)h;
  (void)stream_id;
  (void)info;
@@ -69,106 +69,106 @@ int sceAvPlayerGetStreamInfo(AvPlayerInternal* h, uint32_t stream_id, void* info
  return 0;
 }
 
-Bool sceAvPlayerGetVideoData(AvPlayerInternal* h, AvPlayerFrameInfo* video_info) {
+Bool APS5_VABI sceAvPlayerGetVideoData(AvPlayerInternal* h, AvPlayerFrameInfo* video_info) {
  (void)h;
  (void)video_info;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-Bool sceAvPlayerGetVideoDataEx(AvPlayerInternal* h, AvPlayerFrameInfoEx* video_info) {
+Bool APS5_VABI sceAvPlayerGetVideoDataEx(AvPlayerInternal* h, AvPlayerFrameInfoEx* video_info) {
  (void)h;
  (void)video_info;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-AvPlayerInternal* sceAvPlayerInit(AvPlayerInitData* init) {
+AvPlayerInternal* APS5_VABI sceAvPlayerInit(AvPlayerInitData* init) {
  (void)init;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceAvPlayerInitEx(const void* init_ex, AvPlayerInternal** handle) {
+int APS5_VABI sceAvPlayerInitEx(const void* init_ex, AvPlayerInternal** handle) {
  (void)init_ex;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-Bool sceAvPlayerIsActive(AvPlayerInternal* h) {
+Bool APS5_VABI sceAvPlayerIsActive(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceAvPlayerJumpToTime(AvPlayerInternal* h, uint64_t time_ms) {
+int APS5_VABI sceAvPlayerJumpToTime(AvPlayerInternal* h, uint64_t time_ms) {
  (void)h;
  (void)time_ms;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerPause(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerPause(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerPostInit(AvPlayerInternal* h, const void* post_init) {
+int APS5_VABI sceAvPlayerPostInit(AvPlayerInternal* h, const void* post_init) {
  (void)h;
  (void)post_init;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerResume(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerResume(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetAvSyncMode(AvPlayerInternal* h, uint32_t sync_mode) {
+int APS5_VABI sceAvPlayerSetAvSyncMode(AvPlayerInternal* h, uint32_t sync_mode) {
  (void)h;
  (void)sync_mode;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetLogCallback(void* callback, void* user_data) {
+int APS5_VABI sceAvPlayerSetLogCallback(void* callback, void* user_data) {
  (void)callback;
  (void)user_data;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetLooping(AvPlayerInternal* h, Bool loop) {
+int APS5_VABI sceAvPlayerSetLooping(AvPlayerInternal* h, Bool loop) {
  (void)h;
  (void)loop;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerSetTrickSpeed(AvPlayerInternal* h, int32_t trick_speed) {
+int APS5_VABI sceAvPlayerSetTrickSpeed(AvPlayerInternal* h, int32_t trick_speed) {
  (void)h;
  (void)trick_speed;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStart(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStart(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStop(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStop(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceAvPlayerStreamCount(AvPlayerInternal* h) {
+int APS5_VABI sceAvPlayerStreamCount(AvPlayerInternal* h) {
  (void)h;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceCesCs/Export.cpp

@@ -10,7 +10,7 @@ const uint8_t* sceCesRefersUcsProfileCp1252(void) {
  return nullptr;
 }
 
-int sceCesSbcToUtf8(const uint8_t* profile, uint8_t sbc, uint8_t* utf8, uint32_t utf8max, uint32_t* utf8_len) {
+int APS5_VABI sceCesSbcToUtf8(const uint8_t* profile, uint8_t sbc, uint8_t* utf8, uint32_t utf8max, uint32_t* utf8_len) {
  (void)profile;
  (void)sbc;
  (void)utf8;
@@ -20,7 +20,7 @@ int sceCesSbcToUtf8(const uint8_t* profile, uint8_t sbc, uint8_t* utf8, uint32_t
  return 0;
 }
 
-int sceCesUtf8ToSbc(const uint8_t* utf8, uint32_t utf8max, uint32_t* utf8_len, const uint8_t* profile, uint8_t* sbc) {
+int APS5_VABI sceCesUtf8ToSbc(const uint8_t* utf8, uint32_t utf8max, uint32_t* utf8_len, const uint8_t* profile, uint8_t* sbc) {
  (void)utf8;
  (void)utf8max;
  (void)utf8_len;

core/libs/prx/libSceCommonDialog/Export.cpp

@@ -2,12 +2,13 @@
 #include <cstddef>
 #include "SceTypes.hpp"
 #include "prx/libSceCommonDialog/CommonDialog.hpp"
+#include "prx/libc/include/General.hpp"
 
 static bool g_initialized = false;
 
 extern "C" {
 
-int sceCommonDialogInitialize(void) {
+int APS5_VABI sceCommonDialogInitialize(void) {
  if (g_initialized) {
   return COMMON_DIALOG_ERROR_ALREADY_INITIALIZED;
  }
@@ -15,7 +16,7 @@ int sceCommonDialogInitialize(void) {
  return COMMON_DIALOG_OK;
 }
 
-bool sceCommonDialogIsUsed(void) {
+bool APS5_VABI sceCommonDialogIsUsed(void) {
  return false;
 }
 

core/libs/prx/libSceContentDelete/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceContentDeleteInitialize(const ContentDeleteInitParam* init_param) {
+int APS5_VABI sceContentDeleteInitialize(const ContentDeleteInitParam* init_param) {
  (void)init_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceContentExport/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceContentExportInit2(const ContentExportInitParam2* init_param) {
+int APS5_VABI sceContentExportInit2(const ContentExportInitParam2* init_param) {
  (void)init_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceContentSearch/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceContentSearchInit(const ContentSearchInitParam* init_param) {
+int APS5_VABI sceContentSearchInit(const ContentSearchInitParam* init_param) {
  (void)init_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceErrorDialog/Export.cpp

@@ -5,33 +5,33 @@
 
 extern "C" {
 
-int sceErrorDialogClose(void) {
+int APS5_VABI sceErrorDialogClose(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceErrorDialogGetStatus(void) {
+int APS5_VABI sceErrorDialogGetStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceErrorDialogInitialize(void) {
+int APS5_VABI sceErrorDialogInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceErrorDialogOpen(const void* param) {
+int APS5_VABI sceErrorDialogOpen(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceErrorDialogTerminate(void) {
+int APS5_VABI sceErrorDialogTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceErrorDialogUpdateStatus(void) {
+int APS5_VABI sceErrorDialogUpdateStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceFiber/Export.cpp

@@ -5,52 +5,52 @@
 
 extern "C" {
 
-int32_t sceFiberFinalize(FiberObject* fiber) {
+int32_t APS5_VABI sceFiberFinalize(FiberObject* fiber) {
  (void)fiber;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberGetInfo(FiberObject* fiber, FiberInfo* fiber_info) {
+int32_t APS5_VABI sceFiberGetInfo(FiberObject* fiber, FiberInfo* fiber_info) {
  (void)fiber;
  (void)fiber_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberGetSelf(FiberObject** fiber) {
+int32_t APS5_VABI sceFiberGetSelf(FiberObject** fiber) {
  (void)fiber;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberGetThreadFramePointerAddress(uint64_t* addr_frame_pointer) {
+int32_t APS5_VABI sceFiberGetThreadFramePointerAddress(uint64_t* addr_frame_pointer) {
  (void)addr_frame_pointer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberOptParamInitialize(FiberOptParam* opt_param) {
+int32_t APS5_VABI sceFiberOptParamInitialize(FiberOptParam* opt_param) {
  (void)opt_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberRename(FiberObject* fiber, const char* name) {
+int32_t APS5_VABI sceFiberRename(FiberObject* fiber, const char* name) {
  (void)fiber;
  (void)name;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberReturnToThread(uint64_t arg_on_return, uint64_t* arg_on_run) {
+int32_t APS5_VABI sceFiberReturnToThread(uint64_t arg_on_return, uint64_t* arg_on_run) {
  (void)arg_on_return;
  (void)arg_on_run;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberRun_nid_postfix(FiberObject* fiber, uint64_t arg_on_run, uint64_t* arg_on_return) {
+int32_t APS5_VABI sceFiberRun_nid_postfix(FiberObject* fiber, uint64_t arg_on_run, uint64_t* arg_on_return) {
  (void)fiber;
  (void)arg_on_run;
  (void)arg_on_return;
@@ -58,18 +58,18 @@ int32_t sceFiberRun_nid_postfix(FiberObject* fiber, uint64_t arg_on_run, uint64_
  return 0;
 }
 
-int32_t sceFiberStartContextSizeCheck(uint32_t flags) {
+int32_t APS5_VABI sceFiberStartContextSizeCheck(uint32_t flags) {
  (void)flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberStopContextSizeCheck(void) {
+int32_t APS5_VABI sceFiberStopContextSizeCheck(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceFiberSwitch(FiberObject* fiber, uint64_t arg_on_run, uint64_t* arg_on_return) {
+int32_t APS5_VABI sceFiberSwitch(FiberObject* fiber, uint64_t arg_on_run, uint64_t* arg_on_return) {
  (void)fiber;
  (void)arg_on_run;
  (void)arg_on_return;

core/libs/prx/libSceFont.native/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t size) {
+int APS5_VABI sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t size) {
  (void)library;
  (void)buffer;
  (void)size;
@@ -13,28 +13,28 @@ int sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t s
  return 0;
 }
 
-int sceFontBindRenderer(FontHandle font_handle, FontRenderer renderer) {
+int APS5_VABI sceFontBindRenderer(FontHandle font_handle, FontRenderer renderer) {
  (void)font_handle;
  (void)renderer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetBidiLevel(FontTextCharacter text_character, int* bidi_level) {
+int APS5_VABI sceFontCharacterGetBidiLevel(FontTextCharacter text_character, int* bidi_level) {
  (void)text_character;
  (void)bidi_level;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetSyllableStringState(FontTextCharacter text_character, int* syllable_string_state) {
+int APS5_VABI sceFontCharacterGetSyllableStringState(FontTextCharacter text_character, int* syllable_string_state) {
  (void)text_character;
  (void)syllable_string_state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle* font_handle, uint32_t* text_code) {
+int APS5_VABI sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle* font_handle, uint32_t* text_code) {
  (void)text_character;
  (void)font_handle;
  (void)text_code;
@@ -42,38 +42,38 @@ int sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle
  return 0;
 }
 
-int sceFontCharacterGetTextOrder(FontTextCharacter text_character, void** text_order) {
+int APS5_VABI sceFontCharacterGetTextOrder(FontTextCharacter text_character, void** text_order) {
  (void)text_character;
  (void)text_order;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceFontCharacterLooksFormatCharacters(FontTextCharacter text_character) {
+uint32_t APS5_VABI sceFontCharacterLooksFormatCharacters(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceFontCharacterLooksWhiteSpace(FontTextCharacter text_character) {
+uint32_t APS5_VABI sceFontCharacterLooksWhiteSpace(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontTextCharacter sceFontCharacterRefersTextBack(FontTextCharacter text_character) {
+FontTextCharacter APS5_VABI sceFontCharacterRefersTextBack(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-FontTextCharacter sceFontCharacterRefersTextNext(FontTextCharacter text_character) {
+FontTextCharacter APS5_VABI sceFontCharacterRefersTextNext(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-FontTextCodes* sceFontCharactersRefersTextCodes(FontTextCharacter text_character, FontTextCharacter term_character, FontTextCodes* text_codes) {
+FontTextCodes* APS5_VABI sceFontCharactersRefersTextCodes(FontTextCharacter text_character, FontTextCharacter term_character, FontTextCodes* text_codes) {
  (void)text_character;
  (void)term_character;
  (void)text_codes;
@@ -81,13 +81,13 @@ FontTextCodes* sceFontCharactersRefersTextCodes(FontTextCharacter text_character
  return nullptr;
 }
 
-int sceFontCloseFont(FontHandle font_handle) {
+int APS5_VABI sceFontCloseFont(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selection, FontLibrary* library) {
+int APS5_VABI sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selection, FontLibrary* library) {
  (void)memory;
  (void)selection;
  (void)library;
@@ -95,7 +95,7 @@ int sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selectio
  return 0;
 }
 
-int sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelection selection, uint64_t edition, FontLibrary* library) {
+int APS5_VABI sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelection selection, uint64_t edition, FontLibrary* library) {
  (void)memory;
  (void)selection;
  (void)edition;
@@ -104,7 +104,7 @@ int sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelecti
  return 0;
 }
 
-int sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelection selection, uint64_t edition, FontRenderer* renderer) {
+int APS5_VABI sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelection selection, uint64_t edition, FontRenderer* renderer) {
  (void)memory;
  (void)selection;
  (void)edition;
@@ -113,7 +113,7 @@ int sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelec
  return 0;
 }
 
-int sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_source, const FontCreateStringDetail* string_detail, FontString* font_string) {
+int APS5_VABI sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_source, const FontCreateStringDetail* string_detail, FontString* font_string) {
  (void)memory;
  (void)font_text_source;
  (void)string_detail;
@@ -122,7 +122,7 @@ int sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_sour
  return 0;
 }
 
-int sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const void* writing_line_detail, FontWritingLine* writing_line) {
+int APS5_VABI sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const void* writing_line_detail, FontWritingLine* writing_line) {
  (void)memory;
  (void)writing_form;
  (void)writing_line_detail;
@@ -131,7 +131,7 @@ int sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const v
  return 0;
 }
 
-int sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attribute) {
+int APS5_VABI sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attribute) {
  (void)font_handle;
  (void)attribute;
  (void)old_attribute;
@@ -139,38 +139,38 @@ int sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attri
  return 0;
 }
 
-int sceFontDeleteGlyph(const FontMemory* memory, void** font_glyph) {
+int APS5_VABI sceFontDeleteGlyph(const FontMemory* memory, void** font_glyph) {
  (void)memory;
  (void)font_glyph;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyLibrary(FontLibrary* library) {
+int APS5_VABI sceFontDestroyLibrary(FontLibrary* library) {
  (void)library;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyRenderer(FontRenderer* renderer) {
+int APS5_VABI sceFontDestroyRenderer(FontRenderer* renderer) {
  (void)renderer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyString(FontString* font_string) {
+int APS5_VABI sceFontDestroyString(FontString* font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyWritingLine(FontWritingLine* writing_line) {
+int APS5_VABI sceFontDestroyWritingLine(FontWritingLine* writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGenerateGlyphDetail* detail, void** font_glyph) {
+int APS5_VABI sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGenerateGlyphDetail* detail, void** font_glyph) {
  (void)font_handle;
  (void)code;
  (void)detail;
@@ -179,7 +179,7 @@ int sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGe
  return 0;
 }
 
-int sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
+int APS5_VABI sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
  (void)font_handle;
  (void)code;
  (void)metrics;
@@ -187,14 +187,14 @@ int sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphM
  return 0;
 }
 
-int sceFontGetHorizontalLayout(FontHandle font_handle, FontHorizontalLayout* layout) {
+int APS5_VABI sceFontGetHorizontalLayout(FontHandle font_handle, FontHorizontalLayout* layout) {
  (void)font_handle;
  (void)layout;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
+int APS5_VABI sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
  (void)font_handle;
  (void)code;
  (void)metrics;
@@ -202,14 +202,14 @@ int sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, Font
  return 0;
 }
 
-int sceFontGetVerticalLayout(FontHandle font_handle, FontVerticalLayout* layout) {
+int APS5_VABI sceFontGetVerticalLayout(FontHandle font_handle, FontVerticalLayout* layout) {
  (void)font_handle;
  (void)layout;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attribute) {
+int APS5_VABI sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attribute) {
  (void)font_glyph;
  (void)attribute;
  (void)old_attribute;
@@ -217,7 +217,7 @@ int sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attrib
  return 0;
 }
 
-int sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte, const FontMemoryInterface* mem_interface, void* mspace_object, FontMemoryDestroyCallback destroy_callback, void* destroy_object) {
+int APS5_VABI sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte, const FontMemoryInterface* mem_interface, void* mspace_object, FontMemoryDestroyCallback destroy_callback, void* destroy_object) {
  (void)font_memory;
  (void)address;
  (void)size_byte;
@@ -229,13 +229,13 @@ int sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte
  return 0;
 }
 
-int sceFontMemoryTerm(FontMemory* font_memory) {
+int APS5_VABI sceFontMemoryTerm(FontMemory* font_memory) {
  (void)font_memory;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle* out_font_handle) {
+int APS5_VABI sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle* out_font_handle) {
  (void)font_handle;
  (void)setup_font;
  (void)out_font_handle;
@@ -243,7 +243,7 @@ int sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle
  return 0;
 }
 
-int sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_t font_size, const FontOpenDetail* detail, FontHandle* handle) {
+int APS5_VABI sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_t font_size, const FontOpenDetail* detail, FontHandle* handle) {
  (void)library;
  (void)font_address;
  (void)font_size;
@@ -253,7 +253,7 @@ int sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_
  return 0;
 }
 
-int sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t open_mode, const FontOpenDetail* detail, FontHandle* handle) {
+int APS5_VABI sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t open_mode, const FontOpenDetail* detail, FontHandle* handle) {
  (void)library;
  (void)font_set_type;
  (void)open_mode;
@@ -263,13 +263,13 @@ int sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t ope
  return 0;
 }
 
-int sceFontRebindRenderer(FontHandle font_handle) {
+int APS5_VABI sceFontRebindRenderer(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code, FontRenderSurface* surf, float x, float y, FontGlyphMetrics* metrics, FontRenderResult* result) {
+int APS5_VABI sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code, FontRenderSurface* surf, float x, float y, FontGlyphMetrics* metrics, FontRenderResult* result) {
  (void)font_handle;
  (void)code;
  (void)surf;
@@ -281,7 +281,7 @@ int sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code,
  return 0;
 }
 
-void sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_width_byte, int pixel_size_byte, int width, int height) {
+void APS5_VABI sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_width_byte, int pixel_size_byte, int width, int height) {
  (void)surf;
  (void)buffer;
  (void)buf_width_byte;
@@ -291,7 +291,7 @@ void sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_wid
  NotImplemented_nid_no_patch(__func__);
 }
 
-void sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1) {
+void APS5_VABI sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1) {
  (void)surf;
  (void)x0;
  (void)y0;
@@ -300,14 +300,14 @@ void sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceFontSetEffectSlant(FontHandle font_handle, float slant_ratio) {
+int APS5_VABI sceFontSetEffectSlant(FontHandle font_handle, float slant_ratio) {
  (void)font_handle;
  (void)slant_ratio;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
+int APS5_VABI sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
  (void)font_handle;
  (void)weight_x_scale;
  (void)weight_y_scale;
@@ -316,7 +316,7 @@ int sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float w
  return 0;
 }
 
-int sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
+int APS5_VABI sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
  (void)font_handle;
  (void)w;
  (void)h;
@@ -324,14 +324,14 @@ int sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
  return 0;
 }
 
-int sceFontSetupRenderEffectSlant(FontHandle font_handle, float slant_ratio) {
+int APS5_VABI sceFontSetupRenderEffectSlant(FontHandle font_handle, float slant_ratio) {
  (void)font_handle;
  (void)slant_ratio;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
+int APS5_VABI sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
  (void)font_handle;
  (void)weight_x_scale;
  (void)weight_y_scale;
@@ -340,7 +340,7 @@ int sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale,
  return 0;
 }
 
-int sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
+int APS5_VABI sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
  (void)font_handle;
  (void)w;
  (void)h;
@@ -348,25 +348,25 @@ int sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
  return 0;
 }
 
-uint32_t sceFontStringGetTerminateCode(FontString font_string) {
+uint32_t APS5_VABI sceFontStringGetTerminateCode(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void* sceFontStringGetTerminateOrder(FontString font_string) {
+void* APS5_VABI sceFontStringGetTerminateOrder(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontStringGetWritingForm(FontString font_string) {
+int APS5_VABI sceFontStringGetWritingForm(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontRenderCharacter sceFontStringRefersRenderCharacters(FontString font_string, FontTextCharacter start_character, FontTextCharacter last_character, uint32_t* character_count) {
+FontRenderCharacter APS5_VABI sceFontStringRefersRenderCharacters(FontString font_string, FontTextCharacter start_character, FontTextCharacter last_character, uint32_t* character_count) {
  (void)font_string;
  (void)start_character;
  (void)last_character;
@@ -375,14 +375,14 @@ FontRenderCharacter sceFontStringRefersRenderCharacters(FontString font_string,
  return {};
 }
 
-FontTextCharacter sceFontStringRefersTextCharacters(FontString font_string, uint32_t* character_count) {
+FontTextCharacter APS5_VABI sceFontStringRefersTextCharacters(FontString font_string, uint32_t* character_count) {
  (void)font_string;
  (void)character_count;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t formats) {
+int APS5_VABI sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t formats) {
  (void)library;
  (void)font_max;
  (void)formats;
@@ -390,25 +390,25 @@ int sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t
  return 0;
 }
 
-int sceFontSupportSystemFonts(FontLibrary library) {
+int APS5_VABI sceFontSupportSystemFonts(FontLibrary library) {
  (void)library;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontTextCodes* sceFontTextCodesStepBack(FontTextCodes* text_codes_step) {
+FontTextCodes* APS5_VABI sceFontTextCodesStepBack(FontTextCodes* text_codes_step) {
  (void)text_codes_step;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-FontTextCodes* sceFontTextCodesStepNext(FontTextCodes* text_codes_step) {
+FontTextCodes* APS5_VABI sceFontTextCodesStepNext(FontTextCodes* text_codes_step) {
  (void)text_codes_step;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_address, uint32_t text_size_byte, FontTextParseFunction text_parser, void* text_object) {
+int APS5_VABI sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_address, uint32_t text_size_byte, FontTextParseFunction text_parser, void* text_object) {
  (void)font_text_source;
  (void)text_address;
  (void)text_size_byte;
@@ -418,40 +418,40 @@ int sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_add
  return 0;
 }
 
-int sceFontTextSourceRewind(FontTextSource* font_text_source) {
+int APS5_VABI sceFontTextSourceRewind(FontTextSource* font_text_source) {
  (void)font_text_source;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontTextSourceSetDefaultFont(FontTextSource* font_text_source, FontHandle default_font) {
+int APS5_VABI sceFontTextSourceSetDefaultFont(FontTextSource* font_text_source, FontHandle default_font) {
  (void)font_text_source;
  (void)default_font;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontTextSourceSetWritingForm(FontTextSource* font_text_source, int writing_form) {
+int APS5_VABI sceFontTextSourceSetWritingForm(FontTextSource* font_text_source, int writing_form) {
  (void)font_text_source;
  (void)writing_form;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontUnbindRenderer(FontHandle font_handle) {
+int APS5_VABI sceFontUnbindRenderer(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingGetRenderMetrics(FontWriting* font_writing, FontWritingMetrics* writing_metrics) {
+int APS5_VABI sceFontWritingGetRenderMetrics(FontWriting* font_writing, FontWritingMetrics* writing_metrics) {
  (void)font_writing;
  (void)writing_metrics;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRenderCharacter font_character) {
+int APS5_VABI sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRenderCharacter font_character) {
  (void)font_writing;
  (void)font_string;
  (void)font_character;
@@ -459,13 +459,13 @@ int sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRe
  return 0;
 }
 
-int sceFontWritingLineClear(FontWritingLine writing_line) {
+int APS5_VABI sceFontWritingLineClear(FontWritingLine writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head_space, float* inline_space, float* tail_space, float* advance_space) {
+int APS5_VABI sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head_space, float* inline_space, float* tail_space, float* advance_space) {
  (void)writing_line;
  (void)head_space;
  (void)inline_space;
@@ -475,20 +475,20 @@ int sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head
  return 0;
 }
 
-int sceFontWritingLineGetRenderMetrics(FontWritingLine writing_line, FontWritingMetrics* writing_metrics) {
+int APS5_VABI sceFontWritingLineGetRenderMetrics(FontWritingLine writing_line, FontWritingMetrics* writing_metrics) {
  (void)writing_line;
  (void)writing_metrics;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontWritingLineStep* sceFontWritingLineRefersRenderStep(FontWritingLine writing_line) {
+FontWritingLineStep* APS5_VABI sceFontWritingLineRefersRenderStep(FontWritingLine writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontWritingLineWritesOrder(FontWritingLine writing_line, uint64_t writing_attribute, const FontWritingMetrics* writing_metrics, void* writing_orderer) {
+int APS5_VABI sceFontWritingLineWritesOrder(FontWritingLine writing_line, uint64_t writing_attribute, const FontWritingMetrics* writing_metrics, void* writing_orderer) {
  (void)writing_line;
  (void)writing_attribute;
  (void)writing_metrics;
@@ -503,14 +503,14 @@ const FontWritingStep* sceFontWritingRefersRenderStep(FontWriting* font_writing)
  return nullptr;
 }
 
-FontTextCharacter sceFontWritingRefersRenderStepCharacter(FontWriting* font_writing, const void** letter_step) {
+FontTextCharacter APS5_VABI sceFontWritingRefersRenderStepCharacter(FontWriting* font_writing, const void** letter_step) {
  (void)font_writing;
  (void)letter_step;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceFontWritingSetMaskInvisible(FontWriting* font_writing, int mask) {
+int APS5_VABI sceFontWritingSetMaskInvisible(FontWriting* font_writing, int mask) {
  (void)font_writing;
  (void)mask;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceFont/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t size) {
+int APS5_VABI sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t size) {
  (void)library;
  (void)buffer;
  (void)size;
@@ -13,28 +13,28 @@ int sceFontAttachDeviceCacheBuffer(FontLibrary library, void* buffer, uint32_t s
  return 0;
 }
 
-int sceFontBindRenderer(FontHandle font_handle, FontRenderer renderer) {
+int APS5_VABI sceFontBindRenderer(FontHandle font_handle, FontRenderer renderer) {
  (void)font_handle;
  (void)renderer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetBidiLevel(FontTextCharacter text_character, int* bidi_level) {
+int APS5_VABI sceFontCharacterGetBidiLevel(FontTextCharacter text_character, int* bidi_level) {
  (void)text_character;
  (void)bidi_level;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetSyllableStringState(FontTextCharacter text_character, int* syllable_string_state) {
+int APS5_VABI sceFontCharacterGetSyllableStringState(FontTextCharacter text_character, int* syllable_string_state) {
  (void)text_character;
  (void)syllable_string_state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle* font_handle, uint32_t* text_code) {
+int APS5_VABI sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle* font_handle, uint32_t* text_code) {
  (void)text_character;
  (void)font_handle;
  (void)text_code;
@@ -42,38 +42,38 @@ int sceFontCharacterGetTextFontCode(FontTextCharacter text_character, FontHandle
  return 0;
 }
 
-int sceFontCharacterGetTextOrder(FontTextCharacter text_character, void** text_order) {
+int APS5_VABI sceFontCharacterGetTextOrder(FontTextCharacter text_character, void** text_order) {
  (void)text_character;
  (void)text_order;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceFontCharacterLooksFormatCharacters(FontTextCharacter text_character) {
+uint32_t APS5_VABI sceFontCharacterLooksFormatCharacters(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceFontCharacterLooksWhiteSpace(FontTextCharacter text_character) {
+uint32_t APS5_VABI sceFontCharacterLooksWhiteSpace(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontTextCharacter sceFontCharacterRefersTextBack(FontTextCharacter text_character) {
+FontTextCharacter APS5_VABI sceFontCharacterRefersTextBack(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-FontTextCharacter sceFontCharacterRefersTextNext(FontTextCharacter text_character) {
+FontTextCharacter APS5_VABI sceFontCharacterRefersTextNext(FontTextCharacter text_character) {
  (void)text_character;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-FontTextCodes* sceFontCharactersRefersTextCodes(FontTextCharacter text_character, FontTextCharacter term_character, FontTextCodes* text_codes) {
+FontTextCodes* APS5_VABI sceFontCharactersRefersTextCodes(FontTextCharacter text_character, FontTextCharacter term_character, FontTextCodes* text_codes) {
  (void)text_character;
  (void)term_character;
  (void)text_codes;
@@ -81,13 +81,13 @@ FontTextCodes* sceFontCharactersRefersTextCodes(FontTextCharacter text_character
  return nullptr;
 }
 
-int sceFontCloseFont(FontHandle font_handle) {
+int APS5_VABI sceFontCloseFont(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selection, FontLibrary* library) {
+int APS5_VABI sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selection, FontLibrary* library) {
  (void)memory;
  (void)selection;
  (void)library;
@@ -95,7 +95,7 @@ int sceFontCreateLibrary(const FontMemory* memory, FontLibrarySelection selectio
  return 0;
 }
 
-int sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelection selection, uint64_t edition, FontLibrary* library) {
+int APS5_VABI sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelection selection, uint64_t edition, FontLibrary* library) {
  (void)memory;
  (void)selection;
  (void)edition;
@@ -104,7 +104,7 @@ int sceFontCreateLibraryWithEdition(const FontMemory* memory, FontLibrarySelecti
  return 0;
 }
 
-int sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelection selection, uint64_t edition, FontRenderer* renderer) {
+int APS5_VABI sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelection selection, uint64_t edition, FontRenderer* renderer) {
  (void)memory;
  (void)selection;
  (void)edition;
@@ -113,7 +113,7 @@ int sceFontCreateRendererWithEdition(const FontMemory* memory, FontRendererSelec
  return 0;
 }
 
-int sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_source, const FontCreateStringDetail* string_detail, FontString* font_string) {
+int APS5_VABI sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_source, const FontCreateStringDetail* string_detail, FontString* font_string) {
  (void)memory;
  (void)font_text_source;
  (void)string_detail;
@@ -122,7 +122,7 @@ int sceFontCreateString(const FontMemory* memory, FontTextSource* font_text_sour
  return 0;
 }
 
-int sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const void* writing_line_detail, FontWritingLine* writing_line) {
+int APS5_VABI sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const void* writing_line_detail, FontWritingLine* writing_line) {
  (void)memory;
  (void)writing_form;
  (void)writing_line_detail;
@@ -131,7 +131,7 @@ int sceFontCreateWritingLine(const FontMemory* memory, int writing_form, const v
  return 0;
 }
 
-int sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attribute) {
+int APS5_VABI sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attribute) {
  (void)font_handle;
  (void)attribute;
  (void)old_attribute;
@@ -139,38 +139,38 @@ int sceFontDefineAttribute(FontHandle font_handle, int attribute, int* old_attri
  return 0;
 }
 
-int sceFontDeleteGlyph(const FontMemory* memory, void** font_glyph) {
+int APS5_VABI sceFontDeleteGlyph(const FontMemory* memory, void** font_glyph) {
  (void)memory;
  (void)font_glyph;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyLibrary(FontLibrary* library) {
+int APS5_VABI sceFontDestroyLibrary(FontLibrary* library) {
  (void)library;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyRenderer(FontRenderer* renderer) {
+int APS5_VABI sceFontDestroyRenderer(FontRenderer* renderer) {
  (void)renderer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyString(FontString* font_string) {
+int APS5_VABI sceFontDestroyString(FontString* font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontDestroyWritingLine(FontWritingLine* writing_line) {
+int APS5_VABI sceFontDestroyWritingLine(FontWritingLine* writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGenerateGlyphDetail* detail, void** font_glyph) {
+int APS5_VABI sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGenerateGlyphDetail* detail, void** font_glyph) {
  (void)font_handle;
  (void)code;
  (void)detail;
@@ -179,7 +179,7 @@ int sceFontGenerateCharGlyph(FontHandle font_handle, uint32_t code, const FontGe
  return 0;
 }
 
-int sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
+int APS5_VABI sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
  (void)font_handle;
  (void)code;
  (void)metrics;
@@ -187,14 +187,14 @@ int sceFontGetCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphM
  return 0;
 }
 
-int sceFontGetHorizontalLayout(FontHandle font_handle, FontHorizontalLayout* layout) {
+int APS5_VABI sceFontGetHorizontalLayout(FontHandle font_handle, FontHorizontalLayout* layout) {
  (void)font_handle;
  (void)layout;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
+int APS5_VABI sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, FontGlyphMetrics* metrics) {
  (void)font_handle;
  (void)code;
  (void)metrics;
@@ -202,14 +202,14 @@ int sceFontGetRenderCharGlyphMetrics(FontHandle font_handle, uint32_t code, Font
  return 0;
 }
 
-int sceFontGetVerticalLayout(FontHandle font_handle, FontVerticalLayout* layout) {
+int APS5_VABI sceFontGetVerticalLayout(FontHandle font_handle, FontVerticalLayout* layout) {
  (void)font_handle;
  (void)layout;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attribute) {
+int APS5_VABI sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attribute) {
  (void)font_glyph;
  (void)attribute;
  (void)old_attribute;
@@ -217,7 +217,7 @@ int sceFontGlyphDefineAttribute(void* font_glyph, int attribute, int* old_attrib
  return 0;
 }
 
-int sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte, const FontMemoryInterface* mem_interface, void* mspace_object, FontMemoryDestroyCallback destroy_callback, void* destroy_object) {
+int APS5_VABI sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte, const FontMemoryInterface* mem_interface, void* mspace_object, FontMemoryDestroyCallback destroy_callback, void* destroy_object) {
  (void)font_memory;
  (void)address;
  (void)size_byte;
@@ -229,13 +229,13 @@ int sceFontMemoryInit(FontMemory* font_memory, void* address, uint32_t size_byte
  return 0;
 }
 
-int sceFontMemoryTerm(FontMemory* font_memory) {
+int APS5_VABI sceFontMemoryTerm(FontMemory* font_memory) {
  (void)font_memory;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle* out_font_handle) {
+int APS5_VABI sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle* out_font_handle) {
  (void)font_handle;
  (void)setup_font;
  (void)out_font_handle;
@@ -243,7 +243,7 @@ int sceFontOpenFontInstance(FontHandle font_handle, void* setup_font, FontHandle
  return 0;
 }
 
-int sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_t font_size, const FontOpenDetail* detail, FontHandle* handle) {
+int APS5_VABI sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_t font_size, const FontOpenDetail* detail, FontHandle* handle) {
  (void)library;
  (void)font_address;
  (void)font_size;
@@ -253,7 +253,7 @@ int sceFontOpenFontMemory(FontLibrary library, const void* font_address, uint32_
  return 0;
 }
 
-int sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t open_mode, const FontOpenDetail* detail, FontHandle* handle) {
+int APS5_VABI sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t open_mode, const FontOpenDetail* detail, FontHandle* handle) {
  (void)library;
  (void)font_set_type;
  (void)open_mode;
@@ -263,13 +263,13 @@ int sceFontOpenFontSet(FontLibrary library, uint32_t font_set_type, uint32_t ope
  return 0;
 }
 
-int sceFontRebindRenderer(FontHandle font_handle) {
+int APS5_VABI sceFontRebindRenderer(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code, FontRenderSurface* surf, float x, float y, FontGlyphMetrics* metrics, FontRenderResult* result) {
+int APS5_VABI sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code, FontRenderSurface* surf, float x, float y, FontGlyphMetrics* metrics, FontRenderResult* result) {
  (void)font_handle;
  (void)code;
  (void)surf;
@@ -281,7 +281,7 @@ int sceFontRenderCharGlyphImageHorizontal(FontHandle font_handle, uint32_t code,
  return 0;
 }
 
-void sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_width_byte, int pixel_size_byte, int width, int height) {
+void APS5_VABI sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_width_byte, int pixel_size_byte, int width, int height) {
  (void)surf;
  (void)buffer;
  (void)buf_width_byte;
@@ -291,7 +291,7 @@ void sceFontRenderSurfaceInit(FontRenderSurface* surf, void* buffer, int buf_wid
  NotImplemented_nid_no_patch(__func__);
 }
 
-void sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1) {
+void APS5_VABI sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32_t y0, uint32_t x1, uint32_t y1) {
  (void)surf;
  (void)x0;
  (void)y0;
@@ -300,14 +300,14 @@ void sceFontRenderSurfaceSetScissor(FontRenderSurface* surf, uint32_t x0, uint32
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceFontSetEffectSlant(FontHandle font_handle, float slant_ratio) {
+int APS5_VABI sceFontSetEffectSlant(FontHandle font_handle, float slant_ratio) {
  (void)font_handle;
  (void)slant_ratio;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
+int APS5_VABI sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
  (void)font_handle;
  (void)weight_x_scale;
  (void)weight_y_scale;
@@ -316,7 +316,7 @@ int sceFontSetEffectWeight(FontHandle font_handle, float weight_x_scale, float w
  return 0;
 }
 
-int sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
+int APS5_VABI sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
  (void)font_handle;
  (void)w;
  (void)h;
@@ -324,14 +324,14 @@ int sceFontSetScalePixel(FontHandle font_handle, float w, float h) {
  return 0;
 }
 
-int sceFontSetupRenderEffectSlant(FontHandle font_handle, float slant_ratio) {
+int APS5_VABI sceFontSetupRenderEffectSlant(FontHandle font_handle, float slant_ratio) {
  (void)font_handle;
  (void)slant_ratio;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
+int APS5_VABI sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale, float weight_y_scale, uint32_t mode) {
  (void)font_handle;
  (void)weight_x_scale;
  (void)weight_y_scale;
@@ -340,7 +340,7 @@ int sceFontSetupRenderEffectWeight(FontHandle font_handle, float weight_x_scale,
  return 0;
 }
 
-int sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
+int APS5_VABI sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
  (void)font_handle;
  (void)w;
  (void)h;
@@ -348,25 +348,25 @@ int sceFontSetupRenderScalePixel(FontHandle font_handle, float w, float h) {
  return 0;
 }
 
-uint32_t sceFontStringGetTerminateCode(FontString font_string) {
+uint32_t APS5_VABI sceFontStringGetTerminateCode(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void* sceFontStringGetTerminateOrder(FontString font_string) {
+void* APS5_VABI sceFontStringGetTerminateOrder(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontStringGetWritingForm(FontString font_string) {
+int APS5_VABI sceFontStringGetWritingForm(FontString font_string) {
  (void)font_string;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontRenderCharacter sceFontStringRefersRenderCharacters(FontString font_string, FontTextCharacter start_character, FontTextCharacter last_character, uint32_t* character_count) {
+FontRenderCharacter APS5_VABI sceFontStringRefersRenderCharacters(FontString font_string, FontTextCharacter start_character, FontTextCharacter last_character, uint32_t* character_count) {
  (void)font_string;
  (void)start_character;
  (void)last_character;
@@ -375,14 +375,14 @@ FontRenderCharacter sceFontStringRefersRenderCharacters(FontString font_string,
  return {};
 }
 
-FontTextCharacter sceFontStringRefersTextCharacters(FontString font_string, uint32_t* character_count) {
+FontTextCharacter APS5_VABI sceFontStringRefersTextCharacters(FontString font_string, uint32_t* character_count) {
  (void)font_string;
  (void)character_count;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t formats) {
+int APS5_VABI sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t formats) {
  (void)library;
  (void)font_max;
  (void)formats;
@@ -390,25 +390,25 @@ int sceFontSupportExternalFonts(FontLibrary library, uint32_t font_max, uint32_t
  return 0;
 }
 
-int sceFontSupportSystemFonts(FontLibrary library) {
+int APS5_VABI sceFontSupportSystemFonts(FontLibrary library) {
  (void)library;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontTextCodes* sceFontTextCodesStepBack(FontTextCodes* text_codes_step) {
+FontTextCodes* APS5_VABI sceFontTextCodesStepBack(FontTextCodes* text_codes_step) {
  (void)text_codes_step;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-FontTextCodes* sceFontTextCodesStepNext(FontTextCodes* text_codes_step) {
+FontTextCodes* APS5_VABI sceFontTextCodesStepNext(FontTextCodes* text_codes_step) {
  (void)text_codes_step;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_address, uint32_t text_size_byte, FontTextParseFunction text_parser, void* text_object) {
+int APS5_VABI sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_address, uint32_t text_size_byte, FontTextParseFunction text_parser, void* text_object) {
  (void)font_text_source;
  (void)text_address;
  (void)text_size_byte;
@@ -418,40 +418,40 @@ int sceFontTextSourceInit(FontTextSource* font_text_source, const void* text_add
  return 0;
 }
 
-int sceFontTextSourceRewind(FontTextSource* font_text_source) {
+int APS5_VABI sceFontTextSourceRewind(FontTextSource* font_text_source) {
  (void)font_text_source;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontTextSourceSetDefaultFont(FontTextSource* font_text_source, FontHandle default_font) {
+int APS5_VABI sceFontTextSourceSetDefaultFont(FontTextSource* font_text_source, FontHandle default_font) {
  (void)font_text_source;
  (void)default_font;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontTextSourceSetWritingForm(FontTextSource* font_text_source, int writing_form) {
+int APS5_VABI sceFontTextSourceSetWritingForm(FontTextSource* font_text_source, int writing_form) {
  (void)font_text_source;
  (void)writing_form;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontUnbindRenderer(FontHandle font_handle) {
+int APS5_VABI sceFontUnbindRenderer(FontHandle font_handle) {
  (void)font_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingGetRenderMetrics(FontWriting* font_writing, FontWritingMetrics* writing_metrics) {
+int APS5_VABI sceFontWritingGetRenderMetrics(FontWriting* font_writing, FontWritingMetrics* writing_metrics) {
  (void)font_writing;
  (void)writing_metrics;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRenderCharacter font_character) {
+int APS5_VABI sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRenderCharacter font_character) {
  (void)font_writing;
  (void)font_string;
  (void)font_character;
@@ -459,13 +459,13 @@ int sceFontWritingInit(FontWriting* font_writing, FontString font_string, FontRe
  return 0;
 }
 
-int sceFontWritingLineClear(FontWritingLine writing_line) {
+int APS5_VABI sceFontWritingLineClear(FontWritingLine writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head_space, float* inline_space, float* tail_space, float* advance_space) {
+int APS5_VABI sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head_space, float* inline_space, float* tail_space, float* advance_space) {
  (void)writing_line;
  (void)head_space;
  (void)inline_space;
@@ -475,20 +475,20 @@ int sceFontWritingLineGetOrderingSpace(FontWritingLine writing_line, float* head
  return 0;
 }
 
-int sceFontWritingLineGetRenderMetrics(FontWritingLine writing_line, FontWritingMetrics* writing_metrics) {
+int APS5_VABI sceFontWritingLineGetRenderMetrics(FontWritingLine writing_line, FontWritingMetrics* writing_metrics) {
  (void)writing_line;
  (void)writing_metrics;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-FontWritingLineStep* sceFontWritingLineRefersRenderStep(FontWritingLine writing_line) {
+FontWritingLineStep* APS5_VABI sceFontWritingLineRefersRenderStep(FontWritingLine writing_line) {
  (void)writing_line;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-int sceFontWritingLineWritesOrder(FontWritingLine writing_line, uint64_t writing_attribute, const FontWritingMetrics* writing_metrics, void* writing_orderer) {
+int APS5_VABI sceFontWritingLineWritesOrder(FontWritingLine writing_line, uint64_t writing_attribute, const FontWritingMetrics* writing_metrics, void* writing_orderer) {
  (void)writing_line;
  (void)writing_attribute;
  (void)writing_metrics;
@@ -503,14 +503,14 @@ const FontWritingStep* sceFontWritingRefersRenderStep(FontWriting* font_writing)
  return nullptr;
 }
 
-FontTextCharacter sceFontWritingRefersRenderStepCharacter(FontWriting* font_writing, const void** letter_step) {
+FontTextCharacter APS5_VABI sceFontWritingRefersRenderStepCharacter(FontWriting* font_writing, const void** letter_step) {
  (void)font_writing;
  (void)letter_step;
  NotImplemented_nid_no_patch(__func__);
  return {};
 }
 
-int sceFontWritingSetMaskInvisible(FontWriting* font_writing, int mask) {
+int APS5_VABI sceFontWritingSetMaskInvisible(FontWriting* font_writing, int mask) {
  (void)font_writing;
  (void)mask;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceFontFt/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-void* sceFontSelectLibraryFt(int value) {
+void* APS5_VABI sceFontSelectLibraryFt(int value) {
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;
 }
 
-void* sceFontSelectRendererFt(int value) {
+void* APS5_VABI sceFontSelectRendererFt(int value) {
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return nullptr;

core/libs/prx/libSceGameLiveStreaming/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceGameLiveStreamingInitialize(size_t heap_size) {
+int APS5_VABI sceGameLiveStreamingInitialize(size_t heap_size) {
  (void)heap_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceGameLiveStreamingTerminate(void) {
+int APS5_VABI sceGameLiveStreamingTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceGameUpdate/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceGameUpdateAbortRequest(int request_id) {
+int APS5_VABI sceGameUpdateAbortRequest(int request_id) {
  (void)request_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceGameUpdateCheck(int request_id, const GameUpdateCheckParam* param, GameUpdateCheckResult* result) {
+int APS5_VABI sceGameUpdateCheck(int request_id, const GameUpdateCheckParam* param, GameUpdateCheckResult* result) {
  (void)request_id;
  (void)param;
  (void)result;
@@ -19,18 +19,18 @@ int sceGameUpdateCheck(int request_id, const GameUpdateCheckParam* param, GameUp
  return 0;
 }
 
-int sceGameUpdateCreateRequest(void) {
+int APS5_VABI sceGameUpdateCreateRequest(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceGameUpdateDeleteRequest(int request_id) {
+int APS5_VABI sceGameUpdateDeleteRequest(int request_id) {
  (void)request_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceGameUpdateGetAddcontLatestVersion(uint32_t service_label, const void* entitlement_label, GameUpdateAddcontVersionInfo* info) {
+int APS5_VABI sceGameUpdateGetAddcontLatestVersion(uint32_t service_label, const void* entitlement_label, GameUpdateAddcontVersionInfo* info) {
  (void)service_label;
  (void)entitlement_label;
  (void)info;
@@ -38,12 +38,12 @@ int sceGameUpdateGetAddcontLatestVersion(uint32_t service_label, const void* ent
  return 0;
 }
 
-int sceGameUpdateInitialize(void) {
+int APS5_VABI sceGameUpdateInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceGameUpdateTerminate(void) {
+int APS5_VABI sceGameUpdateTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceHttp/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceHttpAbortRequest(int request_id) {
+int APS5_VABI sceHttpAbortRequest(int request_id) {
  (void)request_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpAddRequestHeader(int id, const char* name, const char* value, uint32_t mode) {
+int APS5_VABI sceHttpAddRequestHeader(int id, const char* name, const char* value, uint32_t mode) {
  (void)id;
  (void)name;
  (void)value;
@@ -20,7 +20,7 @@ int sceHttpAddRequestHeader(int id, const char* name, const char* value, uint32_
  return 0;
 }
 
-int sceHttpCreateConnection(int tmpl_id, const char* server_name, const char* scheme, uint16_t port, int enable_keep_alive) {
+int APS5_VABI sceHttpCreateConnection(int tmpl_id, const char* server_name, const char* scheme, uint16_t port, int enable_keep_alive) {
  (void)tmpl_id;
  (void)server_name;
  (void)scheme;
@@ -30,7 +30,7 @@ int sceHttpCreateConnection(int tmpl_id, const char* server_name, const char* sc
  return 0;
 }
 
-int sceHttpCreateConnectionWithURL(int tmpl_id, const char* url, int enable_keep_alive) {
+int APS5_VABI sceHttpCreateConnectionWithURL(int tmpl_id, const char* url, int enable_keep_alive) {
  (void)tmpl_id;
  (void)url;
  (void)enable_keep_alive;
@@ -38,14 +38,14 @@ int sceHttpCreateConnectionWithURL(int tmpl_id, const char* url, int enable_keep
  return 0;
 }
 
-int sceHttpCreateEpoll(int http_ctx_id, HttpEpollHandle* eh) {
+int APS5_VABI sceHttpCreateEpoll(int http_ctx_id, HttpEpollHandle* eh) {
  (void)http_ctx_id;
  (void)eh;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpCreateRequest(int conn_id, int method, const char* path, uint64_t content_length) {
+int APS5_VABI sceHttpCreateRequest(int conn_id, int method, const char* path, uint64_t content_length) {
  (void)conn_id;
  (void)method;
  (void)path;
@@ -54,7 +54,7 @@ int sceHttpCreateRequest(int conn_id, int method, const char* path, uint64_t con
  return 0;
 }
 
-int sceHttpCreateRequestWithURL2(int conn_id, const char* method, const char* url, uint64_t content_length) {
+int APS5_VABI sceHttpCreateRequestWithURL2(int conn_id, const char* method, const char* url, uint64_t content_length) {
  (void)conn_id;
  (void)method;
  (void)url;
@@ -63,7 +63,7 @@ int sceHttpCreateRequestWithURL2(int conn_id, const char* method, const char* ur
  return 0;
 }
 
-int sceHttpCreateTemplate(int http_ctx_id, const char* user_agent, int http_ver, int is_auto_proxy_conf) {
+int APS5_VABI sceHttpCreateTemplate(int http_ctx_id, const char* user_agent, int http_ver, int is_auto_proxy_conf) {
  (void)http_ctx_id;
  (void)user_agent;
  (void)http_ver;
@@ -72,32 +72,32 @@ int sceHttpCreateTemplate(int http_ctx_id, const char* user_agent, int http_ver,
  return 0;
 }
 
-int sceHttpDeleteConnection(int conn_id) {
+int APS5_VABI sceHttpDeleteConnection(int conn_id) {
  (void)conn_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpDeleteRequest(int req_id) {
+int APS5_VABI sceHttpDeleteRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpDeleteTemplate(int tmpl_id) {
+int APS5_VABI sceHttpDeleteTemplate(int tmpl_id) {
  (void)tmpl_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpDestroyEpoll(int http_ctx_id, HttpEpollHandle eh) {
+int APS5_VABI sceHttpDestroyEpoll(int http_ctx_id, HttpEpollHandle eh) {
  (void)http_ctx_id;
  (void)eh;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpGetAllResponseHeaders(int request_id, char** header, size_t* header_size) {
+int APS5_VABI sceHttpGetAllResponseHeaders(int request_id, char** header, size_t* header_size) {
  (void)request_id;
  (void)header;
  (void)header_size;
@@ -105,7 +105,7 @@ int sceHttpGetAllResponseHeaders(int request_id, char** header, size_t* header_s
  return 0;
 }
 
-int sceHttpGetResponseContentLength(int request_id, int* result, uint64_t* content_length) {
+int APS5_VABI sceHttpGetResponseContentLength(int request_id, int* result, uint64_t* content_length) {
  (void)request_id;
  (void)result;
  (void)content_length;
@@ -113,14 +113,14 @@ int sceHttpGetResponseContentLength(int request_id, int* result, uint64_t* conte
  return 0;
 }
 
-int sceHttpGetStatusCode(int request_id, int* status_code) {
+int APS5_VABI sceHttpGetStatusCode(int request_id, int* status_code) {
  (void)request_id;
  (void)status_code;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpInit_nid_postfix(int memid, int ssl_ctx_id, uint64_t pool_size) {
+int APS5_VABI sceHttpInit_nid_postfix(int memid, int ssl_ctx_id, uint64_t pool_size) {
  (void)memid;
  (void)ssl_ctx_id;
  (void)pool_size;
@@ -128,14 +128,14 @@ int sceHttpInit_nid_postfix(int memid, int ssl_ctx_id, uint64_t pool_size) {
  return 0;
 }
 
-int sceHttpsDisableOption(int id, uint32_t ssl_flags) {
+int APS5_VABI sceHttpsDisableOption(int id, uint32_t ssl_flags) {
  (void)id;
  (void)ssl_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSendRequest(int request_id, const void* post_data, size_t size) {
+int APS5_VABI sceHttpSendRequest(int request_id, const void* post_data, size_t size) {
  (void)request_id;
  (void)post_data;
  (void)size;
@@ -143,28 +143,28 @@ int sceHttpSendRequest(int request_id, const void* post_data, size_t size) {
  return 0;
 }
 
-int sceHttpSetAuthEnabled(int id, int enable) {
+int APS5_VABI sceHttpSetAuthEnabled(int id, int enable) {
  (void)id;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetAutoRedirect(int id, int enable) {
+int APS5_VABI sceHttpSetAutoRedirect(int id, int enable) {
  (void)id;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetConnectTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttpSetConnectTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetEpoll(int id, HttpEpollHandle eh, void* user_arg) {
+int APS5_VABI sceHttpSetEpoll(int id, HttpEpollHandle eh, void* user_arg) {
  (void)id;
  (void)eh;
  (void)user_arg;
@@ -172,56 +172,56 @@ int sceHttpSetEpoll(int id, HttpEpollHandle eh, void* user_arg) {
  return 0;
 }
 
-int sceHttpSetNonblock(int id, int enable) {
+int APS5_VABI sceHttpSetNonblock(int id, int enable) {
  (void)id;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetRecvTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttpSetRecvTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetRequestContentLength(int request_id, uint64_t content_length) {
+int APS5_VABI sceHttpSetRequestContentLength(int request_id, uint64_t content_length) {
  (void)request_id;
  (void)content_length;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetResolveRetry(int id, int32_t retry) {
+int APS5_VABI sceHttpSetResolveRetry(int id, int32_t retry) {
  (void)id;
  (void)retry;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetResolveTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttpSetResolveTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpSetSendTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttpSetSendTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpsSetMinSslVersion(int id, uint32_t ssl_version) {
+int APS5_VABI sceHttpsSetMinSslVersion(int id, uint32_t ssl_version) {
  (void)id;
  (void)ssl_version;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpsSetSslCallback(int id, HttpsCallback cbfunc, void* user_arg) {
+int APS5_VABI sceHttpsSetSslCallback(int id, HttpsCallback cbfunc, void* user_arg) {
  (void)id;
  (void)cbfunc;
  (void)user_arg;
@@ -229,19 +229,19 @@ int sceHttpsSetSslCallback(int id, HttpsCallback cbfunc, void* user_arg) {
  return 0;
 }
 
-int sceHttpTerm_nid_postfix(int http_ctx_id) {
+int APS5_VABI sceHttpTerm_nid_postfix(int http_ctx_id) {
  (void)http_ctx_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpUnsetEpoll(int id) {
+int APS5_VABI sceHttpUnsetEpoll(int id) {
  (void)id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttpUriBuild(char* out, size_t* require, size_t prepare, const SceHttpUriElement* src_element, uint32_t option) {
+int APS5_VABI sceHttpUriBuild(char* out, size_t* require, size_t prepare, const SceHttpUriElement* src_element, uint32_t option) {
  (void)out;
  (void)require;
  (void)prepare;
@@ -251,7 +251,7 @@ int sceHttpUriBuild(char* out, size_t* require, size_t prepare, const SceHttpUri
  return 0;
 }
 
-int sceHttpUriEscape(char* out, size_t* require, size_t prepare, const char* in) {
+int APS5_VABI sceHttpUriEscape(char* out, size_t* require, size_t prepare, const char* in) {
  (void)out;
  (void)require;
  (void)prepare;
@@ -260,7 +260,7 @@ int sceHttpUriEscape(char* out, size_t* require, size_t prepare, const char* in)
  return 0;
 }
 
-int sceHttpUriParse(SceHttpUriElement* out, const char* src_url, void* pool, size_t* require, size_t prepare) {
+int APS5_VABI sceHttpUriParse(SceHttpUriElement* out, const char* src_url, void* pool, size_t* require, size_t prepare) {
  (void)out;
  (void)src_url;
  (void)pool;
@@ -270,7 +270,7 @@ int sceHttpUriParse(SceHttpUriElement* out, const char* src_url, void* pool, siz
  return 0;
 }
 
-int sceHttpWaitRequest(HttpEpollHandle eh, HttpNBEvent* nbev, int maxevents, int timeout) {
+int APS5_VABI sceHttpWaitRequest(HttpEpollHandle eh, HttpNBEvent* nbev, int maxevents, int timeout) {
  (void)eh;
  (void)nbev;
  (void)maxevents;

core/libs/prx/libSceHttp2/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceHttp2AddRequestHeader(int id, const char* name, const char* value, uint32_t mode) {
+int APS5_VABI sceHttp2AddRequestHeader(int id, const char* name, const char* value, uint32_t mode) {
  (void)id;
  (void)name;
  (void)value;
@@ -14,7 +14,7 @@ int sceHttp2AddRequestHeader(int id, const char* name, const char* value, uint32
  return 0;
 }
 
-int sceHttp2CreateRequestWithURL(int tmpl_id, const char* method, const char* url, uint64_t content_length) {
+int APS5_VABI sceHttp2CreateRequestWithURL(int tmpl_id, const char* method, const char* url, uint64_t content_length) {
  (void)tmpl_id;
  (void)method;
  (void)url;
@@ -23,7 +23,7 @@ int sceHttp2CreateRequestWithURL(int tmpl_id, const char* method, const char* ur
  return 0;
 }
 
-int sceHttp2CreateTemplate(int lib_http2_ctx_id, const char* user_agent, int http_ver, int is_auto_proxy_conf) {
+int APS5_VABI sceHttp2CreateTemplate(int lib_http2_ctx_id, const char* user_agent, int http_ver, int is_auto_proxy_conf) {
  (void)lib_http2_ctx_id;
  (void)user_agent;
  (void)http_ver;
@@ -33,19 +33,19 @@ int sceHttp2CreateTemplate(int lib_http2_ctx_id, const char* user_agent, int htt
  return 0;
 }
 
-int sceHttp2DeleteRequest(int req_id) {
+int APS5_VABI sceHttp2DeleteRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2DeleteTemplate(int tmpl_id) {
+int APS5_VABI sceHttp2DeleteTemplate(int tmpl_id) {
  (void)tmpl_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2GetAllResponseHeaders(int req_id, char** header, size_t* header_size) {
+int APS5_VABI sceHttp2GetAllResponseHeaders(int req_id, char** header, size_t* header_size) {
  (void)req_id;
  (void)header;
  (void)header_size;
@@ -53,7 +53,7 @@ int sceHttp2GetAllResponseHeaders(int req_id, char** header, size_t* header_size
  return 0;
 }
 
-int sceHttp2GetResponseContentLength(int req_id, int* result, uint64_t* content_length) {
+int APS5_VABI sceHttp2GetResponseContentLength(int req_id, int* result, uint64_t* content_length) {
  (void)req_id;
  (void)result;
  (void)content_length;
@@ -61,14 +61,14 @@ int sceHttp2GetResponseContentLength(int req_id, int* result, uint64_t* content_
  return 0;
 }
 
-int sceHttp2GetStatusCode(int req_id, int* status_code) {
+int APS5_VABI sceHttp2GetStatusCode(int req_id, int* status_code) {
  (void)req_id;
  (void)status_code;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2Init(int libnet_mem_id, int libssl_ctx_id, size_t pool_size, int max_concurrent_request) {
+int APS5_VABI sceHttp2Init(int libnet_mem_id, int libssl_ctx_id, size_t pool_size, int max_concurrent_request) {
  (void)libnet_mem_id;
  (void)libssl_ctx_id;
  (void)pool_size;
@@ -77,7 +77,7 @@ int sceHttp2Init(int libnet_mem_id, int libssl_ctx_id, size_t pool_size, int max
  return 0;
 }
 
-int sceHttp2ReadData(int req_id, void* data, size_t size) {
+int APS5_VABI sceHttp2ReadData(int req_id, void* data, size_t size) {
  (void)req_id;
  (void)data;
  (void)size;
@@ -85,7 +85,7 @@ int sceHttp2ReadData(int req_id, void* data, size_t size) {
  return 0;
 }
 
-int sceHttp2ReadDataAsync(int req_id, void* data, size_t size, void* kqueue_option, void* option) {
+int APS5_VABI sceHttp2ReadDataAsync(int req_id, void* data, size_t size, void* kqueue_option, void* option) {
  (void)req_id;
  (void)data;
  (void)size;
@@ -95,7 +95,7 @@ int sceHttp2ReadDataAsync(int req_id, void* data, size_t size, void* kqueue_opti
  return 0;
 }
 
-int sceHttp2SendRequest(int req_id, const void* post_data, size_t size) {
+int APS5_VABI sceHttp2SendRequest(int req_id, const void* post_data, size_t size) {
  (void)req_id;
  (void)post_data;
  (void)size;
@@ -103,7 +103,7 @@ int sceHttp2SendRequest(int req_id, const void* post_data, size_t size) {
  return 0;
 }
 
-int sceHttp2SendRequestAsync(int req_id, const void* post_data, size_t size, void* kqueue_option, void* option) {
+int APS5_VABI sceHttp2SendRequestAsync(int req_id, const void* post_data, size_t size, void* kqueue_option, void* option) {
  (void)req_id;
  (void)post_data;
  (void)size;
@@ -113,49 +113,49 @@ int sceHttp2SendRequestAsync(int req_id, const void* post_data, size_t size, voi
  return 0;
 }
 
-int sceHttp2SetAuthEnabled(int id, int is_enable) {
+int APS5_VABI sceHttp2SetAuthEnabled(int id, int is_enable) {
  (void)id;
  (void)is_enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetAutoRedirect(int id, int enable) {
+int APS5_VABI sceHttp2SetAutoRedirect(int id, int enable) {
  (void)id;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetConnectionWaitTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetConnectionWaitTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetConnectTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetConnectTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetInflateGZIPEnabled(int id, int enable) {
+int APS5_VABI sceHttp2SetInflateGZIPEnabled(int id, int enable) {
  (void)id;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetRecvTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetRecvTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetRedirectCallback(int id, void* cb_func, void* user_arg) {
+int APS5_VABI sceHttp2SetRedirectCallback(int id, void* cb_func, void* user_arg) {
  (void)id;
  (void)cb_func;
  (void)user_arg;
@@ -163,28 +163,28 @@ int sceHttp2SetRedirectCallback(int id, void* cb_func, void* user_arg) {
  return 0;
 }
 
-int sceHttp2SetRequestContentLength(int id, uint64_t content_length) {
+int APS5_VABI sceHttp2SetRequestContentLength(int id, uint64_t content_length) {
  (void)id;
  (void)content_length;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetResolveTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetResolveTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetSendTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetSendTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SetSslCallback(int id, void* cb_func, void* user_arg) {
+int APS5_VABI sceHttp2SetSslCallback(int id, void* cb_func, void* user_arg) {
  (void)id;
  (void)cb_func;
  (void)user_arg;
@@ -192,34 +192,34 @@ int sceHttp2SetSslCallback(int id, void* cb_func, void* user_arg) {
  return 0;
 }
 
-int sceHttp2SetTimeOut(int id, uint32_t usec) {
+int APS5_VABI sceHttp2SetTimeOut(int id, uint32_t usec) {
  (void)id;
  (void)usec;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SslDisableOption(int id, uint32_t ssl_flags) {
+int APS5_VABI sceHttp2SslDisableOption(int id, uint32_t ssl_flags) {
  (void)id;
  (void)ssl_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2SslEnableOption(int id, uint32_t ssl_flags) {
+int APS5_VABI sceHttp2SslEnableOption(int id, uint32_t ssl_flags) {
  (void)id;
  (void)ssl_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2Term(int lib_http2_ctx_id) {
+int APS5_VABI sceHttp2Term(int lib_http2_ctx_id) {
  (void)lib_http2_ctx_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceHttp2WaitAsync(int req_id, Http2AsyncResult* result, uint32_t* timeout, void* option) {
+int APS5_VABI sceHttp2WaitAsync(int req_id, Http2AsyncResult* result, uint32_t* timeout, void* option) {
  (void)req_id;
  (void)result;
  (void)timeout;

core/libs/prx/libSceIme/Export.cpp

@@ -5,12 +5,12 @@
 
 extern "C" {
 
-int sceImeClose_nid_postfix(void) {
+int APS5_VABI sceImeClose_nid_postfix(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeGetPanelSize(const Param* param, uint32_t* width, uint32_t* height) {
+int APS5_VABI sceImeGetPanelSize(const Param* param, uint32_t* width, uint32_t* height) {
  (void)param;
  (void)width;
  (void)height;
@@ -18,73 +18,73 @@ int sceImeGetPanelSize(const Param* param, uint32_t* width, uint32_t* height) {
  return 0;
 }
 
-int sceImeKeyboardClose(int32_t user_id) {
+int APS5_VABI sceImeKeyboardClose(int32_t user_id) {
  (void)user_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeKeyboardGetInfo(uint32_t resource_id, KeyboardInfo* info) {
+int APS5_VABI sceImeKeyboardGetInfo(uint32_t resource_id, KeyboardInfo* info) {
  (void)resource_id;
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeKeyboardGetResourceId(int32_t user_id, KeyboardResourceIdArray* resource_ids) {
+int APS5_VABI sceImeKeyboardGetResourceId(int32_t user_id, KeyboardResourceIdArray* resource_ids) {
  (void)user_id;
  (void)resource_ids;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeKeyboardOpen(int32_t user_id, const KeyboardParam* param) {
+int APS5_VABI sceImeKeyboardOpen(int32_t user_id, const KeyboardParam* param) {
  (void)user_id;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeKeyboardSetMode(int32_t user_id, uint32_t mode) {
+int APS5_VABI sceImeKeyboardSetMode(int32_t user_id, uint32_t mode) {
  (void)user_id;
  (void)mode;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeOpen_nid_postfix(const Param* param, const ExtendedParam* extended) {
+int APS5_VABI sceImeOpen_nid_postfix(const Param* param, const ExtendedParam* extended) {
  (void)param;
  (void)extended;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void sceImeParamInit(Param* param) {
+void APS5_VABI sceImeParamInit(Param* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceImeSetCaret(const Caret* caret) {
+int APS5_VABI sceImeSetCaret(const Caret* caret) {
  (void)caret;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeSetText(const char16_t* text, uint32_t length) {
+int APS5_VABI sceImeSetText(const char16_t* text, uint32_t length) {
  (void)text;
  (void)length;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeSetTextGeometry(TextAreaMode mode, const TextGeometry* geometry) {
+int APS5_VABI sceImeSetTextGeometry(TextAreaMode mode, const TextGeometry* geometry) {
  (void)mode;
  (void)geometry;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeUpdate(EventHandler handler) {
+int APS5_VABI sceImeUpdate(EventHandler handler) {
  (void)handler;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceImeDialog/Export.cpp

@@ -5,18 +5,18 @@
 
 extern "C" {
 
-int sceImeDialogAbort(void) {
+int APS5_VABI sceImeDialogAbort(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeDialogGetPanelPositionAndForm(PositionAndForm* form) {
+int APS5_VABI sceImeDialogGetPanelPositionAndForm(PositionAndForm* form) {
  (void)form;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeDialogGetPanelSize(const Param* param, uint32_t* width, uint32_t* height) {
+int APS5_VABI sceImeDialogGetPanelSize(const Param* param, uint32_t* width, uint32_t* height) {
  (void)param;
  (void)width;
  (void)height;
@@ -24,7 +24,7 @@ int sceImeDialogGetPanelSize(const Param* param, uint32_t* width, uint32_t* heig
  return 0;
 }
 
-int sceImeDialogGetPanelSizeExtended(const Param* param, const ExtendedParam* extended, uint32_t* width, uint32_t* height) {
+int APS5_VABI sceImeDialogGetPanelSizeExtended(const Param* param, const ExtendedParam* extended, uint32_t* width, uint32_t* height) {
  (void)param;
  (void)extended;
  (void)width;
@@ -33,25 +33,25 @@ int sceImeDialogGetPanelSizeExtended(const Param* param, const ExtendedParam* ex
  return 0;
 }
 
-int sceImeDialogGetResult(Result* result) {
+int APS5_VABI sceImeDialogGetResult(Result* result) {
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeDialogGetStatus(void) {
+int APS5_VABI sceImeDialogGetStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeDialogInit(const Param* param, const ExtendedParam* extended) {
+int APS5_VABI sceImeDialogInit(const Param* param, const ExtendedParam* extended) {
  (void)param;
  (void)extended;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceImeDialogTerm(void) {
+int APS5_VABI sceImeDialogTerm(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceKeyboard/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceKeyboardClose(int32_t handle) {
+int APS5_VABI sceKeyboardClose(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceKeyboardGetKey2Char(int32_t handle, int32_t arrange, uint32_t led, uint32_t modifier_key, uint16_t key_code, KeyboardCharData* char_data) {
+int APS5_VABI sceKeyboardGetKey2Char(int32_t handle, int32_t arrange, uint32_t led, uint32_t modifier_key, uint16_t key_code, KeyboardCharData* char_data) {
  (void)handle;
  (void)arrange;
  (void)led;
@@ -22,12 +22,12 @@ int sceKeyboardGetKey2Char(int32_t handle, int32_t arrange, uint32_t led, uint32
  return 0;
 }
 
-int sceKeyboardInit(void) {
+int APS5_VABI sceKeyboardInit(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceKeyboardOpen(int user_id, int32_t type, int32_t index, const void* param) {
+int APS5_VABI sceKeyboardOpen(int user_id, int32_t type, int32_t index, const void* param) {
  (void)user_id;
  (void)type;
  (void)index;
@@ -36,7 +36,7 @@ int sceKeyboardOpen(int user_id, int32_t type, int32_t index, const void* param)
  return 0;
 }
 
-int sceKeyboardRead(int32_t handle, KeyboardData* data, int32_t num) {
+int APS5_VABI sceKeyboardRead(int32_t handle, KeyboardData* data, int32_t num) {
  (void)handle;
  (void)data;
  (void)num;
@@ -44,7 +44,7 @@ int sceKeyboardRead(int32_t handle, KeyboardData* data, int32_t num) {
  return 0;
 }
 
-int sceKeyboardReadState(int32_t handle, KeyboardData* data) {
+int APS5_VABI sceKeyboardReadState(int32_t handle, KeyboardData* data) {
  (void)handle;
  (void)data;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceLibcInternal/Export.cpp

@@ -6,7 +6,7 @@
 extern "C" {
 
 
-void sceLibcHeapGetTraceInfo_nid_postfix(Info* info) {
+void APS5_VABI sceLibcHeapGetTraceInfo_nid_postfix(Info* info) {
  (void)info;
  NotImplemented_nid_no_patch(__func__);
 }

core/libs/prx/libSceLoginDialog/Export.cpp

@@ -5,39 +5,39 @@
 
 extern "C" {
 
-int sceLoginDialogClose(void) {
+int APS5_VABI sceLoginDialogClose(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogGetResult(void* result) {
+int APS5_VABI sceLoginDialogGetResult(void* result) {
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogGetStatus(void) {
+int APS5_VABI sceLoginDialogGetStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogInitialize(void) {
+int APS5_VABI sceLoginDialogInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogOpen(const void* param) {
+int APS5_VABI sceLoginDialogOpen(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogTerminate(void) {
+int APS5_VABI sceLoginDialogTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceLoginDialogUpdateStatus(void) {
+int APS5_VABI sceLoginDialogUpdateStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceMouse/Export.cpp

@@ -5,18 +5,18 @@
 
 extern "C" {
 
-int sceMouseClose(int32_t handle) {
+int APS5_VABI sceMouseClose(int32_t handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMouseInit(void) {
+int APS5_VABI sceMouseInit(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMouseOpen(int user_id, int32_t type, int32_t index, const void* param) {
+int APS5_VABI sceMouseOpen(int user_id, int32_t type, int32_t index, const void* param) {
  (void)user_id;
  (void)type;
  (void)index;
@@ -25,7 +25,7 @@ int sceMouseOpen(int user_id, int32_t type, int32_t index, const void* param) {
  return 0;
 }
 
-int sceMouseRead(int32_t handle, MouseData* data, int32_t num) {
+int APS5_VABI sceMouseRead(int32_t handle, MouseData* data, int32_t num) {
  (void)handle;
  (void)data;
  (void)num;

core/libs/prx/libSceMsgDialog/Export.cpp

@@ -5,60 +5,60 @@
 
 extern "C" {
 
-int sceMsgDialogClose(void) {
+int APS5_VABI sceMsgDialogClose(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogGetResult(void* result) {
+int APS5_VABI sceMsgDialogGetResult(void* result) {
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogGetStatus(void) {
+int APS5_VABI sceMsgDialogGetStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogInitialize(void) {
+int APS5_VABI sceMsgDialogInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogOpen(const void* param) {
+int APS5_VABI sceMsgDialogOpen(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogProgressBarInc(int target, uint32_t delta) {
+int APS5_VABI sceMsgDialogProgressBarInc(int target, uint32_t delta) {
  (void)target;
  (void)delta;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogProgressBarSetMsg(int target, const char* msg) {
+int APS5_VABI sceMsgDialogProgressBarSetMsg(int target, const char* msg) {
  (void)target;
  (void)msg;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogProgressBarSetValue(int target, uint32_t rate) {
+int APS5_VABI sceMsgDialogProgressBarSetValue(int target, uint32_t rate) {
  (void)target;
  (void)rate;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogTerminate(void) {
+int APS5_VABI sceMsgDialogTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceMsgDialogUpdateStatus(void) {
+int APS5_VABI sceMsgDialogUpdateStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceNet/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNetAccept(int s, void* addr, uint32_t* addrlen) {
+int APS5_VABI sceNetAccept(int s, void* addr, uint32_t* addrlen) {
  (void)s;
  (void)addr;
  (void)addrlen;
@@ -13,7 +13,7 @@ int sceNetAccept(int s, void* addr, uint32_t* addrlen) {
  return 0;
 }
 
-int sceNetBind_nid_postfix(int s, const void* addr, uint32_t addrlen) {
+int APS5_VABI sceNetBind_nid_postfix(int s, const void* addr, uint32_t addrlen) {
  (void)s;
  (void)addr;
  (void)addrlen;
@@ -21,7 +21,7 @@ int sceNetBind_nid_postfix(int s, const void* addr, uint32_t addrlen) {
  return 0;
 }
 
-int sceNetEpollControl(int eid, int op, int id, const NetEpollEvent* event) {
+int APS5_VABI sceNetEpollControl(int eid, int op, int id, const NetEpollEvent* event) {
  (void)eid;
  (void)op;
  (void)id;
@@ -30,20 +30,20 @@ int sceNetEpollControl(int eid, int op, int id, const NetEpollEvent* event) {
  return 0;
 }
 
-int sceNetEpollCreate(const char* name, int flags) {
+int APS5_VABI sceNetEpollCreate(const char* name, int flags) {
  (void)name;
  (void)flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetEpollDestroy(int eid) {
+int APS5_VABI sceNetEpollDestroy(int eid) {
  (void)eid;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetEpollWait(int eid, NetEpollEvent* events, int maxevents, int timeout) {
+int APS5_VABI sceNetEpollWait(int eid, NetEpollEvent* events, int maxevents, int timeout) {
  (void)eid;
  (void)events;
  (void)maxevents;
@@ -52,7 +52,7 @@ int sceNetEpollWait(int eid, NetEpollEvent* events, int maxevents, int timeout)
  return 0;
 }
 
-int sceNetEtherNtostr(const NetEtherAddr* n, char* str, size_t len) {
+int APS5_VABI sceNetEtherNtostr(const NetEtherAddr* n, char* str, size_t len) {
  (void)n;
  (void)str;
  (void)len;
@@ -60,14 +60,14 @@ int sceNetEtherNtostr(const NetEtherAddr* n, char* str, size_t len) {
  return 0;
 }
 
-int sceNetGetMacAddress(NetEtherAddr* addr, int flags) {
+int APS5_VABI sceNetGetMacAddress(NetEtherAddr* addr, int flags) {
  (void)addr;
  (void)flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetGetSockInfo(int s, void* info, int n, int flags) {
+int APS5_VABI sceNetGetSockInfo(int s, void* info, int n, int flags) {
  (void)s;
  (void)info;
  (void)n;
@@ -76,7 +76,7 @@ int sceNetGetSockInfo(int s, void* info, int n, int flags) {
  return 0;
 }
 
-int sceNetGetsockname(int s, void* addr, uint32_t* addrlen) {
+int APS5_VABI sceNetGetsockname(int s, void* addr, uint32_t* addrlen) {
  (void)s;
  (void)addr;
  (void)addrlen;
@@ -84,13 +84,13 @@ int sceNetGetsockname(int s, void* addr, uint32_t* addrlen) {
  return 0;
 }
 
-uint32_t sceNetHtonl_nid_postfix(uint32_t host32) {
+uint32_t APS5_VABI sceNetHtonl_nid_postfix(uint32_t host32) {
  (void)host32;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint16_t sceNetHtons_nid_postfix(uint16_t host16) {
+uint16_t APS5_VABI sceNetHtons_nid_postfix(uint16_t host16) {
  (void)host16;
  NotImplemented_nid_no_patch(__func__);
  return 0;
@@ -105,7 +105,7 @@ const char* sceNetInetNtop(int af, const void* src, char* dst, uint32_t size) {
  return nullptr;
 }
 
-int sceNetInetPton(int af, const char* src, void* dst) {
+int APS5_VABI sceNetInetPton(int af, const char* src, void* dst) {
  (void)af;
  (void)src;
  (void)dst;
@@ -113,31 +113,31 @@ int sceNetInetPton(int af, const char* src, void* dst) {
  return 0;
 }
 
-int sceNetInit_nid_postfix(void) {
+int APS5_VABI sceNetInit_nid_postfix(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetListen(int s, int backlog) {
+int APS5_VABI sceNetListen(int s, int backlog) {
  (void)s;
  (void)backlog;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint32_t sceNetNtohl_nid_postfix(uint32_t net32) {
+uint32_t APS5_VABI sceNetNtohl_nid_postfix(uint32_t net32) {
  (void)net32;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-uint16_t sceNetNtohs_nid_postfix(uint16_t net16) {
+uint16_t APS5_VABI sceNetNtohs_nid_postfix(uint16_t net16) {
  (void)net16;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetPoolCreate(const char* name, int size, int flags) {
+int APS5_VABI sceNetPoolCreate(const char* name, int size, int flags) {
  (void)name;
  (void)size;
  (void)flags;
@@ -145,13 +145,13 @@ int sceNetPoolCreate(const char* name, int size, int flags) {
  return 0;
 }
 
-int sceNetPoolDestroy(int memid) {
+int APS5_VABI sceNetPoolDestroy(int memid) {
  (void)memid;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetResolverCreate(const char* name, int memid, int flags) {
+int APS5_VABI sceNetResolverCreate(const char* name, int memid, int flags) {
  (void)name;
  (void)memid;
  (void)flags;
@@ -159,7 +159,7 @@ int sceNetResolverCreate(const char* name, int memid, int flags) {
  return 0;
 }
 
-int sceNetResolverStartNtoa(int rid, const char* hostname, void* addr, int timeout, int retry, int flags) {
+int APS5_VABI sceNetResolverStartNtoa(int rid, const char* hostname, void* addr, int timeout, int retry, int flags) {
  (void)rid;
  (void)hostname;
  (void)addr;
@@ -170,7 +170,7 @@ int sceNetResolverStartNtoa(int rid, const char* hostname, void* addr, int timeo
  return 0;
 }
 
-int sceNetSetsockopt(int s, int level, int optname, const void* optval, uint32_t optlen) {
+int APS5_VABI sceNetSetsockopt(int s, int level, int optname, const void* optval, uint32_t optlen) {
  (void)s;
  (void)level;
  (void)optname;
@@ -180,14 +180,14 @@ int sceNetSetsockopt(int s, int level, int optname, const void* optval, uint32_t
  return 0;
 }
 
-int sceNetShutdown(int s, int how) {
+int APS5_VABI sceNetShutdown(int s, int how) {
  (void)s;
  (void)how;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetSocket(const char* name, int family, int type, int protocol) {
+int APS5_VABI sceNetSocket(const char* name, int family, int type, int protocol) {
  (void)name;
  (void)family;
  (void)type;
@@ -196,7 +196,7 @@ int sceNetSocket(const char* name, int family, int type, int protocol) {
  return 0;
 }
 
-int sceNetSocketClose(int s) {
+int APS5_VABI sceNetSocketClose(int s) {
  (void)s;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceNetCtl/Export.cpp

@@ -5,49 +5,49 @@
 
 extern "C" {
 
-int sceNetCtlCheckCallback(void) {
+int APS5_VABI sceNetCtlCheckCallback(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlGetInfo(int code, NetCtlInfo* info) {
+int APS5_VABI sceNetCtlGetInfo(int code, NetCtlInfo* info) {
  (void)code;
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlGetNatInfo(NetCtlNatInfo* nat_info) {
+int APS5_VABI sceNetCtlGetNatInfo(NetCtlNatInfo* nat_info) {
  (void)nat_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlGetResult(int event_type, int* error_code) {
+int APS5_VABI sceNetCtlGetResult(int event_type, int* error_code) {
  (void)event_type;
  (void)error_code;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlGetState(int* state) {
+int APS5_VABI sceNetCtlGetState(int* state) {
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlGetStateV6(int* state) {
+int APS5_VABI sceNetCtlGetStateV6(int* state) {
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlInit(void) {
+int APS5_VABI sceNetCtlInit(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNetCtlRegisterCallback(NetCtlCallback func, void* arg, int* cid) {
+int APS5_VABI sceNetCtlRegisterCallback(NetCtlCallback func, void* arg, int* cid) {
  (void)func;
  (void)arg;
  (void)cid;
@@ -55,11 +55,11 @@ int sceNetCtlRegisterCallback(NetCtlCallback func, void* arg, int* cid) {
  return 0;
 }
 
-void sceNetCtlTerm(void) {
+void APS5_VABI sceNetCtlTerm(void) {
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceNetCtlUnregisterCallback(int cid) {
+int APS5_VABI sceNetCtlUnregisterCallback(int cid) {
  (void)cid;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceNgs2.native/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_pos, uint32_t num_samples, Ngs2WaveformBlock* block) {
+int APS5_VABI sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_pos, uint32_t num_samples, Ngs2WaveformBlock* block) {
  (void)format;
  (void)sample_pos;
  (void)num_samples;
@@ -14,7 +14,7 @@ int sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_p
  return 0;
 }
 
-int sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceParam* source, Ngs2GeomAttribute* out_attrib, uint32_t flags) {
+int APS5_VABI sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceParam* source, Ngs2GeomAttribute* out_attrib, uint32_t flags) {
  (void)listener;
  (void)source;
  (void)out_attrib;
@@ -23,7 +23,7 @@ int sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceP
  return 0;
 }
 
-int sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListenerWork* out_work, uint32_t flags) {
+int APS5_VABI sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListenerWork* out_work, uint32_t flags) {
  (void)param;
  (void)out_work;
  (void)flags;
@@ -31,19 +31,19 @@ int sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListener
  return 0;
 }
 
-int sceNgs2GeomResetListenerParam(Ngs2GeomListenerParam* out_listener_param) {
+int APS5_VABI sceNgs2GeomResetListenerParam(Ngs2GeomListenerParam* out_listener_param) {
  (void)out_listener_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2GeomResetSourceParam(Ngs2GeomSourceParam* out_source_param) {
+int APS5_VABI sceNgs2GeomResetSourceParam(Ngs2GeomSourceParam* out_source_param) {
  (void)out_source_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uint32_t num_params, uint32_t matrix_format, float* out_volume_matrix) {
+int APS5_VABI sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uint32_t num_params, uint32_t matrix_format, float* out_volume_matrix) {
  (void)work;
  (void)params;
  (void)num_params;
@@ -53,7 +53,7 @@ int sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uin
  return 0;
 }
 
-int sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_angle, uint32_t num_speakers) {
+int APS5_VABI sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_angle, uint32_t num_speakers) {
  (void)work;
  (void)speaker_angles;
  (void)unit_angle;
@@ -62,7 +62,7 @@ int sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_an
  return 0;
 }
 
-int sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInfo* info) {
+int APS5_VABI sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInfo* info) {
  (void)data;
  (void)data_size;
  (void)info;
@@ -70,7 +70,7 @@ int sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInf
  return 0;
 }
 
-int sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
  (void)system_handle;
  (void)rack_id;
  (void)option;
@@ -80,7 +80,7 @@ int sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackO
  return 0;
 }
 
-int sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
  (void)system_handle;
  (void)rack_id;
  (void)option;
@@ -90,14 +90,14 @@ int sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, co
  return 0;
 }
 
-int sceNgs2RackDestroy(uintptr_t rack_handle, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2RackDestroy(uintptr_t rack_handle, Ngs2ContextBufferInfo* buffer_info) {
  (void)rack_handle;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_t* handle) {
  (void)rack_handle;
  (void)voice_id;
  (void)handle;
@@ -105,13 +105,13 @@ int sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_
  return 0;
 }
 
-int sceNgs2RackLock(uintptr_t rack_handle) {
+int APS5_VABI sceNgs2RackLock(uintptr_t rack_handle) {
  (void)rack_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, Ngs2ContextBufferInfo* buffer_info) {
  (void)rack_id;
  (void)option;
  (void)buffer_info;
@@ -119,13 +119,13 @@ int sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, N
  return 0;
 }
 
-int sceNgs2RackUnlock(uintptr_t rack_handle) {
+int APS5_VABI sceNgs2RackUnlock(uintptr_t rack_handle) {
  (void)rack_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
+int APS5_VABI sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
  (void)option;
  (void)buffer_info;
  (void)handle;
@@ -133,7 +133,7 @@ int sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferI
  return 0;
 }
 
-int sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
+int APS5_VABI sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
  (void)option;
  (void)allocator;
  (void)handle;
@@ -141,14 +141,14 @@ int sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2B
  return 0;
 }
 
-int sceNgs2SystemDestroy(uintptr_t system_handle, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2SystemDestroy(uintptr_t system_handle, Ngs2ContextBufferInfo* buffer_info) {
  (void)system_handle;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t info_size) {
+int APS5_VABI sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t info_size) {
  (void)system_handle;
  (void)info;
  (void)info_size;
@@ -156,14 +156,14 @@ int sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t i
  return 0;
 }
 
-int sceNgs2SystemQueryBufferSize(const Ngs2SystemOption* option, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2SystemQueryBufferSize(const Ngs2SystemOption* option, Ngs2ContextBufferInfo* buffer_info) {
  (void)option;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buffer_info, uint32_t num_buffer_info) {
+int APS5_VABI sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buffer_info, uint32_t num_buffer_info) {
  (void)system_handle;
  (void)buffer_info;
  (void)num_buffer_info;
@@ -171,27 +171,27 @@ int sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buf
  return 0;
 }
 
-int sceNgs2SystemResetOption(Ngs2SystemOption* option) {
+int APS5_VABI sceNgs2SystemResetOption(Ngs2SystemOption* option) {
  (void)option;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemSetGrainSamples(uintptr_t system_handle, uint32_t num_samples) {
+int APS5_VABI sceNgs2SystemSetGrainSamples(uintptr_t system_handle, uint32_t num_samples) {
  (void)system_handle;
  (void)num_samples;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2VoiceControl(uintptr_t voice_handle, const Ngs2VoiceParamHeader* param_list) {
+int APS5_VABI sceNgs2VoiceControl(uintptr_t voice_handle, const Ngs2VoiceParamHeader* param_list) {
  (void)voice_handle;
  (void)param_list;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t state_size) {
+int APS5_VABI sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t state_size) {
  (void)voice_handle;
  (void)state;
  (void)state_size;
@@ -199,14 +199,14 @@ int sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t s
  return 0;
 }
 
-int sceNgs2VoiceGetStateFlags(uintptr_t voice_handle, uint32_t* state_flags) {
+int APS5_VABI sceNgs2VoiceGetStateFlags(uintptr_t voice_handle, uint32_t* state_flags) {
  (void)voice_handle;
  (void)state_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2VoiceRunCommands(uintptr_t voice_handle, const void* commands, uint32_t num_commands, uint32_t flags) {
+int APS5_VABI sceNgs2VoiceRunCommands(uintptr_t voice_handle, const void* commands, uint32_t num_commands, uint32_t flags) {
  (void)voice_handle;
  (void)commands;
  (void)num_commands;

core/libs/prx/libSceNgs2/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_pos, uint32_t num_samples, Ngs2WaveformBlock* block) {
+int APS5_VABI sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_pos, uint32_t num_samples, Ngs2WaveformBlock* block) {
  (void)format;
  (void)sample_pos;
  (void)num_samples;
@@ -14,7 +14,7 @@ int sceNgs2CalcWaveformBlock(const Ngs2WaveformFormat* format, uint32_t sample_p
  return 0;
 }
 
-int sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceParam* source, Ngs2GeomAttribute* out_attrib, uint32_t flags) {
+int APS5_VABI sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceParam* source, Ngs2GeomAttribute* out_attrib, uint32_t flags) {
  (void)listener;
  (void)source;
  (void)out_attrib;
@@ -23,7 +23,7 @@ int sceNgs2GeomApply(const Ngs2GeomListenerWork* listener, const Ngs2GeomSourceP
  return 0;
 }
 
-int sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListenerWork* out_work, uint32_t flags) {
+int APS5_VABI sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListenerWork* out_work, uint32_t flags) {
  (void)param;
  (void)out_work;
  (void)flags;
@@ -31,19 +31,19 @@ int sceNgs2GeomCalcListener(const Ngs2GeomListenerParam* param, Ngs2GeomListener
  return 0;
 }
 
-int sceNgs2GeomResetListenerParam(Ngs2GeomListenerParam* out_listener_param) {
+int APS5_VABI sceNgs2GeomResetListenerParam(Ngs2GeomListenerParam* out_listener_param) {
  (void)out_listener_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2GeomResetSourceParam(Ngs2GeomSourceParam* out_source_param) {
+int APS5_VABI sceNgs2GeomResetSourceParam(Ngs2GeomSourceParam* out_source_param) {
  (void)out_source_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uint32_t num_params, uint32_t matrix_format, float* out_volume_matrix) {
+int APS5_VABI sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uint32_t num_params, uint32_t matrix_format, float* out_volume_matrix) {
  (void)work;
  (void)params;
  (void)num_params;
@@ -53,7 +53,7 @@ int sceNgs2PanGetVolumeMatrix(Ngs2PanWork* work, const Ngs2PanParam* params, uin
  return 0;
 }
 
-int sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_angle, uint32_t num_speakers) {
+int APS5_VABI sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_angle, uint32_t num_speakers) {
  (void)work;
  (void)speaker_angles;
  (void)unit_angle;
@@ -62,7 +62,7 @@ int sceNgs2PanInit(Ngs2PanWork* work, const float* speaker_angles, float unit_an
  return 0;
 }
 
-int sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInfo* info) {
+int APS5_VABI sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInfo* info) {
  (void)data;
  (void)data_size;
  (void)info;
@@ -70,7 +70,7 @@ int sceNgs2ParseWaveformData(const void* data, size_t data_size, Ngs2WaveformInf
  return 0;
 }
 
-int sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
  (void)system_handle;
  (void)rack_id;
  (void)option;
@@ -80,7 +80,7 @@ int sceNgs2RackCreate(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackO
  return 0;
 }
 
-int sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, const Ngs2RackOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
  (void)system_handle;
  (void)rack_id;
  (void)option;
@@ -90,14 +90,14 @@ int sceNgs2RackCreateWithAllocator(uintptr_t system_handle, uint32_t rack_id, co
  return 0;
 }
 
-int sceNgs2RackDestroy(uintptr_t rack_handle, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2RackDestroy(uintptr_t rack_handle, Ngs2ContextBufferInfo* buffer_info) {
  (void)rack_handle;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_t* handle) {
+int APS5_VABI sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_t* handle) {
  (void)rack_handle;
  (void)voice_id;
  (void)handle;
@@ -105,13 +105,13 @@ int sceNgs2RackGetVoiceHandle(uintptr_t rack_handle, uint32_t voice_id, uintptr_
  return 0;
 }
 
-int sceNgs2RackLock(uintptr_t rack_handle) {
+int APS5_VABI sceNgs2RackLock(uintptr_t rack_handle) {
  (void)rack_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, Ngs2ContextBufferInfo* buffer_info) {
  (void)rack_id;
  (void)option;
  (void)buffer_info;
@@ -119,13 +119,13 @@ int sceNgs2RackQueryBufferSize(uint32_t rack_id, const Ngs2RackOption* option, N
  return 0;
 }
 
-int sceNgs2RackUnlock(uintptr_t rack_handle) {
+int APS5_VABI sceNgs2RackUnlock(uintptr_t rack_handle) {
  (void)rack_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
+int APS5_VABI sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferInfo* buffer_info, uintptr_t* handle) {
  (void)option;
  (void)buffer_info;
  (void)handle;
@@ -133,7 +133,7 @@ int sceNgs2SystemCreate(const Ngs2SystemOption* option, const Ngs2ContextBufferI
  return 0;
 }
 
-int sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
+int APS5_VABI sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2BufferAllocator* allocator, uintptr_t* handle) {
  (void)option;
  (void)allocator;
  (void)handle;
@@ -141,14 +141,14 @@ int sceNgs2SystemCreateWithAllocator(const Ngs2SystemOption* option, const Ngs2B
  return 0;
 }
 
-int sceNgs2SystemDestroy(uintptr_t system_handle, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2SystemDestroy(uintptr_t system_handle, Ngs2ContextBufferInfo* buffer_info) {
  (void)system_handle;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t info_size) {
+int APS5_VABI sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t info_size) {
  (void)system_handle;
  (void)info;
  (void)info_size;
@@ -156,14 +156,14 @@ int sceNgs2SystemGetInfo(uintptr_t system_handle, Ngs2SystemInfo* info, size_t i
  return 0;
 }
 
-int sceNgs2SystemQueryBufferSize(const Ngs2SystemOption* option, Ngs2ContextBufferInfo* buffer_info) {
+int APS5_VABI sceNgs2SystemQueryBufferSize(const Ngs2SystemOption* option, Ngs2ContextBufferInfo* buffer_info) {
  (void)option;
  (void)buffer_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buffer_info, uint32_t num_buffer_info) {
+int APS5_VABI sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buffer_info, uint32_t num_buffer_info) {
  (void)system_handle;
  (void)buffer_info;
  (void)num_buffer_info;
@@ -171,21 +171,21 @@ int sceNgs2SystemRender(uintptr_t system_handle, const Ngs2RenderBufferInfo* buf
  return 0;
 }
 
-int sceNgs2SystemSetGrainSamples(uintptr_t system_handle, uint32_t num_samples) {
+int APS5_VABI sceNgs2SystemSetGrainSamples(uintptr_t system_handle, uint32_t num_samples) {
  (void)system_handle;
  (void)num_samples;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2VoiceControl(uintptr_t voice_handle, const Ngs2VoiceParamHeader* param_list) {
+int APS5_VABI sceNgs2VoiceControl(uintptr_t voice_handle, const Ngs2VoiceParamHeader* param_list) {
  (void)voice_handle;
  (void)param_list;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t state_size) {
+int APS5_VABI sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t state_size) {
  (void)voice_handle;
  (void)state;
  (void)state_size;
@@ -193,7 +193,7 @@ int sceNgs2VoiceGetState(uintptr_t voice_handle, Ngs2VoiceState* state, size_t s
  return 0;
 }
 
-int sceNgs2VoiceGetStateFlags(uintptr_t voice_handle, uint32_t* state_flags) {
+int APS5_VABI sceNgs2VoiceGetStateFlags(uintptr_t voice_handle, uint32_t* state_flags) {
  (void)voice_handle;
  (void)state_flags;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceNpAuth/Export.cpp

@@ -5,30 +5,30 @@
 
 extern "C" {
 
-int sceNpAuthAbortRequest(int req_id) {
+int APS5_VABI sceNpAuthAbortRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpAuthCreateAsyncRequest(const void* param) {
+int APS5_VABI sceNpAuthCreateAsyncRequest(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpAuthCreateRequest(void) {
+int APS5_VABI sceNpAuthCreateRequest(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpAuthDeleteRequest(int req_id) {
+int APS5_VABI sceNpAuthDeleteRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpAuthGetAuthorizationCodeV3(int req_id, const void* param, void* auth_code, int* issuer_id) {
+int APS5_VABI sceNpAuthGetAuthorizationCodeV3(int req_id, const void* param, void* auth_code, int* issuer_id) {
  (void)req_id;
  (void)param;
  (void)auth_code;
@@ -37,7 +37,7 @@ int sceNpAuthGetAuthorizationCodeV3(int req_id, const void* param, void* auth_co
  return 0;
 }
 
-int sceNpAuthGetIdTokenV3(int req_id, const void* param, void* id_token) {
+int APS5_VABI sceNpAuthGetIdTokenV3(int req_id, const void* param, void* id_token) {
  (void)req_id;
  (void)param;
  (void)id_token;
@@ -45,14 +45,14 @@ int sceNpAuthGetIdTokenV3(int req_id, const void* param, void* id_token) {
  return 0;
 }
 
-int sceNpAuthPollAsync(int req_id, int* result) {
+int APS5_VABI sceNpAuthPollAsync(int req_id, int* result) {
  (void)req_id;
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpAuthWaitAsync(int req_id, int* result) {
+int APS5_VABI sceNpAuthWaitAsync(int req_id, int* result) {
  (void)req_id;
  (void)result;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceNpCommerce/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNpCommerceDialogUpdateStatus(void) {
+int APS5_VABI sceNpCommerceDialogUpdateStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceNpEntitlementAccess/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNpEntitlementAccessGetAddcontEntitlementInfo(uint32_t service_label, const NpUnifiedEntitlementLabel* entitlement_label, NpEntitlementAccessAddcontEntitlementInfo* info) {
+int APS5_VABI sceNpEntitlementAccessGetAddcontEntitlementInfo(uint32_t service_label, const NpUnifiedEntitlementLabel* entitlement_label, NpEntitlementAccessAddcontEntitlementInfo* info) {
  (void)service_label;
  (void)entitlement_label;
  (void)info;
@@ -13,7 +13,7 @@ int sceNpEntitlementAccessGetAddcontEntitlementInfo(uint32_t service_label, cons
  return 0;
 }
 
-int sceNpEntitlementAccessGetAddcontEntitlementInfoList(uint32_t service_label, NpEntitlementAccessAddcontEntitlementInfo* list, uint32_t list_num, uint32_t* hit_num) {
+int APS5_VABI sceNpEntitlementAccessGetAddcontEntitlementInfoList(uint32_t service_label, NpEntitlementAccessAddcontEntitlementInfo* list, uint32_t list_num, uint32_t* hit_num) {
  (void)service_label;
  (void)list;
  (void)list_num;
@@ -22,13 +22,13 @@ int sceNpEntitlementAccessGetAddcontEntitlementInfoList(uint32_t service_label,
  return 0;
 }
 
-int sceNpEntitlementAccessGetSkuFlag(uint32_t* sku_flag) {
+int APS5_VABI sceNpEntitlementAccessGetSkuFlag(uint32_t* sku_flag) {
  (void)sku_flag;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpEntitlementAccessInitialize(const NpEntitlementAccessInitParam* init_param, NpEntitlementAccessBootParam* boot_param) {
+int APS5_VABI sceNpEntitlementAccessInitialize(const NpEntitlementAccessInitParam* init_param, NpEntitlementAccessBootParam* boot_param) {
  (void)init_param;
  (void)boot_param;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceNpGameIntent/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNpGameIntentGetPropertyValueString(const NpGameIntentData* intent_data, const char* key, char* value_buf, size_t buf_size) {
+int APS5_VABI sceNpGameIntentGetPropertyValueString(const NpGameIntentData* intent_data, const char* key, char* value_buf, size_t buf_size) {
  (void)intent_data;
  (void)key;
  (void)value_buf;
@@ -14,19 +14,19 @@ int sceNpGameIntentGetPropertyValueString(const NpGameIntentData* intent_data, c
  return 0;
 }
 
-int sceNpGameIntentInitialize(const void* init_param) {
+int APS5_VABI sceNpGameIntentInitialize(const void* init_param) {
  (void)init_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGameIntentReceiveIntent(NpGameIntentInfo* intent_info) {
+int APS5_VABI sceNpGameIntentReceiveIntent(NpGameIntentInfo* intent_info) {
  (void)intent_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGameIntentTerminate(void) {
+int APS5_VABI sceNpGameIntentTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceNpManager/Export.cpp

@@ -5,18 +5,18 @@
 
 extern "C" {
 
-int sceNpAbortRequest(int req_id) {
+int APS5_VABI sceNpAbortRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpCheckCallback(void) {
+int APS5_VABI sceNpCheckCallback(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpCheckNpAvailability(int req_id, const char* user, void* result) {
+int APS5_VABI sceNpCheckNpAvailability(int req_id, const char* user, void* result) {
  (void)req_id;
  (void)user;
  (void)result;
@@ -24,14 +24,14 @@ int sceNpCheckNpAvailability(int req_id, const char* user, void* result) {
  return 0;
 }
 
-int sceNpCheckNpReachability(int req_id, int user_id) {
+int APS5_VABI sceNpCheckNpReachability(int req_id, int user_id) {
  (void)req_id;
  (void)user_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpCheckPremium(int req_id, const NpCheckPremiumParameter* param, NpCheckPremiumResult* result) {
+int APS5_VABI sceNpCheckPremium(int req_id, const NpCheckPremiumParameter* param, NpCheckPremiumResult* result) {
  (void)req_id;
  (void)param;
  (void)result;
@@ -39,24 +39,24 @@ int sceNpCheckPremium(int req_id, const NpCheckPremiumParameter* param, NpCheckP
  return 0;
 }
 
-int sceNpCreateAsyncRequest(const NpCreateAsyncRequestParameter* param) {
+int APS5_VABI sceNpCreateAsyncRequest(const NpCreateAsyncRequestParameter* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpCreateRequest(void) {
+int APS5_VABI sceNpCreateRequest(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpDeleteRequest(int req_id) {
+int APS5_VABI sceNpDeleteRequest(int req_id) {
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetAccountAge(int req_id, int user_id, uint8_t* age) {
+int APS5_VABI sceNpGetAccountAge(int req_id, int user_id, uint8_t* age) {
  (void)req_id;
  (void)user_id;
  (void)age;
@@ -64,110 +64,110 @@ int sceNpGetAccountAge(int req_id, int user_id, uint8_t* age) {
  return 0;
 }
 
-int sceNpGetAccountCountryA(int user_id, void* country_code) {
+int APS5_VABI sceNpGetAccountCountryA(int user_id, void* country_code) {
  (void)user_id;
  (void)country_code;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetAccountIdA(int user_id, uint64_t* account_id) {
+int APS5_VABI sceNpGetAccountIdA(int user_id, uint64_t* account_id) {
  (void)user_id;
  (void)account_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetNpId(int user_id, NpId* np_id) {
+int APS5_VABI sceNpGetNpId(int user_id, NpId* np_id) {
  (void)user_id;
  (void)np_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetNpReachabilityState(int user_id, uint32_t* state) {
+int APS5_VABI sceNpGetNpReachabilityState(int user_id, uint32_t* state) {
  (void)user_id;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetOnlineId(int user_id, NpOnlineId* online_id) {
+int APS5_VABI sceNpGetOnlineId(int user_id, NpOnlineId* online_id) {
  (void)user_id;
  (void)online_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpGetState(int user_id, uint32_t* state) {
+int APS5_VABI sceNpGetState(int user_id, uint32_t* state) {
  (void)user_id;
  (void)state;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpHasSignedUp(int user_id, bool* has_signed_up) {
+int APS5_VABI sceNpHasSignedUp(int user_id, bool* has_signed_up) {
  (void)user_id;
  (void)has_signed_up;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpPollAsync(int req_id, int* result) {
+int APS5_VABI sceNpPollAsync(int req_id, int* result) {
  (void)req_id;
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-void sceNpRegisterGamePresenceCallback(void* callback, void* userdata) {
+void APS5_VABI sceNpRegisterGamePresenceCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceNpRegisterNpReachabilityStateCallback(void* callback, void* userdata) {
+int APS5_VABI sceNpRegisterNpReachabilityStateCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpRegisterPlusEventCallback(void* callback, void* userdata) {
+int APS5_VABI sceNpRegisterPlusEventCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpRegisterPremiumEventCallback(void* callback, void* userdata) {
+int APS5_VABI sceNpRegisterPremiumEventCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpRegisterStateCallback(void* callback, void* userdata) {
+int APS5_VABI sceNpRegisterStateCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpSetContentRestriction(const NpContentRestriction* restriction) {
+int APS5_VABI sceNpSetContentRestriction(const NpContentRestriction* restriction) {
  (void)restriction;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpSetNpTitleId(const NpTitleId* title_id, const NpTitleSecret* title_secret) {
+int APS5_VABI sceNpSetNpTitleId(const NpTitleId* title_id, const NpTitleSecret* title_secret) {
  (void)title_id;
  (void)title_secret;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUnregisterStateCallback(void) {
+int APS5_VABI sceNpUnregisterStateCallback(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceNpSessionSignaling/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceNpSessionSignalingInitialize(void* param) {
+int APS5_VABI sceNpSessionSignalingInitialize(void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceNpTrophy2/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceNpTrophy2AbortHandle(int handle) {
+int APS5_VABI sceNpTrophy2AbortHandle(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpTrophy2CreateContext(int* context, int user_id, uint32_t service_label, uint64_t options) {
+int APS5_VABI sceNpTrophy2CreateContext(int* context, int user_id, uint32_t service_label, uint64_t options) {
  (void)context;
  (void)user_id;
  (void)service_label;
@@ -20,25 +20,25 @@ int sceNpTrophy2CreateContext(int* context, int user_id, uint32_t service_label,
  return 0;
 }
 
-int sceNpTrophy2CreateHandle(int* handle) {
+int APS5_VABI sceNpTrophy2CreateHandle(int* handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpTrophy2DestroyContext(int context) {
+int APS5_VABI sceNpTrophy2DestroyContext(int context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpTrophy2DestroyHandle(int handle) {
+int APS5_VABI sceNpTrophy2DestroyHandle(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpTrophy2GetGameIcon(int context, int handle, void* buffer, size_t* size) {
+int APS5_VABI sceNpTrophy2GetGameIcon(int context, int handle, void* buffer, size_t* size) {
  (void)context;
  (void)handle;
  (void)buffer;
@@ -47,7 +47,7 @@ int sceNpTrophy2GetGameIcon(int context, int handle, void* buffer, size_t* size)
  return 0;
 }
 
-int sceNpTrophy2GetGameInfo(int context, int handle, NpTrophy2GameDetails* details, NpTrophy2GameData* data) {
+int APS5_VABI sceNpTrophy2GetGameInfo(int context, int handle, NpTrophy2GameDetails* details, NpTrophy2GameData* data) {
  (void)context;
  (void)handle;
  (void)details;
@@ -56,7 +56,7 @@ int sceNpTrophy2GetGameInfo(int context, int handle, NpTrophy2GameDetails* detai
  return 0;
 }
 
-int sceNpTrophy2GetGroupIcon(int context, int handle, int group_id, void* buffer, size_t* size) {
+int APS5_VABI sceNpTrophy2GetGroupIcon(int context, int handle, int group_id, void* buffer, size_t* size) {
  (void)context;
  (void)handle;
  (void)group_id;
@@ -66,7 +66,7 @@ int sceNpTrophy2GetGroupIcon(int context, int handle, int group_id, void* buffer
  return 0;
 }
 
-int sceNpTrophy2GetGroupInfo(int context, int handle, int group_id, NpTrophy2GroupDetails* details, NpTrophy2GroupData* data) {
+int APS5_VABI sceNpTrophy2GetGroupInfo(int context, int handle, int group_id, NpTrophy2GroupDetails* details, NpTrophy2GroupData* data) {
  (void)context;
  (void)handle;
  (void)group_id;
@@ -76,7 +76,7 @@ int sceNpTrophy2GetGroupInfo(int context, int handle, int group_id, NpTrophy2Gro
  return 0;
 }
 
-int sceNpTrophy2GetGroupInfoArray(int context, int handle, uint32_t offset, uint32_t limit, NpTrophy2GroupDetails* details_array, NpTrophy2GroupData* data_array, uint32_t* count) {
+int APS5_VABI sceNpTrophy2GetGroupInfoArray(int context, int handle, uint32_t offset, uint32_t limit, NpTrophy2GroupDetails* details_array, NpTrophy2GroupData* data_array, uint32_t* count) {
  (void)context;
  (void)handle;
  (void)offset;
@@ -88,7 +88,7 @@ int sceNpTrophy2GetGroupInfoArray(int context, int handle, uint32_t offset, uint
  return 0;
 }
 
-int sceNpTrophy2GetTrophyIcon(int context, int handle, int trophy_id, void* buffer, size_t* size) {
+int APS5_VABI sceNpTrophy2GetTrophyIcon(int context, int handle, int trophy_id, void* buffer, size_t* size) {
  (void)context;
  (void)handle;
  (void)trophy_id;
@@ -98,7 +98,7 @@ int sceNpTrophy2GetTrophyIcon(int context, int handle, int trophy_id, void* buff
  return 0;
 }
 
-int sceNpTrophy2GetTrophyInfo(int context, int handle, int trophy_id, NpTrophy2Details* details, NpTrophy2Data* data) {
+int APS5_VABI sceNpTrophy2GetTrophyInfo(int context, int handle, int trophy_id, NpTrophy2Details* details, NpTrophy2Data* data) {
  (void)context;
  (void)handle;
  (void)trophy_id;
@@ -108,7 +108,7 @@ int sceNpTrophy2GetTrophyInfo(int context, int handle, int trophy_id, NpTrophy2D
  return 0;
 }
 
-int sceNpTrophy2GetTrophyInfoArray(int context, int handle, uint32_t offset, uint32_t limit, NpTrophy2Details* details_array, NpTrophy2Data* data_array, uint32_t* count) {
+int APS5_VABI sceNpTrophy2GetTrophyInfoArray(int context, int handle, uint32_t offset, uint32_t limit, NpTrophy2Details* details_array, NpTrophy2Data* data_array, uint32_t* count) {
  (void)context;
  (void)handle;
  (void)offset;
@@ -120,7 +120,7 @@ int sceNpTrophy2GetTrophyInfoArray(int context, int handle, uint32_t offset, uin
  return 0;
 }
 
-int sceNpTrophy2RegisterContext(int context, int handle, uint64_t options) {
+int APS5_VABI sceNpTrophy2RegisterContext(int context, int handle, uint64_t options) {
  (void)context;
  (void)handle;
  (void)options;
@@ -128,7 +128,7 @@ int sceNpTrophy2RegisterContext(int context, int handle, uint64_t options) {
  return 0;
 }
 
-int sceNpTrophy2RegisterUnlockCallback(void* callback, void* userdata) {
+int APS5_VABI sceNpTrophy2RegisterUnlockCallback(void* callback, void* userdata) {
  (void)callback;
  (void)userdata;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceNpUniversalDataSystem/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceNpUniversalDataSystemAbortHandle(int handle) {
+int APS5_VABI sceNpUniversalDataSystemAbortHandle(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemCreateContext(int* context, int user_id, uint32_t service_label, uint64_t options) {
+int APS5_VABI sceNpUniversalDataSystemCreateContext(int* context, int user_id, uint32_t service_label, uint64_t options) {
  (void)context;
  (void)user_id;
  (void)service_label;
@@ -20,7 +20,7 @@ int sceNpUniversalDataSystemCreateContext(int* context, int user_id, uint32_t se
  return 0;
 }
 
-int sceNpUniversalDataSystemCreateEvent(const char* event_name, const NpUniversalDataSystemEventPropertyObject* prop, NpUniversalDataSystemEvent** new_event, NpUniversalDataSystemEventPropertyObject** prop_ptr) {
+int APS5_VABI sceNpUniversalDataSystemCreateEvent(const char* event_name, const NpUniversalDataSystemEventPropertyObject* prop, NpUniversalDataSystemEvent** new_event, NpUniversalDataSystemEventPropertyObject** prop_ptr) {
  (void)event_name;
  (void)prop;
  (void)new_event;
@@ -29,62 +29,62 @@ int sceNpUniversalDataSystemCreateEvent(const char* event_name, const NpUniversa
  return 0;
 }
 
-int sceNpUniversalDataSystemCreateEventPropertyArray(NpUniversalDataSystemEventPropertyArray** new_array) {
+int APS5_VABI sceNpUniversalDataSystemCreateEventPropertyArray(NpUniversalDataSystemEventPropertyArray** new_array) {
  (void)new_array;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemCreateEventPropertyObject(NpUniversalDataSystemEventPropertyObject** new_object) {
+int APS5_VABI sceNpUniversalDataSystemCreateEventPropertyObject(NpUniversalDataSystemEventPropertyObject** new_object) {
  (void)new_object;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemCreateHandle(int* handle) {
+int APS5_VABI sceNpUniversalDataSystemCreateHandle(int* handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemDestroyContext(int context) {
+int APS5_VABI sceNpUniversalDataSystemDestroyContext(int context) {
  (void)context;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemDestroyEvent(NpUniversalDataSystemEvent* event) {
+int APS5_VABI sceNpUniversalDataSystemDestroyEvent(NpUniversalDataSystemEvent* event) {
  (void)event;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemDestroyEventPropertyArray(NpUniversalDataSystemEventPropertyArray* array) {
+int APS5_VABI sceNpUniversalDataSystemDestroyEventPropertyArray(NpUniversalDataSystemEventPropertyArray* array) {
  (void)array;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemDestroyEventPropertyObject(NpUniversalDataSystemEventPropertyObject* object) {
+int APS5_VABI sceNpUniversalDataSystemDestroyEventPropertyObject(NpUniversalDataSystemEventPropertyObject* object) {
  (void)object;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemDestroyHandle(int handle) {
+int APS5_VABI sceNpUniversalDataSystemDestroyHandle(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventEstimateSize(const NpUniversalDataSystemEvent* event, size_t* size) {
+int APS5_VABI sceNpUniversalDataSystemEventEstimateSize(const NpUniversalDataSystemEvent* event, size_t* size) {
  (void)event;
  (void)size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetArray(NpUniversalDataSystemEventPropertyArray* array, const NpUniversalDataSystemEventPropertyArray* value, NpUniversalDataSystemEventPropertyArray** value_ptr) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetArray(NpUniversalDataSystemEventPropertyArray* array, const NpUniversalDataSystemEventPropertyArray* value, NpUniversalDataSystemEventPropertyArray** value_ptr) {
  (void)array;
  (void)value;
  (void)value_ptr;
@@ -92,7 +92,7 @@ int sceNpUniversalDataSystemEventPropertyArraySetArray(NpUniversalDataSystemEven
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetBinary(NpUniversalDataSystemEventPropertyArray* array, const void* value, size_t value_size) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetBinary(NpUniversalDataSystemEventPropertyArray* array, const void* value, size_t value_size) {
  (void)array;
  (void)value;
  (void)value_size;
@@ -100,42 +100,42 @@ int sceNpUniversalDataSystemEventPropertyArraySetBinary(NpUniversalDataSystemEve
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetBool(NpUniversalDataSystemEventPropertyArray* array, bool value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetBool(NpUniversalDataSystemEventPropertyArray* array, bool value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetFloat32(NpUniversalDataSystemEventPropertyArray* array, float value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetFloat32(NpUniversalDataSystemEventPropertyArray* array, float value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetFloat64(NpUniversalDataSystemEventPropertyArray* array, double value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetFloat64(NpUniversalDataSystemEventPropertyArray* array, double value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetInt32(NpUniversalDataSystemEventPropertyArray* array, int32_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetInt32(NpUniversalDataSystemEventPropertyArray* array, int32_t value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetInt64(NpUniversalDataSystemEventPropertyArray* array, int64_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetInt64(NpUniversalDataSystemEventPropertyArray* array, int64_t value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetObject(NpUniversalDataSystemEventPropertyArray* array, const NpUniversalDataSystemEventPropertyObject* value, NpUniversalDataSystemEventPropertyObject** value_ptr) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetObject(NpUniversalDataSystemEventPropertyArray* array, const NpUniversalDataSystemEventPropertyObject* value, NpUniversalDataSystemEventPropertyObject** value_ptr) {
  (void)array;
  (void)value;
  (void)value_ptr;
@@ -143,28 +143,28 @@ int sceNpUniversalDataSystemEventPropertyArraySetObject(NpUniversalDataSystemEve
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetString(NpUniversalDataSystemEventPropertyArray* array, const char* value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetString(NpUniversalDataSystemEventPropertyArray* array, const char* value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetUInt32(NpUniversalDataSystemEventPropertyArray* array, uint32_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetUInt32(NpUniversalDataSystemEventPropertyArray* array, uint32_t value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyArraySetUInt64(NpUniversalDataSystemEventPropertyArray* array, uint64_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyArraySetUInt64(NpUniversalDataSystemEventPropertyArray* array, uint64_t value) {
  (void)array;
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetArray(NpUniversalDataSystemEventPropertyObject* object, const char* key, const NpUniversalDataSystemEventPropertyArray* value, NpUniversalDataSystemEventPropertyArray** value_ptr) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetArray(NpUniversalDataSystemEventPropertyObject* object, const char* key, const NpUniversalDataSystemEventPropertyArray* value, NpUniversalDataSystemEventPropertyArray** value_ptr) {
  (void)object;
  (void)key;
  (void)value;
@@ -173,7 +173,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetArray(NpUniversalDataSystemEve
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetBinary(NpUniversalDataSystemEventPropertyObject* object, const char* key, const void* value, size_t value_size) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetBinary(NpUniversalDataSystemEventPropertyObject* object, const char* key, const void* value, size_t value_size) {
  (void)object;
  (void)key;
  (void)value;
@@ -182,7 +182,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetBinary(NpUniversalDataSystemEv
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetBool(NpUniversalDataSystemEventPropertyObject* object, const char* key, bool value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetBool(NpUniversalDataSystemEventPropertyObject* object, const char* key, bool value) {
  (void)object;
  (void)key;
  (void)value;
@@ -190,7 +190,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetBool(NpUniversalDataSystemEven
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetFloat32(NpUniversalDataSystemEventPropertyObject* object, const char* key, float value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetFloat32(NpUniversalDataSystemEventPropertyObject* object, const char* key, float value) {
  (void)object;
  (void)key;
  (void)value;
@@ -198,7 +198,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetFloat32(NpUniversalDataSystemE
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetFloat64(NpUniversalDataSystemEventPropertyObject* object, const char* key, double value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetFloat64(NpUniversalDataSystemEventPropertyObject* object, const char* key, double value) {
  (void)object;
  (void)key;
  (void)value;
@@ -206,7 +206,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetFloat64(NpUniversalDataSystemE
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetInt32(NpUniversalDataSystemEventPropertyObject* object, const char* key, int32_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetInt32(NpUniversalDataSystemEventPropertyObject* object, const char* key, int32_t value) {
  (void)object;
  (void)key;
  (void)value;
@@ -214,7 +214,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetInt32(NpUniversalDataSystemEve
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetInt64(NpUniversalDataSystemEventPropertyObject* object, const char* key, int64_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetInt64(NpUniversalDataSystemEventPropertyObject* object, const char* key, int64_t value) {
  (void)object;
  (void)key;
  (void)value;
@@ -222,7 +222,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetInt64(NpUniversalDataSystemEve
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetObject(NpUniversalDataSystemEventPropertyObject* object, const char* key, const NpUniversalDataSystemEventPropertyObject* value, NpUniversalDataSystemEventPropertyObject** value_ptr) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetObject(NpUniversalDataSystemEventPropertyObject* object, const char* key, const NpUniversalDataSystemEventPropertyObject* value, NpUniversalDataSystemEventPropertyObject** value_ptr) {
  (void)object;
  (void)key;
  (void)value;
@@ -231,7 +231,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetObject(NpUniversalDataSystemEv
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetString(NpUniversalDataSystemEventPropertyObject* object, const char* key, const char* value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetString(NpUniversalDataSystemEventPropertyObject* object, const char* key, const char* value) {
  (void)object;
  (void)key;
  (void)value;
@@ -239,7 +239,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetString(NpUniversalDataSystemEv
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetUInt32(NpUniversalDataSystemEventPropertyObject* object, const char* key, uint32_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetUInt32(NpUniversalDataSystemEventPropertyObject* object, const char* key, uint32_t value) {
  (void)object;
  (void)key;
  (void)value;
@@ -247,7 +247,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetUInt32(NpUniversalDataSystemEv
  return 0;
 }
 
-int sceNpUniversalDataSystemEventPropertyObjectSetUInt64(NpUniversalDataSystemEventPropertyObject* object, const char* key, uint64_t value) {
+int APS5_VABI sceNpUniversalDataSystemEventPropertyObjectSetUInt64(NpUniversalDataSystemEventPropertyObject* object, const char* key, uint64_t value) {
  (void)object;
  (void)key;
  (void)value;
@@ -255,7 +255,7 @@ int sceNpUniversalDataSystemEventPropertyObjectSetUInt64(NpUniversalDataSystemEv
  return 0;
 }
 
-int sceNpUniversalDataSystemEventToString(const NpUniversalDataSystemEvent* event, char* buf, size_t buf_size, size_t* string_size) {
+int APS5_VABI sceNpUniversalDataSystemEventToString(const NpUniversalDataSystemEvent* event, char* buf, size_t buf_size, size_t* string_size) {
  (void)event;
  (void)buf;
  (void)buf_size;
@@ -264,26 +264,26 @@ int sceNpUniversalDataSystemEventToString(const NpUniversalDataSystemEvent* even
  return 0;
 }
 
-int sceNpUniversalDataSystemGetMemoryStat(NpUniversalDataSystemMemoryStat* stat) {
+int APS5_VABI sceNpUniversalDataSystemGetMemoryStat(NpUniversalDataSystemMemoryStat* stat) {
  (void)stat;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemGetStorageStat(int context, NpUniversalDataSystemStorageStat* stat) {
+int APS5_VABI sceNpUniversalDataSystemGetStorageStat(int context, NpUniversalDataSystemStorageStat* stat) {
  (void)context;
  (void)stat;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemInitialize(const NpUniversalDataSystemInitParam* param) {
+int APS5_VABI sceNpUniversalDataSystemInitialize(const NpUniversalDataSystemInitParam* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpUniversalDataSystemPostEvent(int context, int handle, const void* event, uint64_t options) {
+int APS5_VABI sceNpUniversalDataSystemPostEvent(int context, int handle, const void* event, uint64_t options) {
  (void)context;
  (void)handle;
  (void)event;
@@ -292,7 +292,7 @@ int sceNpUniversalDataSystemPostEvent(int context, int handle, const void* event
  return 0;
 }
 
-int sceNpUniversalDataSystemRegisterContext(int context, int handle, uint64_t options) {
+int APS5_VABI sceNpUniversalDataSystemRegisterContext(int context, int handle, uint64_t options) {
  (void)context;
  (void)handle;
  (void)options;
@@ -300,7 +300,7 @@ int sceNpUniversalDataSystemRegisterContext(int context, int handle, uint64_t op
  return 0;
 }
 
-int sceNpUniversalDataSystemTerminate(void) {
+int APS5_VABI sceNpUniversalDataSystemTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceNpWebApi2/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int sceNpWebApi2AbortRequest(int64_t request_id) {
+int APS5_VABI sceNpWebApi2AbortRequest(int64_t request_id) {
  (void)request_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2AddHttpRequestHeader(int64_t request_id, const char* field_name, const char* value) {
+int APS5_VABI sceNpWebApi2AddHttpRequestHeader(int64_t request_id, const char* field_name, const char* value) {
  (void)request_id;
  (void)field_name;
  (void)value;
@@ -19,11 +19,11 @@ int sceNpWebApi2AddHttpRequestHeader(int64_t request_id, const char* field_name,
  return 0;
 }
 
-void sceNpWebApi2CheckTimeout(void) {
+void APS5_VABI sceNpWebApi2CheckTimeout(void) {
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceNpWebApi2CreateRequest(int user_context_id, const char* api_group, const char* path, const char* method, const void* content_parameter, int64_t* request_id) {
+int APS5_VABI sceNpWebApi2CreateRequest(int user_context_id, const char* api_group, const char* path, const char* method, const void* content_parameter, int64_t* request_id) {
  (void)user_context_id;
  (void)api_group;
  (void)path;
@@ -34,26 +34,26 @@ int sceNpWebApi2CreateRequest(int user_context_id, const char* api_group, const
  return 0;
 }
 
-int sceNpWebApi2CreateUserContext(int lib_ctx_id, int user_id) {
+int APS5_VABI sceNpWebApi2CreateUserContext(int lib_ctx_id, int user_id) {
  (void)lib_ctx_id;
  (void)user_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2DeleteRequest(int64_t request_id) {
+int APS5_VABI sceNpWebApi2DeleteRequest(int64_t request_id) {
  (void)request_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2DeleteUserContext(int user_context_id) {
+int APS5_VABI sceNpWebApi2DeleteUserContext(int user_context_id) {
  (void)user_context_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2GetHttpResponseHeaderValue(int64_t request_id, const char* field_name, char* value, size_t value_size) {
+int APS5_VABI sceNpWebApi2GetHttpResponseHeaderValue(int64_t request_id, const char* field_name, char* value, size_t value_size) {
  (void)request_id;
  (void)field_name;
  (void)value;
@@ -62,7 +62,7 @@ int sceNpWebApi2GetHttpResponseHeaderValue(int64_t request_id, const char* field
  return 0;
 }
 
-int sceNpWebApi2GetHttpResponseHeaderValueLength(int64_t request_id, const char* field_name, size_t* value_length) {
+int APS5_VABI sceNpWebApi2GetHttpResponseHeaderValueLength(int64_t request_id, const char* field_name, size_t* value_length) {
  (void)request_id;
  (void)field_name;
  (void)value_length;
@@ -70,14 +70,14 @@ int sceNpWebApi2GetHttpResponseHeaderValueLength(int64_t request_id, const char*
  return 0;
 }
 
-int sceNpWebApi2Initialize(int lib_http_ctx_id, size_t pool_size) {
+int APS5_VABI sceNpWebApi2Initialize(int lib_http_ctx_id, size_t pool_size) {
  (void)lib_http_ctx_id;
  (void)pool_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2PushEventCreateFilter(int lib_ctx_id, int handle_id, const char* np_service_name, uint32_t np_service_label, const void* filter_param, size_t filter_param_num) {
+int APS5_VABI sceNpWebApi2PushEventCreateFilter(int lib_ctx_id, int handle_id, const char* np_service_name, uint32_t np_service_label, const void* filter_param, size_t filter_param_num) {
  (void)lib_ctx_id;
  (void)handle_id;
  (void)np_service_name;
@@ -88,27 +88,27 @@ int sceNpWebApi2PushEventCreateFilter(int lib_ctx_id, int handle_id, const char*
  return 0;
 }
 
-int sceNpWebApi2PushEventCreateHandle(int lib_ctx_id) {
+int APS5_VABI sceNpWebApi2PushEventCreateHandle(int lib_ctx_id) {
  (void)lib_ctx_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2PushEventDeleteHandle(int lib_ctx_id, int handle_id) {
+int APS5_VABI sceNpWebApi2PushEventDeleteHandle(int lib_ctx_id, int handle_id) {
  (void)lib_ctx_id;
  (void)handle_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2PushEventDeletePushContext(int user_context_id, const void* push_context_id) {
+int APS5_VABI sceNpWebApi2PushEventDeletePushContext(int user_context_id, const void* push_context_id) {
  (void)user_context_id;
  (void)push_context_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceNpWebApi2PushEventRegisterCallback(int user_context_id, int filter_id, void* callback, void* user_arg) {
+int APS5_VABI sceNpWebApi2PushEventRegisterCallback(int user_context_id, int filter_id, void* callback, void* user_arg) {
  (void)user_context_id;
  (void)filter_id;
  (void)callback;
@@ -117,7 +117,7 @@ int sceNpWebApi2PushEventRegisterCallback(int user_context_id, int filter_id, vo
  return 0;
 }
 
-int sceNpWebApi2ReadData(int64_t request_id, void* data, size_t size) {
+int APS5_VABI sceNpWebApi2ReadData(int64_t request_id, void* data, size_t size) {
  (void)request_id;
  (void)data;
  (void)size;
@@ -125,7 +125,7 @@ int sceNpWebApi2ReadData(int64_t request_id, void* data, size_t size) {
  return 0;
 }
 
-int sceNpWebApi2SendRequest(int64_t request_id, const void* data, size_t data_size, NpWebApi2ResponseInformationOption* response_info_option) {
+int APS5_VABI sceNpWebApi2SendRequest(int64_t request_id, const void* data, size_t data_size, NpWebApi2ResponseInformationOption* response_info_option) {
  (void)request_id;
  (void)data;
  (void)data_size;
@@ -134,7 +134,7 @@ int sceNpWebApi2SendRequest(int64_t request_id, const void* data, size_t data_si
  return 0;
 }
 
-int sceNpWebApi2Terminate(int lib_ctx_id) {
+int APS5_VABI sceNpWebApi2Terminate(int lib_ctx_id) {
  (void)lib_ctx_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libScePad/Export.cpp

@@ -8,21 +8,21 @@
 
 extern "C" {
 
-int scePadClose_nid_postfix(int handle) {
+int APS5_VABI scePadClose_nid_postfix(int handle) {
  if (handle != PAD_HANDLE) {
   return PAD_ERROR_INVALID_HANDLE;
  }
  return PAD_OK;
 }
 
-int scePadDeviceClassGetExtendedInformation(int handle, PadDeviceClassExtendedInformation* info) {
+int APS5_VABI scePadDeviceClassGetExtendedInformation(int handle, PadDeviceClassExtendedInformation* info) {
  (void)handle;
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadDeviceClassParseData(int handle, const PadData* data, PadDeviceClassData* class_data) {
+int APS5_VABI scePadDeviceClassParseData(int handle, const PadData* data, PadDeviceClassData* class_data) {
  (void)handle;
  (void)data;
  (void)class_data;
@@ -30,7 +30,7 @@ int scePadDeviceClassParseData(int handle, const PadData* data, PadDeviceClassDa
  return 0;
 }
 
-int scePadGetControllerInformation(int handle, PadControllerInformation* info) {
+int APS5_VABI scePadGetControllerInformation(int handle, PadControllerInformation* info) {
  if (handle != PAD_HANDLE) {
   return PAD_ERROR_INVALID_HANDLE;
  }
@@ -50,7 +50,7 @@ int scePadGetControllerInformation(int handle, PadControllerInformation* info) {
  return PAD_OK;
 }
 
-int scePadGetHandle(int user_id, int type, int index) {
+int APS5_VABI scePadGetHandle(int user_id, int type, int index) {
  (void)user_id;
  (void)type;
  (void)index;
@@ -58,18 +58,18 @@ int scePadGetHandle(int user_id, int type, int index) {
  return 0;
 }
 
-int scePadGetTriggerEffectState(int handle, PadTriggerEffectStateInformation* info) {
+int APS5_VABI scePadGetTriggerEffectState(int handle, PadTriggerEffectStateInformation* info) {
  (void)handle;
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadInit_nid_postfix(void) {
+int APS5_VABI scePadInit_nid_postfix(void) {
  return PAD_OK;
 }
 
-int scePadOpen_nid_postfix(int userId, int type, int index, const void* param) {
+int APS5_VABI scePadOpen_nid_postfix(int userId, int type, int index, const void* param) {
  (void)param;
  if (index != 0) {
   return PAD_ERROR_INVALID_ARG;
@@ -82,7 +82,7 @@ int scePadOpen_nid_postfix(int userId, int type, int index, const void* param) {
  return PAD_HANDLE;
 }
 
-int scePadRead_nid_postfix(int handle, PadData* data, int num) {
+int APS5_VABI scePadRead_nid_postfix(int handle, PadData* data, int num) {
  (void)handle;
  (void)data;
  (void)num;
@@ -90,40 +90,40 @@ int scePadRead_nid_postfix(int handle, PadData* data, int num) {
  return 0;
 }
 
-int scePadReadState(int handle, PadData* data) {
+int APS5_VABI scePadReadState(int handle, PadData* data) {
  (void)handle;
  (void)data;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadResetLightBar(int handle) {
+int APS5_VABI scePadResetLightBar(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadResetOrientation(int handle) {
+int APS5_VABI scePadResetOrientation(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetAngularVelocityDeadbandState(int handle, bool enable) {
+int APS5_VABI scePadSetAngularVelocityDeadbandState(int handle, bool enable) {
  (void)handle;
  (void)enable;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetLightBar(int handle, const PadLightBarParam* param) {
+int APS5_VABI scePadSetLightBar(int handle, const PadLightBarParam* param) {
  (void)handle;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetMotionSensorState(int handle, bool enable) {
+int APS5_VABI scePadSetMotionSensorState(int handle, bool enable) {
  (void)handle;
  (void)enable;
  // if (enable) {
@@ -132,35 +132,35 @@ int scePadSetMotionSensorState(int handle, bool enable) {
  return PAD_OK;
 }
 
-int scePadSetTiltCorrectionState(int handle, bool enabled) {
+int APS5_VABI scePadSetTiltCorrectionState(int handle, bool enabled) {
  (void)handle;
  (void)enabled;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetTriggerEffect(int handle, const void* param) {
+int APS5_VABI scePadSetTriggerEffect(int handle, const void* param) {
  (void)handle;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetVibration(int handle, const PadVibrationParam* param) {
+int APS5_VABI scePadSetVibration(int handle, const PadVibrationParam* param) {
  (void)handle;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetVibrationMode(int handle, int mode) {
+int APS5_VABI scePadSetVibrationMode(int handle, int mode) {
  (void)handle;
  (void)mode;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePadSetVibrationTriggerEffectWeakWhileEmbeddedMicInUse(bool enabled) {
+int APS5_VABI scePadSetVibrationTriggerEffectWeakWhileEmbeddedMicInUse(bool enabled) {
  (void)enabled;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libScePlayGo/Export.cpp

@@ -5,13 +5,13 @@
 
 extern "C" {
 
-int scePlayGoClose(int handle) {
+int APS5_VABI scePlayGoClose(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoGetChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t number_of_entries, uint32_t* out_entries) {
+int APS5_VABI scePlayGoGetChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t number_of_entries, uint32_t* out_entries) {
  (void)handle;
  (void)out_chunk_id_list;
  (void)number_of_entries;
@@ -20,7 +20,7 @@ int scePlayGoGetChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t number
  return 0;
 }
 
-int scePlayGoGetEta(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int64_t* out_eta) {
+int APS5_VABI scePlayGoGetEta(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int64_t* out_eta) {
  (void)handle;
  (void)chunk_ids;
  (void)number_of_entries;
@@ -29,7 +29,7 @@ int scePlayGoGetEta(int handle, const uint16_t* chunk_ids, uint32_t number_of_en
  return 0;
 }
 
-int scePlayGoGetInstallChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t number_of_entries, uint32_t* out_entries) {
+int APS5_VABI scePlayGoGetInstallChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t number_of_entries, uint32_t* out_entries) {
  (void)handle;
  (void)out_chunk_id_list;
  (void)number_of_entries;
@@ -38,21 +38,21 @@ int scePlayGoGetInstallChunkId(int handle, uint16_t* out_chunk_id_list, uint32_t
  return 0;
 }
 
-int scePlayGoGetInstallSpeed(int handle, int32_t* out_speed) {
+int APS5_VABI scePlayGoGetInstallSpeed(int handle, int32_t* out_speed) {
  (void)handle;
  (void)out_speed;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoGetLanguageMask(int handle, uint64_t* out_language_mask) {
+int APS5_VABI scePlayGoGetLanguageMask(int handle, uint64_t* out_language_mask) {
  (void)handle;
  (void)out_language_mask;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoGetLocus(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int8_t* out_loci) {
+int APS5_VABI scePlayGoGetLocus(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int8_t* out_loci) {
  (void)handle;
  (void)chunk_ids;
  (void)number_of_entries;
@@ -61,7 +61,7 @@ int scePlayGoGetLocus(int handle, const uint16_t* chunk_ids, uint32_t number_of_
  return 0;
 }
 
-int scePlayGoGetOptionalChunk(int handle, int32_t type, PlayGoOptionalChunk* option) {
+int APS5_VABI scePlayGoGetOptionalChunk(int handle, int32_t type, PlayGoOptionalChunk* option) {
  (void)handle;
  (void)type;
  (void)option;
@@ -69,7 +69,7 @@ int scePlayGoGetOptionalChunk(int handle, int32_t type, PlayGoOptionalChunk* opt
  return 0;
 }
 
-int scePlayGoGetProgress(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, PlayGoProgress* out_progress) {
+int APS5_VABI scePlayGoGetProgress(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, PlayGoProgress* out_progress) {
  (void)handle;
  (void)chunk_ids;
  (void)number_of_entries;
@@ -78,7 +78,7 @@ int scePlayGoGetProgress(int handle, const uint16_t* chunk_ids, uint32_t number_
  return 0;
 }
 
-int scePlayGoGetSupportedOptionalChunk(int handle, int32_t type, PlayGoOptionalChunk* option) {
+int APS5_VABI scePlayGoGetSupportedOptionalChunk(int handle, int32_t type, PlayGoOptionalChunk* option) {
  (void)handle;
  (void)type;
  (void)option;
@@ -86,7 +86,7 @@ int scePlayGoGetSupportedOptionalChunk(int handle, int32_t type, PlayGoOptionalC
  return 0;
 }
 
-int scePlayGoGetToDoList(int handle, PlayGoToDo* out_todo_list, uint32_t number_of_entries, uint32_t* out_entries) {
+int APS5_VABI scePlayGoGetToDoList(int handle, PlayGoToDo* out_todo_list, uint32_t number_of_entries, uint32_t* out_entries) {
  (void)handle;
  (void)out_todo_list;
  (void)number_of_entries;
@@ -95,20 +95,20 @@ int scePlayGoGetToDoList(int handle, PlayGoToDo* out_todo_list, uint32_t number_
  return 0;
 }
 
-int scePlayGoInitialize(const PlayGoInitParams* init) {
+int APS5_VABI scePlayGoInitialize(const PlayGoInitParams* init) {
  (void)init;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoOpen(int* out_handle, const void* param) {
+int APS5_VABI scePlayGoOpen(int* out_handle, const void* param) {
  (void)out_handle;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoPrefetch(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int8_t minimum_locus) {
+int APS5_VABI scePlayGoPrefetch(int handle, const uint16_t* chunk_ids, uint32_t number_of_entries, int8_t minimum_locus) {
  (void)handle;
  (void)chunk_ids;
  (void)number_of_entries;
@@ -117,7 +117,7 @@ int scePlayGoPrefetch(int handle, const uint16_t* chunk_ids, uint32_t number_of_
  return 0;
 }
 
-int scePlayGoPrefetchOptionalChunk(int handle, int32_t type, const PlayGoOptionalChunk* option) {
+int APS5_VABI scePlayGoPrefetchOptionalChunk(int handle, int32_t type, const PlayGoOptionalChunk* option) {
  (void)handle;
  (void)type;
  (void)option;
@@ -125,14 +125,14 @@ int scePlayGoPrefetchOptionalChunk(int handle, int32_t type, const PlayGoOptiona
  return 0;
 }
 
-int scePlayGoSetInstallSpeed(int handle, int32_t speed) {
+int APS5_VABI scePlayGoSetInstallSpeed(int handle, int32_t speed) {
  (void)handle;
  (void)speed;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int scePlayGoSetToDoList(int handle, const PlayGoToDo* todo_list, uint32_t number_of_entries) {
+int APS5_VABI scePlayGoSetToDoList(int handle, const PlayGoToDo* todo_list, uint32_t number_of_entries) {
  (void)handle;
  (void)todo_list;
  (void)number_of_entries;
@@ -140,7 +140,7 @@ int scePlayGoSetToDoList(int handle, const PlayGoToDo* todo_list, uint32_t numbe
  return 0;
 }
 
-int scePlayGoTerminate(void) {
+int APS5_VABI scePlayGoTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libScePngDec/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int32_t scePngDecCreate(const PngDecCreateParam* param, void* memory_address, uint32_t memory_size, void** handle) {
+int32_t APS5_VABI scePngDecCreate(const PngDecCreateParam* param, void* memory_address, uint32_t memory_size, void** handle) {
  (void)param;
  (void)memory_address;
  (void)memory_size;
@@ -14,7 +14,7 @@ int32_t scePngDecCreate(const PngDecCreateParam* param, void* memory_address, ui
  return 0;
 }
 
-int32_t scePngDecDecode(void* handle, const PngDecDecodeParam* param, PngDecImageInfo* image_info) {
+int32_t APS5_VABI scePngDecDecode(void* handle, const PngDecDecodeParam* param, PngDecImageInfo* image_info) {
  (void)handle;
  (void)param;
  (void)image_info;
@@ -22,20 +22,20 @@ int32_t scePngDecDecode(void* handle, const PngDecDecodeParam* param, PngDecImag
  return 0;
 }
 
-int32_t scePngDecDelete(void* handle) {
+int32_t APS5_VABI scePngDecDelete(void* handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t scePngDecParseHeader(const PngDecParseParam* param, PngDecImageInfo* image_info) {
+int32_t APS5_VABI scePngDecParseHeader(const PngDecParseParam* param, PngDecImageInfo* image_info) {
  (void)param;
  (void)image_info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t scePngDecQueryMemorySize(const PngDecCreateParam* param) {
+int32_t APS5_VABI scePngDecQueryMemorySize(const PngDecCreateParam* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceRandom/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceRandomGetRandomNumber(void* buf, size_t size) {
+int APS5_VABI sceRandomGetRandomNumber(void* buf, size_t size) {
  (void)buf;
  (void)size;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceRazorCpu/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-uint32_t sceRazorCpuIsCapturing(void) {
+uint32_t APS5_VABI sceRazorCpuIsCapturing(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceRemoteplay/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceRemoteplayGetConnectionStatus(int user_id, int* status) {
+int APS5_VABI sceRemoteplayGetConnectionStatus(int user_id, int* status) {
  (void)user_id;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRemoteplayInitialize(void* heap, size_t heap_size) {
+int APS5_VABI sceRemoteplayInitialize(void* heap, size_t heap_size) {
  (void)heap;
  (void)heap_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRemoteplayTerminate(void) {
+int APS5_VABI sceRemoteplayTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceRtc/Export.cpp

@@ -5,27 +5,27 @@
 
 extern "C" {
 
-int sceRtcCheckValid(const RtcDateTime* time) {
+int APS5_VABI sceRtcCheckValid(const RtcDateTime* time) {
  (void)time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcConvertLocalTimeToUtc(const RtcTick* local_time, RtcTick* utc) {
+int APS5_VABI sceRtcConvertLocalTimeToUtc(const RtcTick* local_time, RtcTick* utc) {
  (void)local_time;
  (void)utc;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcConvertUtcToLocalTime(const RtcTick* utc, RtcTick* local_time) {
+int APS5_VABI sceRtcConvertUtcToLocalTime(const RtcTick* utc, RtcTick* local_time) {
  (void)utc;
  (void)local_time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcFormatRFC3339(char* date_time, const RtcTick* utc, int time_zone_minutes) {
+int APS5_VABI sceRtcFormatRFC3339(char* date_time, const RtcTick* utc, int time_zone_minutes) {
  (void)date_time;
  (void)utc;
  (void)time_zone_minutes;
@@ -33,32 +33,32 @@ int sceRtcFormatRFC3339(char* date_time, const RtcTick* utc, int time_zone_minut
  return 0;
 }
 
-int sceRtcGetCurrentClock(RtcDateTime* time, int time_zone_minutes) {
+int APS5_VABI sceRtcGetCurrentClock(RtcDateTime* time, int time_zone_minutes) {
  (void)time;
  (void)time_zone_minutes;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetCurrentClockLocalTime(RtcDateTime* time) {
+int APS5_VABI sceRtcGetCurrentClockLocalTime(RtcDateTime* time) {
  (void)time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetCurrentNetworkTick(RtcTick* tick) {
+int APS5_VABI sceRtcGetCurrentNetworkTick(RtcTick* tick) {
  (void)tick;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetCurrentTick(RtcTick* tick) {
+int APS5_VABI sceRtcGetCurrentTick(RtcTick* tick) {
  (void)tick;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetDayOfWeek(int year, int month, int day) {
+int APS5_VABI sceRtcGetDayOfWeek(int year, int month, int day) {
  (void)year;
  (void)month;
  (void)day;
@@ -66,67 +66,67 @@ int sceRtcGetDayOfWeek(int year, int month, int day) {
  return 0;
 }
 
-int sceRtcGetTick(const RtcDateTime* time, RtcTick* tick) {
+int APS5_VABI sceRtcGetTick(const RtcDateTime* time, RtcTick* tick) {
  (void)time;
  (void)tick;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetTickResolution(void) {
+int APS5_VABI sceRtcGetTickResolution(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetTime_t(const RtcDateTime* time, int64_t* seconds) {
+int APS5_VABI sceRtcGetTime_t(const RtcDateTime* time, int64_t* seconds) {
  (void)time;
  (void)seconds;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcGetWin32FileTime(const RtcDateTime* time, uint64_t* win32_time) {
+int APS5_VABI sceRtcGetWin32FileTime(const RtcDateTime* time, uint64_t* win32_time) {
  (void)time;
  (void)win32_time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcIsLeapYear(int year) {
+int APS5_VABI sceRtcIsLeapYear(int year) {
  (void)year;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcParseRFC3339(RtcTick* utc, const char* date_time) {
+int APS5_VABI sceRtcParseRFC3339(RtcTick* utc, const char* date_time) {
  (void)utc;
  (void)date_time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcSetTick(RtcDateTime* time, const RtcTick* tick) {
+int APS5_VABI sceRtcSetTick(RtcDateTime* time, const RtcTick* tick) {
  (void)time;
  (void)tick;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcSetTime_t(RtcDateTime* time, int64_t seconds) {
+int APS5_VABI sceRtcSetTime_t(RtcDateTime* time, int64_t seconds) {
  (void)time;
  (void)seconds;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcSetWin32FileTime(RtcDateTime* time, uint64_t win32_time) {
+int APS5_VABI sceRtcSetWin32FileTime(RtcDateTime* time, uint64_t win32_time) {
  (void)time;
  (void)win32_time;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRtcTickAddDays(RtcTick* dst, const RtcTick* src, int32_t days) {
+int APS5_VABI sceRtcTickAddDays(RtcTick* dst, const RtcTick* src, int32_t days) {
  (void)dst;
  (void)src;
  (void)days;
@@ -134,7 +134,7 @@ int sceRtcTickAddDays(RtcTick* dst, const RtcTick* src, int32_t days) {
  return 0;
 }
 
-int sceRtcTickAddHours(RtcTick* dst, const RtcTick* src, int32_t hours) {
+int APS5_VABI sceRtcTickAddHours(RtcTick* dst, const RtcTick* src, int32_t hours) {
  (void)dst;
  (void)src;
  (void)hours;
@@ -142,7 +142,7 @@ int sceRtcTickAddHours(RtcTick* dst, const RtcTick* src, int32_t hours) {
  return 0;
 }
 
-int sceRtcTickAddMicroseconds(RtcTick* dst, const RtcTick* src, int64_t usec) {
+int APS5_VABI sceRtcTickAddMicroseconds(RtcTick* dst, const RtcTick* src, int64_t usec) {
  (void)dst;
  (void)src;
  (void)usec;
@@ -150,7 +150,7 @@ int sceRtcTickAddMicroseconds(RtcTick* dst, const RtcTick* src, int64_t usec) {
  return 0;
 }
 
-int sceRtcTickAddMinutes(RtcTick* dst, const RtcTick* src, int64_t minutes) {
+int APS5_VABI sceRtcTickAddMinutes(RtcTick* dst, const RtcTick* src, int64_t minutes) {
  (void)dst;
  (void)src;
  (void)minutes;
@@ -158,7 +158,7 @@ int sceRtcTickAddMinutes(RtcTick* dst, const RtcTick* src, int64_t minutes) {
  return 0;
 }
 
-int sceRtcTickAddSeconds(RtcTick* dst, const RtcTick* src, int64_t seconds) {
+int APS5_VABI sceRtcTickAddSeconds(RtcTick* dst, const RtcTick* src, int64_t seconds) {
  (void)dst;
  (void)src;
  (void)seconds;
@@ -166,7 +166,7 @@ int sceRtcTickAddSeconds(RtcTick* dst, const RtcTick* src, int64_t seconds) {
  return 0;
 }
 
-int sceRtcTickAddTicks(RtcTick* dst, const RtcTick* src, int64_t ticks) {
+int APS5_VABI sceRtcTickAddTicks(RtcTick* dst, const RtcTick* src, int64_t ticks) {
  (void)dst;
  (void)src;
  (void)ticks;
@@ -174,7 +174,7 @@ int sceRtcTickAddTicks(RtcTick* dst, const RtcTick* src, int64_t ticks) {
  return 0;
 }
 
-int sceRtcTickAddWeeks(RtcTick* dst, const RtcTick* src, int32_t weeks) {
+int APS5_VABI sceRtcTickAddWeeks(RtcTick* dst, const RtcTick* src, int32_t weeks) {
  (void)dst;
  (void)src;
  (void)weeks;

core/libs/prx/libSceRudp/Export.cpp

@@ -5,21 +5,21 @@
 
 extern "C" {
 
-int sceRudpEnableInternalIOThread(uint32_t stack_size, uint32_t priority) {
+int APS5_VABI sceRudpEnableInternalIOThread(uint32_t stack_size, uint32_t priority) {
  (void)stack_size;
  (void)priority;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRudpInit_nid_postfix(void* mem_pool, int mem_pool_size) {
+int APS5_VABI sceRudpInit_nid_postfix(void* mem_pool, int mem_pool_size) {
  (void)mem_pool;
  (void)mem_pool_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceRudpSetEventHandler(RudpEventHandler handler, void* arg) {
+int APS5_VABI sceRudpSetEventHandler(RudpEventHandler handler, void* arg) {
  (void)handler;
  (void)arg;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceSaveData.native/Export.cpp

@@ -54,23 +54,23 @@ static bool dir_name_match(const char* str, const char* pattern) {
 
 extern "C" {
 
-int sceSaveDataBackup(const SaveDataBackup* backup) {
+int APS5_VABI sceSaveDataBackup(const SaveDataBackup* backup) {
     (void)backup;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataCommit(const SaveDataCommitParam* param) {
+int APS5_VABI sceSaveDataCommit(const SaveDataCommitParam* param) {
     (void)param;
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataCreateTransactionResource(uint32_t size) {
+int APS5_VABI sceSaveDataCreateTransactionResource(uint32_t size) {
     (void)size;
     return g_transaction_counter.fetch_add(1);
 }
 
-int sceSaveDataDelete(const SaveDataDelete* del) {
+int APS5_VABI sceSaveDataDelete(const SaveDataDelete* del) {
     if (del == nullptr || del->dir_name == nullptr) {
         throw std::runtime_error("sceSaveDataDelete: null argument");
     }
@@ -81,12 +81,12 @@ int sceSaveDataDelete(const SaveDataDelete* del) {
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataDeleteTransactionResource(int32_t resource) {
+int APS5_VABI sceSaveDataDeleteTransactionResource(int32_t resource) {
     (void)resource;
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataDirNameSearch(const SaveDataDirNameSearchCond* cond, SaveDataDirNameSearchResult* result) {
+int APS5_VABI sceSaveDataDirNameSearch(const SaveDataDirNameSearchCond* cond, SaveDataDirNameSearchResult* result) {
     if (cond == nullptr || result == nullptr) {
         throw std::runtime_error("sceSaveDataDirNameSearch: null argument");
     }
@@ -121,14 +121,14 @@ int sceSaveDataDirNameSearch(const SaveDataDirNameSearchCond* cond, SaveDataDirN
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataGetEventResult(const void* event_param, SaveDataEvent* event) {
+int APS5_VABI sceSaveDataGetEventResult(const void* event_param, SaveDataEvent* event) {
     (void)event_param;
     (void)event;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataGetMountInfo(const SaveDataMountPoint* mount_point, SaveDataMountInfo* info) {
+int APS5_VABI sceSaveDataGetMountInfo(const SaveDataMountPoint* mount_point, SaveDataMountInfo* info) {
     if (mount_point == nullptr || info == nullptr) {
         throw std::runtime_error("sceSaveDataGetMountInfo: null argument");
     }
@@ -141,7 +141,7 @@ int sceSaveDataGetMountInfo(const SaveDataMountPoint* mount_point, SaveDataMount
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataGetParam(const SaveDataMountPoint* mount_point, uint32_t param_type, void* param_buf, size_t param_buf_size, size_t* got_size) {
+int APS5_VABI sceSaveDataGetParam(const SaveDataMountPoint* mount_point, uint32_t param_type, void* param_buf, size_t param_buf_size, size_t* got_size) {
     (void)param_type;
     if (mount_point == nullptr || param_buf == nullptr) {
         throw std::runtime_error("sceSaveDataGetParam: null argument");
@@ -156,13 +156,13 @@ int sceSaveDataGetParam(const SaveDataMountPoint* mount_point, uint32_t param_ty
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataGetSaveDataMemory2(SaveDataMemoryGet2* get_param) {
+int APS5_VABI sceSaveDataGetSaveDataMemory2(SaveDataMemoryGet2* get_param) {
     (void)get_param;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataInitialize3(const void* init) {
+int APS5_VABI sceSaveDataInitialize3(const void* init) {
     (void)init;
     // NotImplemented_nid_no_patch(__func__);
     if (g_initialized) {
@@ -172,7 +172,7 @@ int sceSaveDataInitialize3(const void* init) {
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataLoadIcon(const SaveDataMountPoint* mount_point, SaveDataIcon* icon) {
+int APS5_VABI sceSaveDataLoadIcon(const SaveDataMountPoint* mount_point, SaveDataIcon* icon) {
     (void)icon;
     if (mount_point == nullptr) {
         throw std::runtime_error("sceSaveDataLoadIcon: null mount_point");
@@ -186,7 +186,7 @@ int sceSaveDataLoadIcon(const SaveDataMountPoint* mount_point, SaveDataIcon* ico
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataMount3(const SaveDataMount3* mount, SaveDataMountResult* mount_result) {
+int APS5_VABI sceSaveDataMount3(const SaveDataMount3* mount, SaveDataMountResult* mount_result) {
     if (mount == nullptr || mount_result == nullptr || mount->dir_name == nullptr) {
         throw std::runtime_error("sceSaveDataMount3: null argument");
     }
@@ -225,13 +225,13 @@ int sceSaveDataMount3(const SaveDataMount3* mount, SaveDataMountResult* mount_re
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataPrepare(const SaveDataMountPoint* mount_point, const SaveDataPrepareParam* param) {
+int APS5_VABI sceSaveDataPrepare(const SaveDataMountPoint* mount_point, const SaveDataPrepareParam* param) {
     (void)mount_point;
     (void)param;
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataSaveIcon(const SaveDataMountPoint* mount_point, const SaveDataIcon* icon) {
+int APS5_VABI sceSaveDataSaveIcon(const SaveDataMountPoint* mount_point, const SaveDataIcon* icon) {
     (void)icon;
     if (mount_point == nullptr) {
         throw std::runtime_error("sceSaveDataSaveIcon: null mount_point");
@@ -242,13 +242,13 @@ int sceSaveDataSaveIcon(const SaveDataMountPoint* mount_point, const SaveDataIco
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataSaveIconByPath(const SaveDataMountPoint* mount_point, const char* path) {
+int APS5_VABI sceSaveDataSaveIconByPath(const SaveDataMountPoint* mount_point, const char* path) {
     (void)mount_point;
     (void)path;
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataSetParam(const SaveDataMountPoint* mount_point, uint32_t param_type, const void* param_buf, size_t param_buf_size) {
+int APS5_VABI sceSaveDataSetParam(const SaveDataMountPoint* mount_point, uint32_t param_type, const void* param_buf, size_t param_buf_size) {
     (void)param_type;
     (void)param_buf;
     (void)param_buf_size;
@@ -261,26 +261,26 @@ int sceSaveDataSetParam(const SaveDataMountPoint* mount_point, uint32_t param_ty
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataSetSaveDataMemory2(const SaveDataMemorySet2* set_param) {
+int APS5_VABI sceSaveDataSetSaveDataMemory2(const SaveDataMemorySet2* set_param) {
     (void)set_param;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataSetupSaveDataMemory2(const SaveDataMemorySetup2* setup_param, SaveDataMemorySetupResult* result) {
+int APS5_VABI sceSaveDataSetupSaveDataMemory2(const SaveDataMemorySetup2* setup_param, SaveDataMemorySetupResult* result) {
     (void)setup_param;
     (void)result;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataSyncSaveDataMemory(const void* sync_param) {
+int APS5_VABI sceSaveDataSyncSaveDataMemory(const void* sync_param) {
     (void)sync_param;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataTerminate(void) {
+int APS5_VABI sceSaveDataTerminate(void) {
     if (!g_initialized) {
         return SAVE_DATA_ERROR_NOT_INITIALIZED;
     }
@@ -291,14 +291,14 @@ int sceSaveDataTerminate(void) {
     return SAVE_DATA_OK;
 }
 
-int sceSaveDataTransferringMount(const SaveDataTransferringMount* mount, SaveDataMountResult* mount_result) {
+int APS5_VABI sceSaveDataTransferringMount(const SaveDataTransferringMount* mount, SaveDataMountResult* mount_result) {
     (void)mount;
     (void)mount_result;
     NotImplemented_nid_no_patch(__func__);
     return 0;
 }
 
-int sceSaveDataUmount2(uint32_t mode, const SaveDataMountPoint* mount_point) {
+int APS5_VABI sceSaveDataUmount2(uint32_t mode, const SaveDataMountPoint* mount_point) {
     (void)mode;
     if (mount_point == nullptr) {
         throw std::runtime_error("sceSaveDataUmount2: null mount_point");

core/libs/prx/libSceSaveData/Export.cpp

@@ -5,45 +5,45 @@
 
 extern "C" {
 
-int sceSaveDataBackup(const SaveDataBackup* backup) {
+int APS5_VABI sceSaveDataBackup(const SaveDataBackup* backup) {
  (void)backup;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataGetEventResult(const void* event_param, SaveDataEvent* event) {
+int APS5_VABI sceSaveDataGetEventResult(const void* event_param, SaveDataEvent* event) {
  (void)event_param;
  (void)event;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataGetSaveDataMemory2(SaveDataMemoryGet2* get_param) {
+int APS5_VABI sceSaveDataGetSaveDataMemory2(SaveDataMemoryGet2* get_param) {
  (void)get_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataSetSaveDataMemory2(const SaveDataMemorySet2* set_param) {
+int APS5_VABI sceSaveDataSetSaveDataMemory2(const SaveDataMemorySet2* set_param) {
  (void)set_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataSetupSaveDataMemory2(const SaveDataMemorySetup2* setup_param, SaveDataMemorySetupResult* result) {
+int APS5_VABI sceSaveDataSetupSaveDataMemory2(const SaveDataMemorySetup2* setup_param, SaveDataMemorySetupResult* result) {
  (void)setup_param;
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataSyncSaveDataMemory(const void* sync_param) {
+int APS5_VABI sceSaveDataSyncSaveDataMemory(const void* sync_param) {
  (void)sync_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSaveDataTransferringMount(const SaveDataTransferringMount* mount, SaveDataMountResult* mount_result) {
+int APS5_VABI sceSaveDataTransferringMount(const SaveDataTransferringMount* mount, SaveDataMountResult* mount_result) {
  (void)mount;
  (void)mount_result;
  NotImplemented_nid_no_patch(__func__);

core/libs/prx/libSceSaveDataDialog.native/Export.cpp

@@ -4,6 +4,7 @@
 #include <cstdio>
 #include "SceTypes.hpp"
 #include "prx/libSceSaveDataDialog.native/SaveDataDialog.hpp"
+#include "prx/libc/include/General.hpp"
 
 static int g_status = SAVE_DATA_DIALOG_STATUS_NONE;
 static int g_mode = 0;
@@ -12,7 +13,7 @@ static char g_dir_name[32] = {};
 
 extern "C" {
 
-int sceSaveDataDialogInitialize(void) {
+int APS5_VABI sceSaveDataDialogInitialize(void) {
  if (g_status != SAVE_DATA_DIALOG_STATUS_NONE) {
   return SAVE_DATA_DIALOG_ERROR_ALREADY_INITIALIZED;
  }
@@ -23,15 +24,15 @@ int sceSaveDataDialogInitialize(void) {
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogGetStatus(void) {
+int APS5_VABI sceSaveDataDialogGetStatus(void) {
  return g_status;
 }
 
-int sceSaveDataDialogUpdateStatus(void) {
+int APS5_VABI sceSaveDataDialogUpdateStatus(void) {
  return g_status;
 }
 
-int sceSaveDataDialogGetResult(void* result) {
+int APS5_VABI sceSaveDataDialogGetResult(void* result) {
  if (result == nullptr) {
   return SAVE_DATA_DIALOG_ERROR_ARG_NULL;
  }
@@ -47,7 +48,7 @@ int sceSaveDataDialogGetResult(void* result) {
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogOpen(const void* param) {
+int APS5_VABI sceSaveDataDialogOpen(const void* param) {
  if (g_status != SAVE_DATA_DIALOG_STATUS_INITIALIZED && g_status != SAVE_DATA_DIALOG_STATUS_FINISHED) {
   return SAVE_DATA_DIALOG_ERROR_INVALID_STATE;
  }
@@ -72,17 +73,17 @@ int sceSaveDataDialogOpen(const void* param) {
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogClose(const void* closeParam) {
+int APS5_VABI sceSaveDataDialogClose(const void* closeParam) {
  (void)closeParam;
  g_status = SAVE_DATA_DIALOG_STATUS_FINISHED;
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogIsReadyToDisplay(void) {
+int APS5_VABI sceSaveDataDialogIsReadyToDisplay(void) {
  return 1;
 }
 
-int sceSaveDataDialogTerminate(void) {
+int APS5_VABI sceSaveDataDialogTerminate(void) {
  g_status = SAVE_DATA_DIALOG_STATUS_NONE;
  g_mode = 0;
  g_user_data = nullptr;
@@ -90,13 +91,13 @@ int sceSaveDataDialogTerminate(void) {
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogProgressBarInc(int target, std::uint32_t delta) {
+int APS5_VABI sceSaveDataDialogProgressBarInc(int target, std::uint32_t delta) {
  (void)target;
  (void)delta;
  return SAVE_DATA_DIALOG_OK;
 }
 
-int sceSaveDataDialogProgressBarSetValue(int target, std::uint32_t rate) {
+int APS5_VABI sceSaveDataDialogProgressBarSetValue(int target, std::uint32_t rate) {
  (void)target;
  (void)rate;
  return SAVE_DATA_DIALOG_OK;

core/libs/prx/libSceSaveDataDialog/Export.cpp

@@ -5,49 +5,49 @@
 
 extern "C" {
 
- int sceSaveDataDialogClose(const void* close_param) {
+ int APS5_VABI sceSaveDataDialogClose(const void* close_param) {
   (void)close_param;
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogGetResult(void* result) {
+ int APS5_VABI sceSaveDataDialogGetResult(void* result) {
   (void)result;
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogInitialize(void) {
+ int APS5_VABI sceSaveDataDialogInitialize(void) {
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogIsReadyToDisplay(void) {
+ int APS5_VABI sceSaveDataDialogIsReadyToDisplay(void) {
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogOpen(const void* param) {
+ int APS5_VABI sceSaveDataDialogOpen(const void* param) {
   (void)param;
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogProgressBarInc(int target, uint32_t delta) {
+ int APS5_VABI sceSaveDataDialogProgressBarInc(int target, uint32_t delta) {
   (void)target;
   (void)delta;
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogProgressBarSetValue(int target, uint32_t rate) {
+ int APS5_VABI sceSaveDataDialogProgressBarSetValue(int target, uint32_t rate) {
   (void)target;
   (void)rate;
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }
 
- int sceSaveDataDialogTerminate(void) {
+ int APS5_VABI sceSaveDataDialogTerminate(void) {
   NotImplemented_nid_no_patch(__func__);
   return 0;
  }

core/libs/prx/libSceShare.native/Export.cpp

@@ -5,40 +5,40 @@
 
 extern "C" {
 
-int sceShareCaptureScreenshot(const void* param, int32_t* req_id) {
+int APS5_VABI sceShareCaptureScreenshot(const void* param, int32_t* req_id) {
  (void)param;
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareCaptureVideoClip(const void* param, int32_t* req_id) {
+int APS5_VABI sceShareCaptureVideoClip(const void* param, int32_t* req_id) {
  (void)param;
  (void)req_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareFeaturePermit(uint32_t feature_flags) {
+int APS5_VABI sceShareFeaturePermit(uint32_t feature_flags) {
  (void)feature_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareFeatureProhibit(uint32_t feature_flags) {
+int APS5_VABI sceShareFeatureProhibit(uint32_t feature_flags) {
  (void)feature_flags;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
+int APS5_VABI sceShareGetCurrentStatus(uint32_t feature_flag, ShareCurrentStatus* status) {
  (void)feature_flag;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
+int APS5_VABI sceShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_mask) {
  (void)heap_size;
  (void)thread_priority;
  (void)affinity_mask;
@@ -46,33 +46,33 @@ int sceShareInitialize(size_t heap_size, int thread_priority, uint64_t affinity_
  return 0;
 }
 
-int sceShareOpenMenuForContent(const void* content_id) {
+int APS5_VABI sceShareOpenMenuForContent(const void* content_id) {
  (void)content_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareRegisterContentEventCallback(void* callback, void* user_data) {
+int APS5_VABI sceShareRegisterContentEventCallback(void* callback, void* user_data) {
  (void)callback;
  (void)user_data;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareSetCaptureSource(uint32_t feature_flags, const void* tap_point) {
+int APS5_VABI sceShareSetCaptureSource(uint32_t feature_flags, const void* tap_point) {
  (void)feature_flags;
  (void)tap_point;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareSetContentParam(const char* content_param) {
+int APS5_VABI sceShareSetContentParam(const char* content_param) {
  (void)content_param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareSetScreenshotOverlayImage(const char* file_path, int32_t margin_x, int32_t margin_y, int32_t origin) {
+int APS5_VABI sceShareSetScreenshotOverlayImage(const char* file_path, int32_t margin_x, int32_t margin_y, int32_t origin) {
  (void)file_path;
  (void)margin_x;
  (void)margin_y;
@@ -81,12 +81,12 @@ int sceShareSetScreenshotOverlayImage(const char* file_path, int32_t margin_x, i
  return 0;
 }
 
-int sceShareTerminate(void) {
+int APS5_VABI sceShareTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceShareUnregisterContentEventCallback(void* callback) {
+int APS5_VABI sceShareUnregisterContentEventCallback(void* callback) {
  (void)callback;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceSharePlay/Export.cpp

@@ -5,14 +5,14 @@
 
 extern "C" {
 
-int sceSharePlayInitialize(void* heap, size_t heap_size) {
+int APS5_VABI sceSharePlayInitialize(void* heap, size_t heap_size) {
  (void)heap;
  (void)heap_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSharePlayTerminate(void) {
+int APS5_VABI sceSharePlayTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceSigninDialog/Export.cpp

@@ -5,39 +5,39 @@
 
 extern "C" {
 
-int sceSigninDialogClose(void) {
+int APS5_VABI sceSigninDialogClose(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogGetResult(void* result) {
+int APS5_VABI sceSigninDialogGetResult(void* result) {
  (void)result;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogGetStatus(void) {
+int APS5_VABI sceSigninDialogGetStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogInitialize(void) {
+int APS5_VABI sceSigninDialogInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogOpen(const void* param) {
+int APS5_VABI sceSigninDialogOpen(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogTerminate(void) {
+int APS5_VABI sceSigninDialogTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSigninDialogUpdateStatus(void) {
+int APS5_VABI sceSigninDialogUpdateStatus(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceSsl/Export.cpp

@@ -5,27 +5,27 @@
 
 extern "C" {
 
-int sceSslFreeCaCerts(int ssl_ctx_id, void* ca_certs) {
+int APS5_VABI sceSslFreeCaCerts(int ssl_ctx_id, void* ca_certs) {
  (void)ssl_ctx_id;
  (void)ca_certs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSslGetCaCerts(int ssl_ctx_id, void* ca_certs) {
+int APS5_VABI sceSslGetCaCerts(int ssl_ctx_id, void* ca_certs) {
  (void)ssl_ctx_id;
  (void)ca_certs;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSslInit_nid_postfix(uint64_t pool_size) {
+int APS5_VABI sceSslInit_nid_postfix(uint64_t pool_size) {
  (void)pool_size;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSslTerm_nid_postfix(int ssl_ctx_id) {
+int APS5_VABI sceSslTerm_nid_postfix(int ssl_ctx_id) {
  (void)ssl_ctx_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceSysmodule/Export.cpp

@@ -92,7 +92,7 @@ bool fillModuleInfoForUnwind(std::uint64_t addr, ModuleInfoForUnwind* info) {
 
 extern "C" {
 
-int sceSysmoduleGetModuleInfoForUnwind(std::uint64_t addr, int flags, ModuleInfoForUnwind* info) {
+int APS5_VABI sceSysmoduleGetModuleInfoForUnwind(std::uint64_t addr, int flags, ModuleInfoForUnwind* info) {
     (void)flags;
     if (!fillModuleInfoForUnwind(addr, info)) {
         throw std::runtime_error("sceSysmoduleGetModuleInfoForUnwind: address not found");
@@ -100,7 +100,7 @@ int sceSysmoduleGetModuleInfoForUnwind(std::uint64_t addr, int flags, ModuleInfo
     return 0;
 }
 
-int sceSysmoduleIsLoaded(std::uint16_t id) {
+int APS5_VABI sceSysmoduleIsLoaded(std::uint16_t id) {
     if (id == 0) {
         throw std::runtime_error("sceSysmoduleIsLoaded: invalid id 0");
     }
@@ -115,7 +115,7 @@ int sceSysmoduleIsLoaded(std::uint16_t id) {
     return 0;
 }
 
-int sceSysmoduleLoadModule(std::uint16_t id) {
+int APS5_VABI sceSysmoduleLoadModule(std::uint16_t id) {
     if (id == 0) {
         throw std::runtime_error("sceSysmoduleLoadModule: invalid id 0");
     }
@@ -127,7 +127,7 @@ int sceSysmoduleLoadModule(std::uint16_t id) {
     return 0;
 }
 
-int sceSysmoduleLoadModuleInternalWithArg(std::uint32_t id, int argc, void* argv, std::uint64_t unk, int* ret) {
+int APS5_VABI sceSysmoduleLoadModuleInternalWithArg(std::uint32_t id, int argc, void* argv, std::uint64_t unk, int* ret) {
     (void)argc;
     (void)argv;
     (void)unk;
@@ -145,7 +145,7 @@ int sceSysmoduleLoadModuleInternalWithArg(std::uint32_t id, int argc, void* argv
     return 0;
 }
 
-int sceSysmoduleUnloadModule(std::uint16_t id) {
+int APS5_VABI sceSysmoduleUnloadModule(std::uint16_t id) {
     if (id == 0) {
         throw std::runtime_error("sceSysmoduleUnloadModule: invalid id 0");
     }

core/libs/prx/libSceSystemGesture/Export.cpp

@@ -5,20 +5,20 @@
 
 extern "C" {
 
-int sceSystemGestureAppendTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
+int APS5_VABI sceSystemGestureAppendTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
  (void)gesture_handle;
  (void)recognizer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureClose(int32_t gesture_handle) {
+int APS5_VABI sceSystemGestureClose(int32_t gesture_handle) {
  (void)gesture_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureCreateTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer, int32_t type, const SystemGestureRectangle* rectangle, const void* param) {
+int APS5_VABI sceSystemGestureCreateTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer, int32_t type, const SystemGestureRectangle* rectangle, const void* param) {
  (void)gesture_handle;
  (void)recognizer;
  (void)type;
@@ -28,12 +28,12 @@ int sceSystemGestureCreateTouchRecognizer(int32_t gesture_handle, SystemGestureT
  return 0;
 }
 
-int sceSystemGestureFinalizePrimitiveTouchRecognizer(void) {
+int APS5_VABI sceSystemGestureFinalizePrimitiveTouchRecognizer(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureGetPrimitiveTouchEventByIndex(int32_t gesture_handle, uint32_t index, SystemGesturePrimitiveTouchEvent* event) {
+int APS5_VABI sceSystemGestureGetPrimitiveTouchEventByIndex(int32_t gesture_handle, uint32_t index, SystemGesturePrimitiveTouchEvent* event) {
  (void)gesture_handle;
  (void)index;
  (void)event;
@@ -41,7 +41,7 @@ int sceSystemGestureGetPrimitiveTouchEventByIndex(int32_t gesture_handle, uint32
  return 0;
 }
 
-int sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(int32_t gesture_handle, uint16_t primitiveId, SystemGesturePrimitiveTouchEvent* event) {
+int APS5_VABI sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(int32_t gesture_handle, uint16_t primitiveId, SystemGesturePrimitiveTouchEvent* event) {
  (void)gesture_handle;
  (void)primitiveId;
  (void)event;
@@ -49,7 +49,7 @@ int sceSystemGestureGetPrimitiveTouchEventByPrimitiveID(int32_t gesture_handle,
  return 0;
 }
 
-int sceSystemGestureGetPrimitiveTouchEvents(int32_t gesture_handle, SystemGesturePrimitiveTouchEvent* event_buffer, uint32_t capacity_of_buffer, uint32_t* number_of_event) {
+int APS5_VABI sceSystemGestureGetPrimitiveTouchEvents(int32_t gesture_handle, SystemGesturePrimitiveTouchEvent* event_buffer, uint32_t capacity_of_buffer, uint32_t* number_of_event) {
  (void)gesture_handle;
  (void)event_buffer;
  (void)capacity_of_buffer;
@@ -58,13 +58,13 @@ int sceSystemGestureGetPrimitiveTouchEvents(int32_t gesture_handle, SystemGestur
  return 0;
 }
 
-int sceSystemGestureGetPrimitiveTouchEventsCount(int32_t gesture_handle) {
+int APS5_VABI sceSystemGestureGetPrimitiveTouchEventsCount(int32_t gesture_handle) {
  (void)gesture_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureGetTouchEventByEventID(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, uint32_t eventId, SystemGestureTouchEvent* event) {
+int APS5_VABI sceSystemGestureGetTouchEventByEventID(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, uint32_t eventId, SystemGestureTouchEvent* event) {
  (void)gesture_handle;
  (void)recognizer;
  (void)eventId;
@@ -73,7 +73,7 @@ int sceSystemGestureGetTouchEventByEventID(int32_t gesture_handle, const SystemG
  return 0;
 }
 
-int sceSystemGestureGetTouchEventByIndex(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, uint32_t index, SystemGestureTouchEvent* event) {
+int APS5_VABI sceSystemGestureGetTouchEventByIndex(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, uint32_t index, SystemGestureTouchEvent* event) {
  (void)gesture_handle;
  (void)recognizer;
  (void)index;
@@ -82,7 +82,7 @@ int sceSystemGestureGetTouchEventByIndex(int32_t gesture_handle, const SystemGes
  return 0;
 }
 
-int sceSystemGestureGetTouchEvents(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, SystemGestureTouchEvent* event_buffer, uint32_t capacity_of_buffer, uint32_t* number_of_event) {
+int APS5_VABI sceSystemGestureGetTouchEvents(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, SystemGestureTouchEvent* event_buffer, uint32_t capacity_of_buffer, uint32_t* number_of_event) {
  (void)gesture_handle;
  (void)recognizer;
  (void)event_buffer;
@@ -92,14 +92,14 @@ int sceSystemGestureGetTouchEvents(int32_t gesture_handle, const SystemGestureTo
  return 0;
 }
 
-int sceSystemGestureGetTouchEventsCount(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer) {
+int APS5_VABI sceSystemGestureGetTouchEventsCount(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer) {
  (void)gesture_handle;
  (void)recognizer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureGetTouchRecognizerInformation(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, SystemGestureTouchRecognizerInformation* information) {
+int APS5_VABI sceSystemGestureGetTouchRecognizerInformation(int32_t gesture_handle, const SystemGestureTouchRecognizer* recognizer, SystemGestureTouchRecognizerInformation* information) {
  (void)gesture_handle;
  (void)recognizer;
  (void)information;
@@ -107,60 +107,60 @@ int sceSystemGestureGetTouchRecognizerInformation(int32_t gesture_handle, const
  return 0;
 }
 
-int sceSystemGestureInitializePrimitiveTouchRecognizer(const void* param) {
+int APS5_VABI sceSystemGestureInitializePrimitiveTouchRecognizer(const void* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int32_t sceSystemGestureOpen(int32_t input_type, const void* param) {
+int32_t APS5_VABI sceSystemGestureOpen(int32_t input_type, const void* param) {
  (void)input_type;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureRemoveTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
+int APS5_VABI sceSystemGestureRemoveTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
  (void)gesture_handle;
  (void)recognizer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureResetPrimitiveTouchRecognizer(int32_t gesture_handle) {
+int APS5_VABI sceSystemGestureResetPrimitiveTouchRecognizer(int32_t gesture_handle) {
  (void)gesture_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureResetTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
+int APS5_VABI sceSystemGestureResetTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
  (void)gesture_handle;
  (void)recognizer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureUpdateAllTouchRecognizer(int32_t gesture_handle) {
+int APS5_VABI sceSystemGestureUpdateAllTouchRecognizer(int32_t gesture_handle) {
  (void)gesture_handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureUpdatePrimitiveTouchRecognizer(int32_t gesture_handle, const void* param) {
+int APS5_VABI sceSystemGestureUpdatePrimitiveTouchRecognizer(int32_t gesture_handle, const void* param) {
  (void)gesture_handle;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureUpdateTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
+int APS5_VABI sceSystemGestureUpdateTouchRecognizer(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer) {
  (void)gesture_handle;
  (void)recognizer;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemGestureUpdateTouchRecognizerRectangle(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer, const SystemGestureRectangle* rectangle) {
+int APS5_VABI sceSystemGestureUpdateTouchRecognizerRectangle(int32_t gesture_handle, SystemGestureTouchRecognizer* recognizer, const SystemGestureRectangle* rectangle) {
  (void)gesture_handle;
  (void)recognizer;
  (void)rectangle;

core/libs/prx/libSceSystemService/Export.cpp

@@ -7,30 +7,30 @@
 
 extern "C" {
 
-int sceSystemServiceDisableNoticeScreenSkipFlagAutoSet(void) {
+int APS5_VABI sceSystemServiceDisableNoticeScreenSkipFlagAutoSet(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceGetDisplaySafeAreaInfo(SystemServiceDisplaySafeAreaInfo* info) {
+int APS5_VABI sceSystemServiceGetDisplaySafeAreaInfo(SystemServiceDisplaySafeAreaInfo* info) {
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceGetHdrToneMapLuminance(SystemServiceHdrToneMapLuminance* luminance) {
+int APS5_VABI sceSystemServiceGetHdrToneMapLuminance(SystemServiceHdrToneMapLuminance* luminance) {
  (void)luminance;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceGetNoticeScreenSkipFlag(bool* value) {
+int APS5_VABI sceSystemServiceGetNoticeScreenSkipFlag(bool* value) {
  (void)value;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceGetStatus(SystemServiceStatus* status) {
+int APS5_VABI sceSystemServiceGetStatus(SystemServiceStatus* status) {
  if (status == nullptr) {
   return SYSTEM_SERVICE_ERROR_PARAMETER;
  }
@@ -38,11 +38,11 @@ int sceSystemServiceGetStatus(SystemServiceStatus* status) {
  return SYSTEM_SERVICE_OK;
 }
 
-int sceSystemServiceHideSplashScreen(void) {
+int APS5_VABI sceSystemServiceHideSplashScreen(void) {
  return SYSTEM_SERVICE_OK;
 }
 
-int sceSystemServiceParamGetInt(int paramId, int* value) {
+int APS5_VABI sceSystemServiceParamGetInt(int paramId, int* value) {
  if (value == nullptr) {
   return SYSTEM_SERVICE_ERROR_PARAMETER;
  }
@@ -59,7 +59,7 @@ int sceSystemServiceParamGetInt(int paramId, int* value) {
  return SYSTEM_SERVICE_OK;
 }
 
-int sceSystemServiceParamGetString(int param_id, char* buf, size_t buf_size) {
+int APS5_VABI sceSystemServiceParamGetString(int param_id, char* buf, size_t buf_size) {
  (void)param_id;
  (void)buf;
  (void)buf_size;
@@ -67,12 +67,12 @@ int sceSystemServiceParamGetString(int param_id, char* buf, size_t buf_size) {
  return 0;
 }
 
-int sceSystemServicePowerTick(void) {
+int APS5_VABI sceSystemServicePowerTick(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceReceiveEvent(SystemServiceEvent* event) {
+int APS5_VABI sceSystemServiceReceiveEvent(SystemServiceEvent* event) {
  if (event == nullptr) {
   return SYSTEM_SERVICE_ERROR_PARAMETER;
  }
@@ -81,13 +81,13 @@ int sceSystemServiceReceiveEvent(SystemServiceEvent* event) {
  return SYSTEM_SERVICE_ERROR_NO_EVENT;
 }
 
-int sceSystemServiceReportAbnormalTermination(const void* info) {
+int APS5_VABI sceSystemServiceReportAbnormalTermination(const void* info) {
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceSystemServiceSetNoticeScreenSkipFlag(void) {
+int APS5_VABI sceSystemServiceSetNoticeScreenSkipFlag(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libSceUlt/Export.cpp

@@ -61,11 +61,11 @@ void* ulthreadRunner(void* arg) {
 
 extern "C" {
 
-int sceUltInitialize() {
+int APS5_VABI sceUltInitialize() {
     return ULT_OK;
 }
 
-int sceUltFinalize() {
+int APS5_VABI sceUltFinalize() {
     std::vector<std::shared_ptr<UltSemaphoreState>> semaphores;
     {
         std::lock_guard<std::mutex> lock(gMutex);
@@ -90,7 +90,7 @@ int sceUltFinalize() {
     return ULT_OK;
 }
 
-int sceUltMutexOptParamInitialize(UltMutexOptParam* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltMutexOptParamInitialize(UltMutexOptParam* optParam, std::uint32_t buildVersion) {
     (void)buildVersion;
     if (optParam == nullptr) {
         return ULT_ERROR_NULL;
@@ -99,7 +99,7 @@ int sceUltMutexOptParamInitialize(UltMutexOptParam* optParam, std::uint32_t buil
     return ULT_OK;
 }
 
-int sceUltMutexCreate(void* mutex, const char* name, void* waitingQueueResourcePool, const UltMutexOptParam* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltMutexCreate(void* mutex, const char* name, void* waitingQueueResourcePool, const UltMutexOptParam* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)buildVersion;
     if (mutex == nullptr) {
@@ -116,7 +116,7 @@ int sceUltMutexCreate(void* mutex, const char* name, void* waitingQueueResourceP
     return ULT_OK;
 }
 
-int sceUltMutexLock(void* mutex) {
+int APS5_VABI sceUltMutexLock(void* mutex) {
     std::shared_ptr<UltMutexState> state;
     {
         std::lock_guard<std::mutex> lock(gMutex);
@@ -130,7 +130,7 @@ int sceUltMutexLock(void* mutex) {
     return ULT_OK;
 }
 
-int sceUltMutexUnlock(void* mutex) {
+int APS5_VABI sceUltMutexUnlock(void* mutex) {
     std::shared_ptr<UltMutexState> state;
     {
         std::lock_guard<std::mutex> lock(gMutex);
@@ -144,11 +144,11 @@ int sceUltMutexUnlock(void* mutex) {
     return ULT_OK;
 }
 
-int sceUltWaitingQueueResourcePoolGetWorkAreaSize(std::uint32_t numThreads, std::uint32_t numSyncObjects) {
+int APS5_VABI sceUltWaitingQueueResourcePoolGetWorkAreaSize(std::uint32_t numThreads, std::uint32_t numSyncObjects) {
     return static_cast<int>(alignUp(static_cast<std::uint64_t>(numThreads + numSyncObjects) * 256u, 8u));
 }
 
-int sceUltWaitingQueueResourcePoolCreate(void* pool, const char* name, std::uint32_t numThreads, std::uint32_t numSyncObjects, void* workArea, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltWaitingQueueResourcePoolCreate(void* pool, const char* name, std::uint32_t numThreads, std::uint32_t numSyncObjects, void* workArea, const void* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)optParam;
     (void)buildVersion;
@@ -161,13 +161,13 @@ int sceUltWaitingQueueResourcePoolCreate(void* pool, const char* name, std::uint
     return ULT_OK;
 }
 
-std::uint64_t sceUltQueueDataResourcePoolGetWorkAreaSize(std::uint32_t numData, std::uint64_t dataSize, std::uint32_t numQueueObject) {
+std::uint64_t APS5_VABI sceUltQueueDataResourcePoolGetWorkAreaSize(std::uint32_t numData, std::uint64_t dataSize, std::uint32_t numQueueObject) {
     const std::uint64_t dataArea = static_cast<std::uint64_t>(numData) * alignUp(dataSize, 8u);
     const std::uint64_t queueArea = static_cast<std::uint64_t>(numQueueObject) * 512u;
     return alignUp(dataArea + queueArea, 8u);
 }
 
-int sceUltQueueDataResourcePoolCreate(void* pool, const char* name, std::uint32_t numData, std::uint64_t dataSize, std::uint32_t numQueueObject, void* waitingQueueResourcePool, void* workArea, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltQueueDataResourcePoolCreate(void* pool, const char* name, std::uint32_t numData, std::uint64_t dataSize, std::uint32_t numQueueObject, void* waitingQueueResourcePool, void* workArea, const void* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)optParam;
     (void)buildVersion;
@@ -183,7 +183,7 @@ int sceUltQueueDataResourcePoolCreate(void* pool, const char* name, std::uint32_
     return ULT_OK;
 }
 
-int sceUltQueueCreate(void* queue, const char* name, std::uint64_t dataSize, void* waitingQueueResourcePool, void* queueDataResourcePool, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltQueueCreate(void* queue, const char* name, std::uint64_t dataSize, void* waitingQueueResourcePool, void* queueDataResourcePool, const void* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)optParam;
     (void)buildVersion;
@@ -208,7 +208,7 @@ int sceUltQueueCreate(void* queue, const char* name, std::uint64_t dataSize, voi
     return ULT_OK;
 }
 
-int sceUltQueuePush(void* queue, const void* data) {
+int APS5_VABI sceUltQueuePush(void* queue, const void* data) {
     std::shared_ptr<UltQueueState> state;
     if (int ret = queueGetState(queue, &state); ret != ULT_OK) {
         return ret;
@@ -227,7 +227,7 @@ int sceUltQueuePush(void* queue, const void* data) {
     return ULT_OK;
 }
 
-int sceUltQueueTryPop(void* queue, void* data) {
+int APS5_VABI sceUltQueueTryPop(void* queue, void* data) {
     std::shared_ptr<UltQueueState> state;
     if (int ret = queueGetState(queue, &state); ret != ULT_OK) {
         return ret;
@@ -247,7 +247,7 @@ int sceUltQueueTryPop(void* queue, void* data) {
     return ULT_OK;
 }
 
-int sceUltSemaphoreCreate(void* semaphore, const char* name, std::int32_t numInitialResource, void* waitingQueueResourcePool, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltSemaphoreCreate(void* semaphore, const char* name, std::int32_t numInitialResource, void* waitingQueueResourcePool, const void* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)optParam;
     (void)buildVersion;
@@ -274,7 +274,7 @@ int sceUltSemaphoreCreate(void* semaphore, const char* name, std::int32_t numIni
     return ULT_OK;
 }
 
-int sceUltSemaphoreAcquire(void* semaphore, std::int32_t numResource) {
+int APS5_VABI sceUltSemaphoreAcquire(void* semaphore, std::int32_t numResource) {
     if (numResource <= 0) {
         return ULT_ERROR_RANGE;
     }
@@ -296,7 +296,7 @@ int sceUltSemaphoreAcquire(void* semaphore, std::int32_t numResource) {
     return ULT_OK;
 }
 
-int sceUltSemaphoreTryAcquire(void* semaphore, std::int32_t numResource) {
+int APS5_VABI sceUltSemaphoreTryAcquire(void* semaphore, std::int32_t numResource) {
     if (numResource <= 0) {
         return ULT_ERROR_RANGE;
     }
@@ -315,7 +315,7 @@ int sceUltSemaphoreTryAcquire(void* semaphore, std::int32_t numResource) {
     return ULT_OK;
 }
 
-int sceUltSemaphoreRelease(void* semaphore, std::int32_t numResource) {
+int APS5_VABI sceUltSemaphoreRelease(void* semaphore, std::int32_t numResource) {
     if (numResource <= 0) {
         return ULT_ERROR_RANGE;
     }
@@ -337,7 +337,7 @@ int sceUltSemaphoreRelease(void* semaphore, std::int32_t numResource) {
     return ULT_OK;
 }
 
-int sceUltSemaphoreDestroy(void* semaphore) {
+int APS5_VABI sceUltSemaphoreDestroy(void* semaphore) {
     if (semaphore == nullptr) {
         return ULT_ERROR_NULL;
     }
@@ -356,7 +356,7 @@ int sceUltSemaphoreDestroy(void* semaphore) {
     return ULT_OK;
 }
 
-int sceUltUlthreadRuntimeOptParamInitialize(UltUlthreadRuntimeOptParam* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltUlthreadRuntimeOptParamInitialize(UltUlthreadRuntimeOptParam* optParam, std::uint32_t buildVersion) {
     (void)buildVersion;
     if (optParam == nullptr) {
         return ULT_ERROR_NULL;
@@ -365,11 +365,11 @@ int sceUltUlthreadRuntimeOptParamInitialize(UltUlthreadRuntimeOptParam* optParam
     return ULT_OK;
 }
 
-std::uint64_t sceUltUlthreadRuntimeGetWorkAreaSize(std::uint32_t maxNumUlthread, std::uint32_t numWorkerThread) {
+std::uint64_t APS5_VABI sceUltUlthreadRuntimeGetWorkAreaSize(std::uint32_t maxNumUlthread, std::uint32_t numWorkerThread) {
     return alignUp(static_cast<std::uint64_t>(maxNumUlthread) * 256u + static_cast<std::uint64_t>(numWorkerThread) * 16u * 1024u, 8u);
 }
 
-int sceUltUlthreadRuntimeCreate(void* runtime, const char* name, std::uint32_t maxNumUlthread, std::uint32_t numWorkerThread, void* workArea, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltUlthreadRuntimeCreate(void* runtime, const char* name, std::uint32_t maxNumUlthread, std::uint32_t numWorkerThread, void* workArea, const void* optParam, std::uint32_t buildVersion) {
     (void)name;
     (void)optParam;
     (void)buildVersion;
@@ -382,7 +382,7 @@ int sceUltUlthreadRuntimeCreate(void* runtime, const char* name, std::uint32_t m
     return ULT_OK;
 }
 
-int sceUltUlthreadCreate(void* ulthread, const char* name, UltUlthreadEntry entry, std::uint64_t arg, void* context, std::uint64_t sizeContext, void* runtime, const void* optParam, std::uint32_t buildVersion) {
+int APS5_VABI sceUltUlthreadCreate(void* ulthread, const char* name, UltUlthreadEntry entry, std::uint64_t arg, void* context, std::uint64_t sizeContext, void* runtime, const void* optParam, std::uint32_t buildVersion) {
     (void)context;
     (void)sizeContext;
     (void)optParam;
@@ -413,7 +413,7 @@ int sceUltUlthreadCreate(void* ulthread, const char* name, UltUlthreadEntry entr
     return ULT_OK;
 }
 
-int sceUltUlthreadJoin(void* ulthread, std::int32_t* status) {
+int APS5_VABI sceUltUlthreadJoin(void* ulthread, std::int32_t* status) {
     if (ulthread == nullptr) {
         return ULT_ERROR_NULL;
     }

core/libs/prx/libSceUserService/Export.cpp

@@ -6,62 +6,62 @@
 
 extern "C" {
 
-int sceUserServiceGetAccessibilityChatTranscription(int user_id, int32_t* chat_transcription) {
+int APS5_VABI sceUserServiceGetAccessibilityChatTranscription(int user_id, int32_t* chat_transcription) {
  (void)user_id;
  (void)chat_transcription;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetAccessibilityPressAndHoldDelay(int user_id, int32_t* press_and_hold_delay) {
+int APS5_VABI sceUserServiceGetAccessibilityPressAndHoldDelay(int user_id, int32_t* press_and_hold_delay) {
  (void)user_id;
  (void)press_and_hold_delay;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetAccessibilityTriggerEffect(int user_id, int32_t* trigger_effect) {
+int APS5_VABI sceUserServiceGetAccessibilityTriggerEffect(int user_id, int32_t* trigger_effect) {
  (void)user_id;
  (void)trigger_effect;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetAccessibilityVibration(int user_id, int32_t* vibration) {
+int APS5_VABI sceUserServiceGetAccessibilityVibration(int user_id, int32_t* vibration) {
  (void)user_id;
  (void)vibration;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetAccessibilityZoomEnabled(int user_id, int32_t* zoom_enabled) {
+int APS5_VABI sceUserServiceGetAccessibilityZoomEnabled(int user_id, int32_t* zoom_enabled) {
  (void)user_id;
  (void)zoom_enabled;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetAgeLevel(int user_id, uint32_t* age_level) {
+int APS5_VABI sceUserServiceGetAgeLevel(int user_id, uint32_t* age_level) {
  (void)user_id;
  (void)age_level;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetEvent(SceUserServiceEvent* event) {
+int APS5_VABI sceUserServiceGetEvent(SceUserServiceEvent* event) {
  (void)event;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetGamePresets(int user_id, UserServiceGamePresets* presets) {
+int APS5_VABI sceUserServiceGetGamePresets(int user_id, UserServiceGamePresets* presets) {
  (void)user_id;
  (void)presets;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceGetInitialUser(int* user_id) {
+int APS5_VABI sceUserServiceGetInitialUser(int* user_id) {
  if (user_id == nullptr) {
   return USER_SERVICE_ERROR_INVALID_ARGUMENT;
  }
@@ -69,7 +69,7 @@ int sceUserServiceGetInitialUser(int* user_id) {
  return USER_SERVICE_OK;
 }
 
-int sceUserServiceGetLoginUserIdList(UserServiceLoginUserIdList* user_id_list) {
+int APS5_VABI sceUserServiceGetLoginUserIdList(UserServiceLoginUserIdList* user_id_list) {
  if (user_id_list == nullptr) {
   return USER_SERVICE_ERROR_INVALID_ARGUMENT;
  }
@@ -80,7 +80,7 @@ int sceUserServiceGetLoginUserIdList(UserServiceLoginUserIdList* user_id_list) {
  return USER_SERVICE_OK;
 }
 
-int sceUserServiceGetUserName(int user_id, char* name, size_t size) {
+int APS5_VABI sceUserServiceGetUserName(int user_id, char* name, size_t size) {
  (void)user_id;
  (void)name;
  (void)size;
@@ -88,23 +88,23 @@ int sceUserServiceGetUserName(int user_id, char* name, size_t size) {
  return 0;
 }
 
-int sceUserServiceGetUserNumber(int user_id, int32_t* number) {
+int APS5_VABI sceUserServiceGetUserNumber(int user_id, int32_t* number) {
  (void)user_id;
  (void)number;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceUserServiceInitialize(const void* params) {
+int APS5_VABI sceUserServiceInitialize(const void* params) {
  (void)params;
  return USER_SERVICE_OK;
 }
 
-int sceUserServiceInitialize2(void) {
+int APS5_VABI sceUserServiceInitialize2(void) {
  return USER_SERVICE_OK;
 }
 
-int sceUserServiceTerminate(void) {
+int APS5_VABI sceUserServiceTerminate(void) {
  return USER_SERVICE_OK;
 }
 

core/libs/prx/libSceVideoOut/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceVideoOutAddFlipEvent(KernelEqueue eq, int handle, void* udata) {
+int APS5_VABI sceVideoOutAddFlipEvent(KernelEqueue eq, int handle, void* udata) {
  (void)eq;
  (void)handle;
  (void)udata;
@@ -13,7 +13,7 @@ int sceVideoOutAddFlipEvent(KernelEqueue eq, int handle, void* udata) {
  return 0;
 }
 
-int sceVideoOutAddOutputModeEvent(KernelEqueue eq, int handle, void* udata) {
+int APS5_VABI sceVideoOutAddOutputModeEvent(KernelEqueue eq, int handle, void* udata) {
  (void)eq;
  (void)handle;
  (void)udata;
@@ -21,7 +21,7 @@ int sceVideoOutAddOutputModeEvent(KernelEqueue eq, int handle, void* udata) {
  return 0;
 }
 
-int sceVideoOutAddPreVblankStartEvent(KernelEqueue eq, int handle, void* udata) {
+int APS5_VABI sceVideoOutAddPreVblankStartEvent(KernelEqueue eq, int handle, void* udata) {
  (void)eq;
  (void)handle;
  (void)udata;
@@ -29,7 +29,7 @@ int sceVideoOutAddPreVblankStartEvent(KernelEqueue eq, int handle, void* udata)
  return 0;
 }
 
-int sceVideoOutAddVblankEvent(KernelEqueue eq, int handle, void* udata) {
+int APS5_VABI sceVideoOutAddVblankEvent(KernelEqueue eq, int handle, void* udata) {
  (void)eq;
  (void)handle;
  (void)udata;
@@ -37,13 +37,13 @@ int sceVideoOutAddVblankEvent(KernelEqueue eq, int handle, void* udata) {
  return 0;
 }
 
-int sceVideoOutClose(int handle) {
+int APS5_VABI sceVideoOutClose(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutConfigureOutput(int handle, uint64_t mode, const VideoOutOutputOptions* options, void* reserved_ptr, uint64_t reserved) {
+int APS5_VABI sceVideoOutConfigureOutput(int handle, uint64_t mode, const VideoOutOutputOptions* options, void* reserved_ptr, uint64_t reserved) {
  (void)handle;
  (void)mode;
  (void)options;
@@ -53,80 +53,80 @@ int sceVideoOutConfigureOutput(int handle, uint64_t mode, const VideoOutOutputOp
  return 0;
 }
 
-int sceVideoOutDeleteFlipEvent(KernelEqueue eq, int handle) {
+int APS5_VABI sceVideoOutDeleteFlipEvent(KernelEqueue eq, int handle) {
  (void)eq;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutDeletePreVblankStartEvent(KernelEqueue eq, int handle) {
+int APS5_VABI sceVideoOutDeletePreVblankStartEvent(KernelEqueue eq, int handle) {
  (void)eq;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutDeleteVblankEvent(KernelEqueue eq, int handle) {
+int APS5_VABI sceVideoOutDeleteVblankEvent(KernelEqueue eq, int handle) {
  (void)eq;
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetEventCount(const KernelEvent* ev) {
+int APS5_VABI sceVideoOutGetEventCount(const KernelEvent* ev) {
  (void)ev;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetEventData(const KernelEvent* ev, int64_t* data) {
+int APS5_VABI sceVideoOutGetEventData(const KernelEvent* ev, int64_t* data) {
  (void)ev;
  (void)data;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetEventId(const KernelEvent* ev) {
+int APS5_VABI sceVideoOutGetEventId(const KernelEvent* ev) {
  (void)ev;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetFlipStatus(int handle, VideoOutFlipStatus* status) {
+int APS5_VABI sceVideoOutGetFlipStatus(int handle, VideoOutFlipStatus* status) {
  (void)handle;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetOutputStatus(int handle, VideoOutOutputStatus* status) {
+int APS5_VABI sceVideoOutGetOutputStatus(int handle, VideoOutOutputStatus* status) {
  (void)handle;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutGetVblankStatus(int handle, VideoOutVblankStatus* status) {
+int APS5_VABI sceVideoOutGetVblankStatus(int handle, VideoOutVblankStatus* status) {
  (void)handle;
  (void)status;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutInitializeOutputOptions(VideoOutOutputOptions* options) {
+int APS5_VABI sceVideoOutInitializeOutputOptions(VideoOutOutputOptions* options) {
  (void)options;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutIsFlipPending(int handle) {
+int APS5_VABI sceVideoOutIsFlipPending(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutIsOutputSupported(int handle, uint64_t mode, const VideoOutOutputOptions* options, void* reserved_ptr, uint64_t reserved) {
+int APS5_VABI sceVideoOutIsOutputSupported(int handle, uint64_t mode, const VideoOutOutputOptions* options, void* reserved_ptr, uint64_t reserved) {
  (void)handle;
  (void)mode;
  (void)options;
@@ -136,7 +136,7 @@ int sceVideoOutIsOutputSupported(int handle, uint64_t mode, const VideoOutOutput
  return 0;
 }
 
-int sceVideoOutOpen(int user_id, int bus_type, int index, const void* param) {
+int APS5_VABI sceVideoOutOpen(int user_id, int bus_type, int index, const void* param) {
  (void)user_id;
  (void)bus_type;
  (void)index;
@@ -145,7 +145,7 @@ int sceVideoOutOpen(int user_id, int bus_type, int index, const void* param) {
  return 0;
 }
 
-int sceVideoOutRegisterBuffers2(int handle, int set_index, int buffer_index_start, const VideoOutBuffers* buffers, int buffer_num, const VideoOutBufferAttribute2* attribute, int category, void* option) {
+int APS5_VABI sceVideoOutRegisterBuffers2(int handle, int set_index, int buffer_index_start, const VideoOutBuffers* buffers, int buffer_num, const VideoOutBufferAttribute2* attribute, int category, void* option) {
  (void)handle;
  (void)set_index;
  (void)buffer_index_start;
@@ -158,7 +158,7 @@ int sceVideoOutRegisterBuffers2(int handle, int set_index, int buffer_index_star
  return 0;
 }
 
-void sceVideoOutSetBufferAttribute2(VideoOutBufferAttribute2* attribute, uint64_t pixel_format, uint32_t tiling_mode, uint32_t width, uint32_t height, uint64_t option, uint32_t dcc_control, uint64_t dcc_cb_register_clear_color) {
+void APS5_VABI sceVideoOutSetBufferAttribute2(VideoOutBufferAttribute2* attribute, uint64_t pixel_format, uint32_t tiling_mode, uint32_t width, uint32_t height, uint64_t option, uint32_t dcc_control, uint64_t dcc_cb_register_clear_color) {
  (void)attribute;
  (void)pixel_format;
  (void)tiling_mode;
@@ -170,14 +170,14 @@ void sceVideoOutSetBufferAttribute2(VideoOutBufferAttribute2* attribute, uint64_
  NotImplemented_nid_no_patch(__func__);
 }
 
-int sceVideoOutSetFlipRate(int handle, int rate) {
+int APS5_VABI sceVideoOutSetFlipRate(int handle, int rate) {
  (void)handle;
  (void)rate;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutSetWindowModeMargins(int handle, int top, int bottom) {
+int APS5_VABI sceVideoOutSetWindowModeMargins(int handle, int top, int bottom) {
  (void)handle;
  (void)top;
  (void)bottom;
@@ -185,7 +185,7 @@ int sceVideoOutSetWindowModeMargins(int handle, int top, int bottom) {
  return 0;
 }
 
-int sceVideoOutSubmitChangeBufferAttribute2(int handle, int set_index, const VideoOutBufferAttribute2* attribute, void* option) {
+int APS5_VABI sceVideoOutSubmitChangeBufferAttribute2(int handle, int set_index, const VideoOutBufferAttribute2* attribute, void* option) {
  (void)handle;
  (void)set_index;
  (void)attribute;
@@ -194,7 +194,7 @@ int sceVideoOutSubmitChangeBufferAttribute2(int handle, int set_index, const Vid
  return 0;
 }
 
-int sceVideoOutSubmitFlip(int handle, int index, int flip_mode, int64_t flip_arg) {
+int APS5_VABI sceVideoOutSubmitFlip(int handle, int index, int flip_mode, int64_t flip_arg) {
  (void)handle;
  (void)index;
  (void)flip_mode;
@@ -203,14 +203,14 @@ int sceVideoOutSubmitFlip(int handle, int index, int flip_mode, int64_t flip_arg
  return 0;
 }
 
-int sceVideoOutUnregisterBuffers(int handle, int set_index) {
+int APS5_VABI sceVideoOutUnregisterBuffers(int handle, int set_index) {
  (void)handle;
  (void)set_index;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVideoOutWaitVblank(int handle) {
+int APS5_VABI sceVideoOutWaitVblank(int handle) {
  (void)handle;
  NotImplemented_nid_no_patch(__func__);
  return 0;

core/libs/prx/libSceVoice/Export.cpp

@@ -5,46 +5,46 @@
 
 extern "C" {
 
-int sceVoiceConnectIPortToOPort(uint32_t input_port_id, uint32_t output_port_id) {
+int APS5_VABI sceVoiceConnectIPortToOPort(uint32_t input_port_id, uint32_t output_port_id) {
  (void)input_port_id;
  (void)output_port_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceCreatePort(uint32_t* port_id, const VoicePortParam* param) {
+int APS5_VABI sceVoiceCreatePort(uint32_t* port_id, const VoicePortParam* param) {
  (void)port_id;
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceDeletePort(uint32_t port_id) {
+int APS5_VABI sceVoiceDeletePort(uint32_t port_id) {
  (void)port_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceDisconnectIPortFromOPort(uint32_t input_port_id, uint32_t output_port_id) {
+int APS5_VABI sceVoiceDisconnectIPortFromOPort(uint32_t input_port_id, uint32_t output_port_id) {
  (void)input_port_id;
  (void)output_port_id;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceEnd_nid_postfix(void) {
+int APS5_VABI sceVoiceEnd_nid_postfix(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceGetBitRate(uint32_t port_id, uint32_t* bitrate) {
+int APS5_VABI sceVoiceGetBitRate(uint32_t port_id, uint32_t* bitrate) {
  (void)port_id;
  (void)bitrate;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceGetPortAttr(uint32_t port_id, int32_t attr, void* value, int32_t size) {
+int APS5_VABI sceVoiceGetPortAttr(uint32_t port_id, int32_t attr, void* value, int32_t size) {
  (void)port_id;
  (void)attr;
  (void)value;
@@ -53,28 +53,28 @@ int sceVoiceGetPortAttr(uint32_t port_id, int32_t attr, void* value, int32_t siz
  return 0;
 }
 
-int sceVoiceGetPortInfo(uint32_t port_id, VoicePortInfo* info) {
+int APS5_VABI sceVoiceGetPortInfo(uint32_t port_id, VoicePortInfo* info) {
  (void)port_id;
  (void)info;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceGetVolume(uint32_t port_id, float* volume) {
+int APS5_VABI sceVoiceGetVolume(uint32_t port_id, float* volume) {
  (void)port_id;
  (void)volume;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceInit(VoiceInitParam* param, int32_t version) {
+int APS5_VABI sceVoiceInit(VoiceInitParam* param, int32_t version) {
  (void)param;
  (void)version;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceReadFromOPort(uint32_t output_port_id, void* data, uint32_t* size) {
+int APS5_VABI sceVoiceReadFromOPort(uint32_t output_port_id, void* data, uint32_t* size) {
  (void)output_port_id;
  (void)data;
  (void)size;
@@ -82,31 +82,31 @@ int sceVoiceReadFromOPort(uint32_t output_port_id, void* data, uint32_t* size) {
  return 0;
 }
 
-int sceVoiceSetThreadsParams(void* params) {
+int APS5_VABI sceVoiceSetThreadsParams(void* params) {
  (void)params;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceSetVolume(uint32_t port_id, float volume) {
+int APS5_VABI sceVoiceSetVolume(uint32_t port_id, float volume) {
  (void)port_id;
  (void)volume;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceStart(const VoiceStartParam* param) {
+int APS5_VABI sceVoiceStart(const VoiceStartParam* param) {
  (void)param;
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceStop(void) {
+int APS5_VABI sceVoiceStop(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceVoiceWriteToIPort(uint32_t input_port_id, const void* data, uint32_t* size, int16_t frame_gaps) {
+int APS5_VABI sceVoiceWriteToIPort(uint32_t input_port_id, const void* data, uint32_t* size, int16_t frame_gaps) {
  (void)input_port_id;
  (void)data;
  (void)size;

core/libs/prx/libSceVoiceQoS/Export.cpp

@@ -5,7 +5,7 @@
 
 extern "C" {
 
-int sceVoiceQoSInit(void* mem_block, uint32_t mem_size, int32_t app_type) {
+int APS5_VABI sceVoiceQoSInit(void* mem_block, uint32_t mem_size, int32_t app_type) {
  (void)mem_block;
  (void)mem_size;
  (void)app_type;

core/libs/prx/libSceWebBrowserDialog/Export.cpp

@@ -5,12 +5,12 @@
 
 extern "C" {
 
-int sceWebBrowserDialogInitialize(void) {
+int APS5_VABI sceWebBrowserDialogInitialize(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }
 
-int sceWebBrowserDialogTerminate(void) {
+int APS5_VABI sceWebBrowserDialogTerminate(void) {
  NotImplemented_nid_no_patch(__func__);
  return 0;
 }

core/libs/prx/libc/Export.cpp

@@ -1,6 +1,7 @@
 #include <cstdint>
 #include <cstddef>
 #include "SceTypes.hpp"
+#include "prx/libc/include/General.hpp"
 
 #include "src/General.cpp"
 #include "src/specifics/gcc/StackGuard.cpp"
@@ -21,17 +22,17 @@ uint32_t Need_sceLibc = 1;
 
 extern "C" {
 
-    void init_env_nid_postfix(const InitEnvParams* params) {
+    void APS5_VABI init_env_nid_postfix(const InitEnvParams* params) {
         (void)params;
         NotImplemented_nid_no_patch(__func__);
     }
 
-    void catchReturnFromMain_nid_postfix(int status) {
+    void APS5_VABI catchReturnFromMain_nid_postfix(int status) {
         (void)status;
         NotImplemented_nid_no_patch(__func__);
     }
 
-    int cxa_atexit_nid_postfix(void (*func)(void*), void* arg, void* d) {
+    int APS5_VABI cxa_atexit_nid_postfix(void (*func)(void*), void* arg, void* d) {
         (void)func;
         (void)arg;
         (void)d;
@@ -39,12 +40,12 @@ extern "C" {
         return 0;
     }
 
-    void cxa_finalize_nid_postfix(void* d) {
+    void APS5_VABI cxa_finalize_nid_postfix(void* d) {
         NotImplemented_nid_no_patch(__func__);
         (void)d;
     }
 
-    int std_execute_once_nid_postfix(int* flag, int (*func)(void*, void*, void**), void* arg) {
+    int APS5_VABI std_execute_once_nid_postfix(int* flag, int (*func)(void*, void*, void**), void* arg) {
         (void)flag;
         (void)func;
         (void)arg;
@@ -52,12 +53,12 @@ extern "C" {
         return 0;
     }
 
-    void LibcHeapGetTraceInfo_nid_postfix(LibcHeapInfo* info) {
+    void APS5_VABI LibcHeapGetTraceInfo_nid_postfix(LibcHeapInfo* info) {
         (void)info;
         NotImplemented_nid_no_patch(__func__);
     }
 
-    int LibcInternalExtCxaThreadAtexit_nid_postfix(void (*destructor)(void*), void* object, void* module_id) {
+    int APS5_VABI LibcInternalExtCxaThreadAtexit_nid_postfix(void (*destructor)(void*), void* object, void* module_id) {
         (void)destructor;
         (void)object;
         (void)module_id;
@@ -65,7 +66,7 @@ extern "C" {
         return 0;
     }
 
-    int LibcHeapErrorReportForGame_nid_postfix(
+    int APS5_VABI LibcHeapErrorReportForGame_nid_postfix(
         uint64_t msp, uint64_t ptr, uint64_t error,
         uint64_t arg3, uint64_t arg4, uint64_t arg5
     ) {

core/libs/prx/libc/include/General.hpp

@@ -1,46 +1,9 @@
 #ifndef CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_HPP
 #define CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_HPP
-#include <cstring>
+
+#include "general/LogMacros.hpp"
+#include "general/VabiMacros.hpp"
 
 extern "C" void NotImplemented_nid_no_patch(const char* funcName);
 
-inline const char* TrimNidPostfix(const char* func) {
-    return func;
-    const char* pos = std::strstr(func, "_nid_postfix");
-    if (pos != nullptr) {
-        static thread_local char buf[256];
-        const std::size_t len = static_cast<std::size_t>(pos - func);
-        std::memcpy(buf, func, len);
-        buf[len] = '\0';
-        return buf;
-    }
-    return func;
-}
-
-constexpr const char* BaseName(const char* path) {
-    const char* last = path;
-    const char* prev = nullptr;
-    for (const char* p = path; *p; ++p)
-        if (*p == '/' || *p == '\\') {
-            prev = last;
-            last = p + 1;
-        }
-    return (prev && *prev) ? prev : last;
-}
-
-#define _APS5_FILE_ BaseName(__FILE__)
-
-#define _APS5_LOG_IMPL(stream, fmt, ...) \
-(std::fprintf(stream, "[%s:%d %s] " fmt "\n", _APS5_FILE_, __LINE__, TrimNidPostfix(__func__), __VA_ARGS__), \
-std::fflush(stream))
-
-#define _APS5_LOG_IMPL_NF(stream, fmt) \
-(std::fprintf(stream, "[%s:%d %s] " fmt "\n", _APS5_FILE_, __LINE__, TrimNidPostfix(__func__)), \
-std::fflush(stream))
-
-#define APS5_LOG_OUT(fmt, ...) _APS5_LOG_IMPL(stdout, fmt, __VA_ARGS__)
-#define APS5_LOG_ERR(fmt, ...) _APS5_LOG_IMPL(stderr, fmt, __VA_ARGS__)
-#define APS5_LOG_CHARS_OUT(fmt) _APS5_LOG_IMPL_NF(stdout, fmt)
-#define APS5_LOG_CHARS_ERR(fmt) _APS5_LOG_IMPL_NF(stderr, fmt)
-
 #endif

core/libs/prx/libc/include/general/LogMacros.hpp

@@ -0,0 +1,45 @@
+#ifndef CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_LOGMACROS_HPP
+#define CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_LOGMACROS_HPP
+
+#include <cstring>
+
+inline const char* TrimNidPostfix(const char* func) {
+    return func;
+    const char* pos = std::strstr(func, "_nid_postfix");
+    if (pos != nullptr) {
+        static thread_local char buf[256];
+        const std::size_t len = static_cast<std::size_t>(pos - func);
+        std::memcpy(buf, func, len);
+        buf[len] = '\0';
+        return buf;
+    }
+    return func;
+}
+
+constexpr const char* BaseName(const char* path) {
+    const char* last = path;
+    const char* prev = nullptr;
+    for (const char* p = path; *p; ++p)
+        if (*p == '/' || *p == '\\') {
+            prev = last;
+            last = p + 1;
+        }
+    return (prev && *prev) ? prev : last;
+}
+
+#define _APS5_FILE_ BaseName(__FILE__)
+
+#define _APS5_LOG_IMPL(stream, fmt, ...) \
+(std::fprintf(stream, "[%s:%d %s] " fmt "\n", _APS5_FILE_, __LINE__, TrimNidPostfix(__func__), __VA_ARGS__), \
+std::fflush(stream))
+
+#define _APS5_LOG_IMPL_NF(stream, fmt) \
+(std::fprintf(stream, "[%s:%d %s] " fmt "\n", _APS5_FILE_, __LINE__, TrimNidPostfix(__func__)), \
+std::fflush(stream))
+
+#define APS5_LOG_OUT(fmt, ...) _APS5_LOG_IMPL(stdout, fmt, __VA_ARGS__)
+#define APS5_LOG_ERR(fmt, ...) _APS5_LOG_IMPL(stderr, fmt, __VA_ARGS__)
+#define APS5_LOG_CHARS_OUT(fmt) _APS5_LOG_IMPL_NF(stdout, fmt)
+#define APS5_LOG_CHARS_ERR(fmt) _APS5_LOG_IMPL_NF(stderr, fmt)
+
+#endif

core/libs/prx/libc/include/general/VabiMacros.hpp

@@ -0,0 +1,6 @@
+#ifndef CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_GENERALMACROS_HPP
+#define CORE_LIBS_PRX_LIBC_INCLUDE_GENERAL_GENERALMACROS_HPP
+
+#define APS5_VABI
+
+#endif

core/libs/prx/libc/src/CxxAbiSupport.cpp

@@ -17,11 +17,11 @@
 #include <functional>
 extern "C" {
 
-void* __cxa_demangle_nid_postfix(const char* mangled, char* buf, std::size_t* len, int* status) {
+void* APS5_VABI __cxa_demangle_nid_postfix(const char* mangled, char* buf, std::size_t* len, int* status) {
     return abi::__cxa_demangle(mangled, buf, len, status);
 }
 
-int __cxa_thread_atexit_impl_nid_postfix(void (*func)(void*), void* arg, void* dso) {
+int APS5_VABI __cxa_thread_atexit_impl_nid_postfix(void (*func)(void*), void* arg, void* dso) {
     return __cxxabiv1::__cxa_thread_atexit(func, arg, dso);
 }
 

core/libs/prx/libc/src/FileAndHeap.cpp

@@ -10,7 +10,7 @@ extern "C" {
 
 [[noreturn]] void _ZSt11_Xbad_allocv_nid_postfix();
 
-FileStream* fopen_nid_postfix(const char* filename, const char* mode) {
+FileStream* APS5_VABI fopen_nid_postfix(const char* filename, const char* mode) {
     if (!filename || !mode) throw std::runtime_error("fopen: null argument");
     std::unique_ptr<std::FILE, decltype(&std::fclose)> handle(std::fopen(filename, mode), std::fclose);
     if (!handle) {
@@ -27,14 +27,14 @@ FileStream* fopen_nid_postfix(const char* filename, const char* mode) {
     return stream.release();
 }
 
-int fclose_nid_postfix(FileStream* stream) {
+int APS5_VABI fclose_nid_postfix(FileStream* stream) {
     GetNativeStream(stream);
     std::unique_ptr<FileStream> owner(stream->IsDynamic() ? stream : nullptr);
     stream->Close();
     return 0;
 }
 
-size_t fread_nid_postfix(void* buffer, size_t size, size_t count, FileStream* stream) {
+size_t APS5_VABI fread_nid_postfix(void* buffer, size_t size, size_t count, FileStream* stream) {
     auto* handle = GetNativeStream(stream);
     if (size == 0 || count == 0) return 0;
     if (!buffer) throw std::runtime_error("fread: null buffer");
@@ -43,7 +43,7 @@ size_t fread_nid_postfix(void* buffer, size_t size, size_t count, FileStream* st
     return result;
 }
 
-size_t fwrite_nid_postfix(const void* buffer, size_t size, size_t count, FileStream* stream) {
+size_t APS5_VABI fwrite_nid_postfix(const void* buffer, size_t size, size_t count, FileStream* stream) {
     auto* handle = GetNativeStream(stream);
     if (size == 0 || count == 0) return 0;
     if (!buffer) throw std::runtime_error("fwrite: null buffer");
@@ -52,33 +52,33 @@ size_t fwrite_nid_postfix(const void* buffer, size_t size, size_t count, FileStr
     return result;
 }
 
-int fseek_nid_postfix(FileStream* stream, long offset, int origin) {
+int APS5_VABI fseek_nid_postfix(FileStream* stream, long offset, int origin) {
     if (origin != SEEK_SET && origin != SEEK_CUR && origin != SEEK_END) throw std::runtime_error("fseek: invalid origin");
     if (std::fseek(GetNativeStream(stream), offset, origin) != 0) throw std::runtime_error("fseek: seek failed");
     return 0;
 }
 
-long ftell_nid_postfix(FileStream* stream) {
+long APS5_VABI ftell_nid_postfix(FileStream* stream) {
     const auto result = std::ftell(GetNativeStream(stream));
     if (result == -1L) throw std::runtime_error("ftell: position query failed");
     return result;
 }
 
-int fputs_nid_postfix(const char* str, FileStream* stream) {
+int APS5_VABI fputs_nid_postfix(const char* str, FileStream* stream) {
     if (!str) throw std::runtime_error("fputs: null string");
     const int result = std::fputs(str, GetNativeStream(stream));
     if (result == EOF) throw std::runtime_error("fputs: write failed");
     return result;
 }
 
-int fflush_nid_postfix(FileStream* stream) {
+int APS5_VABI fflush_nid_postfix(FileStream* stream) {
     if (std::fflush(stream ? GetNativeStream(stream) : nullptr) != 0) throw std::runtime_error("fflush: flush failed");
     return 0;
 }
 
 constexpr std::uintptr_t AlignedBlockTag = 1;
 
-void* malloc_nid_postfix(size_t size) {
+void* APS5_VABI malloc_nid_postfix(size_t size) {
     const size_t headerSize = sizeof(std::uintptr_t);
     void* rawPtr = std::malloc(size + headerSize);
     if (rawPtr == nullptr) {
@@ -88,7 +88,7 @@ void* malloc_nid_postfix(size_t size) {
     return static_cast<char*>(rawPtr) + headerSize;
 }
 
-void free_nid_postfix(void* ptr) {
+void APS5_VABI free_nid_postfix(void* ptr) {
     if (ptr == nullptr) {
         return;
     }
@@ -100,7 +100,7 @@ void free_nid_postfix(void* ptr) {
     }
 }
 
-void* realloc_nid_postfix(void* ptr, size_t newSize) {
+void* APS5_VABI realloc_nid_postfix(void* ptr, size_t newSize) {
     if (ptr == nullptr) {
         return malloc_nid_postfix(newSize);
     }
@@ -113,7 +113,7 @@ void* realloc_nid_postfix(void* ptr, size_t newSize) {
     return static_cast<char*>(newRawPtr) + headerSize;
 }
 
-void* memalign_nid_postfix(size_t alignment, size_t size) {
+void* APS5_VABI memalign_nid_postfix(size_t alignment, size_t size) {
     const size_t headerSize = sizeof(void*) * 2;
     const size_t worstCaseSize = size + alignment + headerSize;
     void* rawPtr = std::malloc(worstCaseSize);
@@ -128,7 +128,7 @@ void* memalign_nid_postfix(size_t alignment, size_t size) {
     return alignedPtr;
 }
 
-void qsort_nid_postfix(void* base, size_t count, size_t size, int (*compare)(const void*, const void*)) {
+void APS5_VABI qsort_nid_postfix(void* base, size_t count, size_t size, int (*compare)(const void*, const void*)) {
     std::qsort(base, count, size, compare);
 }
 

core/libs/prx/libc/src/Formatting.cpp

@@ -7,7 +7,7 @@
 
 extern "C" {
 
-int printf_nid_postfix(const char* format, ...) {
+int APS5_VABI printf_nid_postfix(const char* format, ...) {
     std::va_list args;
     va_start(args, format);
     const int result = std::vprintf(format, args);
@@ -15,7 +15,7 @@ int printf_nid_postfix(const char* format, ...) {
     return result;
 }
 
-int libc_printf_nid_postfix(VA_ARGS) {
+int APS5_VABI libc_printf_nid_postfix(VA_ARGS) {
     (void)rcx; (void)r8; (void)r9;
     LibcDetail::RegSaveArea regs;
     LibcDetail::FillRegSaveArea(regs, rsi, rdx, rcx, r8, r9, 0,
@@ -26,7 +26,7 @@ int libc_printf_nid_postfix(VA_ARGS) {
     return std::vprintf(reinterpret_cast<const char*>(rdi), *va);
 }
 
-int snprintf_nid_postfix(VA_ARGS) {
+int APS5_VABI snprintf_nid_postfix(VA_ARGS) {
     LibcDetail::RegSaveArea regs;
     LibcDetail::FillRegSaveArea(regs, rdx, rcx, r8, r9, 0, 0,
         xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
@@ -41,7 +41,7 @@ int snprintf_nid_postfix(VA_ARGS) {
     );
 }
 
-int sprintf_nid_postfix(VA_ARGS) {
+int APS5_VABI sprintf_nid_postfix(VA_ARGS) {
     LibcDetail::RegSaveArea regs;
     LibcDetail::FillRegSaveArea(regs, rsi, rdx, rcx, r8, r9, 0,
         xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
@@ -55,7 +55,7 @@ int sprintf_nid_postfix(VA_ARGS) {
     );
 }
 
-int sscanf_nid_postfix(VA_ARGS) {
+int APS5_VABI sscanf_nid_postfix(VA_ARGS) {
     LibcDetail::RegSaveArea regs;
     LibcDetail::FillRegSaveArea(regs, rdx, rcx, r8, r9, 0, 0,
         xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7);
@@ -69,17 +69,17 @@ int sscanf_nid_postfix(VA_ARGS) {
     );
 }
 
-int vprintf_nid_postfix(const char* str, VaList* c) {
+int APS5_VABI vprintf_nid_postfix(const char* str, VaList* c) {
     std::va_list* va = reinterpret_cast<std::va_list*>(c);
     return std::vprintf(str, *va);
 }
 
-int vsnprintf_nid_postfix(char* str, size_t size, const char* format, VaList* c) {
+int APS5_VABI vsnprintf_nid_postfix(char* str, size_t size, const char* format, VaList* c) {
     std::va_list* va = reinterpret_cast<std::va_list*>(c);
     return std::vsnprintf(str, size, format, *va);
 }
 
-int puts_nid_postfix(const char* s) {
+int APS5_VABI puts_nid_postfix(const char* s) {
     return std::puts(s);
 }
 

core/libs/prx/libc/src/General.cpp

@@ -1,6 +1,6 @@
 #include <stdexcept>
 #include <string>
 
-extern "C" void NotImplemented_nid_no_patch(const char* funcName) {
+extern "C" void APS5_VABI NotImplemented_nid_no_patch(const char* funcName) {
     throw std::runtime_error(std::string(funcName) + " not implemented");
 }

core/libs/prx/libc/src/JumpBuffer.cpp

@@ -2,7 +2,7 @@
 
 extern "C" {
 
-int setjmp_nid_postfix(std::jmp_buf env) {
+int APS5_VABI setjmp_nid_postfix(std::jmp_buf env) {
     return setjmp(env);
 }
 

core/libs/prx/libc/src/LocaleSupport.cpp

@@ -38,7 +38,7 @@ long _ZNSt6locale2id7_Id_cntE_nid_postfix = 0;
 
 const std::locale* _ZSt21_sceLibcClassicLocale_nid_postfix = &ClassicLocaleInstance();
 
-void _ZNSt6locale5_InitEv_nid_postfix() {
+void APS5_VABI _ZNSt6locale5_InitEv_nid_postfix() {
     std::lock_guard<std::mutex> lock(g_localeInitMutex);
     if (!g_localeInitialized) {
         ClassicLocaleInstance();
@@ -46,11 +46,11 @@ void _ZNSt6locale5_InitEv_nid_postfix() {
     }
 }
 
-void _ZNSt6locale5facet9_RegisterEv_nid_postfix() {
+void APS5_VABI _ZNSt6locale5facet9_RegisterEv_nid_postfix() {
     NotImplemented_nid_no_patch(__func__);
 }
 
-const std::locale* _ZNSt6locale16_GetgloballocaleEv_nid_postfix() {
+const std::locale* APS5_VABI _ZNSt6locale16_GetgloballocaleEv_nid_postfix() {
     return &ClassicLocaleInstance();
 }
 
@@ -61,16 +61,16 @@ void _ZNSt7collateIwE7_GetcatEPPKNSt6locale5facetEPKS1__nid_postfix(
     *targetFacet = &std::use_facet<std::collate<wchar_t>>(effectiveLocale);
 }
 
-void _ZNSt8_LocinfoC1EPKc_nid_postfix(LocinfoStorage* self, const char* localeName) {
+void APS5_VABI _ZNSt8_LocinfoC1EPKc_nid_postfix(LocinfoStorage* self, const char* localeName) {
     (void)localeName;
     new (self) LocinfoStorage {};
 }
 
-void _ZNSt8_LocinfoD1Ev_nid_postfix(LocinfoStorage* self) {
+void APS5_VABI _ZNSt8_LocinfoD1Ev_nid_postfix(LocinfoStorage* self) {
     (void)self;
 }
 
-wchar_t* _Mbtowcx_nid_postfix(wchar_t* dst, const char* src, std::size_t count, mbstate_t* st) {
+wchar_t* APS5_VABI _Mbtowcx_nid_postfix(wchar_t* dst, const char* src, std::size_t count, mbstate_t* st) {
     while (count > 0) {
         std::size_t result = std::mbrtowc(dst, src, count, st);
         if (result == static_cast<std::size_t>(-1) || result == static_cast<std::size_t>(-2))
@@ -84,19 +84,19 @@ wchar_t* _Mbtowcx_nid_postfix(wchar_t* dst, const char* src, std::size_t count,
     return dst;
 }
 
-char* _Wctombx_nid_postfix(char* dst, wchar_t src, mbstate_t* st) {
+char* APS5_VABI _Wctombx_nid_postfix(char* dst, wchar_t src, mbstate_t* st) {
     std::size_t result = std::wcrtomb(dst, src, st);
     if (result == static_cast<std::size_t>(-1))
         return nullptr;
     return dst + result;
 }
 
-const short* _Getpctype_nid_postfix() {
+const short* APS5_VABI _Getpctype_nid_postfix() {
     const auto& facet = std::use_facet<std::ctype<char>>(ClassicLocaleInstance());
     return reinterpret_cast<const short*>(facet.table());
 }
 
-const short* _Getptolower_nid_postfix() {
+const short* APS5_VABI _Getptolower_nid_postfix() {
     static short table[std::ctype<char>::table_size];
     static std::once_flag flag;
     std::call_once(flag, []() {
@@ -107,7 +107,7 @@ const short* _Getptolower_nid_postfix() {
     return table;
 }
 
-const short* _Getptoupper_nid_postfix() {
+const short* APS5_VABI _Getptoupper_nid_postfix() {
     static short table[std::ctype<char>::table_size];
     static std::once_flag flag;
     std::call_once(flag, []() {
@@ -118,21 +118,21 @@ const short* _Getptoupper_nid_postfix() {
     return table;
 }
 
-mbstate_t* _Getpmbstate_nid_postfix() {
+mbstate_t* APS5_VABI _Getpmbstate_nid_postfix() {
     thread_local mbstate_t state {};
     return &state;
 }
 
-mbstate_t* _Getpwcstate_nid_postfix() {
+mbstate_t* APS5_VABI _Getpwcstate_nid_postfix() {
     thread_local mbstate_t state {};
     return &state;
 }
 
-wint_t _Towctrans_nid_postfix(wint_t c, wctrans_t desc) {
+wint_t APS5_VABI _Towctrans_nid_postfix(wint_t c, wctrans_t desc) {
     return std::towctrans(c, desc);
 }
 
-void _init_env_nid_postfix() {
+void APS5_VABI _init_env_nid_postfix() {
 }
 
 }

core/libs/prx/libc/src/Math.cpp

@@ -14,7 +14,7 @@ double log_nid_postfix(double x) { return std::log(x); }
 float sinf_nid_postfix(float x) { return std::sin(x); }
 float cosf_nid_postfix(float x) { return std::cos(x); }
 
-void sincosf_nid_postfix(float x, float* sinp, float* cosp) {
+void APS5_VABI sincosf_nid_postfix(float x, float* sinp, float* cosp) {
     *sinp = std::sin(x);
     *cosp = std::cos(x);
 }
@@ -22,7 +22,7 @@ void sincosf_nid_postfix(float x, float* sinp, float* cosp) {
 double sin_nid_postfix(double x) { return std::sin(x); }
 double cos_nid_postfix(double x) { return std::cos(x); }
 
-void sincos_nid_postfix(double x, double* sinp, double* cosp) {
+void APS5_VABI sincos_nid_postfix(double x, double* sinp, double* cosp) {
     *sinp = std::sin(x);
     *cosp = std::cos(x);
 }

core/libs/prx/libc/src/Process.cpp

@@ -6,7 +6,7 @@
 
 extern "C" {
 
-void exit_nid_postfix(int code) {
+void APS5_VABI exit_nid_postfix(int code) {
     std::exit(code);
 }
 
@@ -19,11 +19,11 @@ void exit_nid_postfix(int code) {
     std::abort();
 }
 
-int* libc_error_nid_postfix() {
+int* APS5_VABI libc_error_nid_postfix() {
     return &errno;
 }
 
-int* __error_nid_postfix() {
+int* APS5_VABI __error_nid_postfix() {
     return &errno;
 }
 
@@ -31,7 +31,7 @@ int* __error_nid_postfix() {
     std::abort();
 }
 
-int atexit_nid_postfix(atexit_func_t func) {
+int APS5_VABI atexit_nid_postfix(atexit_func_t func) {
     if (func == nullptr)
         return 0;
     return std::atexit(func);

core/libs/prx/libc/src/RuntimeSupport.cpp

@@ -20,7 +20,7 @@ extern "C" {
 FileStream _Stderr_nid_postfix{stderr};
 FileStream _Stdout_nid_postfix{stdout};
 
-int __cxa_atexit_nid_postfix(void (*func)(void*), void* arg, void* dsoHandle) {
+int APS5_VABI __cxa_atexit_nid_postfix(void (*func)(void*), void* arg, void* dsoHandle) {
     (void)dsoHandle;
     static std::vector<std::pair<void (*)(void*), void*>> destructors;
     static bool runnerRegistered = false;
@@ -36,25 +36,25 @@ int __cxa_atexit_nid_postfix(void (*func)(void*), void* arg, void* dsoHandle) {
     return 0;
 }
 
-unsigned int _Atomic_fetch_add_4_nid_postfix(volatile unsigned int* target, unsigned int value, int memoryOrder) {
+unsigned int APS5_VABI _Atomic_fetch_add_4_nid_postfix(volatile unsigned int* target, unsigned int value, int memoryOrder) {
     (void)memoryOrder;
     return GccAtomicFetchAdd(target, value);
 }
 
-unsigned int _Atomic_fetch_sub_4_nid_postfix(volatile unsigned int* target, unsigned int value, int memoryOrder) {
+unsigned int APS5_VABI _Atomic_fetch_sub_4_nid_postfix(volatile unsigned int* target, unsigned int value, int memoryOrder) {
     (void)memoryOrder;
     return GccAtomicFetchSub(target, value);
 }
 
-unsigned long _Stoul_nid_postfix(const char* str, char** endptr, int base) {
+unsigned long APS5_VABI _Stoul_nid_postfix(const char* str, char** endptr, int base) {
     return std::strtoul(str, endptr, base);
 }
 
-void _Locksyslock_nid_postfix() {
+void APS5_VABI _Locksyslock_nid_postfix() {
     g_sysLock.lock();
 }
 
-void _Unlocksyslock_nid_postfix() {
+void APS5_VABI _Unlocksyslock_nid_postfix() {
     g_sysLock.unlock();
 }
 

core/libs/prx/libc/src/Strings.cpp

@@ -7,64 +7,64 @@
 
 extern "C" {
 
-void* memset_nid_postfix(void* s, int c, size_t n) {
+void* APS5_VABI memset_nid_postfix(void* s, int c, size_t n) {
     APS5_LOG_OUT("s=%p c=%d n=%zu", s, c, n);
     return std::memset(s, c, n);
 }
 
-void* memcpy_nid_postfix(void* dest, const void* src, size_t n) {
+void* APS5_VABI memcpy_nid_postfix(void* dest, const void* src, size_t n) {
     return std::memcpy(dest, src, n);
 }
 
-void* memmove_nid_postfix(void* dest, const void* src, size_t n) {
+void* APS5_VABI memmove_nid_postfix(void* dest, const void* src, size_t n) {
     return std::memmove(dest, src, n);
 }
 
-int memcmp_nid_postfix(const void* s1, const void* s2, size_t n) {
+int APS5_VABI memcmp_nid_postfix(const void* s1, const void* s2, size_t n) {
     return std::memcmp(s1, s2, n);
 }
 
-const void* memchr_nid_postfix(const void* s, int c, size_t n) {
+const void* APS5_VABI memchr_nid_postfix(const void* s, int c, size_t n) {
     return std::memchr(s, c, n);
 }
 
-int strcmp_nid_postfix(const char* s1, const char* s2) {
+int APS5_VABI strcmp_nid_postfix(const char* s1, const char* s2) {
     return std::strcmp(s1, s2);
 }
 
-int strncmp_nid_postfix(const char* s1, const char* s2, size_t n) {
+int APS5_VABI strncmp_nid_postfix(const char* s1, const char* s2, size_t n) {
     return std::strncmp(s1, s2, n);
 }
 
-size_t strlen_nid_postfix(const char* s) {
+size_t APS5_VABI strlen_nid_postfix(const char* s) {
     return std::strlen(s);
 }
 
-char* strcpy_nid_postfix(char* dest, const char* src) {
+char* APS5_VABI strcpy_nid_postfix(char* dest, const char* src) {
     return std::strcpy(dest, src);
 }
 
-char* strncpy_nid_postfix(char* dest, const char* src, size_t count) {
+char* APS5_VABI strncpy_nid_postfix(char* dest, const char* src, size_t count) {
     return std::strncpy(dest, src, count);
 }
 
-char* strcat_nid_postfix(char* dest, const char* src) {
+char* APS5_VABI strcat_nid_postfix(char* dest, const char* src) {
     return std::strcat(dest, src);
 }
 
-const char* strchr_nid_postfix(const char* s, int c) {
+const char* APS5_VABI strchr_nid_postfix(const char* s, int c) {
     return std::strchr(s, c);
 }
 
-char* strrchr_nid_postfix(const char* s, int c) {
+char* APS5_VABI strrchr_nid_postfix(const char* s, int c) {
     return std::strrchr(const_cast<char*>(s), c);
 }
 
-char* strstr_nid_postfix(const char* haystack, const char* needle) {
+char* APS5_VABI strstr_nid_postfix(const char* haystack, const char* needle) {
     return std::strstr(const_cast<char*>(haystack), needle);
 }
 
-size_t strlcpy_nid_postfix(char* dest, const char* src, size_t size) {
+size_t APS5_VABI strlcpy_nid_postfix(char* dest, const char* src, size_t size) {
     const size_t srcLen = std::strlen(src);
     if (size != 0u) {
         const size_t copyLen = srcLen < size - 1u ? srcLen : size - 1u;
@@ -74,43 +74,43 @@ size_t strlcpy_nid_postfix(char* dest, const char* src, size_t size) {
     return srcLen;
 }
 
-long strtol_nid_postfix(const char* str, char** endptr, int base) {
+long APS5_VABI strtol_nid_postfix(const char* str, char** endptr, int base) {
     return std::strtol(str, endptr, base);
 }
 
-unsigned long strtoul_nid_postfix(const char* str, char** endptr, int base) {
+unsigned long APS5_VABI strtoul_nid_postfix(const char* str, char** endptr, int base) {
     return std::strtoul(str, endptr, base);
 }
 
-long long strtoll_nid_postfix(const char* str, char** endptr, int base) {
+long long APS5_VABI strtoll_nid_postfix(const char* str, char** endptr, int base) {
     return std::strtoll(str, endptr, base);
 }
 
-unsigned long long strtoull_nid_postfix(const char* str, char** endptr, int base) {
+unsigned long long APS5_VABI strtoull_nid_postfix(const char* str, char** endptr, int base) {
     return std::strtoull(str, endptr, base);
 }
 
-double strtod_nid_postfix(const char* str, char** endptr) {
+double APS5_VABI strtod_nid_postfix(const char* str, char** endptr) {
     return std::strtod(str, endptr);
 }
 
-int atoi_nid_postfix(const char* str) {
+int APS5_VABI atoi_nid_postfix(const char* str) {
     return std::atoi(str);
 }
 
-const wchar_t* wmemchr_nid_postfix(const wchar_t* s, wchar_t c, size_t n) {
+const wchar_t* APS5_VABI wmemchr_nid_postfix(const wchar_t* s, wchar_t c, size_t n) {
     return std::wmemchr(s, c, n);
 }
 
-int wmemcmp_nid_postfix(const wchar_t* s1, const wchar_t* s2, size_t n) {
+int APS5_VABI wmemcmp_nid_postfix(const wchar_t* s1, const wchar_t* s2, size_t n) {
     return std::wmemcmp(s1, s2, n);
 }
 
-wchar_t* wmemcpy_nid_postfix(wchar_t* dest, const wchar_t* src, size_t n) {
+wchar_t* APS5_VABI wmemcpy_nid_postfix(wchar_t* dest, const wchar_t* src, size_t n) {
     return std::wmemcpy(dest, src, n);
 }
 
-wchar_t* wmemmove_nid_postfix(wchar_t* dest, const wchar_t* src, size_t n) {
+wchar_t* APS5_VABI wmemmove_nid_postfix(wchar_t* dest, const wchar_t* src, size_t n) {
     return std::wmemmove(dest, src, n);
 }
 
@@ -119,7 +119,7 @@ wchar_t* wmemmove_nid_postfix(wchar_t* dest, const wchar_t* src, size_t n) {
 
 extern "C" {
 
-int strcasecmp_nid_postfix(const char* s1, const char* s2) {
+int APS5_VABI strcasecmp_nid_postfix(const char* s1, const char* s2) {
     while (*s1 && *s2) {
         unsigned char a = static_cast<unsigned char>(std::tolower(static_cast<unsigned char>(*s1)));
         unsigned char b = static_cast<unsigned char>(std::tolower(static_cast<unsigned char>(*s2)));
@@ -129,7 +129,7 @@ int strcasecmp_nid_postfix(const char* s1, const char* s2) {
     return static_cast<unsigned char>(*s1) - static_cast<unsigned char>(*s2);
 }
 
-int strncasecmp_nid_postfix(const char* s1, const char* s2, size_t n) {
+int APS5_VABI strncasecmp_nid_postfix(const char* s1, const char* s2, size_t n) {
     while (n && *s1 && *s2) {
         unsigned char a = static_cast<unsigned char>(std::tolower(static_cast<unsigned char>(*s1)));
         unsigned char b = static_cast<unsigned char>(std::tolower(static_cast<unsigned char>(*s2)));
@@ -140,7 +140,7 @@ int strncasecmp_nid_postfix(const char* s1, const char* s2, size_t n) {
     return static_cast<unsigned char>(*s1) - static_cast<unsigned char>(*s2);
 }
 
-char* strdup_nid_postfix(const char* s) {
+char* APS5_VABI strdup_nid_postfix(const char* s) {
     std::size_t len = std::strlen(s) + 1;
     char* copy = static_cast<char*>(std::malloc(len));
     if (!copy) return nullptr;