vsh

Zangetsu38 · Oct 30, 2024 · a478a22 · a478a22
1 parent 44871c0
commit a478a22
Show file tree

Hide file tree

Showing 15 changed files with 323 additions and 25 deletions.
diff --git a/vita3k/kernel/src/load_self.cpp b/vita3k/kernel/src/load_self.cpp
@@ -627,8 +627,9 @@ SceUID load_self(KernelState &kernel, MemState &mem, const void *self, const std
                     unsigned long dest_bytes = seg_header.p_filesz;
                     const uint8_t *const compressed_segment_bytes = self_bytes + seg_infos[seg_index].offset;
 
-                    int res = mz_uncompress(seg_ptr.get(mem), &dest_bytes, compressed_segment_bytes, static_cast<mz_ulong>(seg_infos[seg_index].length));
-                    assert(res == MZ_OK);
+                int res = MZ_OK;
+                    if (seg_infos[seg_index].length > 0)
+                    res = mz_uncompress(seg_ptr.get(mem), &dest_bytes, compressed_segment_bytes, static_cast<mz_ulong>(seg_infos[seg_index].length));
                 } else {
                     memcpy(seg_ptr.get(mem), seg_bytes, seg_header.p_filesz);
                 }

diff --git a/vita3k/modules/CMakeLists.txt b/vita3k/modules/CMakeLists.txt
@@ -59,6 +59,7 @@ set(SOURCE_LIST
 	SceHid/SceHid.cpp
 	SceHttp/SceHttp.cpp
 	SceIme/SceIme.cpp
+        SceIpmi/SceIpmi.cpp
 	SceIncomingDialog/SceIncomingDialog.cpp
 	SceIofilemgr/SceIofilemgr.cpp
 	SceJpeg/SceJpegUser.cpp

diff --git a/vita3k/modules/SceAppMgr/SceSharedFb.cpp b/vita3k/modules/SceAppMgr/SceSharedFb.cpp
@@ -16,33 +16,108 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <module/module.h>
+#include "../SceDisplay/SceDisplay.h"
 
-EXPORT(int, _sceSharedFbOpen) {
-    return UNIMPLEMENTED();
+#include <gxm/types.h>
+
+#include <kernel/state.h>
+
+
+#include <modules/module_parent.h>
+
+typedef struct SceSharedFbInfo { // size is 0x58
+    Ptr<void> base1; // cdram base
+    int memsize;
+    Ptr<void> base2; // cdram base
+    int unk_0C;
+    Ptr<void> unk_10;
+    int unk_14;
+    int unk_18;
+    int unk_1C;
+    int unk_20;
+    int pitch; // 960
+    int width; // 960
+    int height; // 544
+    SceGxmColorFormat color_format; // SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR
+    int curbuf;
+    int unk_38;
+    int unk_3C;
+    int unk_40;
+    int unk_44;
+    int vsync;
+    int unk_4C;
+    int unk_50;
+    int unk_54;
+} SceSharedFbInfo;
+
+struct SharedFbState {
+    SceSharedFbInfo info;
+};
+
+LIBRARY_INIT(SceSharedFb) {
+    emuenv.kernel.obj_store.create<SharedFbState>();
 }
 
-EXPORT(int, sceSharedFbBegin) {
-    return UNIMPLEMENTED();
+DECL_EXPORT(int, sceSharedFbCreate, int smth);
+
+EXPORT(int, _sceSharedFbOpen, int smth) {
+    STUBBED("sceSharedFbCreate");
+    return CALL_EXPORT(sceSharedFbCreate, smth);
+}
+
+EXPORT(int, sceSharedFbBegin, int id, SceSharedFbInfo *info) {
+    SharedFbState *state = emuenv.kernel.obj_store.get<SharedFbState>();
+    state->info.curbuf = 1;
+    *info = state->info;
+    return 0;
 }
 
 EXPORT(int, sceSharedFbClose) {
     return UNIMPLEMENTED();
 }
 
-EXPORT(int, sceSharedFbCreate) {
-    return UNIMPLEMENTED();
+EXPORT(int, sceSharedFbCreate, int smth) {
+    SharedFbState *state = emuenv.kernel.obj_store.get<SharedFbState>();
+    if (state->info.memsize == 0) {
+        // enough memory for 2 956x544 buffers
+        constexpr uint32_t alloc_size = 4 * 1024 * 512 * 2;
+        Ptr<uint8_t> data = Ptr<uint8_t>(alloc(emuenv.mem, alloc_size, "sharedFB"));
+        state->info = SceSharedFbInfo{
+            .base1 = data,
+            .memsize = alloc_size,
+            .base2 = data + alloc_size / 2,
+            .pitch = 960,
+            .width = 960,
+            .height = 544,
+            .color_format = SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR,
+            .curbuf = 1,
+        };
+    }
+    return 1;
 }
 
 EXPORT(int, sceSharedFbDelete) {
     return UNIMPLEMENTED();
 }
 
 EXPORT(int, sceSharedFbEnd) {
-    return UNIMPLEMENTED();
+    SharedFbState *state = emuenv.kernel.obj_store.get<SharedFbState>();
+    Ptr<void> data = (state->info.curbuf == 0) ? state->info.base2 : state->info.base1;
+    // tell the display a new buffer is ready
+    SceDisplayFrameBuf frame_buf{
+        .size = sizeof(SceDisplayFrameBuf),
+        .base = data,
+        .pitch = 960,
+        .width = 960,
+        .height = 544
+    };
+    return CALL_EXPORT(_sceDisplaySetFrameBuf, &frame_buf, SCE_DISPLAY_SETBUF_NEXTFRAME, nullptr);
 }
 
-EXPORT(int, sceSharedFbGetInfo) {
-    return UNIMPLEMENTED();
+EXPORT(int, sceSharedFbGetInfo, int id, SceSharedFbInfo *info) {
+    SharedFbState *state = emuenv.kernel.obj_store.get<SharedFbState>();
+    *info = state->info;
+    return 0;
 }
 
 EXPORT(int, sceSharedFbGetRenderingInfo) {

diff --git a/vita3k/modules/SceDisplay/SceDisplay.h b/vita3k/modules/SceDisplay/SceDisplay.h
@@ -68,4 +68,5 @@ struct SceDisplayFrameBuf2 : public SceDisplayFrameBuf {
 
 DECL_EXPORT(SceInt32, _sceDisplayGetFrameBuf, SceDisplayFrameBuf *pFrameBuf, SceDisplaySetBufSync sync, uint32_t *pFrameBuf_size);
 DECL_EXPORT(SceInt32, _sceDisplaySetFrameBuf, const SceDisplayFrameBuf *pFrameBuf, SceDisplaySetBufSync sync, uint32_t *pFrameBuf_size);
+DECL_EXPORT(SceInt32, sceDisplayRegisterVblankStartCallback, SceUID uid);
 DECL_EXPORT(int, _sceDisplayGetMaximumFrameBufResolution, int *width, int *height);
diff --git a/vita3k/modules/SceDriverUser/SceAppMgrUser.cpp b/vita3k/modules/SceDriverUser/SceAppMgrUser.cpp
@@ -246,8 +246,22 @@ EXPORT(int, sceAppMgrGetCurrentBgmState) {
     return UNIMPLEMENTED();
 }
 
-EXPORT(int, sceAppMgrGetCurrentBgmState2) {
+struct BgmState {
+    uint32_t unk_0;
+    uint32_t unk2;
+    int unk3;
+    int unk4;
+    int unk5;
+    int unk6;
+    int unk7;
+    int unk8;
+};
+
+EXPORT(int, sceAppMgrGetCurrentBgmState2, BgmState *state) {
     TRACY_FUNC(sceAppMgrGetCurrentBgmState2);
+    memset(state, 0, sizeof(BgmState));
+    state->unk_0 = 130;
+    // state->unk2 = 130;
     return UNIMPLEMENTED();
 }
 

diff --git a/vita3k/modules/SceDriverUser/SceErrorUser.cpp b/vita3k/modules/SceDriverUser/SceErrorUser.cpp
@@ -17,8 +17,9 @@
 
 #include <module/module.h>
 
-EXPORT(int, sceErrorGetExternalString) {
-    return UNIMPLEMENTED();
+EXPORT(int, sceErrorGetExternalString, char *result, int err) {
+    sprintf(result, "0x%08X", err);
+    return 0;
 }
 
 EXPORT(int, sceErrorHistoryClearError) {

diff --git a/vita3k/modules/SceIpmi/SceIpmi.cpp b/vita3k/modules/SceIpmi/SceIpmi.cpp
@@ -0,0 +1,148 @@
+// Vita3K emulator project
+// Copyright (C) 2023 Vita3K team
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#include <module/module.h>
+#include "modules/module_parent.h"
+
+static Ptr<void> client_vtable = Ptr<void>();
+
+EXPORT(int, _ZN4IPMI6Client10disconnectEv) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client11getUserDataEv) {
+    return UNIMPLEMENTED();
+}
+
+struct BufferInfo {
+    Ptr<void> pBuffer;
+    SceSize bufferSize;
+    SceSize bufferWrittenSize; // size written by method
+};
+
+EXPORT(int, _ZN4IPMI6Client12tryGetResultEjPiPvPmm, unsigned int a1, int *a2, void *a3, unsigned long *a4, unsigned long a5) {
+    //    LOG_DEBUG("a1: {}, a2: {}, a4: {}, a5: {}", a1, *a2, *a4, a5);
+    //*a2 = 1000;
+
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client12tryGetResultEjjPiPNS_10BufferInfoEj) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client13pollEventFlagEjjjPj) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client13waitEventFlagEjjjPjS1_) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client16invokeSyncMethodEjPKNS_8DataInfoEjPiPNS_10BufferInfoEj) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client16invokeSyncMethodEjPKvjPiPvPjj) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client17invokeAsyncMethodEjPKNS_8DataInfoEjPjPKNS0_12EventNotifeeE) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client17invokeAsyncMethodEjPKvjPiPKNS0_12EventNotifeeE) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client19terminateConnectionEv) {
+    return UNIMPLEMENTED();
+}
+
+// IPMI::Client::Config::estimateClientMemorySize()
+EXPORT(int, _ZN4IPMI6Client6Config24estimateClientMemorySizeEv) {
+    STUBBED("stubbed");
+    return 0x100;
+}
+
+// IPMI::Client::create(IPMI::Client**, IPMI::Client::Config const*, void*, void*)
+EXPORT(int, _ZN4IPMI6Client6createEPPS0_PKNS0_6ConfigEPvS6_, Ptr<void> *client, void const *config, Ptr<void> user_data, Ptr<void> client_memory) {
+    if (!client_vtable) {
+        // initialize the vtable
+        client_vtable = create_vtable({
+                                          0x101C93F8, // destroy
+                                          0xA22C3E01, // connect
+                                          0xEC73331C, // disconnect
+                                          0xD484D36D, // terminateConnection
+                                          0x28BD5F19, // invokeSyncMethod
+                                          0x73C72FBB, // invokeSyncMethod
+                                          0xAFD10F3B, // invokeAsyncMethod
+                                          0x387AFA3F, // invokeAsyncMethod
+                                          0xF8C2B8BA, // tryGetResult
+                                          0x4EBB01A2, // tryGetResult
+                                          0x8FF23C3C, // pollEventFlag
+                                          0x45C32034, // waitEventFlag
+                                          0x004F48ED, // getUserData
+                                          0xA3E650B0, // getMsg
+                                          0x60EFADE7, // tryGetMsg
+                                          0xA5AA193C, // ~Client
+                                      },
+            emuenv.mem);
+    }
+
+    *client_memory.cast<Ptr<void>>().get(emuenv.mem) = client_vtable;
+    *client = client_memory;
+    LOG_DEBUG("Stubed");
+    return 0;
+}
+
+EXPORT(int, _ZN4IPMI6Client6getMsgEjPvPjjS2_) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client7connectEPKvjPi, void *client, void const *params, SceSize params_size, SceInt32 *error) {
+    *error = 0;
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client7destroyEv) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6Client9tryGetMsgEjPvPmm) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, _ZN4IPMI6ClientD1Ev) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, SceIpmi_296D44D4) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, SceIpmi_BC3A3031) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, SceIpmi_2C6DB642) {
+    return UNIMPLEMENTED();
+}
+
+EXPORT(int, SceIpmi_006EFA9D) {
+    return UNIMPLEMENTED();
+}
diff --git a/vita3k/modules/SceKernelModulemgr/SceModulemgr.cpp b/vita3k/modules/SceKernelModulemgr/SceModulemgr.cpp
@@ -75,9 +75,9 @@ EXPORT(SceUID, _sceKernelLoadStartModule, const char *moduleFileName, SceSize ar
     return kernel_start_module(emuenv, module_id, args, argp, pRes);
 }
 
