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

Improve rstl::__insertion_sort, use in CScriptSpecialFunction 

Former-commit-id: 714e3dea7e
This commit is contained in:
Henrique Gemignani Passos Lima 2022-11-27 15:23:54 +02:00
parent 4bade5e25e
commit b97f9c56de
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
asm/MetroidPrime/ScriptObjects/CScriptSpecialFunction.s
View File

@ -4633,7 +4633,7 @@ lbl_80153040:
/* 801530C4 00150024 90 E1 00 3C */ stw r7, 0x3c(r1)
/* 801530C8 00150028 90 C1 00 40 */ stw r6, 0x40(r1)
/* 801530CC 0015002C 90 01 00 44 */ stw r0, 0x44(r1)
/* 801530D0 00150030 48 00 07 BD */ bl sub_8015388c
/* 801530D0 00150030 48 00 07 BD */ bl "__insertion_sort<Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFQ24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter"
/* 801530D4 00150034 48 00 02 F4 */ b lbl_801533C8
lbl_801530D8:
/* 801530D8 00150038 54 80 0F FE */ srwi r0, r4, 0x1f
@ -4647,7 +4647,7 @@ lbl_801530D8:
/* 801530F8 00150058 90 01 00 38 */ stw r0, 0x38(r1)
/* 801530FC 0015005C 7F 43 22 14 */ add r26, r3, r4
/* 80153100 00150060 7F 44 D3 78 */ mr r4, r26
/* 80153104 00150064 48 00 03 F5 */ bl sub_801534f8
/* 80153104 00150064 48 00 03 F5 */ bl "__sort3<Q222CScriptSpecialFunction15SRingController,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerQ236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter"
/* 80153108 00150068 80 9C 00 00 */ lwz r4, 0(r28)
/* 8015310C 0015006C A0 DA 00 00 */ lhz r6, 0(r26)
/* 80153110 00150070 80 61 00 4C */ lwz r3, 0x4c(r1)
@ -4923,8 +4923,8 @@ lbl_801534DC:
/* 801534F0 00150450 38 21 00 30 */ addi r1, r1, 0x30
/* 801534F4 00150454 4E 80 00 20 */ blr
.global sub_801534f8
sub_801534f8:
.global "__sort3<Q222CScriptSpecialFunction15SRingController,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerQ236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter"
"__sort3<Q222CScriptSpecialFunction15SRingController,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerRQ222CScriptSpecialFunction15SRingControllerQ236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter":
/* 801534F8 00150458 94 21 FF 20 */ stwu r1, -0xe0(r1)
/* 801534FC 0015045C 7C 08 02 A6 */ mflr r0
/* 80153500 00150460 90 01 00 E4 */ stw r0, 0xe4(r1)
@ -5164,8 +5164,8 @@ lbl_80153878:
/* 80153884 001507E4 38 21 00 E0 */ addi r1, r1, 0xe0
/* 80153888 001507E8 4E 80 00 20 */ blr
.global sub_8015388c
sub_8015388c:
.global "__insertion_sort<Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFQ24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter"
"__insertion_sort<Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>,Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter>__4rstlFQ24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q24rstl176pointer_iterator<Q222CScriptSpecialFunction15SRingController,Q24rstl78vector<Q222CScriptSpecialFunction15SRingController,Q24rstl17rmemory_allocator>,Q24rstl17rmemory_allocator>Q236@unnamed@CScriptSpecialFunction_cpp@11CRingSorter":
/* 8015388C 001507EC 94 21 FF 90 */ stwu r1, -0x70(r1)
/* 80153890 001507F0 7C 08 02 A6 */ mflr r0
/* 80153894 001507F4 90 01 00 74 */ stw r0, 0x74(r1)

7
include/rstl/algorithm.hpp
View File

@ -40,13 +40,10 @@ void __insertion_sort(It first, It last, Cmp cmp) {
typename iterator_traits< It >::value_type value = *next;
It t1 = next;
It t2 = next;
while (first < t1 && cmp(value, *(t2 - 1))) {
*t1 = *(t2 - 1);
for (It t2 = next - 1; first < t1 && cmp(value, *t2); --t2) {
*t1 = *t2;
--t1;
--t2;
}
*t1 = value;
}
}

10
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@ -28,21 +28,17 @@
#include "Kyoto/Math/CVector2i.hpp"
#include "Kyoto/Math/CloseEnough.hpp"
#include "math.h"
#include "rstl/math.hpp"
#include "rstl/iterator.hpp"
#include "rstl/algorithm.hpp"
#include "math.h"
namespace rstl {
static int string_find(const string& haystack, const string& needle, int) {
// TODO: proper implementation
return 0;
}
template < class It, class Cmp >
void sort(It first, It last, Cmp cmp) {
// TODO: proper implementation
cmp(*first, *last);
}
} // namespace rstl
CScriptSpecialFunction::CScriptSpecialFunction(