mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-06-26 02:14:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improving compatibility with standard cpp compiler (#2920)

Browse Source 
* Improving compatibility with standard cpp compiler

* Add __REGISTER macro for non mwcc compatibility

* Fix for PR comments

* fix missing define for revolution

* Simplifying cSAngle conversion
This commit is contained in:
kipcode66
2025-12-07 00:08:05 -05:00
committed by GitHub
parent 7ac2c38caf
commit fc31053cb6
68 changed files with 1417 additions and 1399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnimation.h
+19 -19
View File
@@ -479,26 +479,26 @@ inline f32 J2DHermiteInterpolation<f32>(f32 f1, f32* f2, f32* f3, f32* f4, f32*
}
template <>
inline f32 J2DHermiteInterpolation<s16>(register f32 pp1, register s16* pp2, register s16* pp3,
register s16* pp4, register s16* pp5, register s16* pp6,
register s16* pp7) {
inline f32 J2DHermiteInterpolation<s16>(__REGISTER f32 pp1, __REGISTER s16* pp2, __REGISTER s16* pp3,
__REGISTER s16* pp4, __REGISTER s16* pp5, __REGISTER s16* pp6,
__REGISTER s16* pp7) {
#ifdef __MWERKS__
register f32 p1 = pp1;
register f32 ff8;
register f32 ff7;
register f32 ff6;
register f32 ff5;
register f32 ff4;
register f32 ff3;
register f32 ff2;
register f32 ff0;
register f32 fout;
register s16* p2 = pp2;
register s16* p3 = pp3;
register s16* p4 = pp4;
register s16* p5 = pp5;
register s16* p6 = pp6;
register s16* p7 = pp7;
__REGISTER f32 p1 = pp1;
__REGISTER f32 ff8;
__REGISTER f32 ff7;
__REGISTER f32 ff6;
__REGISTER f32 ff5;
__REGISTER f32 ff4;
__REGISTER f32 ff3;
__REGISTER f32 ff2;
__REGISTER f32 ff0;
__REGISTER f32 fout;
__REGISTER s16* p2 = pp2;
__REGISTER s16* p3 = pp3;
__REGISTER s16* p4 = pp4;
__REGISTER s16* p5 = pp5;
__REGISTER s16* p6 = pp6;
__REGISTER s16* p7 = pp7;
// clang-format off
asm {
psq_l ff2, 0(p2), 0x1, 5
include/JSystem/J3DGraphAnimator/J3DSkinDeform.h
+1 -1
View File
@@ -100,7 +100,7 @@ public:
/* 0x10 */ u32 mFlags;
}; // Size: 0x14
inline void J3DFillZero32B(register void* param_0, register u32 param_1) {
inline void J3DFillZero32B(__REGISTER void* param_0, __REGISTER u32 param_1) {
#ifdef __MWERKS__
asm {
srwi param_1, param_1, 5
include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+6 -6
View File
@@ -4,13 +4,13 @@
#include "JSystem/J3DGraphBase/J3DSys.h"
// matches debug
inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
inline f32 J3DCalcZValue(__REGISTER MtxP m, __REGISTER Vec v) {
#ifdef __MWERKS__
register f32 temp_f4;
register f32 out;
register f32 temp_f0;
register f32 temp_f2;
register f32 temp_f1 = 1.0f;
__REGISTER f32 temp_f4;
__REGISTER f32 out;
__REGISTER f32 temp_f0;
__REGISTER f32 temp_f2;
__REGISTER f32 temp_f1 = 1.0f;
// clang-format off
asm {
include/JSystem/J3DGraphBase/J3DStruct.h
+3 -3
View File
@@ -54,9 +54,9 @@ struct J3DTextureSRTInfo {
inline void operator=(J3DTextureSRTInfo const& other) {
#ifdef __MWERKS__
register const f32* src = &other.mScaleX;
register f32* dst = &mScaleX;
register f32 xy;
__REGISTER const f32* src = &other.mScaleX;
__REGISTER f32* dst = &mScaleX;
__REGISTER f32 xy;
asm {
psq_l xy, 0(src), 0, 0
psq_st xy, 0(dst), 0, 0
include/JSystem/J3DGraphBase/J3DTransform.h
+21 -21
View File
@@ -23,10 +23,10 @@ struct J3DTransformInfo {
} */
#ifdef __MWERKS__
inline J3DTransformInfo& operator=(const register J3DTransformInfo& b) {
register const J3DTransformInfo& var_r31 = b;
register J3DTransformInfo& var_r30 = *this;
register f32 var_f31;
inline J3DTransformInfo& operator=(const __REGISTER J3DTransformInfo& b) {
__REGISTER const J3DTransformInfo& var_r31 = b;
__REGISTER J3DTransformInfo& var_r30 = *this;
__REGISTER f32 var_f31;
asm {
psq_l var_f31, J3DTransformInfo.mScale(var_r31), 0, 0
psq_st var_f31, J3DTransformInfo.mScale(var_r30), 0, 0
@@ -64,13 +64,13 @@ void J3DScaleNrmMtx33(f32 (*)[3], const Vec&);
void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32);
inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
inline void J3DPSMtx33Copy(__REGISTER Mtx3P src, __REGISTER Mtx3P dst) {
#ifdef __MWERKS__
register f32 fr4;
register f32 fr3;
register f32 fr2;
register f32 fr1;
register f32 fr0;
__REGISTER f32 fr4;
__REGISTER f32 fr3;
__REGISTER f32 fr2;
__REGISTER f32 fr1;
__REGISTER f32 fr0;
asm {
psq_l fr4, 0(src), 0, 0
@@ -87,14 +87,14 @@ inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
#endif
}
inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
inline void J3DPSMtx33CopyFrom34(__REGISTER MtxP src, __REGISTER Mtx3P dst) {
#ifdef __MWERKS__
register f32 x_y1;
register f32 z1;
register f32 x_y2;
register f32 z2;
register f32 x_y3;
register f32 z3;
__REGISTER f32 x_y1;
__REGISTER f32 z1;
__REGISTER f32 x_y2;
__REGISTER f32 z2;
__REGISTER f32 x_y3;
__REGISTER f32 z3;
asm {
psq_l x_y1, 0(src), 0, 0
lfs z1, 8(src)
@@ -112,7 +112,7 @@ inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
#endif
}
inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* dst) {
inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) {
#ifdef __MWERKS__
asm {
psq_l f0, 0(vec), 0, 0
@@ -139,7 +139,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register Vec* vec, register Vec* d
#endif
}
inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16Vec* dst) {
inline void J3DPSMulMtxVec(__REGISTER MtxP mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) {
#ifdef __MWERKS__
asm {
psq_l f0, 0(vec), 0, 7
@@ -166,7 +166,7 @@ inline void J3DPSMulMtxVec(register MtxP mtx, register S16Vec* vec, register S16
#endif
}
inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec* dst) {
inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER Vec* vec, __REGISTER Vec* dst) {
#ifdef __MWERKS__
asm {
lis r6, PSMulUnit01@ha
@@ -197,7 +197,7 @@ inline void J3DPSMulMtxVec(register Mtx3P mtx, register Vec* vec, register Vec*
#endif
}
inline void J3DPSMulMtxVec(register Mtx3P mtx, register S16Vec* vec, register S16Vec* dst) {
inline void J3DPSMulMtxVec(__REGISTER Mtx3P mtx, __REGISTER S16Vec* vec, __REGISTER S16Vec* dst) {
#ifdef __MWERKS__
asm {
lis r6, PSMulUnit01@ha
include/JSystem/JGeometry.h
+27 -27
View File
@@ -127,11 +127,11 @@ struct TVec3<s16> {
inline void setTVec3f(const f32* vec_a, f32* vec_b) {
#ifdef __MWERKS__
const register f32* v_a = vec_a;
register f32* v_b = vec_b;
const __REGISTER f32* v_a = vec_a;
__REGISTER f32* v_b = vec_b;
register f32 a_x;
register f32 b_x;
__REGISTER f32 a_x;
__REGISTER f32 b_x;
asm {
psq_l a_x, 0(v_a), 0, 0
@@ -154,14 +154,14 @@ inline float fsqrt_step(float mag) {
#endif
}
inline void mulInternal(register const f32* a, register const f32* b, register float* dst) {
inline void mulInternal(__REGISTER const f32* a, __REGISTER const f32* b, __REGISTER float* dst) {
#ifdef __MWERKS__
register f32 a_x_y;
register f32 b_x_y;
register f32 x_y;
register f32 za;
register f32 zb;
register f32 z;
__REGISTER f32 a_x_y;
__REGISTER f32 b_x_y;
__REGISTER f32 x_y;
__REGISTER f32 za;
__REGISTER f32 zb;
__REGISTER f32 z;
asm {
psq_l a_x_y, 0(a), 0, 0
@@ -283,12 +283,12 @@ struct TVec3<f32> : public Vec {
return VECMag((Vec*)this);
}
void scale(register f32 sc) {
void scale(__REGISTER f32 sc) {
#ifdef __MWERKS__
register f32 z;
register f32 x_y;
register f32* dst = &x;
register f32 zres;
__REGISTER f32 z;
__REGISTER f32 x_y;
__REGISTER f32* dst = &x;
__REGISTER f32 zres;
asm {
psq_l x_y, 0(dst), 0, 0
@@ -301,13 +301,13 @@ struct TVec3<f32> : public Vec {
#endif
}
void scale(register f32 sc, const TVec3<f32>& other) {
void scale(__REGISTER f32 sc, const TVec3<f32>& other) {
#ifdef __MWERKS__
register const f32* src = &other.x;
register f32 z;
register f32 x_y;
register f32* dst = &x;
register f32 zres;
__REGISTER const f32* src = &other.x;
__REGISTER f32 z;
__REGISTER f32 x_y;
__REGISTER f32* dst = &x;
__REGISTER f32 zres;
asm {
psq_l x_y, 0(src), 0, 0
@@ -320,16 +320,16 @@ struct TVec3<f32> : public Vec {
#endif
}
void scaleAdd(register f32 sc, const TVec3<f32>& a, const TVec3<f32>& b) {
void scaleAdd(__REGISTER f32 sc, const TVec3<f32>& a, const TVec3<f32>& b) {
JMAVECScaleAdd(&a, &b, this, sc);
}
void negateInternal(TVec3<f32>* dst) {
#ifdef __MWERKS__
register f32* rdst = &dst->x;
const register f32* src = &x;
register f32 x_y;
register f32 z;
__REGISTER f32* rdst = &dst->x;
const __REGISTER f32* src = &x;
__REGISTER f32 x_y;
__REGISTER f32 z;
asm {
psq_l x_y, 0(src), 0, 0
include/JSystem/JMath/JMath.h
+62 -62
View File
@@ -7,9 +7,9 @@
void JMAMTXApplyScale(const Mtx, Mtx, f32, f32, f32);
void JMAEulerToQuat(s16 param_0, s16 param_1, s16 param_2, Quaternion* param_3);
void JMAQuatLerp(const Quaternion*, const Quaternion*, f32, Quaternion*);
void JMAFastVECNormalize(register const Vec* src, register Vec* dst);
void JMAVECScaleAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst,
register f32 scale);
void JMAFastVECNormalize(__REGISTER const Vec* src, __REGISTER Vec* dst);
void JMAVECScaleAdd(__REGISTER const Vec* vec1, __REGISTER const Vec* vec2, __REGISTER Vec* dst,
__REGISTER f32 scale);
inline int JMAAbs(int value) {
#ifdef __MWERKS__
@@ -23,9 +23,9 @@ inline f32 JMAFastReciprocal(f32 value) {
#endif
}
inline float __frsqrtes(register double f) {
inline float __frsqrtes(__REGISTER double f) {
#ifdef __MWERKS__
register float out;
__REGISTER float out;
// clang-format off
asm {
@@ -37,10 +37,10 @@ inline float __frsqrtes(register double f) {
#endif
}
inline f32 JMAFastSqrt(register const f32 input) {
inline f32 JMAFastSqrt(__REGISTER const f32 input) {
#ifdef __MWERKS__
if (input > 0.0f) {
register f32 out;
__REGISTER f32 out;
asm {
frsqrte out, input
}
@@ -51,17 +51,17 @@ inline f32 JMAFastSqrt(register const f32 input) {
#endif
}
inline f32 JMAHermiteInterpolation(register f32 p1, register f32 p2, register f32 p3,
register f32 p4, register f32 p5, register f32 p6,
register f32 p7) {
inline f32 JMAHermiteInterpolation(__REGISTER f32 p1, __REGISTER f32 p2, __REGISTER f32 p3,
__REGISTER f32 p4, __REGISTER f32 p5, __REGISTER f32 p6,
__REGISTER f32 p7) {
#ifdef __MWERKS__
register f32 ff25;
register f32 ff31;
register f32 ff30;
register f32 ff29;
register f32 ff28;
register f32 ff27;
register f32 ff26;
__REGISTER f32 ff25;
__REGISTER f32 ff31;
__REGISTER f32 ff30;
__REGISTER f32 ff29;
__REGISTER f32 ff28;
__REGISTER f32 ff27;
__REGISTER f32 ff26;
// clang-format off
asm {
fsubs ff31, p1, p2
@@ -99,10 +99,10 @@ inline void fastVECNormalize(const Vec* src, Vec* dst) {
return JMAFastVECNormalize(src, dst);
}
inline void gekko_ps_copy3(register void* dst, register const void* src) {
inline void gekko_ps_copy3(__REGISTER void* dst, __REGISTER const void* src) {
#ifdef __MWERKS__
register f32 src0;
register f32 src1;
__REGISTER f32 src0;
__REGISTER f32 src1;
asm {
psq_l src0, 0(src), 0, 0
lfs src1, 8(src)
@@ -112,11 +112,11 @@ inline void gekko_ps_copy3(register void* dst, register const void* src) {
#endif
}
inline void gekko_ps_copy6(register void* dst, register const void* src) {
inline void gekko_ps_copy6(__REGISTER void* dst, __REGISTER const void* src) {
#ifdef __MWERKS__
register f32 src0;
register f32 src1;
register f32 src2;
__REGISTER f32 src0;
__REGISTER f32 src1;
__REGISTER f32 src2;
asm {
psq_l src0, 0(src), 0, 0
psq_l src1, 8(src), 0, 0
@@ -128,14 +128,14 @@ inline void gekko_ps_copy6(register void* dst, register const void* src) {
#endif
}
inline void gekko_ps_copy12(register void* dst, register const void* src) {
inline void gekko_ps_copy12(__REGISTER void* dst, __REGISTER const void* src) {
#ifdef __MWERKS__
register f32 src0;
register f32 src1;
register f32 src2;
register f32 src3;
register f32 src4;
register f32 src5;
__REGISTER f32 src0;
__REGISTER f32 src1;
__REGISTER f32 src2;
__REGISTER f32 src3;
__REGISTER f32 src4;
__REGISTER f32 src5;
asm {
psq_l src0, 0(src), 0, 0
psq_l src1, 8(src), 0, 0
@@ -153,16 +153,16 @@ inline void gekko_ps_copy12(register void* dst, register const void* src) {
#endif
}
inline void gekko_ps_copy16(register void* dst, register const void* src) {
inline void gekko_ps_copy16(__REGISTER void* dst, __REGISTER const void* src) {
#ifdef __MWERKS__
register f32 src0;
register f32 src1;
register f32 src2;
register f32 src3;
register f32 src4;
register f32 src5;
register f32 src6;
register f32 src7;
__REGISTER f32 src0;
__REGISTER f32 src1;
__REGISTER f32 src2;
__REGISTER f32 src3;
__REGISTER f32 src4;
__REGISTER f32 src5;
__REGISTER f32 src6;
__REGISTER f32 src7;
asm {
psq_l src0, 0(src), 0, 0
psq_l src1, 8(src), 0, 0
@@ -187,13 +187,13 @@ inline void gekko_ps_copy16(register void* dst, register const void* src) {
}; // namespace JMath
namespace JMathInlineVEC {
inline void C_VECAdd(register const Vec* a, register const Vec* b, register Vec* ab) {
inline void C_VECAdd(__REGISTER const Vec* a, __REGISTER const Vec* b, __REGISTER Vec* ab) {
#ifdef __MWERKS__
register f32 axy;
register f32 bxy;
register f32 az;
register f32 sumz;
register f32 bz;
__REGISTER f32 axy;
__REGISTER f32 bxy;
__REGISTER f32 az;
__REGISTER f32 sumz;
__REGISTER f32 bz;
asm {
psq_l axy, 0(a), 0, 0
psq_l bxy, 0(b), 0, 0
@@ -207,13 +207,13 @@ namespace JMathInlineVEC {
#endif
}
inline void C_VECSubtract(register const Vec* a, register const Vec* b, register Vec* ab) {
inline void C_VECSubtract(__REGISTER const Vec* a, __REGISTER const Vec* b, __REGISTER Vec* ab) {
#ifdef __MWERKS__
register f32 axy;
register f32 bxy;
register f32 az;
register f32 subz;
register f32 bz;
__REGISTER f32 axy;
__REGISTER f32 bxy;
__REGISTER f32 az;
__REGISTER f32 subz;
__REGISTER f32 bz;
asm {
psq_l axy, 0(a), 0, 0
psq_l bxy, 0(b), 0, 0
@@ -227,11 +227,11 @@ namespace JMathInlineVEC {
#endif
}
inline f32 C_VECSquareMag(register const Vec* v) {
inline f32 C_VECSquareMag(__REGISTER const Vec* v) {
#ifdef __MWERKS__
register f32 x_y;
register f32 z;
register f32 res;
__REGISTER f32 x_y;
__REGISTER f32 z;
__REGISTER f32 res;
asm {
psq_l x_y, 0(v), 0, 0
@@ -244,13 +244,13 @@ namespace JMathInlineVEC {
#endif
}
inline f32 C_VECDotProduct(register const Vec *a, register const Vec *b) {
inline f32 C_VECDotProduct(__REGISTER const Vec *a, __REGISTER const Vec *b) {
#ifdef __MWERKS__
register f32 res;
register f32 thisyz;
register f32 otheryz;
register f32 otherxy;
register f32 thisxy;
__REGISTER f32 res;
__REGISTER f32 thisyz;
__REGISTER f32 otheryz;
__REGISTER f32 otherxy;
__REGISTER f32 thisxy;
asm {
psq_l thisyz, 4(a), 0, 0
psq_l otheryz, 4(b), 0, 0
include/dolphin/os.h
+6 -6
View File
@@ -288,10 +288,10 @@ extern int __OSInIPL;
#define ASSERT(cond) ASSERTLINE(__LINE__, cond)
inline s16 __OSf32tos16(register f32 inF) {
register s16 out;
inline s16 __OSf32tos16(__REGISTER f32 inF) {
__REGISTER s16 out;
u32 tmp;
register u32* tmpPtr = &tmp;
__REGISTER u32* tmpPtr = &tmp;
// clang-format off
#ifdef __MWERKS__
asm {
@@ -308,10 +308,10 @@ inline void OSf32tos16(f32* f, s16* out) {
*out = __OSf32tos16(*f);
}
inline u8 __OSf32tou8(register f32 inF) {
register u8 out;
inline u8 __OSf32tou8(__REGISTER f32 inF) {
__REGISTER u8 out;
u32 tmp;
register u32* tmpPtr = &tmp;
__REGISTER u32* tmpPtr = &tmp;
// clang-format off
#ifdef __MWERKS__
asm {
include/dolphin/types.h
+6
View File
@@ -76,6 +76,12 @@ typedef unsigned int uint;
#endif
#endif
#ifdef __MWERKS__
#define __REGISTER register
#else
#define __REGISTER
#endif
#include <stddef.h>
#endif
include/revolution/os.h
+2 -2
View File
@@ -306,7 +306,7 @@ extern BOOL __OSInReboot;
#define ASSERT(cond) ASSERTLINE(__LINE__, cond)
inline s16 __OSf32tos16(register f32 inF) {
inline s16 __OSf32tos16(__REGISTER f32 inF) {
#ifdef __MWERKS__
register s16 out;
u32 tmp;
@@ -327,7 +327,7 @@ inline void OSf32tos16(f32* f, s16* out) {
*out = __OSf32tos16(*f);
}
inline u8 __OSf32tou8(register f32 inF) {
inline u8 __OSf32tou8(__REGISTER f32 inF) {
#ifdef __MWERKS__
register u8 out;
u32 tmp;
include/revolution/types.h
+6
View File
@@ -73,6 +73,12 @@ typedef unsigned int uint;
#endif
#endif
#ifdef __MWERKS__
#define __REGISTER register
#else
#define __REGISTER
#endif
#include <stddef.h>
#endif