-EXPORT(int, _sceKernelOpenModule) {
-    TRACY_FUNC(_sceKernelOpenModule);
-    return UNIMPLEMENTED();
+EXPORT(SceUID, _sceKernelOpenModule, const char *moduleFileName, SceSize args, const Ptr<void> argp, SceUInt32 flags, const SceKernelLMOption *pOpt, int *pRes) {
+    TRACY_FUNC(_sceKernelOpenModule, moduleFileName, args, argp, flags, pOpt, pRes);
+    return CALL_EXPORT(_sceKernelLoadStartModule, moduleFileName, args, argp, flags, pOpt, pRes);
 }
 
 EXPORT(int, _sceKernelStartModule, SceUID uid, SceSize args, Ptr<const void> argp, SceUInt32 flags, const SceKernelStartModuleOpt *pOpt, int *pRes) {

diff --git a/vita3k/modules/SceKernelThreadMgr/SceThreadmgr.cpp b/vita3k/modules/SceKernelThreadMgr/SceThreadmgr.cpp
@@ -1026,7 +1026,7 @@ EXPORT(SceUID, sceKernelCreateCallback, char *name, SceUInt32 attr, Ptr<SceKerne
 
 EXPORT(int, sceKernelCreateThreadForUser, const char *name, SceKernelThreadEntry entry, int init_priority, SceKernelCreateThread_opt *options) {
     TRACY_FUNC(sceKernelCreateThreadForUser, name, entry, init_priority, options);
-    if (options->cpu_affinity_mask & ~SCE_KERNEL_CPU_MASK_USER_ALL) {
+    if (options->cpu_affinity_mask & ~SCE_KERNEL_CPU_MASK_USER_ALL | 0x80000) {
         return RET_ERROR(SCE_KERNEL_ERROR_INVALID_CPU_AFFINITY);
     }
 

diff --git a/vita3k/modules/SceLibKernel/SceLibKernel.cpp b/vita3k/modules/SceLibKernel/SceLibKernel.cpp
@@ -1574,9 +1574,9 @@ EXPORT(SceInt32, sceKernelLockWriteRWLockCB, SceUID lock_id, SceUInt32 *timeout)
     return CALL_EXPORT(_sceKernelLockWriteRWLockCB, lock_id, timeout);
 }
 
-EXPORT(int, sceKernelOpenModule) {
-    TRACY_FUNC(sceKernelOpenModule);
-    return UNIMPLEMENTED();
+EXPORT(SceUID, sceKernelOpenModule, const char *moduleFileName, SceSize args, const Ptr<void> argp, SceUInt32 flags, const SceKernelLMOption *pOpt, int *pRes) {
+    TRACY_FUNC(sceKernelOpenModule, moduleFileName, args, argp, flags, pOpt, pRes);
+    return CALL_EXPORT(_sceKernelLoadStartModule, moduleFileName, args, argp, flags, pOpt, pRes);
 }
 
 EXPORT(int, sceKernelPMonThreadGetCounter) {

diff --git a/vita3k/modules/SceVshBridge/SceVshBridge.cpp b/vita3k/modules/SceVshBridge/SceVshBridge.cpp
@@ -17,6 +17,8 @@
 
 #include <module/module.h>
 
+#include "../SceDisplay/SceDisplay.h"
+
 EXPORT(int, _vshAppMgrAcInstGetAcdirParam) {
     return UNIMPLEMENTED();
 }
@@ -421,8 +423,8 @@ EXPORT(int, vshCtrlUnregisterNotifyCallBack) {
     return UNIMPLEMENTED();
 }
 
-EXPORT(int, vshDisplayRegisterFrameBufCallback) {
-    return UNIMPLEMENTED();
+EXPORT(SceInt32, vshDisplayRegisterFrameBufCallback, SceUID uid) {
+    return CALL_EXPORT(sceDisplayRegisterVblankStartCallback, uid);
 }
 
 EXPORT(int, vshDisplaySetInvertColors) {
@@ -746,7 +748,8 @@ EXPORT(int, vshSblSsIsDevelopmentMode) {
 }
 
 EXPORT(int, vshSblUtMgrHasComTestFlag) {
-    return UNIMPLEMENTED();
+    STUBBED("");
+    return 1;
 }
 
 EXPORT(int, vshSblUtMgrHasNpTestFlag) {