Skip to content

Commit d39b233

Browse files
DogmanderDogmander
committed
Add split names
1 parent 32705d6 commit d39b233

5 files changed

Lines changed: 243 additions & 247 deletions

File tree

‎configs/main.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ segments:
156156
- [0x16C2A8, cpp, FGDK3/Code/ThrowCat]
157157
- [0x16C710, cpp, FGDK3/Code/Playstation2/Thread]
158158
- [0x16D380, cpp, FGDK3/Code/TextRes]
159-
- [0x16D5C8, cpp, text_0026C5C8] # StdMem.cpp?
159+
- [0x16D5C8, cpp, FGDK3/Code/StdMem]
160160
- [0x16E178, cpp, FGDK3/Code/Playstation2/SoundManager]
161161
- [0x16EF68, cpp, FGDK3/Code/Playstation2/Sound]
162162
- [0x170BA0, cpp, FGDK3/Code/Playstation2/sifManager]
@@ -174,7 +174,7 @@ segments:
174174
- [0x190150, cpp, text_0028F150]
175175
- [0x191F58, cpp, text_00290F58]
176176
- [0x1975D0, cpp, text_002965D0]
177-
- [0x197670, cpp, text_00296570]
177+
- [0x197670, cpp, FGDK3/Code/Playstation2/IOPMem]
178178
- [0x198578, cpp, text_00297578]
179179
- [0x1A2D88, cpp, text_002A1D88]
180180
- [0x1A59A0, cpp, FGDK3/Code/Playstation2/GE_RenderHardware]
@@ -339,8 +339,7 @@ segments:
339339
- [0x33C610, .rodata, FGDK3/Code/Playstation2/Thread]
340340
- [0x33C820, .rodata, FGDK3/Code/TextRes]
341341

342-
- [0x33C8E0, .rodata, text_0026C5C8]
343-
#-[0x33C8E0, .rodata, FGDK3/Code/StdMem]
342+
- [0x33C8E0, .rodata, FGDK3/Code/StdMem]
344343
#-[0x33C918, .rodata, FGDK3/Code/StdInit]
345344
- [0x33C978, .rodata, FGDK3/Code/Playstation2/SoundManager]
346345
- [0x33C9E0, .rodata, FGDK3/Code/Playstation2/Sound]
@@ -360,7 +359,7 @@ segments:
360359
#-[0x33FA98, .rodata, FGDK3/Code/Playstation2/IOPMem]
361360
- [0x33FAF0, .rodata, text_00290F58]
362361
- [0x33FC60, .rodata, text_002965D0]
363-
- [0x33FC70, .rodata, text_00296570]
362+
- [0x33FC70, .rodata, FGDK3/Code/Playstation2/IOPMem]
364363
- [0x33FE30, .rodata, text_00297578]
365364
- [0x340250, .rodata, text_002A1D88]
366365
- [0x340320, .rodata, FGDK3/Code/Playstation2/GE_RenderHardware]

