mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-07-29 15:23:01 -04:00
some cleanup of f_pc/f_op files (#2254)
* cleanup f_pc files * cleanup f_op files * fix a couple f_op_actor_mng functions * minor JSystem work
This commit is contained in:
TakaRikka
@@ -25,40 +25,48 @@ void J3DGQRSetup7(u32 r0, u32 r1, u32 r2, u32 r3) {
|
||||
|
||||
/* 80311670-80311760 30BFB0 00F0+00 0/0 2/2 0/0 .text J3DCalcBBoardMtx__FPA4_f */
|
||||
// this uses a non-standard sqrtf, not sure why or how its supposed to be setup
|
||||
static inline f32 sqrtf2(f32 x) {
|
||||
if (x > 0.0f) {
|
||||
f32 guess = (f32)__frsqrte(x);
|
||||
return (f32)(x * guess);
|
||||
}
|
||||
return x;
|
||||
inline f32 J3D_sqrtf(register f32 x) {
|
||||
register f32 recip;
|
||||
|
||||
if (x > 0.0f) {
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
asm { frsqrte recip, x }
|
||||
#endif // clang-format on
|
||||
return recip * x;
|
||||
}
|
||||
return x;
|
||||
}
|
||||
|
||||
void J3DCalcBBoardMtx(Mtx mtx) {
|
||||
void J3DCalcBBoardMtx(register Mtx mtx) {
|
||||
f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
|
||||
f32 y = (mtx[0][1] * mtx[0][1]) + (mtx[1][1] * mtx[1][1]) + (mtx[2][1] * mtx[2][1]);
|
||||
f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
|
||||
|
||||
if (x > 0.0f) {
|
||||
x *= sqrtf2(x);
|
||||
x = J3D_sqrtf(x);
|
||||
}
|
||||
if (y > 0.0f) {
|
||||
y *= sqrtf2(y);
|
||||
y = J3D_sqrtf(y);
|
||||
}
|
||||
if (z > 0.0f) {
|
||||
z *= sqrtf2(z);
|
||||
z = J3D_sqrtf(z);
|
||||
}
|
||||
|
||||
register f32 zero = 0.0f;
|
||||
// zero out gaps of zeroes
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
asm {
|
||||
psq_st zero, 0x04(mtx), 0, 0
|
||||
|
||||
psq_st zero, 0x20(mtx), 0, 0
|
||||
}
|
||||
#endif // clang-format on
|
||||
|
||||
mtx[0][0] = x;
|
||||
mtx[0][1] = 0.0f;
|
||||
mtx[0][2] = 0.0f;
|
||||
|
||||
mtx[1][0] = 0.0f;
|
||||
mtx[1][1] = y;
|
||||
mtx[1][2] = 0.0f;
|
||||
|
||||
mtx[2][0] = 0.0f;
|
||||
mtx[2][1] = 0.0f;
|
||||
mtx[2][2] = z;
|
||||
mtx[1][0] = zero;
|
||||
mtx[1][1] = y;
|
||||
mtx[1][2] = zero;
|
||||
mtx[2][2] = z;
|
||||
}
|
||||
|
||||
/* 803A1E30-803A1E50 02E490 0020+00 0/0 1/1 0/0 .rodata j3dDefaultTransformInfo */
|
||||
@@ -73,13 +81,85 @@ extern Mtx const j3dDefaultMtx = {
|
||||
{1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
|
||||
|
||||
/* 80311760-8031189C 30C0A0 013C+00 0/0 2/2 0/0 .text J3DCalcYBBoardMtx__FPA4_f */
|
||||
void J3DCalcYBBoardMtx(f32 (*param_0)[4]) {
|
||||
// NONMATCHING
|
||||
void J3DCalcYBBoardMtx(Mtx mtx) {
|
||||
f32 x = (mtx[0][0] * mtx[0][0]) + (mtx[1][0] * mtx[1][0]) + (mtx[2][0] * mtx[2][0]);
|
||||
f32 z = (mtx[0][2] * mtx[0][2]) + (mtx[1][2] * mtx[1][2]) + (mtx[2][2] * mtx[2][2]);
|
||||
|
||||
if (x > 0.0f) {
|
||||
x = J3D_sqrtf(x);
|
||||
}
|
||||
if (z > 0.0f) {
|
||||
z = J3D_sqrtf(z);
|
||||
}
|
||||
|
||||
Vec vec = { 0.0f, -mtx[2][1], mtx[1][1] };
|
||||
VECNormalize(&vec, &vec);
|
||||
|
||||
mtx[0][0] = x;
|
||||
mtx[0][2] = 0.0f;
|
||||
mtx[1][0] = 0.0f;
|
||||
|
||||
mtx[1][2] = vec.y * z;
|
||||
mtx[2][0] = 0.0f;
|
||||
mtx[2][2] = vec.z * z;
|
||||
}
|
||||
|
||||
/* 8031189C-80311964 30C1DC 00C8+00 0/0 6/6 0/0 .text J3DPSCalcInverseTranspose__FPA4_fPA3_f */
|
||||
void J3DPSCalcInverseTranspose(f32 (*param_0)[4], f32 (*param_1)[3]) {
|
||||
// NONMATCHING
|
||||
asm void J3DPSCalcInverseTranspose(register Mtx src, register Mtx33 dst) {
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
psq_l f0, 0(src), 1, 0
|
||||
psq_l f1, 4(src), 0, 0
|
||||
psq_l f2, 16(src), 1, 0
|
||||
ps_merge10 f6, f1, f0
|
||||
psq_l f3, 20(src), 0, 0
|
||||
psq_l f4, 32(src), 1, 0
|
||||
ps_merge10 f7, f3, f2
|
||||
psq_l f5, 36(src), 0, 0
|
||||
ps_mul f11, f3, f6
|
||||
ps_merge10 f8, f5, f4
|
||||
ps_mul f13, f5, f7
|
||||
ps_msub f11, f1, f7, f11
|
||||
ps_mul f12, f1, f8
|
||||
ps_msub f13, f3, f8, f13
|
||||
ps_msub f12, f5, f6, f12
|
||||
ps_mul f10, f3, f4
|
||||
ps_mul f9, f0, f5
|
||||
ps_mul f8, f1, f2
|
||||
ps_msub f10, f2, f5, f10
|
||||
ps_msub f9, f1, f4, f9
|
||||
ps_msub f8, f0, f3, f8
|
||||
ps_mul f7, f0, f13
|
||||
ps_sub f1, f1, f1
|
||||
ps_madd f7, f2, f12, f7
|
||||
ps_madd f7, f4, f11, f7
|
||||
ps_cmpo0 cr0, f7, f1
|
||||
bne lbl_8005F118
|
||||
li r3, 0
|
||||
blr
|
||||
|
||||
lbl_8005F118:
|
||||
fres f0, f7
|
||||
ps_add f6, f0, f0
|
||||
ps_mul f5, f0, f0
|
||||
ps_nmsub f0, f7, f5, f6
|
||||
ps_add f6, f0, f0
|
||||
ps_mul f5, f0, f0
|
||||
ps_nmsub f0, f7, f5, f6
|
||||
ps_muls0 f13, f13, f0
|
||||
ps_muls0 f12, f12, f0
|
||||
psq_st f13, 0(dst), 0, 0
|
||||
ps_muls0 f11, f11, f0
|
||||
psq_st f12, 12(dst), 0, 0
|
||||
ps_muls0 f10, f10, f0
|
||||
psq_st f11, 24(dst), 0, 0
|
||||
ps_muls0 f9, f9, f0
|
||||
psq_st f10, 8(dst), 1, 0
|
||||
ps_muls0 f8, f8, f0
|
||||
psq_st f9, 20(r4), 1, 0
|
||||
li r3, 1
|
||||
psq_st f8, 32(r4), 1, 0
|
||||
blr
|
||||
#endif // clang-format on
|
||||
}
|
||||
|
||||
/* 80311964-80311A24 30C2A4 00C0+00 0/0 2/2 2/2 .text
|
||||
@@ -239,73 +319,264 @@ void J3DGetTextureMtxMayaOld(const J3DTextureSRTInfo& srt, Mtx dst) {
|
||||
|
||||
|
||||
/* 80311D94-80311DF8 30C6D4 0064+00 0/0 2/2 0/0 .text J3DScaleNrmMtx__FPA4_fRC3Vec */
|
||||
#ifdef NONMATCHING
|
||||
void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
|
||||
register f32 mtx_xy, mtx_z_, scl_xy, scl_z_;
|
||||
asm void J3DScaleNrmMtx(register Mtx mtx, const register Vec& scl) {
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
nofralloc;
|
||||
|
||||
asm {
|
||||
/* Row 0 */
|
||||
psq_l scl_xy, 0(scl), 0, 0
|
||||
psq_l mtx_xy, 0(mtx), 0, 0
|
||||
lfs scl_z_, 8(scl)
|
||||
lfs mtx_z_, 8(mtx)
|
||||
ps_mul f4, mtx_xy, scl_xy
|
||||
psq_st f4, 0(mtx), 0, 0
|
||||
fmuls f4, mtx_z_, scl_z_
|
||||
stfs f4, 8(mtx)
|
||||
psq_l fp2, 0(scl), 0, 0
|
||||
psq_l fp0, 0(mtx), 0, 0
|
||||
lfs fp3, 8(scl)
|
||||
lfs fp1, 8(mtx)
|
||||
ps_mul f4, fp0, fp2
|
||||
psq_st f4, 0(mtx), 0, 0
|
||||
fmuls f4, fp1, fp3
|
||||
stfs f4, 8(mtx)
|
||||
|
||||
/* Row 1 */
|
||||
psq_l scl_xy, 0(scl), 0, 0
|
||||
psq_l mtx_xy, 16(mtx), 0, 0
|
||||
lfs scl_z_, 8(scl)
|
||||
lfs mtx_z_, 24(mtx)
|
||||
ps_mul f4, mtx_xy, scl_xy
|
||||
psq_st f4, 16(mtx), 0, 0
|
||||
fmuls f4, mtx_z_, scl_z_
|
||||
stfs f4, 24(mtx)
|
||||
/* Row 1 */
|
||||
psq_l fp2, 0(scl), 0, 0
|
||||
psq_l fp0, 16(mtx), 0, 0
|
||||
lfs fp3, 8(scl)
|
||||
lfs fp1, 24(mtx)
|
||||
ps_mul f4, fp0, fp2
|
||||
psq_st f4, 16(mtx), 0, 0
|
||||
fmuls f4, fp1, fp3
|
||||
stfs f4, 24(mtx)
|
||||
|
||||
/* Row 2 */
|
||||
psq_l scl_xy, 0(scl), 0, 0
|
||||
psq_l mtx_xy, 32(mtx), 0, 0
|
||||
lfs scl_z_, 8(scl)
|
||||
lfs mtx_z_, 40(mtx)
|
||||
ps_mul f4, mtx_xy, scl_xy
|
||||
psq_st f4, 32(mtx), 0, 0
|
||||
fmuls f4, mtx_z_, scl_z_
|
||||
stfs f4, 40(mtx)
|
||||
}
|
||||
/* Row 2 */
|
||||
psq_l fp2, 0(scl), 0, 0
|
||||
psq_l fp0, 32(mtx), 0, 0
|
||||
lfs fp3, 8(scl)
|
||||
lfs fp1, 40(mtx)
|
||||
ps_mul f4, fp0, fp2
|
||||
psq_st f4, 32(mtx), 0, 0
|
||||
fmuls f4, fp1, fp3
|
||||
stfs f4, 40(mtx)
|
||||
blr
|
||||
#endif // clang-format on
|
||||
}
|
||||
#else
|
||||
void J3DScaleNrmMtx(f32 (*param_0)[4], Vec const& param_1) {
|
||||
// NONMATCHING
|
||||
}
|
||||
#endif
|
||||
|
||||
/* 80311DF8-80311E4C 30C738 0054+00 0/0 5/5 0/0 .text J3DScaleNrmMtx33__FPA3_fRC3Vec */
|
||||
void J3DScaleNrmMtx33(f32 (*param_0)[3], Vec const& param_1) {
|
||||
// NONMATCHING
|
||||
asm void J3DScaleNrmMtx33(register Mtx33 mtx, const register Vec& scale) {
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
psq_l f0, 0(mtx), 0, 0
|
||||
psq_l f6, 0(scale), 0, 0
|
||||
lfs f1, 8(mtx)
|
||||
lfs f7, 8(scale)
|
||||
ps_mul f0, f0, f6
|
||||
psq_l f2, 12(mtx), 0, 0
|
||||
fmuls f1, f1, f7
|
||||
lfs f3, 0x14(mtx)
|
||||
ps_mul f2, f2, f6
|
||||
psq_l f4, 24(mtx), 0, 0
|
||||
fmuls f3, f3, f7
|
||||
lfs f5, 0x20(mtx)
|
||||
ps_mul f4, f4, f6
|
||||
psq_st f0, 0(mtx), 0, 0
|
||||
fmuls f5, f5, f7
|
||||
stfs f1, 8(mtx)
|
||||
psq_st f2, 12(mtx), 0, 0
|
||||
stfs f3, 0x14(mtx)
|
||||
psq_st f4, 24(mtx), 0, 0
|
||||
stfs f5, 0x20(mtx)
|
||||
blr
|
||||
#endif // clang-format on
|
||||
}
|
||||
|
||||
/* 80311E4C-80311F70 30C78C 0124+00 0/0 3/3 0/0 .text J3DMtxProjConcat__FPA4_fPA4_fPA4_f
|
||||
*/
|
||||
void J3DMtxProjConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4]) {
|
||||
// NONMATCHING
|
||||
asm void J3DMtxProjConcat(register Mtx mtx1, register Mtx mtx2, register Mtx dst) {
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
psq_l f2, 0(mtx1), 0, 0
|
||||
psq_l f3, 8(mtx1), 0, 0
|
||||
ps_merge00 f6, f2, f2
|
||||
ps_merge11 f7, f2, f2
|
||||
ps_merge00 f8, f3, f3
|
||||
ps_merge11 f9, f3, f3
|
||||
psq_l f10, 0(mtx2), 0, 0
|
||||
psq_l f11, 16(mtx2), 0, 0
|
||||
psq_l f12, 32(mtx2), 0, 0
|
||||
psq_l f13, 48(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 0(dst), 0, 0
|
||||
psq_l f10, 8(mtx2), 0, 0
|
||||
psq_l f11, 24(mtx2), 0, 0
|
||||
psq_l f12, 40(mtx2), 0, 0
|
||||
psq_l f13, 56(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 8(dst), 0, 0
|
||||
psq_l f2, 16(mtx1), 0, 0
|
||||
psq_l f3, 24(mtx1), 0, 0
|
||||
ps_merge00 f6, f2, f2
|
||||
ps_merge11 f7, f2, f2
|
||||
ps_merge00 f8, f3, f3
|
||||
ps_merge11 f9, f3, f3
|
||||
psq_l f10, 0(mtx2), 0, 0
|
||||
psq_l f11, 16(mtx2), 0, 0
|
||||
psq_l f12, 32(mtx2), 0, 0
|
||||
psq_l f13, 48(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 16(dst), 0, 0
|
||||
psq_l f10, 8(mtx2), 0, 0
|
||||
psq_l f11, 24(mtx2), 0, 0
|
||||
psq_l f12, 40(mtx2), 0, 0
|
||||
psq_l f13, 56(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 24(dst), 0, 0
|
||||
psq_l f2, 32(mtx1), 0, 0
|
||||
psq_l f3, 40(mtx1), 0, 0
|
||||
ps_merge00 f6, f2, f2
|
||||
ps_merge11 f7, f2, f2
|
||||
ps_merge00 f8, f3, f3
|
||||
ps_merge11 f9, f3, f3
|
||||
psq_l f10, 0(mtx2), 0, 0
|
||||
psq_l f11, 16(mtx2), 0, 0
|
||||
psq_l f12, 32(mtx2), 0, 0
|
||||
psq_l f13, 48(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 32(dst), 0, 0
|
||||
psq_l f10, 8(mtx2), 0, 0
|
||||
psq_l f11, 24(mtx2), 0, 0
|
||||
psq_l f12, 40(mtx2), 0, 0
|
||||
psq_l f13, 56(mtx2), 0, 0
|
||||
ps_mul f0, f6, f10
|
||||
ps_madd f0, f7, f11, f0
|
||||
ps_madd f0, f8, f12, f0
|
||||
ps_madd f0, f9, f13, f0
|
||||
psq_st f0, 40(dst), 0, 0
|
||||
blr
|
||||
#endif // clang-format on
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 80450958-80450960 0003D8 0008+00 1/1 0/0 0/0 .sdata Unit01 */
|
||||
static f32 Unit01[2] = {
|
||||
0.0f, 1.0f
|
||||
};
|
||||
|
||||
/* 80311F70-8031204C 30C8B0 00DC+00 0/0 1/1 0/0 .text J3DPSMtxArrayConcat__FPA4_fPA4_fPA4_fUl */
|
||||
void J3DPSMtxArrayConcat(f32 (*param_0)[4], f32 (*param_1)[4], f32 (*param_2)[4], u32 param_3) {
|
||||
// NONMATCHING
|
||||
}
|
||||
#ifdef __MWERKS__ // clang-format off
|
||||
asm void J3DPSMtxArrayConcat(register Mtx mA, register Mtx mB, register Mtx mAB, register u32 count) {
|
||||
#define FP0 fp0
|
||||
#define FP1 fp1
|
||||
#define FP2 fp2
|
||||
#define FP3 fp3
|
||||
#define FP4 fp4
|
||||
#define FP5 fp5
|
||||
#define FP6 fp6
|
||||
#define FP7 fp7
|
||||
#define FP8 fp8
|
||||
#define FP9 fp9
|
||||
#define FP10 fp10
|
||||
#define FP11 fp11
|
||||
#define FP12 fp12
|
||||
#define FP13 fp13
|
||||
#define FP14 fp14
|
||||
#define FP15 fp15
|
||||
#define FP31 fp31
|
||||
#define UNIT_R r7
|
||||
|
||||
// this is just PSMtxConcat???
|
||||
nofralloc
|
||||
|
||||
stwu sp, -0x40(sp)
|
||||
stfd FP14, 0x08(sp)
|
||||
addis UNIT_R, 0, Unit01@ha
|
||||
stfd FP15, 0x10(sp)
|
||||
addi UNIT_R, UNIT_R, Unit01@l
|
||||
stfd FP31, 0x28(sp)
|
||||
subi mB, mB, 0x08
|
||||
subi mAB, mAB, 0x08
|
||||
mtctr count
|
||||
loop:
|
||||
psq_l FP0, 0x00(mA), 0, 0
|
||||
psq_l FP6, 0x08(mB), 0, 0
|
||||
psq_l FP7, 0x10(mB), 0, 0
|
||||
psq_l FP8, 0x18(mB), 0, 0
|
||||
ps_muls0 FP12, FP6, FP0
|
||||
psq_l FP2, 0x10(mA), 0, 0
|
||||
ps_muls0 FP13, FP7, FP0
|
||||
psq_l FP31, 0x00(UNIT_R), 0, 0
|
||||
ps_muls0 FP14, FP6, FP2
|
||||
psq_l FP9, 0x20(mB), 0, 0
|
||||
ps_muls0 FP15, FP7, FP2
|
||||
psq_l FP1, 0x08(mA), 0, 0
|
||||
ps_madds1 FP12, FP8, FP0, FP12
|
||||
psq_l FP3, 0x18(mA), 0, 0
|
||||
ps_madds1 FP14, FP8, FP2, FP14
|
||||
psq_l FP10, 0x28(mB), 0, 0
|
||||
ps_madds1 FP13, FP9, FP0, FP13
|
||||
psq_lu FP11, 0x30(mB), 0, 0
|
||||
ps_madds1 FP15, FP9, FP2, FP15
|
||||
psq_l FP4, 0x20(mA), 0, 0
|
||||
psq_l FP5, 0x28(mA), 0, 0
|
||||
ps_madds0 FP12, FP10, FP1, FP12
|
||||
ps_madds0 FP13, FP11, FP1, FP13
|
||||
ps_madds0 FP14, FP10, FP3, FP14
|
||||
ps_madds0 FP15, FP11, FP3, FP15
|
||||
psq_st FP12, 0x08(mAB), 0, 0
|
||||
|
||||
ps_muls0 FP2, FP6, FP4
|
||||
ps_madds1 FP13, FP31, FP1, FP13
|
||||
ps_muls0 FP0, FP7, FP4
|
||||
psq_st FP14, 0x18(mAB), 0, 0
|
||||
ps_madds1 FP15, FP31, FP3, FP15
|
||||
|
||||
psq_st FP13, 0x10(mAB), 0, 0
|
||||
|
||||
ps_madds1 FP2, FP8, FP4, FP2
|
||||
ps_madds1 FP0, FP9, FP4, FP0
|
||||
ps_madds0 FP2, FP10, FP5, FP2
|
||||
psq_st FP15, 0x20(mAB), 0, 0
|
||||
ps_madds0 FP0, FP11, FP5, FP0
|
||||
psq_st FP2, 0x28(mAB), 0, 0
|
||||
ps_madds1 FP0, FP31, FP5, FP0
|
||||
psq_stu FP0, 0x30(mAB), 0, 0
|
||||
|
||||
bdnz loop
|
||||
|
||||
lfd FP14, 0x08(sp)
|
||||
lfd FP15, 0x10(sp)
|
||||
lfd FP31, 0x28(sp)
|
||||
addi sp, sp, 0x40
|
||||
blr
|
||||
|
||||
#undef FP0
|
||||
#undef FP1
|
||||
#undef FP2
|
||||
#undef FP3
|
||||
#undef FP4
|
||||
#undef FP5
|
||||
#undef FP6
|
||||
#undef FP7
|
||||
#undef FP8
|
||||
#undef FP9
|
||||
#undef FP10
|
||||
#undef FP11
|
||||
#undef FP12
|
||||
#undef FP13
|
||||
#undef FP14
|
||||
#undef FP15
|
||||
#undef FP31
|
||||
#undef UNIT_R
|
||||
}
|
||||
#endif // clang-format on
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 803CD8F8-803CD900 02AA18 0008+00 0/0 2/2 0/0 .data PSMulUnit01 */
|
||||
extern f32 PSMulUnit01[2] = {
|
||||
extern f32 PSMulUnit01[] = {
|
||||
0.0f,
|
||||
-1.0f,
|
||||
};
|
||||
|
||||
@@ -4,222 +4,6 @@
|
||||
//
|
||||
|
||||
#include "JSystem/JGadget/std-vector.h"
|
||||
#include "dolphin/types.h"
|
||||
#include "algorithm.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
//
|
||||
|
||||
namespace JGadget {
|
||||
struct vector {
|
||||
/* 802DCCC8 */ static u32 extend_default(u32, u32, u32);
|
||||
};
|
||||
|
||||
template <typename T>
|
||||
struct TAllocator {
|
||||
void destroy(T* item) {}
|
||||
void deallocate(T* mem, u32 size) {
|
||||
DeallocateRaw(mem);
|
||||
}
|
||||
void DeallocateRaw(T* mem) {
|
||||
delete mem;
|
||||
}
|
||||
T* allocate(u32 count, void *param_2) {
|
||||
return AllocateRaw(count * sizeof(T));
|
||||
}
|
||||
T* AllocateRaw(u32 size) {
|
||||
return (T*)new char[size];
|
||||
}
|
||||
|
||||
u8 field_0x0;
|
||||
};
|
||||
/* TAllocator<void*> */
|
||||
struct TAllocator__template0 {};
|
||||
|
||||
typedef u32 (*extendFunc)(u32, u32, u32);
|
||||
|
||||
template <typename T, typename Allocator = JGadget::TAllocator<T> >
|
||||
struct TVector {
|
||||
struct TDestructed_deallocate_ {
|
||||
TDestructed_deallocate_(Allocator* allocator, T* addr) {
|
||||
mAllocator = allocator;
|
||||
mAddr = addr;
|
||||
}
|
||||
void set(T* addr) {
|
||||
mAddr = addr;
|
||||
}
|
||||
inline ~TDestructed_deallocate_() {
|
||||
mAllocator->deallocate(mAddr, 0);
|
||||
}
|
||||
Allocator* mAllocator;
|
||||
T* mAddr;
|
||||
};
|
||||
|
||||
TVector(Allocator const& param_0) {
|
||||
field_0x0 = param_0;
|
||||
pBegin_ = NULL;
|
||||
pEnd_ = pBegin_;
|
||||
mCapacity = 0;
|
||||
pfnExtend_ = JGadget::vector::extend_default;
|
||||
}
|
||||
|
||||
~TVector() {
|
||||
clear();
|
||||
field_0x0.deallocate(pBegin_, 0);
|
||||
}
|
||||
|
||||
T* insert(T* pos, const T& val) {
|
||||
u32 diff = (u32)pos - (u32)begin();
|
||||
insert(pos, 1, val);
|
||||
return pBegin_ + diff;
|
||||
}
|
||||
|
||||
void insert(T* pos, u32 count, const T& val) {
|
||||
if (count != 0) {
|
||||
T* this_00 = Insert_raw(pos, count);
|
||||
if (this_00 != end()) {
|
||||
std::uninitialized_fill_n(this_00, count, val);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
T* Insert_raw(T* pos, u32 count) {
|
||||
if (count == 0) {
|
||||
return pos;
|
||||
}
|
||||
if (mCapacity < count + size()) {
|
||||
u32 uVar4 = GetSize_extend_(count);
|
||||
T* ppvVar5 = field_0x0.allocate(uVar4, NULL);
|
||||
if (ppvVar5 == NULL) {
|
||||
pos = end();
|
||||
} else {
|
||||
TDestructed_deallocate_ aTStack_30(&field_0x0, ppvVar5);
|
||||
T* ppvVar6 = std::uninitialized_copy(pBegin_, pos, ppvVar5);
|
||||
std::uninitialized_copy(pos, pEnd_, ppvVar6 + count);
|
||||
DestroyElement_all_();
|
||||
aTStack_30.set(pBegin_);
|
||||
u32 uVar2 = (u32)pEnd_ - (u32)pBegin_;
|
||||
pEnd_ = ppvVar5 + count + (uVar2 / 4);
|
||||
pBegin_ = ppvVar5;
|
||||
mCapacity = uVar4;
|
||||
pos = ppvVar6;
|
||||
}
|
||||
} else {
|
||||
T* ppvVar5 = pos + count;
|
||||
if (ppvVar5 < pEnd_) {
|
||||
T* ppvVar6 = pEnd_ - count;
|
||||
std::uninitialized_copy(ppvVar6, pEnd_, pEnd_);
|
||||
std::copy_backward(pos, ppvVar6, pEnd_);
|
||||
DestroyElement_(pos, ppvVar5);
|
||||
pEnd_ += count;
|
||||
} else {
|
||||
std::uninitialized_copy(pos, pEnd_, ppvVar5);
|
||||
DestroyElement_(pos, pEnd_);
|
||||
pEnd_ += count;
|
||||
}
|
||||
}
|
||||
return pos;
|
||||
}
|
||||
|
||||
T* begin() {
|
||||
return pBegin_;
|
||||
}
|
||||
|
||||
T* end() {
|
||||
return pEnd_;
|
||||
}
|
||||
|
||||
u32 size() {
|
||||
if (pBegin_ == 0) {
|
||||
return 0;
|
||||
}
|
||||
return ((u32)pEnd_ - (u32)pBegin_) / 4;
|
||||
}
|
||||
|
||||
u32 capacity() { return mCapacity; }
|
||||
|
||||
u32 GetSize_extend_(u32 count) {
|
||||
u32 iVar2 = size();
|
||||
u32 uVar3 = capacity();
|
||||
u32 uVar4 = pfnExtend_(uVar3, iVar2, count);
|
||||
if (uVar4 < iVar2 + count) {
|
||||
uVar4 = iVar2 + count;
|
||||
}
|
||||
return uVar4;
|
||||
}
|
||||
|
||||
void DestroyElement_(T* start, T* end) {
|
||||
for (; start != end; start++) {
|
||||
field_0x0.destroy(start);
|
||||
}
|
||||
}
|
||||
|
||||
void DestroyElement_all_() {
|
||||
DestroyElement_(pBegin_, pEnd_);
|
||||
}
|
||||
|
||||
T* erase(T* start, T* end) {
|
||||
T* vectorEnd = pEnd_;
|
||||
T* ppvVar3 = std::copy(end, vectorEnd, start);
|
||||
DestroyElement_(ppvVar3, pEnd_);
|
||||
pEnd_ = ppvVar3;
|
||||
return start;
|
||||
}
|
||||
|
||||
void clear() {
|
||||
erase(begin(), end());
|
||||
}
|
||||
|
||||
Allocator field_0x0;
|
||||
T* pBegin_;
|
||||
T* pEnd_;
|
||||
u32 mCapacity;
|
||||
extendFunc pfnExtend_;
|
||||
};
|
||||
/* TVector<void*, JGadget::TAllocator<void*>> */
|
||||
struct TVector__template0 {
|
||||
/* 802DD130 */ void func_802DD130(void* _this, void**, void* const&);
|
||||
/* 802DCE1C */ void func_802DCE1C(void* _this, void**, u32, void* const&);
|
||||
/* 802DCE8C */ void func_802DCE8C(void* _this, void**, u32);
|
||||
};
|
||||
|
||||
struct TVector_pointer_void : public TVector<void*> {
|
||||
/* 802DCCD0 */ TVector_pointer_void(JGadget::TAllocator<void*> const&);
|
||||
/* 802DCCFC */ ~TVector_pointer_void();
|
||||
/* 802DCDA4 */ void insert(void**, void* const&);
|
||||
/* 802DCDC4 */ void** erase(void**, void**);
|
||||
};
|
||||
|
||||
}; // namespace JGadget
|
||||
|
||||
//
|
||||
// Forward References:
|
||||
//
|
||||
|
||||
extern "C" void extend_default__Q27JGadget6vectorFUlUlUl();
|
||||
extern "C" void func_802DCCD0();
|
||||
extern "C" void __dt__Q27JGadget20TVector_pointer_voidFv();
|
||||
extern "C" void insert__Q27JGadget20TVector_pointer_voidFPPvRCPv();
|
||||
extern "C" void erase__Q27JGadget20TVector_pointer_voidFPPvPPv();
|
||||
extern "C" void func_802DCE1C(void* _this, void**, u32, void* const&);
|
||||
extern "C" void func_802DCE8C(void* _this, void**, u32);
|
||||
extern "C" void func_802DD130(void* _this, void**, void* const&);
|
||||
|
||||
//
|
||||
// External References:
|
||||
//
|
||||
|
||||
extern "C" void* __nw__FUl();
|
||||
extern "C" void __dl__FPv();
|
||||
extern "C" void _savegpr_27();
|
||||
extern "C" void _savegpr_29();
|
||||
extern "C" void _restgpr_27();
|
||||
extern "C" void _restgpr_29();
|
||||
|
||||
//
|
||||
// Declarations:
|
||||
//
|
||||
|
||||
/* 802DCCC8-802DCCD0 2D7608 0008+00 1/1 0/0 0/0 .text extend_default__Q27JGadget6vectorFUlUlUl */
|
||||
u32 JGadget::vector::extend_default(u32 param_0, u32 param_1, u32 param_2) {
|
||||
@@ -237,37 +21,12 @@ JGadget::TVector_pointer_void::~TVector_pointer_void() {
|
||||
|
||||
/* 802DCDA4-802DCDC4 2D76E4 0020+00 0/0 1/1 0/0 .text
|
||||
* insert__Q27JGadget20TVector_pointer_voidFPPvRCPv */
|
||||
// the entire function chain needs work
|
||||
#ifdef NONMATCHING
|
||||
void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) {
|
||||
TVector<void*>::insert(param_0, param_1);
|
||||
}
|
||||
#else
|
||||
void JGadget::TVector_pointer_void::insert(void** param_0, void* const& param_1) {
|
||||
// NONMATCHING
|
||||
}
|
||||
#endif
|
||||
|
||||
/* 802DCDC4-802DCE1C 2D7704 0058+00 0/0 1/1 0/0 .text
|
||||
* erase__Q27JGadget20TVector_pointer_voidFPPvPPv */
|
||||
void** JGadget::TVector_pointer_void::erase(void** param_0, void** param_1) {
|
||||
return TVector<void*>::erase(param_0, param_1);
|
||||
}
|
||||
|
||||
/* 802DCE1C-802DCE8C 2D775C 0070+00 1/1 0/0 0/0 .text
|
||||
* insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUlRCPv */
|
||||
extern "C" void func_802DCE1C(void* _this, void** param_0, u32 param_1, void* const& param_2) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 802DCE8C-802DD130 2D77CC 02A4+00 1/1 0/0 0/0 .text
|
||||
* Insert_raw__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvUl */
|
||||
extern "C" void func_802DCE8C(void* _this, void** param_0, u32 param_1) {
|
||||
// NONMATCHING
|
||||
}
|
||||
|
||||
/* 802DD130-802DD188 2D7A70 0058+00 1/1 0/0 0/0 .text
|
||||
* insert__Q27JGadget38TVector<Pv,Q27JGadget14TAllocator<Pv>>FPPvRCPv */
|
||||
extern "C" void func_802DD130(void* _this, void** param_0, void* const& param_1) {
|
||||
// NONMATCHING
|
||||
}
|
||||
@@ -4,8 +4,9 @@
|
||||
//
|
||||
|
||||
#include "JSystem/JMessage/resource.h"
|
||||
#include "string.h"
|
||||
#include <algorithm.h>
|
||||
#include "dol2asm.h"
|
||||
#include "string.h"
|
||||
|
||||
//
|
||||
// Types:
|
||||
@@ -64,12 +65,81 @@ extern "C" f32 ga4cSignature__Q28JMessage4data[1 + 1 /* padding */];
|
||||
|
||||
/* 802A8CDC-802A8EC0 2A361C 01E4+00 0/0 1/1 0/0 .text
|
||||
* toMessageIndex_messageID__Q28JMessage9TResourceCFUlUlPb */
|
||||
u16 JMessage::TResource::toMessageIndex_messageID(u32 param_0, u32 param_1,
|
||||
bool* param_2) const {
|
||||
// NONMATCHING
|
||||
// NONMATCHING - instruction order
|
||||
u16 JMessage::TResource::toMessageIndex_messageID(u32 lowerHalf, u32 upperHalf,
|
||||
bool* isMsgValid) const {
|
||||
if (!mMessageID.get()) {
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
u32 val = -1;
|
||||
bool check = true;
|
||||
|
||||
switch (mMessageID.get_formSupplement()) {
|
||||
case 0:
|
||||
if (upperHalf) {
|
||||
check = false;
|
||||
}
|
||||
val = lowerHalf;
|
||||
break;
|
||||
case 1:
|
||||
if (lowerHalf > 0xFFFFFF || upperHalf > 0xFF) {
|
||||
check = false;
|
||||
}
|
||||
val = ((lowerHalf << 8) & 0xFFFFFF00) | (upperHalf & 0xFF);
|
||||
break;
|
||||
case 2:
|
||||
if (lowerHalf > 0xFFFF || upperHalf > 0xFFFF) {
|
||||
check = false;
|
||||
}
|
||||
val = ((lowerHalf << 16) & 0xFFFF0000) | (upperHalf & 0xFFFF);
|
||||
break;
|
||||
case 3:
|
||||
if (lowerHalf > 0xFF || upperHalf > 0xFFFFFF) {
|
||||
check = false;
|
||||
}
|
||||
val = ((lowerHalf << 24) & 0xFF000000) | (upperHalf & 0x00FFFFFF);
|
||||
break;
|
||||
case 4:
|
||||
if (lowerHalf) {
|
||||
check = false;
|
||||
}
|
||||
val = upperHalf;
|
||||
break;
|
||||
default:
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
if (isMsgValid) {
|
||||
*isMsgValid = check;
|
||||
}
|
||||
|
||||
if (val == 0xFFFFFFFF) {
|
||||
return 0xFFFF;
|
||||
}
|
||||
|
||||
const u32* first = (u32*)mMessageID.getContent();
|
||||
const u32* last = (u32*)(first + mMessageID.get_number());
|
||||
|
||||
const u32* lower;
|
||||
if (mMessageID.get_isOrdered()) {
|
||||
lower = std::lower_bound<const u32*, u32>(first, last, val);
|
||||
|
||||
if (lower == last || *lower != val) {
|
||||
return 0xFFFF;
|
||||
}
|
||||
} else {
|
||||
lower = first;
|
||||
while (lower != last && *lower != val) {
|
||||
lower++;
|
||||
}
|
||||
if (lower == last) {
|
||||
return 0xFFFF;
|
||||
}
|
||||
}
|
||||
return (lower - first);
|
||||
}
|
||||
|
||||
/* ############################################################################################## */
|
||||
/* 803C9C80-803C9C94 -00001 0014+00 1/1 0/0 0/0 .data
|
||||
* sapfnParseCharacter___Q28JMessage18TResourceContainer */
|
||||
JMessage::locale::parseCharacter_function JMessage::TResourceContainer::sapfnParseCharacter_[5] = {
|
||||
@@ -115,15 +185,19 @@ JMessage::TResourceContainer::TCResource::TCResource() {
|
||||
/* 802A8EF8-802A8F6C 2A3838 0074+00 1/0 2/2 0/0 .text
|
||||
* __dt__Q38JMessage18TResourceContainer10TCResourceFv */
|
||||
// need to fix TLinkList_factory vtable stuff
|
||||
// JMessage::TResourceContainer::TCResource::~TCResource() {
|
||||
extern "C" void __dt__Q38JMessage18TResourceContainer10TCResourceFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
JMessage::TResourceContainer::TCResource::~TCResource() {}
|
||||
|
||||
/* 802A8F6C-802A8FFC 2A38AC 0090+00 0/0 1/1 0/0 .text
|
||||
* Get_groupID__Q38JMessage18TResourceContainer10TCResourceFUs */
|
||||
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 param_0) {
|
||||
// NONMATCHING
|
||||
// NONMATCHING
|
||||
JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 groupID) {
|
||||
JGadget::TContainerEnumerator<TResource, 0> enumerator(this);
|
||||
while (enumerator) {
|
||||
const TResource* res = &(*enumerator);
|
||||
if (res->field_0xc.get_groupID() == groupID)
|
||||
return (TResource*)res;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802A8FFC-802A9048 2A393C 004C+00 1/0 0/0 0/0 .text
|
||||
@@ -169,10 +243,7 @@ JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
|
||||
}
|
||||
|
||||
/* 802A9158-802A91B8 2A3A98 0060+00 1/0 0/0 0/0 .text __dt__Q28JMessage6TParseFv */
|
||||
// JMessage::TParse::~TParse() {
|
||||
extern "C" void __dt__Q28JMessage6TParseFv() {
|
||||
// NONMATCHING
|
||||
}
|
||||
JMessage::TParse::~TParse() {}
|
||||
|
||||
/* 802A91B8-802A92F4 2A3AF8 013C+00 1/0 0/0 0/0 .text
|
||||
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
|
||||
@@ -253,7 +324,7 @@ int JMessage::locale::parseCharacter_2Byte(char const** string) {
|
||||
}
|
||||
|
||||
/* 802A94D4-802A9528 2A3E14 0054+00 1/1 0/0 0/0 .text lower_bound<PCUl,Ul>__3stdFPCUlPCUlRCUl */
|
||||
extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1,
|
||||
/* extern "C" void func_802A94D4(void* _this, u32 const* param_0, u32 const* param_1,
|
||||
u32 const& param_2) {
|
||||
// NONMATCHING
|
||||
}
|
||||
} */
|
||||
|
||||
@@ -190,7 +190,7 @@ JStudio::ctb::TObject* JStudio::ctb::TControl::getObject_index(u32 param_0) {
|
||||
return 0;
|
||||
}
|
||||
JGadget::TLinkList<TObject, -12>::iterator aiStack_14 = mList.begin();
|
||||
std::advance(aiStack_14, param_0);
|
||||
std::advance_fake(aiStack_14, param_0);
|
||||
return &*aiStack_14;
|
||||
}
|
||||
|
||||
@@ -302,4 +302,4 @@ extern "C" void func_802815B4(void* _this, JGadget::TLinkList<JStudio::ctb::TObj
|
||||
JGadget::TLinkList<JStudio::ctb::TObject, 12>::iterator param_1,
|
||||
JStudio::object::TPRObject_ID_equal param_2) {
|
||||
// NONMATCHING
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user