PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Link CRandom16.cpp

This commit is contained in:
Phillip Stephens 2022-07-30 03:34:28 -07:00
parent 5bfa43d591
commit 4a01665439
5 changed files with 92 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -102,7 +102,7 @@ ifeq ($(VERBOSE),0)
# this set of LDFLAGS generates no warnings.
LDFLAGS := $(MAPGEN) -fp fmadd -nodefaults -w off
endif
CFLAGS_1.2 = -proc gekko -nodefaults -Cpp_exceptions off -RTTI off -fp fmadd -str reuse,pool,readonly -O4,p -maxerrors 1 -use_lmw_stmw on -enum int -inline auto -MMD $(INCLUDES)
CFLAGS_1.2 = -proc gekko -nodefaults -Cpp_exceptions off -RTTI off -fp fmadd -fp_contract on -str reuse,pool,readonly -O4,p -maxerrors 1 -use_lmw_stmw on -enum int -inline auto -MMD $(INCLUDES)
CFLAGS_MUSYX = -proc gekko -nodefaults -Cpp_exceptions off -RTTI off -fp fmadd -str reuse,pool,readonly -O4,p -maxerrors 1 -enum int -inline auto -MMD $(INCLUDES)
CFLAGS = $(CFLAGS_1.2) -gccinc -inline deferred,noauto

20
asm/Kyoto/CRandom16.s
View File

@ -2,11 +2,11 @@
.section .sbss, "wa"
.global lbl_805A9450
lbl_805A9450:
.global gRandomNumber__9CRandom16
gRandomNumber__9CRandom16:
.skip 0x4
.global lbl_805A9454
lbl_805A9454:
.global gCurrentGlobalRandom__13CGlobalRandom
gCurrentGlobalRandom__13CGlobalRandom:
.skip 0x4
.section .text, "ax"
@ -101,12 +101,12 @@ __ct__9CRandom16FUi:
.global _SetRandomNumber__9CRandom16FP9CRandom16
_SetRandomNumber__9CRandom16FP9CRandom16:
/* 803125F4 0030F554 90 6D A8 90 */ stw r3, lbl_805A9450@sda21(r13)
/* 803125F4 0030F554 90 6D A8 90 */ stw r3, gRandomNumber__9CRandom16@sda21(r13)
/* 803125F8 0030F558 4E 80 00 20 */ blr
.global GetRandomNumber__9CRandom16Fv
GetRandomNumber__9CRandom16Fv:
/* 803125FC 0030F55C 80 6D A8 90 */ lwz r3, lbl_805A9450@sda21(r13)
/* 803125FC 0030F55C 80 6D A8 90 */ lwz r3, gRandomNumber__9CRandom16@sda21(r13)
/* 80312600 0030F560 4E 80 00 20 */ blr
.global __dt__13CGlobalRandomFv
@ -121,11 +121,11 @@ __dt__13CGlobalRandomFv:
/* 80312620 0030F580 41 82 00 44 */ beq lbl_80312664
/* 80312624 0030F584 80 7E 00 08 */ lwz r3, 8(r30)
/* 80312628 0030F588 28 03 00 00 */ cmplwi r3, 0
/* 8031262C 0030F58C 90 6D A8 94 */ stw r3, lbl_805A9454@sda21(r13)
/* 8031262C 0030F58C 90 6D A8 94 */ stw r3, gCurrentGlobalRandom__13CGlobalRandom@sda21(r13)
/* 80312630 0030F590 41 82 00 1C */ beq lbl_8031264C
/* 80312634 0030F594 38 00 00 01 */ li r0, 1
/* 80312638 0030F598 98 03 00 04 */ stb r0, 4(r3)
/* 8031263C 0030F59C 80 6D A8 94 */ lwz r3, lbl_805A9454@sda21(r13)
/* 8031263C 0030F59C 80 6D A8 94 */ lwz r3, gCurrentGlobalRandom__13CGlobalRandom@sda21(r13)
/* 80312640 0030F5A0 80 63 00 00 */ lwz r3, 0(r3)
/* 80312644 0030F5A4 4B FF FF B1 */ bl _SetRandomNumber__9CRandom16FP9CRandom16
/* 80312648 0030F5A8 48 00 00 0C */ b lbl_80312654
@ -156,7 +156,7 @@ __ct__13CGlobalRandomFR9CRandom16:
/* 80312694 0030F5F4 7C 7F 1B 78 */ mr r31, r3
/* 80312698 0030F5F8 90 83 00 00 */ stw r4, 0(r3)
/* 8031269C 0030F5FC 98 03 00 04 */ stb r0, 4(r3)
/* 803126A0 0030F600 80 0D A8 94 */ lwz r0, lbl_805A9454@sda21(r13)
/* 803126A0 0030F600 80 0D A8 94 */ lwz r0, gCurrentGlobalRandom__13CGlobalRandom@sda21(r13)
/* 803126A4 0030F604 90 03 00 08 */ stw r0, 8(r3)
/* 803126A8 0030F608 80 63 00 08 */ lwz r3, 8(r3)
/* 803126AC 0030F60C 28 03 00 00 */ cmplwi r3, 0
@ -164,7 +164,7 @@ __ct__13CGlobalRandomFR9CRandom16:
/* 803126B4 0030F614 38 00 00 00 */ li r0, 0
/* 803126B8 0030F618 98 03 00 04 */ stb r0, 4(r3)
lbl_803126BC:
/* 803126BC 0030F61C 93 ED A8 94 */ stw r31, lbl_805A9454@sda21(r13)
/* 803126BC 0030F61C 93 ED A8 94 */ stw r31, gCurrentGlobalRandom__13CGlobalRandom@sda21(r13)
/* 803126C0 0030F620 80 7F 00 00 */ lwz r3, 0(r31)
/* 803126C4 0030F624 4B FF FF 31 */ bl _SetRandomNumber__9CRandom16FP9CRandom16
/* 803126C8 0030F628 80 01 00 14 */ lwz r0, 0x14(r1)

