From 475d94201c3f6c5a4f1fd91a5f57f7510c56ead8 Mon Sep 17 00:00:00 2001 From: lepelog <25211966+lepelog@users.noreply.github.com> Date: Sat, 13 Nov 2021 13:24:38 +0100 Subject: [PATCH] rebase --- include/msl_c/math.h | 3 ++- libs/Z2AudioLib/Z2LinkMgr.cpp | 1 - src/d/a/d_a_alink.cpp | 1 - src/d/d_attention.cpp | 3 --- src/d/d_drawlist.cpp | 3 --- src/d/d_jnt_col.cpp | 2 -- src/d/particle/d_particle.cpp | 2 -- src/m_Do/m_Do_ext.cpp | 1 - src/m_Do/m_Do_mtx.cpp | 1 - 9 files changed, 2 insertions(+), 15 deletions(-) diff --git a/include/msl_c/math.h b/include/msl_c/math.h index a966a8cce03..844a5142514 100644 --- a/include/msl_c/math.h +++ b/include/msl_c/math.h @@ -46,6 +46,7 @@ f32 tanf(f32); extern f32 __float_nan[4]; extern f32 __float_epsilon[4]; +extern f32 __float_max[4]; inline f64 sqrt_step(f64 tmpd, f32 mag) { return tmpd * 0.5 * (3.0 - mag * (tmpd * tmpd)); @@ -68,4 +69,4 @@ inline f32 sqrtf(f32 mag) { } } -#endif \ No newline at end of file +#endif diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp index b65cfd28044..08c33a65895 100644 --- a/libs/Z2AudioLib/Z2LinkMgr.cpp +++ b/libs/Z2AudioLib/Z2LinkMgr.cpp @@ -167,7 +167,6 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; extern "C" extern void* __vt__14Z2SoundStarter[5 + 1 /* padding */]; extern "C" extern void* __vt__16Z2SoundObjSimple[8]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; extern "C" extern u8 data_80450B40[4]; extern "C" extern u8 data_80450B44[4]; extern "C" extern u8 data_80450B48[4]; diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp index cb7d394ae04..399a08f354d 100644 --- a/src/d/a/d_a_alink.cpp +++ b/src/d/a/d_a_alink.cpp @@ -3613,7 +3613,6 @@ extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_whiteColor; extern "C" u16 m_branchId__7dDemo_c[1 + 3 /* padding */]; -extern "C" extern u32 __float_max; extern "C" extern u8 data_80450B38[4]; extern "C" f32 mGroundY__11fopAcM_gc_c; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 61117fabb1c..93440185549 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -177,14 +177,11 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void tan(); extern "C" extern void* __vt__25mDoExt_McaMorfCallBack1_c[3]; extern "C" u8 dist_table__12dAttention_c[6552]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; extern "C" extern u8 data_80450F58[8]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 65b36253a72..65313866f84 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -288,7 +288,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" void fmod(); extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; extern "C" extern void* __vt__26mDoExt_3DlineMatSortPacket[5]; extern "C" extern void* __vt__12dDlst_base_c[3]; @@ -303,8 +302,6 @@ extern "C" u8 mBackColor__13mDoGph_gInf_c[4]; extern "C" extern u8 g_clearColor[4]; extern "C" extern u32 g_blackColor; extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; extern "C" f32 mSystemFar__14mDoLib_clipper; extern "C" f32 mFovyRate__14mDoLib_clipper; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 90892955919..05b7b398109 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -88,8 +88,6 @@ extern "C" extern void* __vt__8cM3dGPla[3]; extern "C" extern void* __vt__8cM3dGCyl[3]; extern "C" u8 now__14mDoMtx_stack_c[48]; extern "C" u8 BaseZ__4cXyz[12]; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_max; // // Declarations: diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp index a963fd0cb80..c677279916b 100644 --- a/src/d/particle/d_particle.cpp +++ b/src/d/particle/d_particle.cpp @@ -605,8 +605,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" extern u8 g_env_light[4880]; extern "C" u8 sincosTable___5JMath[65536]; extern "C" extern u32 g_whiteColor; -extern "C" extern u32 __float_nan; -extern "C" extern u32 __float_epsilon; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; extern "C" extern u8 JPTracePCB4[4]; extern "C" f32 mWaterY__11fopAcM_wt_c[1 + 1 /* padding */]; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7e84af69512..0e6f5a4dde0 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -596,7 +596,6 @@ extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 mCurrentMtx__6J3DSys[48]; extern "C" f32 mParentS__6J3DSys[3]; extern "C" u8 sGDLObj__17J3DDisplayListObj[16]; -extern "C" extern u32 __float_nan; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; extern "C" u8 sCurrentHeap__7JKRHeap[4]; extern "C" u8 sOldVcdVatCmd__8J3DShape[4]; diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp index aa1bb4f6c04..1dca9d11b9e 100644 --- a/src/m_Do/m_Do_mtx.cpp +++ b/src/m_Do/m_Do_mtx.cpp @@ -71,7 +71,6 @@ extern "C" void __register_global_object(); extern "C" void _savegpr_29(); extern "C" void _restgpr_29(); extern "C" u8 sincosTable___5JMath[65536]; -extern "C" extern u32 __float_epsilon; extern "C" extern f32 G_CM3D_F_ABS_MIN[1 + 1 /* padding */]; //