Game-Decompilation/perfect_dark
1
0
Fork 0
mirror of https://github.com/n64decomp/perfect_dark.git synced 2024-11-26 23:50:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create functionally equivalent C for handwritten RNG functions

Browse Source
This commit is contained in:
Ryan Dwyer 2022-11-18 22:30:06 +10:00
parent 1c7dc246f5
commit 1b0e512e2a
10 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -318,6 +318,7 @@ ifeq ($(COMPILER), ido)
src/lib/ultra/io/pfsinitpak2.c
MIPS3_C_FILES := \
src/lib/rng.c \
src/lib/ultra/libc/ll.c \
src/lib/ultra/libc/llcvt.c
@ -750,6 +751,11 @@ $(B_DIR)/rsp/%.o: $(B_DIR)/rsp/%.bin
TOOLCHAIN=$(TOOLCHAIN) ROMID=$(ROMID) tools/mkrawobject $< $@
ifeq ($(COMPILER), ido)
$(B_DIR)/lib/rng.o: src/lib/rng.c $(ASSETMGR_O_FILES) $(RECOMP_FILES)
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS) $(OPT_LVL) -o $@ $<
tools/patchmips3 $@ || rm $@
$(B_DIR)/lib/ultra/libc/llcvt.o: src/lib/ultra/libc/llcvt.c $(ASSETMGR_O_FILES) $(RECOMP_FILES)
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS) $(OPT_LVL) -o $@ $<

2
ld/libfiles.jpn-final.inc
View File

@ -40,7 +40,7 @@
build/ROMID/lib/music.o (section); \
build/ROMID/lib/memp.o (section); \
build/ROMID/lib/mema.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/rngasm.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \

2
ld/libfiles.ntsc-beta.inc
View File

@ -42,7 +42,7 @@
build/ROMID/lib/music.o (section); \
build/ROMID/lib/memp.o (section); \
build/ROMID/lib/mema.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/rngasm.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \

2
ld/libfiles.ntsc-final.inc
View File

@ -40,7 +40,7 @@
build/ROMID/lib/music.o (section); \
build/ROMID/lib/memp.o (section); \
build/ROMID/lib/mema.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/rngasm.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \

2
ld/libfiles.pal-beta.inc
View File

@ -40,7 +40,7 @@
build/ROMID/lib/music.o (section); \
build/ROMID/lib/memp.o (section); \
build/ROMID/lib/mema.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/rngasm.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \

2
ld/libfiles.pal-final.inc
View File

@ -40,7 +40,7 @@
build/ROMID/lib/music.o (section); \
build/ROMID/lib/memp.o (section); \
build/ROMID/lib/mema.o (section); \
build/ROMID/lib/rng.o (section); \
build/ROMID/lib/rngasm.o (section); \
build/ROMID/lib/args.o (section); \
build/ROMID/lib/str.o (section); \
build/ROMID/lib/ultra/libc/sprintf.o (section); \

1
src/include/lib/rng.h
View File

@ -5,7 +5,6 @@
#include "types.h"
u32 random(void);
void rngSetSeed(u32 seed);
u32 rngRotateSeed(u64 *value);
#endif

4
src/lib/main.c
View File

@ -70,6 +70,10 @@
#include "data.h"
#include "types.h"
// mainLoop calls rngSetSeed with a u32 argument,
// but the function takes a u64 so an incorrect declaration is needed.
void rngSetSeed(u32 seed);
bool var8005d9b0 = false;
s32 g_StageNum = STAGE_TITLE;
u32 g_MainMemaHeapSize = 1024 * 300;

41
src/lib/rng.c Normal file
View File

@ -0,0 +1,41 @@
#include <ultra64.h>
#include "constants.h"
#include "bss.h"
#include "lib/rng.h"
#include "data.h"
#include "types.h"
u64 g_RngSeed = 0xab8d9f7781280783;
/**
* Generate a random number between 0 and 4294967295.
*/
u32 random(void)
{
g_RngSeed = ((g_RngSeed << 63) >> 31 | (g_RngSeed << 31) >> 32) ^ (g_RngSeed << 44) >> 32;
g_RngSeed = ((g_RngSeed >> 20) & 0xfff) ^ g_RngSeed;
return g_RngSeed;
}
/**
* Set the given seed as the RNG seed. Add 1 to make sure it isn't 0.
*/
void rngSetSeed(u64 seed)
{
g_RngSeed = seed + 1;
}
/**
* Rotate the given seed using the same algorithm as random().
*
* Store the new 64-bit seed at the pointed address and return the same seed
* cast as a u32.
*/
u32 rngRotateSeed(u64 *seed)
{
*seed = ((*seed << 63) >> 31 | (*seed << 31) >> 32) ^ (*seed << 44) >> 32;
*seed = ((*seed >> 20) & 0xfff) ^ *seed;
return *seed;
}

2
src/lib/rng.s → src/lib/rngasm.s
View File

@ -36,7 +36,7 @@ glabel random
dsra32 $v0, $v0, 0
/**
* void rngSetSeed(u32 seed)
* void rngSetSeed(u64 seed)
*
* Set the given seed as the RNG seed. Add 1 to make sure it isn't 0.
*/