Skip to content

Commit 618b3dd

Browse files
committed
menu/memc: match memc_manager_save
- and `.sdata`
1 parent 7b250ec commit 618b3dd

File tree

7 files changed

+382
-46
lines changed

7 files changed

+382
-46
lines changed

config/p3.jul12.slinky.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ settings:
88
- .shstrtab
99
- .symtab
1010
- .strtab
11-
11+
1212
#sections_start_alignment: {
1313
# .vutext: 64,
1414
# .reginfo: 16,
@@ -277,7 +277,6 @@ segments:
277277

278278
- { path: src/main/cdctrl.c.o }
279279
- { path: asm/data/main/stdat.data.s.o }
280-
#- { path: asm/data/main/scrctrl.data.s.o }
281280
- { path: src/main/scrctrl.c.o }
282281
- { path: src/main/sprite.c.o }
283282
- { path: src/main/fadectrl.c.o }
@@ -759,7 +758,7 @@ segments:
759758
- { path: src/menu/menu_mdl.c.o }
760759
- { path: asm/data/menu/menusub.sdata.s.o }
761760
- { path: asm/data/menu/p3mc.sdata.s.o }
762-
- { path: asm/data/menu/memc.sdata.s.o }
761+
- { path: src/menu/memc.c.o }
763762
- { path: src/menu/mntm2hed.c.o }
764763
- { path: asm/data/menu/menufont.sdata.s.o }
765764
- { path: src/menu/pksprite.c.o }

config/p3.jul12.symbol_addrs.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,14 +2375,18 @@ sceCdReadClock = 0x00163a20; // type:func
23752375
// libmc.c
23762376
sceMcInit = 0x00163b18; // type:func
23772377
sceMcOpen = 0x00163e78; // type:func
2378+
sceMcMkdir = 0x00163fb0; // type:func
23782379
sceMcClose = 0x00163fe8; // type:func
2380+
sceMcSeek = 0x001640a0; // type:func
23792381
sceMcRead = 0x00164208; // type:func
2382+
sceMcWrite = 0x00164328; // type:func
23802383
sceMcSync = 0x00164518; // type:func
23812384
sceMcGetInfo = 0x00164650; // type:func
23822385
sceMcGetDir = 0x001647d8; // type:func
23832386
sceMcChdir = 0x001649b8; // type:func
23842387
sceMcFormat = 0x00164b08; // type:func
23852388
sceMcDelete = 0x00164bd0; // type:func
2389+
sceMcFlush = 0x00164cf8; // type:func
23862390

23872391
// sce/ee/gcc/src/newlib/libm/math/sf_cos.c
23882392
cosf = 0x001652d0; // type:func

config/p3.jul12.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ segments:
366366
- [0x2996F0, .sdata, menu/menudata]
367367
- [0x299700, sdata, menu/menusub]
368368
- [0x299830, sdata, menu/p3mc]
369-
- [0x299878, sdata, menu/memc]
369+
- [0x299878, .sdata, menu/memc]
370370
- [0x299890, sdata, menu/menufont]
371371
- [0x2998A0, .sdata, menu/pksprite]
372372

progress/menu_progress.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"schemaVersion": 1, "label": "menu", "message": "68.9839%", "color": "yellow"}
1+
{"schemaVersion": 1, "label": "menu", "message": "69.2513%", "color": "yellow"}

progress/report.json