34
include/Kyoto/CRandom16.hpp Normal file
View File

@ -0,0 +1,34 @@
#ifndef __CRANDOM16_HPP__
#define __CRANDOM16_HPP__
#include "types.h"
class CRandom16;
class CGlobalRandom {
static CGlobalRandom* gCurrentGlobalRandom;
public:
CGlobalRandom(CRandom16& rnd);
~CGlobalRandom();
private:
CRandom16& mRandom;
bool mIsFirst;
CGlobalRandom* mPrev;
};
class CRandom16 {
friend class CGlobalRandom;
static CRandom16* gRandomNumber;
static void _SetRandomNumber(CRandom16* rnd);
public:
static CRandom16* GetRandomNumber();
CRandom16(u32 seed = 99);
void SetSeed(u32 seed);
s32 Range(s32 min, s32 max);
float Range(float min, float max);
s32 Next();
float Float();
private:
u32 mSeed;
};
#endif // __CRANDOM16_HPP__

2
obj_files.mk
View File

@ -526,7 +526,7 @@ KYOTO :=\
$(BUILD_DIR)/asm/Kyoto/Math/CMatrix3f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CMatrix4f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CQuaternion.o\
$(BUILD_DIR)/asm/Kyoto/CRandom16.o\
$(BUILD_DIR)/src/Kyoto/CRandom16.o\
$(BUILD_DIR)/asm/Kyoto/Math/CTransform4f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CUnitVector3f.o\
$(BUILD_DIR)/asm/Kyoto/Math/CVector2f.o\

46
src/Kyoto/CRandom16.cpp Normal file
View File

@ -0,0 +1,46 @@
#include "Kyoto/CRandom16.hpp"
#include "Kyoto/Alloc/CMemory.hpp"
CRandom16* CRandom16::gRandomNumber = nullptr;
CGlobalRandom* CGlobalRandom::gCurrentGlobalRandom = nullptr;
CGlobalRandom::CGlobalRandom(CRandom16& rnd) : mRandom(rnd) {
mIsFirst = true;
mPrev = gCurrentGlobalRandom;
if (mPrev != nullptr) {
mPrev->mIsFirst = false;
}
gCurrentGlobalRandom = this;
CRandom16::_SetRandomNumber(&mRandom);
}
CGlobalRandom::~CGlobalRandom() {
gCurrentGlobalRandom = mPrev;
if (gCurrentGlobalRandom != nullptr) {
gCurrentGlobalRandom->mIsFirst = true;
CRandom16::_SetRandomNumber(&gCurrentGlobalRandom->mRandom);
} else {
CRandom16::_SetRandomNumber(nullptr);
}
}
CRandom16* CRandom16::GetRandomNumber() { return gRandomNumber; }
void CRandom16::_SetRandomNumber(CRandom16* rnd) { gRandomNumber = rnd; }
CRandom16::CRandom16(u32 seed) : mSeed(seed) {}
void CRandom16::SetSeed(u32 seed) { mSeed = seed; }
s32 CRandom16::Range(s32 min, s32 max) { return min + (Next() % ((max - min) + 1)); }
float CRandom16::Range(float min, float max) { return ((max - min) * Float()) + min; }
s32 CRandom16::Next() {
mSeed = (mSeed * 0x41c64e6d) + 0x00003039;
return (mSeed >> 16) & 0xffff;
}
f32 CRandom16::Float() {
s32 next = Next();
return 1.52590222E-5f * next;
}