falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/res: Finish GParamList by fixing stack issues 

Turns out Nintendo used a macro.
This commit is contained in:
Léo Lam 2020-09-20 14:42:04 +02:00
parent 9aadac7040
commit ba8edc3d45
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
4 changed files with 100 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/uking_functions.csv
View File

@ -89049,7 +89049,7 @@
0x0000007101186414,nullsub_4613,4, 0x0000007101186414,nullsub_4613,4,
0x0000007101186418,nullsub_4614,4,_ZN4ksys3res10GParamList9doCreate_EPhjPN4sead4HeapE 0x0000007101186418,nullsub_4614,4,_ZN4ksys3res10GParamList9doCreate_EPhjPN4sead4HeapE
0x000000710118641c,ResourceBgparamlist::doCreate,4,_ZThn632_N4ksys3res10GParamList9doCreate_EPhjPN4sead4HeapE 0x000000710118641c,ResourceBgparamlist::doCreate,4,_ZThn632_N4ksys3res10GParamList9doCreate_EPhjPN4sead4HeapE
0x0000007101186420,Bgparamlist::parse,22480,_ZN4ksys3res10GParamList6parse_EPhmPN4sead4HeapE| 0x0000007101186420,Bgparamlist::parse,22480,_ZN4ksys3res10GParamList6parse_EPhmPN4sead4HeapE
0x000000710118bbf0,ResourceBgparamlist::parse,28,_ZThn632_N4ksys3res10GParamList6parse_EPhmPN4sead4HeapE 0x000000710118bbf0,ResourceBgparamlist::parse,28,_ZThn632_N4ksys3res10GParamList6parse_EPhmPN4sead4HeapE
0x000000710118bc0c,nullsub_4616,4,_ZN4ksys3res10GParamList9finalize_Ev 0x000000710118bc0c,nullsub_4616,4,_ZN4ksys3res10GParamList9finalize_Ev
0x000000710118bc10,nullsub_4617,4,_ZThn632_N4ksys3res10GParamList9finalize_Ev 0x000000710118bc10,nullsub_4617,4,_ZThn632_N4ksys3res10GParamList9finalize_Ev

Can't render this file because it is too large.

2
src/KingSystem/Resource/GeneralParamList/resGParamListTraits.h
View File

@ -11,6 +11,8 @@ struct GParamListObjTypeTraits;
template <> \ template <> \
struct GParamListObjTypeTraits<GParamListObjType::NAME> { \ struct GParamListObjTypeTraits<GParamListObjType::NAME> { \
using type = class GParamListObject##NAME; \ using type = class GParamListObject##NAME; \
static inline constexpr auto enum_value = GParamListObjType::NAME; \
static inline constexpr auto index = static_cast<s32>(enum_value); \
}; };
KSYS_DECLARE_GPARAM_TRAIT_(System) KSYS_DECLARE_GPARAM_TRAIT_(System)

202
src/KingSystem/Resource/resResourceGParamList.cpp
View File

