lifning/gpsp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

just make the ifdef N64

Browse source
This commit is contained in:
lif 2023-12-24 00:06:56 -08:00
parent 052656959f
commit 53490ec797
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -442,7 +442,7 @@ else ifeq ($(platform), n64)
AR = $(N64_INST)/bin/mips64-elf-ar$(EXE_EXT) AR = $(N64_INST)/bin/mips64-elf-ar$(EXE_EXT)
CFLAGS += -fomit-frame-pointer -ffast-math CFLAGS += -fomit-frame-pointer -ffast-math
CFLAGS += -march=vr4300 -mtune=vr4300 -falign-functions=32 CFLAGS += -march=vr4300 -mtune=vr4300 -falign-functions=32
CFLAGS += -DNINTENDO64 -DUSE_RGBA5551_FORMAT -DSMALL_TRANSLATION_CACHE -DROM_BUFFER_SIZE=1 CFLAGS += -DN64 -DUSE_RGBA5551_FORMAT -DSMALL_TRANSLATION_CACHE -DROM_BUFFER_SIZE=1
CFLAGS += -I$(N64_INST)/include/ CFLAGS += -I$(N64_INST)/include/
HAVE_DYNAREC = 0 HAVE_DYNAREC = 0
CPU_ARCH := mips CPU_ARCH := mips

22
libretro/libretro-common/vfs/vfs_implementation.c
View file

@ -51,12 +51,12 @@
# if defined(PSP) # if defined(PSP)
# include <pspiofilemgr.h> # include <pspiofilemgr.h>
# endif # endif
# if defined(NINTENDO64) # if defined(N64)
# include <libdragon.h> # include <libdragon.h>
# endif # endif
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> # include <sys/stat.h>
# if !defined(VITA) && !defined(NINTENDO64) # if !defined(VITA) && !defined(N64)
# include <dirent.h> # include <dirent.h>
# endif # endif
# include <unistd.h> # include <unistd.h>
@ -78,7 +78,7 @@
# endif # endif
# include <sys/types.h> # include <sys/types.h>
# include <sys/stat.h> # include <sys/stat.h>
# if !defined(NINTENDO64) # if !defined(N64)
# include <dirent.h> # include <dirent.h>
# endif # endif
# include <unistd.h> # include <unistd.h>
@ -620,7 +620,7 @@ int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, i
stream->size = length; stream->size = length;
return 0; return 0;
} }
#elif !defined(VITA) && !defined(PSP) && !defined(PS2) && !defined(ORBIS) && (!defined(SWITCH) || defined(HAVE_LIBNX)) && !defined(NINTENDO64) #elif !defined(VITA) && !defined(PSP) && !defined(PS2) && !defined(ORBIS) && (!defined(SWITCH) || defined(HAVE_LIBNX)) && !defined(N64)
if (stream && ftruncate(fileno(stream->fp), (off_t)length) == 0) if (stream && ftruncate(fileno(stream->fp), (off_t)length) == 0)
{ {
stream->size = length; stream->size = length;
@ -1026,7 +1026,7 @@ int retro_vfs_mkdir_impl(const char *dir)
free(dir_buf); free(dir_buf);
} }
} }
#elif defined(NINTENDO64) #elif defined(N64)
int ret = 0; int ret = 0;
return -1; return -1;
#else #else
@ -1061,7 +1061,7 @@ struct libretro_vfs_implementation_dir
int error; int error;
int directory; int directory;
sysFSDirent entry; sysFSDirent entry;
#elif defined(NINTENDO64) #elif defined(N64)
bool directory; bool directory;
unsigned flags; unsigned flags;
char path[1024]; char path[1024];
@ -1140,7 +1140,7 @@ libretro_vfs_implementation_dir *retro_vfs_opendir_impl(
rdir->entry = NULL; rdir->entry = NULL;
#elif defined(__PSL1GHT__) || defined(__PS3__) #elif defined(__PSL1GHT__) || defined(__PS3__)
rdir->error = sysFsOpendir(name, &rdir->directory); rdir->error = sysFsOpendir(name, &rdir->directory);
#elif defined(NINTENDO64) #elif defined(N64)
if (dfs_chdir(name) != DFS_ESUCCESS) return NULL; if (dfs_chdir(name) != DFS_ESUCCESS) return NULL;
rdir->flags = 0xff; rdir->flags = 0xff;
rdir->directory = true; rdir->directory = true;
@ -1182,7 +1182,7 @@ bool retro_vfs_readdir_impl(libretro_vfs_implementation_dir *rdir)
uint64_t nread; uint64_t nread;
rdir->error = sysFsReaddir(rdir->directory, &rdir->entry, &nread); rdir->error = sysFsReaddir(rdir->directory, &rdir->entry, &nread);
return (nread != 0); return (nread != 0);
#elif defined(NINTENDO64) #elif defined(N64)
if (rdir->flags == 0xff) { if (rdir->flags == 0xff) {
rdir->flags = dfs_dir_findfirst(".", rdir->path); rdir->flags = dfs_dir_findfirst(".", rdir->path);
} else { } else {
@ -1209,7 +1209,7 @@ const char *retro_vfs_dirent_get_name_impl(libretro_vfs_implementation_dir *rdir
return (char*)rdir->entry.cFileName; return (char*)rdir->entry.cFileName;
#elif defined(VITA) || defined(__PSL1GHT__) || defined(__PS3__) #elif defined(VITA) || defined(__PSL1GHT__) || defined(__PS3__)
return rdir->entry.d_name; return rdir->entry.d_name;
#elif defined(NINTENDO64) #elif defined(N64)
return rdir->path; return rdir->path;
#else #else
if (!rdir || !rdir->entry) if (!rdir || !rdir->entry)
@ -1229,7 +1229,7 @@ bool retro_vfs_dirent_is_dir_impl(libretro_vfs_implementation_dir *rdir)
#elif defined(__PSL1GHT__) || defined(__PS3__) #elif defined(__PSL1GHT__) || defined(__PS3__)
sysFSDirent *entry = (sysFSDirent*)&rdir->entry; sysFSDirent *entry = (sysFSDirent*)&rdir->entry;
return (entry->d_type == FS_TYPE_DIR); return (entry->d_type == FS_TYPE_DIR);
#elif defined(NINTENDO64) #elif defined(N64)
return rdir->flags & FLAGS_DIR; return rdir->flags & FLAGS_DIR;
#else #else
struct stat buf; struct stat buf;
@ -1262,7 +1262,7 @@ int retro_vfs_closedir_impl(libretro_vfs_implementation_dir *rdir)
sceIoDclose(rdir->directory); sceIoDclose(rdir->directory);
#elif defined(__PSL1GHT__) || defined(__PS3__) #elif defined(__PSL1GHT__) || defined(__PS3__)
rdir->error = sysFsClosedir(rdir->directory); rdir->error = sysFsClosedir(rdir->directory);
#elif defined(NINTENDO64) #elif defined(N64)
#else #else
if (rdir->directory) if (rdir->directory)

2
mips/mips_stub.S
View file

@ -615,7 +615,7 @@ fnptrs:
# Make this section executable! # Make this section executable!
.text .text
#if defined(PSP) || defined(PS2) || defined(NINTENDO64) #if defined(PSP) || defined(PS2) || defined(N64)
.section .bss .section .bss
#else #else
# Need to mark the section as awx (for Linux) # Need to mark the section as awx (for Linux)