‎src/FGDK3/Code/Playstation2/IOPMem.cpp‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
#include "common.h"
2+
#include "debug.h"
3+
#include "unk.h"
4+
5+
#include "FGDK3/Playstation2/IOPMem.h"
6+
#include <ee/sifdev.h>
7+
#include "FGDK3/ThrowCat.h"
8+
9+
#ifdef NON_MATCHING
10+
11+
Status IOPMem_InternalInitialise() {
12+
return Status(0xFFFFFFFF, "c:/coding/fgdk3/Code/Playstation2/IOPMem.cpp", 47);
13+
}
14+
15+
#else
16+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", IOPMem_InternalInitialise__Fv);
17+
#endif
18+
19+
void IOPMem_InternalFinalise() {
20+
return;
21+
}
22+
23+
#ifdef NON_MATCHING
24+
25+
StdInit_ModuleDescription IOPMem_StdInit_Description = {
26+
0,
27+
&IOPMem_StdInit_UsedModules
28+
};
29+
30+
void * const IOPMem_StdInit_UsedModules[] = {
31+
&IOPMem_InternalInitialise,
32+
&IOPMem_InternalFinalise,
33+
&Semaphore_Initialise,
34+
&Semaphore_Finalise,
35+
0,
36+
0,
37+
};
38+
39+
Status IOPMem_Initialise() {
40+
return StdInit_InitialisationSequence(&IOPMem_StdInit_Description);
41+
}
42+
43+
void IOPMem_Finalise() {
44+
StdInit_FinalisationSequence(&IOPMem_StdInit_Description);
45+
}
46+
47+
#else
48+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", IOPMem_Initialise__Fv);
49+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", IOPMem_Finalise__Fv);
50+
#endif
51+
52+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296710);
53+
54+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002967C8);
55+
/*
56+
void func_002967C8(void* arg0, int arg1) {
57+
sceSifFreeIopHeap(arg0);
58+
IOPMem_Finalise();
59+
if (arg1 & 1) {
60+
delete(arg0);
61+
}
62+
}
63+
*/
64+
65+
INCLUDE_RODATA("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", D_0043EC70); /* "c:/coding/fgdk3/Code/Playstation2/IOPMem.cpp" */
66+
67+
68+
// Split? (Non-PS2 specific code)
69+
void InterfaceError(char* file, int line) {
70+
DDE_FatalError("Failed to get interface in %s (line %d).", file, line);
71+
}
72+
73+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296840);
74+
75+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296878);
76+
#ifdef NON_MATCHING
77+
extern void* D_00451CB8;
78+
ClassInfo::ClassInfo() {
79+
this->unk8 = &D_00451CB8;
80+
this->unk4 = 0;
81+
this->unk10 = 0;
82+
this->unkC = 0;
83+
this->unk14 = 0;
84+
this->unk18 = 0;
85+
}
86+
#else
87+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", __9ClassInfo);
88+
#endif
89+
90+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", _$_9ClassInfo);
91+
92+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296AF0); /* rct ClassInfo::AddInterface ? */
93+
94+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296CB8);
95+
96+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296D40); /* rct3 InterfaceTag::InterfaceTag */
97+
// "There are more than %i interfaces (%i, in fact): the ClassInfo interface arrays should become cleverer."
98+
99+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00296FB0);
100+
101+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002970C0);
102+
103+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297158);
104+
105+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002971D0);
106+
107+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002971F8);
108+
109+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297228);
110+
111+
INCLUDE_RODATA("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", _vt$9ClassInfo);
112+
113+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297238);
114+
115+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297378);
116+
117+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002973C0);
118+
119+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297400);
120+
121+
INCLUDE_RODATA("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", D_0043EDC0); /* "13GenericObject" */
122+
123+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", __tf9ClassInfo);
124+
125+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002974A0);
126+
127+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002974A8); /* return a0->unk18 */
128+
129+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002974B0);
130+
131+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002974E0);
132+
133+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_002974E8);
134+
135+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297520);
136+
137+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/Playstation2/IOPMem", func_00297558);
138+
139+

‎src/FGDK3/Code/StdMem.cpp‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
#include "common.h"
2+
#include "FGDK3/Playstation2/Thread.h"
3+
#include "FGDK3/ThrowCat.h"
4+
#include "mem.h"
5+
6+
#include "unk.h"
7+
8+
// Beginning of StdMem.cpp
9+
#ifdef NON_MATCHING
10+
11+
Status StdMem_InternalInitialise() {
12+
return Status(0xFFFFFFFF, "c:/coding/fgdk3/Code/Common/StdMem.cpp", 986);
13+
}
14+
15+
#else
16+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", StdMem_InternalInitialise__Fv);
17+
#endif
18+
19+
void StdMem_InternalFinalise() {
20+
return;
21+
}
22+
23+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", StdMem_Initialise__Fv);
24+
25+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", StdMem_Finalise__Fv);
26+
27+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C668);
28+
29+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C698);
30+
31+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C708);
32+
33+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C728);
34+
35+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C780);
36+
37+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C818);
38+
39+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C900);
40+
41+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026C9C8);
42+
43+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", StdInit_InitialisationSequence__FP25StdInit_ModuleDescription); // stdinit.cpp?
44+
45+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", StdInit_FinalisationSequence__FP25StdInit_ModuleDescription);
46+
47+
48+
#ifdef NON_MATCHING
49+
void StdInit_ClientBase::CheckError(Status status) {
50+
//SStack_20.m_unk0 = *param_2;
51+
if (status.m_unk0 != 0xffffffff) {
52+
status.m_file = "";
53+
ThrowCatch_DefiniteThrow(status);
54+
}
55+
}
56+
#else
57+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", CheckError__18StdInit_ClientBaseG6Status);
58+
#endif
59+
60+
// status.cpp?
61+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", PrepareReport_6StatusPci); /* Status::PrepareReport(char*, int) */
62+
63+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026CED0);
64+
65+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", __tf6Status);
66+
67+
68+
Status func_0026CF60(void) {
69+
return Status(0xFFFFFFFF, 0x0, -1);
70+
}
71+
72+
73+
Status func_0026CF98(void) {
74+
return Status(0xFFFFFFFF, 0x0, -1);
75+
}
76+
77+
78+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026CFD0);
79+
80+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026CFF8);
81+
82+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D068);
83+
84+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D108);
85+
86+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D110);
87+
88+
int func_0026D120() {
89+
return 0;
90+
}
91+
92+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D128);
93+
94+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D138);
95+
96+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D148);
97+
98+
INCLUDE_ASM("asm/nonmatchings/FGDK3/Code/StdMem", func_0026D158);
99+
100+
INCLUDE_RODATA("asm/nonmatchings/FGDK3/Code/StdMem", _vt$6Status);

‎src/text_0026C5C8.cpp‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)