@ -88,25 +88,6 @@ namespace ksys::res {
void GParamList::doCreate_(u8*, u32, sead::Heap*) {} void GParamList::doCreate_(u8*, u32, sead::Heap*) {}
template <GParamListObjType Type>
KSYS_ALWAYS_INLINE void GParamList::add(const agl::utl::ResParameterList& list,
const sead::SafeString& name, sead::Heap* heap,
GParamList* dummy_list) {
const auto pobj = agl::utl::getResParameterObj(list, name);
if (pobj.ptr()) {
using T = typename GParamListObjTypeTraits<Type>::type;
auto* obj = new (heap) T;
if (obj)
addObj(&obj->getObj(), obj->getName());
mObjects[s32(Type)] = obj;
} else {
mObjects[s32(Type)] = dummy_list ? dummy_list->mObjects[s32(Type)] : nullptr;
}
}
bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) { bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
GParamList* dummy_list = nullptr; GParamList* dummy_list = nullptr;
if (!sead::IsDerivedFrom<DummyGParamList>(this) && act::ActorParamMgr::instance()) if (!sead::IsDerivedFrom<DummyGParamList>(this) && act::ActorParamMgr::instance())
@ -116,92 +97,103 @@ bool GParamList::parse_(u8* data, size_t, sead::Heap* heap) {
const agl::utl::ResParameterArchive archive{data}; const agl::utl::ResParameterArchive archive{data};
add<GParamListObjType::System>(archive.getRootList(), "System", heap, dummy_list); #define KSYS_GPARAM_ADD_(NAME) \
add<GParamListObjType::General>(archive.getRootList(), "General", heap, dummy_list); do { \
add<GParamListObjType::Enemy>(archive.getRootList(), "Enemy", heap, dummy_list); using Traits = GParamListObjTypeTraits<GParamListObjType::NAME>; \
add<GParamListObjType::EnemyLevel>(archive.getRootList(), "EnemyLevel", heap, dummy_list); const auto pobj = agl::utl::getResParameterObj(archive.getRootList(), #NAME); \
add<GParamListObjType::EnemyRace>(archive.getRootList(), "EnemyRace", heap, dummy_list); if (pobj.ptr()) { \
add<GParamListObjType::AttackInterval>(archive.getRootList(), "AttackInterval", heap, auto* obj = new (heap) Traits::type; \
dummy_list); if (obj) \
add<GParamListObjType::EnemyShown>(archive.getRootList(), "EnemyShown", heap, dummy_list); addObj(&obj->getObj(), obj->getName()); \
add<GParamListObjType::BindBone>(archive.getRootList(), "BindBone", heap, dummy_list); \
add<GParamListObjType::Attack>(archive.getRootList(), "Attack", heap, dummy_list); mObjects[Traits::index] = obj; \
add<GParamListObjType::WeaponCommon>(archive.getRootList(), "WeaponCommon", heap, dummy_list); \
add<GParamListObjType::WeaponThrow>(archive.getRootList(), "WeaponThrow", heap, dummy_list); } else { \
add<GParamListObjType::Sandworm>(archive.getRootList(), "Sandworm", heap, dummy_list); mObjects[Traits::index] = dummy_list ? dummy_list->mObjects[Traits::index] : nullptr; \
add<GParamListObjType::SmallSword>(archive.getRootList(), "SmallSword", heap, dummy_list); } \
add<GParamListObjType::Rod>(archive.getRootList(), "Rod", heap, dummy_list); } while (0)
add<GParamListObjType::LargeSword>(archive.getRootList(), "LargeSword", heap, dummy_list);
add<GParamListObjType::Spear>(archive.getRootList(), "Spear", heap, dummy_list); KSYS_GPARAM_ADD_(System);
add<GParamListObjType::Shield>(archive.getRootList(), "Shield", heap, dummy_list); KSYS_GPARAM_ADD_(General);
add<GParamListObjType::Bow>(archive.getRootList(), "Bow", heap, dummy_list); KSYS_GPARAM_ADD_(Enemy);
add<GParamListObjType::WeaponOption>(archive.getRootList(), "WeaponOption", heap, dummy_list); KSYS_GPARAM_ADD_(EnemyLevel);
add<GParamListObjType::MasterSword>(archive.getRootList(), "MasterSword", heap, dummy_list); KSYS_GPARAM_ADD_(EnemyRace);
add<GParamListObjType::GuardianMiniWeapon>(archive.getRootList(), "GuardianMiniWeapon", heap, KSYS_GPARAM_ADD_(AttackInterval);
dummy_list); KSYS_GPARAM_ADD_(EnemyShown);
add<GParamListObjType::Player>(archive.getRootList(), "Player", heap, dummy_list); KSYS_GPARAM_ADD_(BindBone);
add<GParamListObjType::Camera>(archive.getRootList(), "Camera", heap, dummy_list); KSYS_GPARAM_ADD_(Attack);
add<GParamListObjType::Grab>(archive.getRootList(), "Grab", heap, dummy_list); KSYS_GPARAM_ADD_(WeaponCommon);
add<GParamListObjType::Armor>(archive.getRootList(), "Armor", heap, dummy_list); KSYS_GPARAM_ADD_(WeaponThrow);
add<GParamListObjType::ArmorEffect>(archive.getRootList(), "ArmorEffect", heap, dummy_list); KSYS_GPARAM_ADD_(Sandworm);
add<GParamListObjType::ArmorHead>(archive.getRootList(), "ArmorHead", heap, dummy_list); KSYS_GPARAM_ADD_(SmallSword);
add<GParamListObjType::ArmorUpper>(archive.getRootList(), "ArmorUpper", heap, dummy_list); KSYS_GPARAM_ADD_(Rod);
add<GParamListObjType::ShiekerStone>(archive.getRootList(), "ShiekerStone", heap, dummy_list); KSYS_GPARAM_ADD_(LargeSword);
add<GParamListObjType::SeriesArmor>(archive.getRootList(), "SeriesArmor", heap, dummy_list); KSYS_GPARAM_ADD_(Spear);
add<GParamListObjType::Liftable>(archive.getRootList(), "Liftable", heap, dummy_list); KSYS_GPARAM_ADD_(Shield);
add<GParamListObjType::Item>(archive.getRootList(), "Item", heap, dummy_list); KSYS_GPARAM_ADD_(Bow);
add<GParamListObjType::Rupee>(archive.getRootList(), "Rupee", heap, dummy_list); KSYS_GPARAM_ADD_(WeaponOption);
add<GParamListObjType::Arrow>(archive.getRootList(), "Arrow", heap, dummy_list); KSYS_GPARAM_ADD_(MasterSword);
add<GParamListObjType::Bullet>(archive.getRootList(), "Bullet", heap, dummy_list); KSYS_GPARAM_ADD_(GuardianMiniWeapon);
add<GParamListObjType::CureItem>(archive.getRootList(), "CureItem", heap, dummy_list); KSYS_GPARAM_ADD_(Player);
add<GParamListObjType::CookSpice>(archive.getRootList(), "CookSpice", heap, dummy_list); KSYS_GPARAM_ADD_(Camera);
add<GParamListObjType::LumberjackTree>(archive.getRootList(), "LumberjackTree", heap, KSYS_GPARAM_ADD_(Grab);
dummy_list); KSYS_GPARAM_ADD_(Armor);
add<GParamListObjType::Npc>(archive.getRootList(), "Npc", heap, dummy_list); KSYS_GPARAM_ADD_(ArmorEffect);
add<GParamListObjType::NpcEquipment>(archive.getRootList(), "NpcEquipment", heap, dummy_list); KSYS_GPARAM_ADD_(ArmorHead);
add<GParamListObjType::Zora>(archive.getRootList(), "Zora", heap, dummy_list); KSYS_GPARAM_ADD_(ArmorUpper);
add<GParamListObjType::Traveler>(archive.getRootList(), "Traveler", heap, dummy_list); KSYS_GPARAM_ADD_(ShiekerStone);
add<GParamListObjType::Prey>(archive.getRootList(), "Prey", heap, dummy_list); KSYS_GPARAM_ADD_(SeriesArmor);
add<GParamListObjType::AnimalFollowOffset>(archive.getRootList(), "AnimalFollowOffset", heap, KSYS_GPARAM_ADD_(Liftable);
dummy_list); KSYS_GPARAM_ADD_(Item);
add<GParamListObjType::ExtendedEntity>(archive.getRootList(), "ExtendedEntity", heap, KSYS_GPARAM_ADD_(Rupee);
dummy_list); KSYS_GPARAM_ADD_(Arrow);
add<GParamListObjType::BindActor>(archive.getRootList(), "BindActor", heap, dummy_list); KSYS_GPARAM_ADD_(Bullet);
add<GParamListObjType::EatTarget>(archive.getRootList(), "EatTarget", heap, dummy_list); KSYS_GPARAM_ADD_(CureItem);
add<GParamListObjType::AnimalUnit>(archive.getRootList(), "AnimalUnit", heap, dummy_list); KSYS_GPARAM_ADD_(CookSpice);
add<GParamListObjType::Insect>(archive.getRootList(), "Insect", heap, dummy_list); KSYS_GPARAM_ADD_(LumberjackTree);
add<GParamListObjType::Fish>(archive.getRootList(), "Fish", heap, dummy_list); KSYS_GPARAM_ADD_(Npc);
add<GParamListObjType::Rope>(archive.getRootList(), "Rope", heap, dummy_list); KSYS_GPARAM_ADD_(NpcEquipment);
add<GParamListObjType::Horse>(archive.getRootList(), "Horse", heap, dummy_list); KSYS_GPARAM_ADD_(Zora);
add<GParamListObjType::HorseUnit>(archive.getRootList(), "HorseUnit", heap, dummy_list); KSYS_GPARAM_ADD_(Traveler);
add<GParamListObjType::HorseObject>(archive.getRootList(), "HorseObject", heap, dummy_list); KSYS_GPARAM_ADD_(Prey);
add<GParamListObjType::HorseRider>(archive.getRootList(), "HorseRider", heap, dummy_list); KSYS_GPARAM_ADD_(AnimalFollowOffset);
add<GParamListObjType::HorseCreator>(archive.getRootList(), "HorseCreator", heap, dummy_list); KSYS_GPARAM_ADD_(ExtendedEntity);
add<GParamListObjType::GiantArmorSlot>(archive.getRootList(), "GiantArmorSlot", heap, KSYS_GPARAM_ADD_(BindActor);
dummy_list); KSYS_GPARAM_ADD_(EatTarget);
add<GParamListObjType::GiantArmor>(archive.getRootList(), "GiantArmor", heap, dummy_list); KSYS_GPARAM_ADD_(AnimalUnit);
add<GParamListObjType::Guardian>(archive.getRootList(), "Guardian", heap, dummy_list); KSYS_GPARAM_ADD_(Insect);
add<GParamListObjType::MonsterShop>(archive.getRootList(), "MonsterShop", heap, dummy_list); KSYS_GPARAM_ADD_(Fish);
add<GParamListObjType::Swarm>(archive.getRootList(), "Swarm", heap, dummy_list); KSYS_GPARAM_ADD_(Rope);
add<GParamListObjType::GelEnemy>(archive.getRootList(), "GelEnemy", heap, dummy_list); KSYS_GPARAM_ADD_(Horse);
add<GParamListObjType::Nest>(archive.getRootList(), "Nest", heap, dummy_list); KSYS_GPARAM_ADD_(HorseUnit);
add<GParamListObjType::Wizzrobe>(archive.getRootList(), "Wizzrobe", heap, dummy_list); KSYS_GPARAM_ADD_(HorseObject);
add<GParamListObjType::StalEnemy>(archive.getRootList(), "StalEnemy", heap, dummy_list); KSYS_GPARAM_ADD_(HorseRider);
add<GParamListObjType::GuardianMini>(archive.getRootList(), "GuardianMini", heap, dummy_list); KSYS_GPARAM_ADD_(HorseCreator);
add<GParamListObjType::ClothReaction>(archive.getRootList(), "ClothReaction", heap, dummy_list); KSYS_GPARAM_ADD_(GiantArmorSlot);
add<GParamListObjType::Global>(archive.getRootList(), "Global", heap, dummy_list); KSYS_GPARAM_ADD_(GiantArmor);
add<GParamListObjType::Beam>(archive.getRootList(), "Beam", heap, dummy_list); KSYS_GPARAM_ADD_(Guardian);
add<GParamListObjType::AutoGen>(archive.getRootList(), "AutoGen", heap, dummy_list); KSYS_GPARAM_ADD_(MonsterShop);
add<GParamListObjType::ChemicalType>(archive.getRootList(), "ChemicalType", heap, dummy_list); KSYS_GPARAM_ADD_(Swarm);
add<GParamListObjType::Golem>(archive.getRootList(), "Golem", heap, dummy_list); KSYS_GPARAM_ADD_(GelEnemy);
add<GParamListObjType::HorseTargetedInfo>(archive.getRootList(), "HorseTargetedInfo", heap, KSYS_GPARAM_ADD_(Nest);
dummy_list); KSYS_GPARAM_ADD_(Wizzrobe);
add<GParamListObjType::WolfLink>(archive.getRootList(), "WolfLink", heap, dummy_list); KSYS_GPARAM_ADD_(StalEnemy);
add<GParamListObjType::Event>(archive.getRootList(), "Event", heap, dummy_list); KSYS_GPARAM_ADD_(GuardianMini);
add<GParamListObjType::GolemIK>(archive.getRootList(), "GolemIK", heap, dummy_list); KSYS_GPARAM_ADD_(ClothReaction);
add<GParamListObjType::PictureBook>(archive.getRootList(), "PictureBook", heap, dummy_list); KSYS_GPARAM_ADD_(Global);
add<GParamListObjType::AirWall>(archive.getRootList(), "AirWall", heap, dummy_list); KSYS_GPARAM_ADD_(Beam);
add<GParamListObjType::Motorcycle>(archive.getRootList(), "Motorcycle", heap, dummy_list); KSYS_GPARAM_ADD_(AutoGen);
KSYS_GPARAM_ADD_(ChemicalType);
KSYS_GPARAM_ADD_(Golem);
KSYS_GPARAM_ADD_(HorseTargetedInfo);
KSYS_GPARAM_ADD_(WolfLink);
KSYS_GPARAM_ADD_(Event);
KSYS_GPARAM_ADD_(GolemIK);
KSYS_GPARAM_ADD_(PictureBook);
KSYS_GPARAM_ADD_(AirWall);
KSYS_GPARAM_ADD_(Motorcycle);
#undef KSYS_GPARAM_ADD_
if (data) if (data)
applyResParameterArchive(archive); applyResParameterArchive(archive);

4
src/KingSystem/Resource/resResourceGParamList.h
View File

@ -23,10 +23,6 @@ protected:
void finalize_() override; void finalize_() override;
private: private:
template <GParamListObjType Type>
void add(const agl::utl::ResParameterList& list, const sead::SafeString& name, sead::Heap* heap,
GParamList* dummy_list);
sead::Buffer<GParamListObject*> mObjects; sead::Buffer<GParamListObject*> mObjects;
}; };
KSYS_CHECK_SIZE_NX150(GParamList, 0x2c0); KSYS_CHECK_SIZE_NX150(GParamList, 0x2c0);