Lines changed: 47 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"measures": {
3-
"fuzzy_match_percent": 57.022823,
3+
"fuzzy_match_percent": 57.54286,
44
"total_code": "342284",
5-
"matched_code": "189620",
6-
"matched_code_percent": 55.39844,
7-
"total_data": "26087740",
8-
"matched_data": "26037556",
9-
"matched_data_percent": 99.80763,
5+
"matched_code": "191400",
6+
"matched_code_percent": 55.91848,
7+
"total_data": "26121904",
8+
"matched_data": "26065248",
9+
"matched_data_percent": 99.78311,
1010
"total_functions": 1429,
11-
"matched_functions": 1051,
12-
"matched_functions_percent": 73.547935,
11+
"matched_functions": 1052,
12+
"matched_functions_percent": 73.61792,
1313
"total_units": 70
1414
},
1515
"units": [
@@ -1796,9 +1796,9 @@
17961796
"total_code": "32776",
17971797
"matched_code": "32232",
17981798
"matched_code_percent": 98.34025,
1799-
"total_data": "1672",
1800-
"matched_data": "204",
1801-
"matched_data_percent": 12.200956,
1799+
"total_data": "35604",
1800+
"matched_data": "27688",
1801+
"matched_data_percent": 77.76654,
18021802
"total_functions": 128,
18031803
"matched_functions": 127,
18041804
"matched_functions_percent": 99.21875,
@@ -1807,12 +1807,14 @@
18071807
"sections": [
18081808
{
18091809
"name": ".bss",
1810+
"size": "27472",
18101811
"fuzzy_match_percent": 100.0,
18111812
"metadata": {}
18121813
},
18131814
{
18141815
"name": ".data",
1815-
"fuzzy_match_percent": 100.0,
1816+
"size": "6448",
1817+
"fuzzy_match_percent": 99.303116,
18161818
"metadata": {}
18171819
},
18181820
{
@@ -1825,6 +1827,12 @@
18251827
"size": "1464",
18261828
"metadata": {}
18271829
},
1830+
{
1831+
"name": ".sbss",
1832+
"size": "12",
1833+
"fuzzy_match_percent": 100.0,
1834+
"metadata": {}
1835+
},
18281836
{
18291837
"name": ".sdata",
18301838
"size": "204",
@@ -3869,7 +3877,9 @@
38693877
"total_code": "5576",
38703878
"matched_code": "3852",
38713879
"matched_code_percent": 69.08178,
3872-
"total_data": "56",
3880+
"total_data": "264",
3881+
"matched_data": "208",
3882+
"matched_data_percent": 78.78788,
38733883
"total_functions": 14,
38743884
"matched_functions": 12,
38753885
"matched_functions_percent": 85.71429,
@@ -3878,6 +3888,7 @@
38783888
"sections": [
38793889
{
38803890
"name": ".bss",
3891+
"size": "208",
38813892
"fuzzy_match_percent": 100.0,
38823893
"metadata": {}
38833894
},
@@ -8212,14 +8223,14 @@
82128223
{
82138224
"name": "menu/memc",
82148225
"measures": {
8215-
"fuzzy_match_percent": 76.85908,
8226+
"fuzzy_match_percent": 100.0,
82168227
"total_code": "7692",
8217-
"matched_code": "5912",
8218-
"matched_code_percent": 76.85908,
8219-
"total_data": "144",
8228+
"matched_code": "7692",
8229+
"matched_code_percent": 100.0,
8230+
"total_data": "168",
82208231
"total_functions": 35,
8221-
"matched_functions": 34,
8222-
"matched_functions_percent": 97.14286,
8232+
"matched_functions": 35,
8233+
"matched_functions_percent": 100.0,
82238234
"total_units": 1
82248235
},
82258236
"sections": [
@@ -8238,10 +8249,15 @@
82388249
"size": "144",
82398250
"metadata": {}
82408251
},
8252+
{
8253+
"name": ".sdata",
8254+
"size": "24",
8255+
"metadata": {}
8256+
},
82418257
{
82428258
"name": ".text",
82438259
"size": "7792",
8244-
"fuzzy_match_percent": 76.85908,
8260+
"fuzzy_match_percent": 100.0,
82458261
"metadata": {}
82468262
}
82478263
],
@@ -8466,6 +8482,7 @@
84668482
{
84678483
"name": "memc_manager_save",
84688484
"size": "1780",
8485+
"fuzzy_match_percent": 100.0,
84698486
"metadata": {},
84708487
"address": "5080"
84718488
},
@@ -13304,9 +13321,9 @@
1330413321
"total_code": "124036",
1330513322
"matched_code": "107924",
1330613323
"matched_code_percent": 87.01022,
13307-
"total_data": "66896",
13308-
"matched_data": "56520",
13309-
"matched_data_percent": 84.48936,
13324+
"total_data": "101036",
13325+
"matched_data": "84212",
13326+
"matched_data_percent": 83.3485,
1331013327
"total_functions": 570,
1331113328
"matched_functions": 541,
1331213329
"matched_functions_percent": 94.91228,
@@ -13316,16 +13333,16 @@
1331613333
{
1331713334
"id": "menu",
1331813335
"measures": {
13319-
"fuzzy_match_percent": 41.185177,
13336+
"fuzzy_match_percent": 42.734997,
1332013337
"total_code": "114852",
13321-
"matched_code": "44956",
13322-
"matched_code_percent": 39.142548,
13323-
"total_data": "19788",
13338+
"matched_code": "46736",
13339+
"matched_code_percent": 40.692368,
13340+
"total_data": "19812",
1332413341
"matched_data": "4204",
13325-
"matched_data_percent": 21.2452,
13342+
"matched_data_percent": 21.219463,
1332613343
"total_functions": 374,
13327-
"matched_functions": 258,
13328-
"matched_functions_percent": 68.98396,
13344+
"matched_functions": 259,
13345+
"matched_functions_percent": 69.251335,
1332913346
"total_units": 9
1333013347
}
1333113348
},

progress/total_progress.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"schemaVersion": 1, "label": "Total percentage", "message": "73.5479%", "color": "yellow"}
1+
{"schemaVersion": 1, "label": "Total percentage", "message": "73.6179%", "color": "yellow"}

0 commit comments

Comments
 (0)