thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2025-10-30 08:02:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Setup pak.cpp

Browse source
This commit is contained in:
angie 2024-05-26 18:50:25 -04:00
parent 3ddeb07d85
commit 8736a16c63
5 changed files with 121 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librecomp/include/recomp_helpers.h
View file

@ -47,4 +47,4 @@ void _return(recomp_context* ctx, T val) {
}
}
#endif
#endif

9
librecomp/src/pak.cpp
View file

@ -1,9 +1,16 @@
#include "recomp.h"
#include <ultramodern/ultra64.h>
#include <ultramodern/ultramodern.hpp>
#include "recomp_helpers.h"
extern "C" void osPfsInitPak_recomp(uint8_t * rdram, recomp_context* ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
PTR(OSMesgQueue) queue = _arg<0, PTR(OSMesgQueue)>(rdram, ctx);
PTR(OSPfs) pfs = _arg<1, PTR(OSPfs)>(rdram, ctx);
int channel = _arg<2, int>(rdram, ctx);
s32 ret = osPfsInitPak(rdram, queue, pfs, channel);
_return<s32>(ctx, ret);
}
extern "C" void osPfsFreeBlocks_recomp(uint8_t * rdram, recomp_context * ctx) {

1
ultramodern/CMakeLists.txt
View file

@ -14,6 +14,7 @@ add_library(ultramodern STATIC
"${CMAKE_CURRENT_SOURCE_DIR}/src/events.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/mesgqueue.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/misc_ultra.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/pak.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/rt64_layer.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/scheduling.cpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/task_win32.cpp"

77
ultramodern/include/ultramodern/ultra64.h
View file

@ -35,9 +35,9 @@ typedef uint8_t u8;
# endif
#else
# define PTR(x) int32_t
# define RDRAM_ARG uint8_t *rdram,
# define RDRAM_ARG uint8_t *rdram,
# define RDRAM_ARG1 uint8_t *rdram
# define PASS_RDRAM rdram,
# define PASS_RDRAM rdram,
# define PASS_RDRAM1 rdram
# define TO_PTR(type, var) ((type*)(&rdram[(uint64_t)var - 0xFFFFFFFF80000000]))
# define GET_MEMBER(type, addr, member) (addr + (intptr_t)&(((type*)nullptr)->member))
@ -214,6 +214,63 @@ typedef struct {
OSViFieldRegs fldRegs[2];
} OSViMode;
/// os_pfs.h
/*
* Structure for file system
*/
typedef struct {
int status;
PTR(OSMesgQueue) queue;
int channel;
u8 id[32];
u8 label[32];
int version;
int dir_size;
int inode_table; /* block location */
int minode_table; /* mirrioring inode_table */
int dir_table; /* block location */
int inode_start_page; /* page # */
// These two members reversed due to endianness
u16 padding;
u8 activebank;
u8 banks;
} OSPfs;
typedef struct {
u32 file_size; /* bytes */
u32 game_code;
#if 0
// I'm not sure how this should look like due to endianness
u16 company_code;
char ext_name[4];
char game_name[16];
#endif
} OSPfsState;
/* File System error number */
#define PFS_ERR_NOPACK 1 /* no memory card is plugged or */
#define PFS_ERR_NEW_PACK 2 /* ram pack has been changed to a different one */
#define PFS_ERR_INCONSISTENT 3 /* need to run Pfschecker*/
#define PFS_ERR_CONTRFAIL CONT_OVERRUN_ERROR
#define PFS_ERR_INVALID 5 /* invalid parameter or file not exist*/
#define PFS_ERR_BAD_DATA 6 /* the data read from pack are bad*/
#define PFS_DATA_FULL 7 /* no free pages on ram pack*/
#define PFS_DIR_FULL 8 /* no free directories on ram pack*/
#define PFS_ERR_EXIST 9 /* file exists*/
#define PFS_ERR_ID_FATAL 10 /* dead ram pack */
#define PFS_ERR_DEVICE 11 /* wrong device type*/
#define PFS_ERR_NO_GBCART 12 /* no gb cartridge (64GB-PAK) */
#define PFS_ERR_NEW_GBCART 13 /* gb cartridge may be changed */
/// os_pfs.h
///////////////
// Functions //
///////////////
@ -255,6 +312,22 @@ int osSetTimer(RDRAM_ARG PTR(OSTimer) timer, OSTime countdown, OSTime interval,
int osStopTimer(RDRAM_ARG PTR(OSTimer) timer);
u32 osVirtualToPhysical(PTR(void) addr);
s32 osPfsInitPak(RDRAM_ARG PTR(OSMesgQueue), PTR(OSPfs), int);
s32 osPfsRepairId(RDRAM_ARG PTR(OSPfs));
s32 osPfsInit(RDRAM_ARG PTR(OSMesgQueue), PTR(OSPfs), int);
s32 osPfsReFormat(RDRAM_ARG PTR(OSPfs), PTR(OSMesgQueue), int);
s32 osPfsChecker(RDRAM_ARG PTR(OSPfs));
s32 osPfsAllocateFile(RDRAM_ARG PTR(OSPfs), u16, u32, PTR(u8), PTR(u8), int, PTR(s32));
s32 osPfsFindFile(RDRAM_ARG PTR(OSPfs), u16, u32, PTR(u8), PTR(u8), PTR(s32));
s32 osPfsDeleteFile(RDRAM_ARG PTR(OSPfs), u16, u32, PTR(u8), PTR(u8));
s32 osPfsReadWriteFile(RDRAM_ARG PTR(OSPfs), s32, u8, int, int, PTR(u8));
s32 osPfsFileState(RDRAM_ARG PTR(OSPfs), s32, PTR(OSPfsState));
s32 osPfsGetLabel(RDRAM_ARG PTR(OSPfs), PTR(u8), PTR(int));
s32 osPfsSetLabel(RDRAM_ARG PTR(OSPfs), PTR(u8));
s32 osPfsIsPlug(RDRAM_ARG PTR(OSMesgQueue), PTR(u8));
s32 osPfsFreeBlocks(RDRAM_ARG PTR(OSPfs), PTR(s32));
s32 osPfsNumFiles(RDRAM_ARG PTR(OSPfs), PTR(s32), PTR(s32));
#ifdef __cplusplus
} // extern "C"
#endif

36
ultramodern/src/pak.cpp Normal file
View file

@ -0,0 +1,36 @@
#include "ultramodern/ultra64.h"
extern "C" s32 osPfsInitPak(RDRAM_ARG PTR(OSMesgQueue) queue, PTR(OSPfs) pfs, int channel) {
return PFS_ERR_NOPACK;
}
#if 0
extern "C" void osPfsFreeBlocks_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsAllocateFile_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsDeleteFile_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsFileState_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsFindFile_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsReadWriteFile_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
extern "C" void osPfsChecker_recomp(uint8_t * rdram, recomp_context * ctx) {
ctx->r2 = 1; // PFS_ERR_NOPACK
}
#endif