diff --git a/Progress.md b/Progress.md index b14d7049fc8..389871f0924 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 23.454294% | 843544 | 3596544 +.text | 23.661493% | 850996 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 31.524084% | 1267480 | 4020672 +Total | 31.709426% | 1274932 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 31.524084% | 1267480 | 4020672 +main.dol | 31.709426% | 1274932 | 4020672 RELs | 33.041295% | 3799856 | 11500324 -Total | 32.648266% | 5067336 | 15520996 +Total | 32.696278% | 5074788 | 15520996 ## RELs @@ -30,759 +30,759 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- f_pc_profile_lst | 100.000000% | 28156 | 28156 d_a_hozelda | 28.805621% | 4920 | 17080 -d_a_passer_mng | 31.038027% | 2416 | 7784 -d_a_formation_mng | 27.806286% | 3468 | 12472 -d_a_guard_mng | 53.457447% | 804 | 1504 -d_a_arrow | 28.104690% | 6400 | 22772 -d_a_mant | 86.020312% | 40316 | 46868 -d_a_demo00 | 29.136000% | 7284 | 25000 -d_a_scene_exit | 61.359223% | 1264 | 2060 -d_a_bg | 41.505376% | 3860 | 9300 -d_a_midna | 22.953368% | 12404 | 54040 -d_a_dmidna | 50.000000% | 944 | 1888 -d_a_swTime | 63.076923% | 656 | 1040 -d_a_tbox | 30.165503% | 9332 | 30936 -d_a_grass | 49.074395% | 28312 | 57692 -d_a_boomerang | 26.528647% | 6612 | 24924 -d_a_swc00 | 43.087121% | 1820 | 4224 -d_a_vrbox2 | 34.977578% | 2184 | 6244 -d_a_talk | 45.434783% | 836 | 1840 -d_a_suspend | 68.303571% | 612 | 896 -d_a_tbox2 | 42.486445% | 4388 | 10328 -d_a_dshutter | 46.003263% | 2256 | 4904 -d_a_cow | 22.936702% | 12784 | 55736 -d_a_scene_exit2 | 44.782034% | 1356 | 3028 -d_a_balloon_2D | 29.886212% | 3572 | 11952 -d_a_L7demo_dr | 30.796884% | 2056 | 6676 -d_a_myna | 30.876570% | 9736 | 31532 -d_a_set_bgobj | 100.000000% | 1108 | 1108 +d_a_ni | 27.299309% | 8216 | 30096 d_a_mg_fshop | 36.363636% | 9360 | 25740 -d_a_path_line | 100.000000% | 508 | 508 -d_a_canoe | 28.479263% | 4944 | 17360 -d_a_do | 25.780847% | 10004 | 38804 -d_a_ykgr | 44.400631% | 2252 | 5072 -d_a_fr | 34.866377% | 4488 | 12872 -d_a_demo_item | 33.863165% | 3920 | 11576 -d_a_swBall | 33.297414% | 1236 | 3712 -d_a_mg_fish | 26.024167% | 17660 | 67860 -d_a_cstaf | 32.377740% | 3840 | 11860 -d_a_peru | 33.139234% | 10244 | 30912 +d_a_movie_player | 23.696790% | 8328 | 35144 +d_a_vrbox | 48.327138% | 1040 | 2152 +d_a_sq | 35.488722% | 3776 | 10640 d_a_ppolamp | 42.341463% | 1736 | 4100 -d_a_crod | 33.887043% | 2448 | 7224 -d_a_horse | 22.301298% | 15668 | 70256 -d_a_spinner | 27.874187% | 5140 | 18440 -d_a_nbomb | 28.739233% | 8808 | 30648 +d_a_demo_item | 33.863165% | 3920 | 11576 +d_a_cstaf | 32.377740% | 3840 | 11860 +d_a_bg | 41.505376% | 3860 | 9300 d_a_tboxSw | 100.000000% | 1016 | 1016 d_a_title | 39.558574% | 2796 | 7068 -d_a_bd | 31.115418% | 5780 | 18576 -d_a_coach_2D | 38.344915% | 2428 | 6332 -d_a_andsw2 | 29.472774% | 1364 | 4628 -d_a_alldie | 100.000000% | 2096 | 2096 -d_a_mirror | 32.707993% | 3208 | 9808 -d_a_bg_obj | 32.434657% | 6304 | 19436 -d_a_cstatue | 29.155833% | 6728 | 23076 -d_a_swhit0 | 35.577421% | 2748 | 7724 -d_a_econt | 59.836066% | 876 | 1464 -d_a_disappear | 45.091514% | 1084 | 2404 d_a_L7low_dr | 38.905775% | 1536 | 3948 -d_a_mg_rod | 24.484345% | 23836 | 97352 -d_a_startAndGoal | 41.918528% | 1276 | 3044 -d_a_bullet | 42.660550% | 2604 | 6104 -d_a_ep | 30.950696% | 5248 | 16956 -d_a_skip_2D | 100.000000% | 1332 | 1332 -d_a_kago | 24.588671% | 15124 | 61508 -d_a_hitobj | 62.682927% | 1028 | 1640 -d_a_swLBall | 33.651805% | 1268 | 3768 -d_a_ni | 27.299309% | 8216 | 30096 -d_a_sq | 35.488722% | 3776 | 10640 -d_a_vrbox | 48.327138% | 1040 | 2152 -d_a_andsw | 60.526316% | 644 | 1064 -d_a_warp_bug | 54.940711% | 1112 | 2024 -d_a_coach_fire | 44.050104% | 1688 | 3832 -d_a_movie_player | 23.696790% | 8328 | 35144 -d_a_izumi_gate | 57.729941% | 1180 | 2044 +d_a_andsw2 | 29.472774% | 1364 | 4628 +d_a_nbomb | 28.739233% | 8808 | 30648 +d_a_talk | 45.434783% | 836 | 1840 +d_a_coach_2D | 38.344915% | 2428 | 6332 +d_a_ykgr | 44.400631% | 2252 | 5072 +d_a_scene_exit | 61.359223% | 1264 | 2060 +d_a_tbox2 | 42.486445% | 4388 | 10328 d_a_shop_item | 43.088737% | 2020 | 4688 +d_a_midna | 22.953368% | 12404 | 54040 +d_a_passer_mng | 31.038027% | 2416 | 7784 +d_a_boomerang | 26.528647% | 6612 | 24924 +d_a_demo00 | 29.136000% | 7284 | 25000 +d_a_startAndGoal | 41.918528% | 1276 | 3044 +d_a_horse | 22.301298% | 15668 | 70256 +d_a_kago | 24.588671% | 15124 | 61508 +d_a_path_line | 100.000000% | 508 | 508 +d_a_do | 25.780847% | 10004 | 38804 +d_a_formation_mng | 27.806286% | 3468 | 12472 +d_a_andsw | 60.526316% | 644 | 1064 +d_a_dmidna | 50.000000% | 944 | 1888 d_a_L7op_demo_dr | 26.198715% | 4240 | 16184 -d_a_e_zs | 31.358336% | 3980 | 12692 -d_a_e_bg | 27.665091% | 7256 | 26228 -d_a_e_gob | 26.683396% | 10208 | 38256 -d_a_e_oc | 22.586920% | 11148 | 49356 -d_a_e_mm | 27.438612% | 4872 | 17756 -d_a_e_sg | 29.168221% | 6256 | 21448 -d_a_e_zh | 27.029865% | 9268 | 34288 -d_a_e_bu | 30.436573% | 5912 | 19424 -d_a_e_yd | 27.879315% | 7688 | 27576 -d_a_e_sm | 24.418880% | 8236 | 33728 -d_a_e_nz | 32.041969% | 4764 | 14868 -d_a_e_rdb | 27.331887% | 9576 | 35036 -d_a_e_gi | 30.183330% | 6388 | 21164 -d_a_e_fk | 32.965394% | 4420 | 13408 -d_a_e_mb | 29.067542% | 4252 | 14628 -d_a_e_ga | 43.014395% | 2032 | 4724 -d_a_e_bs | 32.320835% | 5448 | 16856 -d_a_e_hzelda | 30.097531% | 7900 | 26248 -d_a_e_rb | 30.197628% | 4584 | 15180 -d_a_e_bi_leaf | 50.446429% | 904 | 1792 -d_a_e_bee | 30.316629% | 4864 | 16044 -d_a_e_yg | 28.386013% | 7436 | 26196 -d_a_e_ww | 23.418134% | 10052 | 42924 -d_a_e_tk | 32.077326% | 3916 | 12208 -d_a_e_dn | 25.842869% | 13460 | 52084 -d_a_e_warpappear | 28.864569% | 4220 | 14620 -d_a_e_yc | 30.733107% | 4712 | 15332 -d_a_e_wb | 23.058129% | 20008 | 86772 -d_a_e_bi | 30.767563% | 5676 | 18448 -d_a_e_ymb | 23.798093% | 14672 | 61652 -d_a_e_dk | 29.244060% | 5416 | 18520 -d_a_e_sh | 30.953709% | 6660 | 21516 -d_a_e_arrow | 35.306882% | 4556 | 12904 -d_a_e_sb | 28.045789% | 5488 | 19568 -d_a_e_tk_ball | 33.349562% | 2740 | 8216 -d_a_e_st_line | 60.459770% | 1052 | 1740 -d_a_e_cr | 34.481521% | 3844 | 11148 -d_a_e_ym | 20.062370% | 13896 | 69264 -d_a_e_mm_mt | 28.672856% | 4200 | 14648 -d_a_e_is | 31.728595% | 3928 | 12380 -d_a_e_gb | 26.939571% | 8292 | 30780 -d_a_e_hb | 27.624471% | 7568 | 27396 -d_a_e_sf | 29.821481% | 8152 | 27336 -d_a_e_fs | 31.823996% | 4976 | 15636 -d_a_e_ai | 28.308171% | 5100 | 18016 -d_a_e_rd | 24.121965% | 25632 | 106260 -d_a_e_ge | 24.669967% | 7176 | 29088 -d_a_e_fz | 30.508860% | 5372 | 17608 -d_a_e_sw | 21.949266% | 9864 | 44940 -d_a_e_st | 26.260013% | 12588 | 47936 -d_a_e_yh | 26.277603% | 9996 | 38040 -d_a_e_nest | 29.119005% | 5804 | 19932 -d_a_e_hz | 23.990326% | 7936 | 33080 -d_a_e_s1 | 28.078818% | 9804 | 34916 -d_a_e_hp | 28.231798% | 6840 | 24228 -d_a_e_ym_tag | 61.764706% | 672 | 1088 -d_a_e_po | 23.824220% | 14204 | 59620 -d_a_e_dt | 27.760631% | 12952 | 46656 -d_a_e_mf | 25.211695% | 12624 | 50072 -d_a_e_th | 29.463680% | 6944 | 23568 -d_a_e_hm | 27.299426% | 8180 | 29964 -d_a_e_ba | 28.140394% | 5484 | 19488 -d_a_e_tt | 27.836991% | 7104 | 25520 -d_a_e_gm | 28.274812% | 10404 | 36796 -d_a_e_oct_bg | 30.217151% | 6568 | 21736 -d_a_e_mk_bo | 29.776477% | 4476 | 15032 -d_a_e_ws | 29.700483% | 6148 | 20700 -d_a_e_vt | 24.313702% | 16332 | 67172 -d_a_e_tk2 | 33.419577% | 3100 | 9276 -d_a_e_bug | 29.207138% | 5172 | 17708 -d_a_e_cr_egg | 43.296089% | 1860 | 4296 -d_a_e_pz | 27.469575% | 13904 | 50616 -d_a_e_ph | 23.274129% | 5556 | 23872 -d_a_e_rdy | 25.649401% | 19788 | 77148 -d_a_e_yr | 27.591936% | 9964 | 36112 -d_a_e_db | 26.006517% | 9896 | 38052 -d_a_e_hb_leaf | 55.309735% | 1000 | 1808 -d_a_e_df | 28.031364% | 4004 | 14284 -d_a_e_yk | 29.001484% | 5472 | 18868 -d_a_e_md | 34.917814% | 3144 | 9004 -d_a_e_sm2 | 30.097087% | 8184 | 27192 -d_a_e_ot | 32.497589% | 5392 | 16592 -d_a_e_kk | 27.161029% | 7516 | 27672 -d_a_e_kr | 27.652396% | 9508 | 34384 -d_a_e_ms | 28.208138% | 5768 | 20448 -d_a_e_fm | 24.588144% | 15164 | 61672 -d_a_e_fb | 31.127328% | 4948 | 15896 -d_a_e_pm | 21.505129% | 11236 | 52248 -d_a_e_dd | 26.687870% | 7384 | 27668 -d_a_e_yd_leaf | 54.022989% | 1128 | 2088 -d_a_e_zm | 28.267015% | 5200 | 18396 -d_a_e_th_ball | 29.462631% | 5724 | 19428 -d_a_e_mk | 25.747187% | 11716 | 45504 -d_a_e_gs | 44.729606% | 1952 | 4364 -d_a_e_db_leaf | 57.582938% | 972 | 1688 -d_a_e_kg | 31.431080% | 4296 | 13668 -d_a_kytag03 | 23.399898% | 1828 | 7812 -d_a_kytag00 | 33.522084% | 2368 | 7064 -d_a_kytag02 | 54.888889% | 988 | 1800 +d_a_guard_mng | 53.457447% | 804 | 1504 +d_a_econt | 59.836066% | 876 | 1464 +d_a_myna | 30.876570% | 9736 | 31532 +d_a_izumi_gate | 57.729941% | 1180 | 2044 +d_a_mirror | 32.707993% | 3208 | 9808 +d_a_cow | 22.936702% | 12784 | 55736 +d_a_disappear | 45.091514% | 1084 | 2404 +d_a_swc00 | 43.087121% | 1820 | 4224 +d_a_spinner | 27.874187% | 5140 | 18440 +d_a_swLBall | 33.651805% | 1268 | 3768 +d_a_suspend | 68.303571% | 612 | 896 +d_a_coach_fire | 44.050104% | 1688 | 3832 +d_a_bg_obj | 32.434657% | 6304 | 19436 +d_a_warp_bug | 54.940711% | 1112 | 2024 +d_a_vrbox2 | 34.977578% | 2184 | 6244 +d_a_alldie | 100.000000% | 2096 | 2096 +d_a_bd | 31.115418% | 5780 | 18576 +d_a_scene_exit2 | 44.782034% | 1356 | 3028 +d_a_swhit0 | 35.577421% | 2748 | 7724 +d_a_swBall | 33.297414% | 1236 | 3712 +d_a_crod | 33.887043% | 2448 | 7224 +d_a_balloon_2D | 29.886212% | 3572 | 11952 +d_a_fr | 34.866377% | 4488 | 12872 +d_a_hitobj | 62.682927% | 1028 | 1640 +d_a_mg_rod | 24.484345% | 23836 | 97352 +d_a_skip_2D | 100.000000% | 1332 | 1332 +d_a_ep | 30.950696% | 5248 | 16956 +d_a_grass | 49.074395% | 28312 | 57692 +d_a_dshutter | 46.003263% | 2256 | 4904 +d_a_tbox | 30.165503% | 9332 | 30936 +d_a_peru | 33.139234% | 10244 | 30912 +d_a_set_bgobj | 100.000000% | 1108 | 1108 +d_a_mant | 86.020312% | 40316 | 46868 +d_a_cstatue | 29.155833% | 6728 | 23076 +d_a_swTime | 63.076923% | 656 | 1040 +d_a_arrow | 28.104690% | 6400 | 22772 +d_a_mg_fish | 26.024167% | 17660 | 67860 +d_a_L7demo_dr | 30.796884% | 2056 | 6676 +d_a_canoe | 28.479263% | 4944 | 17360 +d_a_bullet | 42.660550% | 2604 | 6104 +d_a_tag_watchge | 61.290323% | 760 | 1240 +d_a_tag_mhint | 35.576923% | 1332 | 3744 +d_a_tag_attack_item | 43.212237% | 1808 | 4184 +d_a_tag_attention | 50.000000% | 1012 | 2024 +d_a_tag_myna2 | 47.260274% | 828 | 1752 +d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 +d_a_tag_hinit | 100.000000% | 1440 | 1440 +d_a_tag_camera | 37.023593% | 1632 | 4408 +d_a_tag_statue_evt | 38.427948% | 2816 | 7328 +d_a_tag_rmbit_sw | 46.642468% | 1028 | 2204 +d_a_tag_TWgate | 53.384834% | 10504 | 19676 +d_a_tag_smk_emt | 50.127226% | 788 | 1572 +d_a_tag_csw | 35.869565% | 3696 | 10304 +d_a_tag_evt | 37.815126% | 1620 | 4284 +d_a_tag_evtmsg | 39.491150% | 1428 | 3616 +d_a_tag_spring | 45.780591% | 868 | 1896 +d_a_tag_poFire | 63.270142% | 1068 | 1688 +d_a_tag_shop_camera | 62.541806% | 748 | 1196 +d_a_tag_wljump | 30.777538% | 1140 | 3704 +d_a_tag_telop | 100.000000% | 1040 | 1040 +d_a_tag_kago_fall | 34.469328% | 1416 | 4108 +d_a_tag_yami | 42.650334% | 1532 | 3592 +d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296 +d_a_tag_arena | 82.022472% | 584 | 712 +d_a_tag_sppath | 33.333333% | 2040 | 6120 +d_a_tag_shop_item | 41.944848% | 1156 | 2756 +d_a_tag_theB_hint | 67.253521% | 764 | 1136 +d_a_tag_lv2prchk | 35.734870% | 992 | 2776 +d_a_tag_mmsg | 100.000000% | 1960 | 1960 +d_a_tag_lightball | 46.212121% | 976 | 2112 +d_a_tag_msg | 37.563971% | 1468 | 3908 +d_a_tag_pachi | 51.107595% | 1292 | 2528 +d_a_tag_evtarea | 37.091319% | 1316 | 3548 +d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848 +d_a_tag_ret_room | 49.168646% | 828 | 1684 +d_a_tag_waterfall | 46.361502% | 1580 | 3408 +d_a_tag_gstart | 100.000000% | 1208 | 1208 +d_a_tag_mstop | 36.151961% | 1180 | 3264 +d_a_tag_escape | 100.000000% | 712 | 712 +d_a_tag_setrestart | 96.739130% | 1780 | 1840 +d_a_tag_river_back | 45.725916% | 1348 | 2948 +d_a_tag_qs | 34.804270% | 1956 | 5620 +d_a_tag_event | 31.075697% | 1248 | 4016 +d_a_tag_gra | 76.000000% | 608 | 800 +d_a_tag_ss_drink | 36.483740% | 1436 | 3936 +d_a_tag_allmato | 30.234070% | 3720 | 12304 +d_a_tag_bottle_item | 38.554217% | 1024 | 2656 +d_a_tag_push | 41.000000% | 1148 | 2800 +d_a_tag_stream | 49.729730% | 736 | 1480 +d_a_tag_magne | 100.000000% | 928 | 928 +d_a_tag_spinner | 45.850622% | 884 | 1928 +d_a_tag_schedule | 82.022472% | 584 | 712 +d_a_tag_setBall | 100.000000% | 880 | 880 +d_a_tag_kmsg | 32.037997% | 1484 | 4632 +d_a_tag_myna_light | 36.747759% | 1148 | 3124 +d_a_tag_howl | 46.934461% | 888 | 1892 +d_a_tag_chkpoint | 39.852399% | 864 | 2168 +d_a_tag_firewall | 35.325132% | 1608 | 4552 +d_a_tag_lv6CstaSw | 51.406250% | 1316 | 2560 +d_a_tag_instruction | 100.000000% | 712 | 712 +d_a_tag_mwait | 35.082873% | 1016 | 2896 +d_a_tag_ajnot | 56.493506% | 696 | 1232 +d_a_tag_hstop | 100.000000% | 3424 | 3424 +d_a_tag_chgrestart | 48.868778% | 864 | 1768 +d_a_tag_cstasw | 51.406250% | 1316 | 2560 +d_a_tag_lv5soup | 100.000000% | 1908 | 1908 +d_a_tag_lantern | 52.013423% | 1240 | 2384 +d_a_tag_guard | 54.421769% | 640 | 1176 +d_a_tag_assistance | 76.699029% | 632 | 824 +d_a_tag_mist | 43.436293% | 900 | 2072 +d_a_tag_wara_howl | 100.000000% | 1420 | 1420 +d_a_tag_hjump | 40.841584% | 1320 | 3232 +d_a_door_dbdoor00 | 40.734908% | 3104 | 7620 +d_a_door_spiral | 100.000000% | 504 | 504 +d_a_door_push | 37.997725% | 2672 | 7032 +d_a_door_shutter | 37.465797% | 14240 | 38008 +d_a_door_bossL5 | 39.221790% | 4032 | 10280 +d_a_door_mbossL1 | 34.467633% | 10372 | 30092 +d_a_door_bossl1 | 39.355114% | 7372 | 18732 +d_a_door_knob00 | 37.500000% | 4608 | 12288 +d_a_door_boss | 40.856890% | 3700 | 9056 +d_a_kytag10 | 31.720430% | 944 | 2976 +d_a_kytag12 | 20.217129% | 3352 | 16580 +d_a_kytag16 | 47.212544% | 1084 | 2296 +d_a_kytag17 | 86.170213% | 648 | 752 +d_a_kytag09 | 49.936948% | 1584 | 3172 d_a_kytag07 | 60.062893% | 764 | 1272 -d_a_kytag14 | 100.000000% | 1408 | 1408 -d_a_kytag11 | 52.643172% | 956 | 1816 d_a_kytag04 | 36.357481% | 2148 | 5908 -d_a_kytag13 | 30.696576% | 2080 | 6776 -d_a_kytag05 | 100.000000% | 816 | 816 -d_a_kytag15 | 49.443561% | 1244 | 2516 d_a_kytag01 | 35.156250% | 1260 | 3584 d_a_kytag08 | 31.379026% | 1520 | 4844 -d_a_kytag09 | 49.936948% | 1584 | 3172 -d_a_kytag17 | 86.170213% | 648 | 752 -d_a_kytag16 | 47.212544% | 1084 | 2296 -d_a_kytag12 | 20.217129% | 3352 | 16580 +d_a_kytag00 | 33.522084% | 2368 | 7064 +d_a_kytag02 | 54.888889% | 988 | 1800 +d_a_kytag14 | 100.000000% | 1408 | 1408 +d_a_kytag11 | 52.643172% | 956 | 1816 +d_a_kytag05 | 100.000000% | 816 | 816 +d_a_kytag13 | 30.696576% | 2080 | 6776 +d_a_kytag03 | 23.399898% | 1828 | 7812 +d_a_kytag15 | 49.443561% | 1244 | 2516 d_a_kytag06 | 31.287129% | 4424 | 14140 -d_a_kytag10 | 31.720430% | 944 | 2976 -d_a_tag_setrestart | 96.739130% | 1780 | 1840 -d_a_tag_TWgate | 53.384834% | 10504 | 19676 -d_a_tag_sppath | 33.333333% | 2040 | 6120 -d_a_tag_ss_drink | 36.483740% | 1436 | 3936 -d_a_tag_myna_light | 36.747759% | 1148 | 3124 -d_a_tag_hstop | 100.000000% | 3424 | 3424 -d_a_tag_evt | 37.815126% | 1620 | 4284 -d_a_tag_wljump | 30.777538% | 1140 | 3704 -d_a_tag_waterfall | 46.361502% | 1580 | 3408 -d_a_tag_statue_evt | 38.427948% | 2816 | 7328 -d_a_tag_kago_fall | 34.469328% | 1416 | 4108 -d_a_tag_watchge | 61.290323% | 760 | 1240 -d_a_tag_guard | 54.421769% | 640 | 1176 -d_a_tag_evtmsg | 39.491150% | 1428 | 3616 -d_a_tag_attention | 50.000000% | 1012 | 2024 -d_a_tag_gstart | 100.000000% | 1208 | 1208 -d_a_tag_qs | 34.804270% | 1956 | 5620 -d_a_tag_shop_item | 41.944848% | 1156 | 2756 -d_a_tag_ajnot | 56.493506% | 696 | 1232 -d_a_tag_csw | 35.869565% | 3696 | 10304 -d_a_tag_instruction | 100.000000% | 712 | 712 -d_a_tag_event | 31.075697% | 1248 | 4016 -d_a_tag_rmbit_sw | 46.642468% | 1028 | 2204 -d_a_tag_gra | 76.000000% | 608 | 800 -d_a_tag_lightball | 46.212121% | 976 | 2112 -d_a_tag_push | 41.000000% | 1148 | 2800 -d_a_tag_kmsg | 32.037997% | 1484 | 4632 -d_a_tag_cstasw | 51.406250% | 1316 | 2560 -d_a_tag_Lv8Gate | 43.347193% | 1668 | 3848 -d_a_tag_schedule | 82.022472% | 584 | 712 -d_a_tag_smk_emt | 50.127226% | 788 | 1572 -d_a_tag_attack_item | 43.212237% | 1808 | 4184 -d_a_tag_setBall | 100.000000% | 880 | 880 -d_a_tag_pachi | 51.107595% | 1292 | 2528 -d_a_tag_arena | 82.022472% | 584 | 712 -d_a_tag_shop_camera | 62.541806% | 748 | 1196 -d_a_tag_firewall | 35.325132% | 1608 | 4552 -d_a_tag_lv5soup | 100.000000% | 1908 | 1908 -d_a_tag_poFire | 63.270142% | 1068 | 1688 -d_a_tag_telop | 100.000000% | 1040 | 1040 -d_a_tag_Lv6Gate | 39.281576% | 2712 | 6904 -d_a_tag_stream | 49.729730% | 736 | 1480 -d_a_tag_howl | 46.934461% | 888 | 1892 -d_a_tag_wara_howl | 100.000000% | 1420 | 1420 -d_a_tag_mmsg | 100.000000% | 1960 | 1960 -d_a_tag_river_back | 45.725916% | 1348 | 2948 -d_a_tag_theB_hint | 67.253521% | 764 | 1136 -d_a_tag_lantern | 52.013423% | 1240 | 2384 -d_a_tag_lv6CstaSw | 51.406250% | 1316 | 2560 -d_a_tag_mhint | 35.576923% | 1332 | 3744 -d_a_tag_hjump | 40.841584% | 1320 | 3232 -d_a_tag_bottle_item | 38.554217% | 1024 | 2656 -d_a_tag_mist | 43.436293% | 900 | 2072 -d_a_tag_spring | 45.780591% | 868 | 1896 -d_a_tag_lv2prchk | 35.734870% | 992 | 2776 -d_a_tag_msg | 37.563971% | 1468 | 3908 -d_a_tag_myna2 | 47.260274% | 828 | 1752 -d_a_tag_Lv7Gate | 34.752224% | 2188 | 6296 -d_a_tag_hinit | 100.000000% | 1440 | 1440 -d_a_tag_allmato | 30.234070% | 3720 | 12304 -d_a_tag_camera | 37.023593% | 1632 | 4408 -d_a_tag_chkpoint | 39.852399% | 864 | 2168 -d_a_tag_magne | 100.000000% | 928 | 928 -d_a_tag_assistance | 76.699029% | 632 | 824 -d_a_tag_chgrestart | 48.868778% | 864 | 1768 -d_a_tag_ret_room | 49.168646% | 828 | 1684 -d_a_tag_spinner | 45.850622% | 884 | 1928 -d_a_tag_evtarea | 37.091319% | 1316 | 3548 -d_a_tag_yami | 42.650334% | 1532 | 3592 -d_a_tag_escape | 100.000000% | 712 | 712 -d_a_tag_mwait | 35.082873% | 1016 | 2896 -d_a_tag_mstop | 36.151961% | 1180 | 3264 -d_a_obj_oiltubo | 40.168244% | 3056 | 7608 -d_a_obj_goGate | 48.046181% | 2164 | 4504 -d_a_obj_master_sword | 43.575419% | 2808 | 6444 -d_a_obj_glowSphere | 38.917749% | 3596 | 9240 -d_a_obj_sm_door | 39.302885% | 2616 | 6656 -d_a_obj_msima | 35.108959% | 3480 | 9912 -d_a_obj_grz_rock | 45.558087% | 1600 | 3512 -d_a_obj_warp_kbrg | 34.066524% | 5080 | 14912 -d_a_obj_bky_rock | 35.592460% | 3172 | 8912 -d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 -d_a_obj_fw | 43.368592% | 2132 | 4916 -d_a_obj_iceleaf | 37.604212% | 3428 | 9116 -d_a_obj_waterfall | 34.033613% | 2268 | 6664 -d_a_obj_digholl | 42.781690% | 972 | 2272 -d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 -d_a_obj_lv4PoGate | 44.906743% | 2504 | 5576 -d_a_obj_kkanban | 47.103514% | 1984 | 4212 -d_a_obj_well_cover | 45.704467% | 1596 | 3492 -d_a_obj_carry | 29.827071% | 18352 | 61528 -d_a_obj_rock | 40.423729% | 1908 | 4720 -d_a_obj_yel_bag | 33.773087% | 3584 | 10612 -d_a_obj_kbox | 35.736196% | 3728 | 10432 -d_a_obj_prop | 47.868217% | 988 | 2064 -d_a_obj_gra_rock | 37.947123% | 2928 | 7716 -d_a_obj_ganonwall2 | 41.938675% | 1696 | 4044 -d_a_obj_lv4Gate | 48.863636% | 2064 | 4224 -d_a_obj_syRock | 38.458961% | 4592 | 11940 -d_a_obj_web1 | 100.000000% | 5772 | 5772 -d_a_obj_sekidoor | 43.834383% | 1948 | 4444 -d_a_obj_lv6TogeRoll | 35.933806% | 4256 | 11844 -d_a_obj_groundwater | 40.823478% | 3728 | 9132 -d_a_obj_lv6elevta | 39.452780% | 1788 | 4532 -d_a_obj_stonemark | 52.549020% | 1072 | 2040 -d_a_obj_life_container | 34.456243% | 3764 | 10924 -d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 -d_a_obj_lv2candle | 38.160920% | 2656 | 6960 -d_a_obj_kgate | 35.192216% | 5932 | 16856 -d_a_obj_lv7PropellerY | 41.738506% | 2324 | 5568 -d_a_obj_wchain | 31.823745% | 3120 | 9804 -d_a_obj_damCps | 100.000000% | 504 | 504 -d_a_obj_lv5yiblltray | 33.403583% | 3804 | 11388 -d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 -d_a_obj_kazeneko | 45.277127% | 2320 | 5124 -d_a_obj_picture | 35.041841% | 4020 | 11472 -d_a_obj_poTbox | 44.731739% | 2768 | 6188 -d_a_obj_catdoor | 82.338611% | 2704 | 3284 -d_a_obj_pillar | 38.500852% | 3616 | 9392 -d_a_obj_firepillar2 | 32.320564% | 2936 | 9084 -d_a_obj_kznkarm | 35.088583% | 2852 | 8128 -d_a_obj_tgake | 49.302326% | 1272 | 2580 -d_a_obj_tornado | 36.577869% | 1428 | 3904 -d_a_obj_hfuta | 39.073970% | 2768 | 7084 -d_a_obj_lbox | 47.423510% | 2356 | 4968 -d_a_obj_hakai_brl | 40.491284% | 2044 | 5048 -d_a_obj_myogan | 51.677852% | 1848 | 3576 -d_a_obj_stopper | 31.675996% | 3848 | 12148 -d_a_obj_rfHole | 43.621701% | 2380 | 5456 -d_a_obj_hata | 39.059081% | 1428 | 3656 -d_a_obj_ito | 30.588925% | 4176 | 13652 -d_a_obj_lv7bridge | 39.684569% | 3724 | 9384 -d_a_obj_lv7BsGate | 48.080279% | 2204 | 4584 -d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 -d_a_obj_klift00 | 37.650457% | 3128 | 8308 -d_a_obj_scannon_crs | 35.204678% | 3612 | 10260 -d_a_obj_window | 42.655602% | 2056 | 4820 -d_a_obj_balloon | 42.722710% | 2724 | 6376 -d_a_obj_enemy_create | 100.000000% | 2828 | 2828 -d_a_obj_pdoor | 37.254902% | 1900 | 5100 -d_a_obj_nougu | 42.325581% | 2548 | 6020 -d_a_obj_ihasi | 43.372216% | 1636 | 3772 -d_a_obj_zraMark | 34.016942% | 3052 | 8972 -d_a_obj_heavySw | 41.214623% | 2796 | 6784 -d_a_obj_flag2 | 46.370840% | 5852 | 12620 -d_a_obj_kita | 40.112090% | 2004 | 4996 -d_a_obj_poCandle | 44.244604% | 2460 | 5560 -d_a_obj_barDesk | 49.477072% | 2460 | 4972 -d_a_obj_Lv5Key | 37.172105% | 2324 | 6252 -d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 -d_a_obj_bmWindow | 38.757933% | 3420 | 8824 -d_a_obj_kshutter | 35.690936% | 4804 | 13460 d_a_obj_lv4floor | 49.786020% | 1396 | 2804 -d_a_obj_ice_l | 34.815373% | 1848 | 5308 -d_a_obj_iceblock | 32.744340% | 4744 | 14488 -d_a_obj_hhashi | 33.138856% | 3408 | 10284 -d_a_obj_bbox | 48.606466% | 1744 | 3588 -d_a_obj_maki | 45.531587% | 2364 | 5192 -d_a_obj_lv3waterEff | 48.122066% | 820 | 1704 -d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200 -d_a_obj_ikada | 40.697674% | 1960 | 4816 -d_a_obj_wood_statue | 36.601579% | 3524 | 9628 -d_a_obj_crope | 26.014689% | 2692 | 10348 -d_a_obj_swLight | 40.346767% | 3444 | 8536 -d_a_obj_bsGate | 48.010850% | 2124 | 4424 -d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 -d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 -d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340 -d_a_obj_ki | 41.573034% | 2220 | 5340 -d_a_obj_gomikabe | 37.032799% | 3884 | 10488 -d_a_obj_lv8OptiLift | 35.768374% | 3212 | 8980 -d_a_obj_swBallC | 41.458222% | 3116 | 7516 -d_a_obj_gadget | 34.371565% | 3752 | 10916 -d_a_obj_twGate | 57.395498% | 2856 | 4976 -d_a_obj_tombo | 33.688640% | 4804 | 14260 -d_a_obj_lv6SwGate | 40.186916% | 3784 | 9416 -d_a_obj_mie | 34.891676% | 3672 | 10524 -d_a_obj_smw_stone | 40.435606% | 1708 | 4224 -d_a_obj_h_saku | 37.610063% | 2392 | 6360 -d_a_obj_riverrock | 37.311178% | 2964 | 7944 -d_a_obj_fallobj | 31.929604% | 2032 | 6364 -d_a_obj_crvlh_down | 42.363776% | 2208 | 5212 -d_a_obj_bombf | 46.875000% | 1020 | 2176 -d_a_obj_ita | 42.717855% | 2804 | 6564 -d_a_obj_toaru_maki | 46.596067% | 1232 | 2644 -d_a_obj_lv6egate | 42.456719% | 2060 | 4852 -d_a_obj_lv3Candle | 45.638126% | 2260 | 4952 -d_a_obj_tatigi | 40.549020% | 2068 | 5100 -d_a_obj_geyser | 29.678068% | 3540 | 11928 -d_a_obj_lv3Water | 44.263566% | 4568 | 10320 -d_a_obj_lv6TogeTrap | 34.484536% | 5352 | 15520 -d_a_obj_wsword | 48.936170% | 1380 | 2820 -d_a_obj_stairBlock | 45.129643% | 2576 | 5708 -d_a_obj_fmobj | 55.200000% | 1104 | 2000 -d_a_obj_firepillar | 43.032015% | 1828 | 4248 -d_a_obj_suisya | 49.914821% | 1172 | 2348 -d_a_obj_web0 | 75.286533% | 4204 | 5584 -d_a_obj_swpush2 | 34.150019% | 3624 | 10612 -d_a_obj_wflag | 41.214286% | 2308 | 5600 -d_a_obj_hb | 29.310936% | 3420 | 11668 -d_a_obj_zra_rock | 45.394112% | 1912 | 4212 -d_a_obj_crvsteel | 48.717949% | 1520 | 3120 -d_a_obj_itamato | 38.072602% | 3524 | 9256 -d_a_obj_lv8KekkaiTrap | 49.367089% | 2028 | 4108 -d_a_obj_kwheel00 | 40.352811% | 2928 | 7256 -d_a_obj_crvgate | 27.603513% | 4400 | 15940 -d_a_obj_tornado2 | 30.997110% | 1716 | 5536 -d_a_obj_eff | 73.504274% | 688 | 936 -d_a_obj_bk_leaf | 41.935484% | 1144 | 2728 -d_a_obj_chandelier | 36.773256% | 2024 | 5504 -d_a_obj_togeTrap | 41.746183% | 3500 | 8384 -d_a_obj_testcube | 100.000000% | 504 | 504 -d_a_obj_sekizo | 53.625171% | 1568 | 2924 -d_a_obj_swhang | 38.446450% | 3920 | 10196 -d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372 -d_a_obj_bhbridge | 39.936609% | 2016 | 5048 -d_a_obj_fireWood | 44.125561% | 1968 | 4460 -d_a_obj_nan | 33.293811% | 5616 | 16868 -d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 -d_a_obj_ten | 30.064631% | 5396 | 17948 -d_a_obj_fireWood2 | 41.290323% | 2304 | 5580 -d_a_obj_pleaf | 44.689221% | 2272 | 5084 -d_a_obj_rgate | 36.466069% | 5696 | 15620 -d_a_obj_knBullet | 43.076923% | 1568 | 3640 -d_a_obj_treesh | 48.098664% | 1872 | 3892 -d_a_obj_automata | 40.573951% | 3676 | 9060 -d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 -d_a_obj_kbacket | 33.053127% | 3932 | 11896 -d_a_obj_avalanche | 41.881443% | 2600 | 6208 -d_a_obj_vground | 44.817927% | 1280 | 2856 -d_a_obj_crvfence | 37.146893% | 3156 | 8496 -d_a_obj_kantera | 37.623762% | 2432 | 6464 -d_a_obj_brg | 22.881356% | 6696 | 29264 -d_a_obj_ss_item | 38.313378% | 2944 | 7684 d_a_obj_scannon_ten | 37.738049% | 3884 | 10292 -d_a_obj_cwall | 30.455195% | 5968 | 19596 -d_a_obj_sw | 27.590884% | 4068 | 14744 -d_a_obj_sakuita | 43.573382% | 1912 | 4388 -d_a_obj_rstair | 37.354086% | 2688 | 7196 -d_a_obj_metalbox | 50.268097% | 1500 | 2984 -d_a_obj_octhashi | 35.325420% | 3452 | 9772 -d_a_obj_dust | 40.406977% | 2224 | 5504 -d_a_obj_hsTarget | 57.317073% | 1504 | 2624 -d_a_obj_timer | 46.691176% | 1016 | 2176 -d_a_obj_graWall | 55.725191% | 1168 | 2096 -d_a_obj_lv4chandelier | 26.284971% | 4848 | 18444 -d_a_obj_rw | 41.210834% | 3104 | 7532 -d_a_obj_zdoor | 45.037688% | 2868 | 6368 -d_a_obj_spinLift | 41.107692% | 2672 | 6500 -d_a_obj_lv9SwShutter | 48.128342% | 2160 | 4488 -d_a_obj_bemos | 32.943081% | 10580 | 32116 -d_a_obj_bkdoor | 45.847554% | 1612 | 3516 -d_a_obj_takaraDai | 46.376812% | 2304 | 4968 -d_a_obj_food | 36.994728% | 3368 | 9104 -d_a_obj_kago | 31.956798% | 4024 | 12592 -d_a_obj_crystal | 44.482173% | 1048 | 2356 -d_a_obj_warp_obrg | 34.784076% | 4124 | 11856 -d_a_obj_lv6swturn | 36.266259% | 1896 | 5228 -d_a_obj_ganonwall | 38.930481% | 1456 | 3740 -d_a_obj_onsen | 49.239281% | 1424 | 2892 -d_a_obj_ndoor | 51.957831% | 1380 | 2656 -d_a_obj_poFire | 36.999540% | 3216 | 8692 -d_a_obj_grave_stone | 42.700730% | 2340 | 5480 -d_a_obj_timeFire | 43.483146% | 1548 | 3560 -d_a_obj_brakeeff | 45.417515% | 1784 | 3928 -d_a_obj_rotTrap | 45.877144% | 3316 | 7228 -d_a_obj_burnbox | 45.251397% | 1620 | 3580 -d_a_obj_kabuto | 30.226537% | 5604 | 18540 -d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 -d_a_obj_wind_stone | 37.702265% | 1864 | 4944 -d_a_obj_tks | 34.669261% | 7128 | 20560 -d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 -d_a_obj_cblock | 42.294713% | 3008 | 7112 -d_a_obj_snow_soup | 37.025948% | 1484 | 4008 -d_a_obj_movebox | 36.691330% | 7736 | 21084 -d_a_obj_inobone | 42.361111% | 1952 | 4608 -d_a_obj_lv4digsand | 43.888433% | 2140 | 4876 -d_a_obj_flag | 37.518248% | 2056 | 5480 -d_a_obj_smgdoor | 41.383095% | 3016 | 7288 -d_a_obj_flag3 | 33.292929% | 3296 | 9900 -d_a_obj_gptaru | 33.238231% | 4660 | 14020 -d_a_obj_onsenFire | 61.419753% | 796 | 1296 -d_a_obj_so | 31.698636% | 6412 | 20228 +d_a_obj_crvhahen | 37.120623% | 1908 | 5140 +d_a_obj_lv4HsTarget | 58.333333% | 1428 | 2448 +d_a_obj_kiPot | 53.782895% | 1308 | 2432 +d_a_obj_fireWood2 | 41.290323% | 2304 | 5580 +d_a_obj_lv4bridge | 47.146866% | 2016 | 4276 +d_a_obj_suisya | 49.914821% | 1172 | 2348 +d_a_obj_tatigi | 40.549020% | 2068 | 5100 d_a_obj_volcbom | 32.897713% | 5236 | 15916 -d_a_obj_nameplate | 39.726962% | 2328 | 5860 -d_a_obj_ice_s | 35.446009% | 2416 | 6816 -d_a_obj_ladder | 42.348485% | 2236 | 5280 -d_a_obj_zrTurara | 43.437672% | 3164 | 7284 -d_a_obj_drop | 30.227416% | 3828 | 12664 -d_a_obj_swpropeller | 39.765679% | 2308 | 5804 -d_a_obj_Turara | 38.494412% | 4684 | 12168 -d_a_obj_lv6SzGate | 45.147151% | 2884 | 6388 -d_a_obj_szbridge | 43.280632% | 1752 | 4048 -d_a_obj_table | 45.544554% | 1656 | 3636 -d_a_obj_lv6Tenbin | 40.000000% | 2848 | 7120 d_a_obj_gra2 | 24.809250% | 21200 | 85452 -d_a_obj_pdwall | 40.192308% | 1672 | 4160 -d_a_obj_kuwagata | 30.226537% | 5604 | 18540 -d_a_obj_fan | 39.173554% | 2844 | 7260 -d_a_obj_gm | 35.212957% | 4696 | 13336 -d_a_obj_smtile | 35.912938% | 2376 | 6616 -d_a_obj_ss_drink | 36.026542% | 3692 | 10248 -d_a_obj_saidan | 50.210970% | 1904 | 3792 -d_a_obj_swBallA | 35.803945% | 2396 | 6692 -d_a_obj_ystone | 42.824944% | 2280 | 5324 -d_a_obj_cowdoor | 56.672761% | 1240 | 2188 -d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496 -d_a_obj_ari | 31.622322% | 5372 | 16988 -d_a_obj_stopper2 | 38.987342% | 1848 | 4740 -d_a_obj_rotBridge | 43.430152% | 2512 | 5784 -d_a_obj_dmelevator | 35.600390% | 4376 | 12292 -d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 -d_a_obj_kwheel01 | 41.610233% | 2212 | 5316 d_a_obj_yousei | 27.926623% | 4628 | 16572 -d_a_obj_mhole | 35.548173% | 2140 | 6020 -d_a_obj_cho | 33.555219% | 4436 | 13220 +d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 +d_a_obj_oiltubo | 40.168244% | 3056 | 7608 +d_a_obj_scannon | 35.209799% | 5404 | 15348 +d_a_obj_barDesk | 49.477072% | 2460 | 4972 +d_a_obj_yobikusa | 39.095993% | 3356 | 8584 +d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 +d_a_obj_hbombkoya | 47.549020% | 3104 | 6528 +d_a_obj_keyhole | 33.394883% | 5064 | 15164 +d_a_obj_ki | 41.573034% | 2220 | 5340 +d_a_obj_lv6swturn | 36.266259% | 1896 | 5228 +d_a_obj_twGate | 57.395498% | 2856 | 4976 +d_a_obj_bsGate | 48.010850% | 2124 | 4424 +d_a_obj_zra_freeze | 37.662338% | 1624 | 4312 +d_a_obj_waterfall | 34.033613% | 2268 | 6664 +d_a_obj_kita | 40.112090% | 2004 | 4996 +d_a_obj_nan | 33.293811% | 5616 | 16868 +d_a_obj_testcube | 100.000000% | 504 | 504 d_a_obj_batta | 31.886560% | 5172 | 16220 -d_a_obj_sekizoa | 32.789446% | 15112 | 46088 -d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 -d_a_obj_rcircle | 43.989432% | 1332 | 3028 -d_a_obj_lv6bemos | 42.081031% | 3656 | 8688 -d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 -d_a_obj_kamakiri | 30.171107% | 5572 | 18468 -d_a_obj_digplace | 35.129068% | 1252 | 3564 -d_a_obj_amiShutter | 42.478422% | 2756 | 6488 -d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 +d_a_obj_udoor | 49.156627% | 1632 | 3320 +d_a_obj_damCps | 100.000000% | 504 | 504 +d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 +d_a_obj_enemy_create | 100.000000% | 2828 | 2828 +d_a_obj_magne_arm | 34.395028% | 7084 | 20596 +d_a_obj_TvCdlst | 43.547170% | 2308 | 5300 +d_a_obj_lv8OptiLift | 35.768374% | 3212 | 8980 +d_a_obj_avalanche | 41.881443% | 2600 | 6208 +d_a_obj_glowSphere | 38.917749% | 3596 | 9240 +d_a_obj_lv4CandleDemoTag | 46.972860% | 1800 | 3832 +d_a_obj_pillar | 38.500852% | 3616 | 9392 +d_a_obj_fchain | 30.649490% | 2284 | 7452 +d_a_obj_Turara | 38.494412% | 4684 | 12168 +d_a_obj_tgake | 49.302326% | 1272 | 2580 d_a_obj_crvlh_up | 42.485784% | 2092 | 4924 -d_a_obj_laundry | 39.077103% | 2676 | 6848 -d_a_obj_swspinner | 39.141631% | 1824 | 4660 +d_a_obj_lv7PropellerY | 41.738506% | 2324 | 5568 +d_a_obj_digholl | 42.781690% | 972 | 2272 +d_a_obj_swpush2 | 34.150019% | 3624 | 10612 +d_a_obj_warp_obrg | 34.784076% | 4124 | 11856 +d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 +d_a_obj_scannon_crs | 35.204678% | 3612 | 10260 +d_a_obj_boumato | 40.192484% | 3508 | 8728 +d_a_obj_lv6FurikoTrap | 45.967742% | 2736 | 5952 +d_a_obj_fireWood | 44.125561% | 1968 | 4460 +d_a_obj_wdStick | 32.908234% | 4748 | 14428 +d_a_obj_lv4PoGate | 44.906743% | 2504 | 5576 +d_a_obj_rotBridge | 43.430152% | 2512 | 5784 +d_a_obj_bmWindow | 38.757933% | 3420 | 8824 +d_a_obj_smtile | 35.912938% | 2376 | 6616 +d_a_obj_sm_door | 39.302885% | 2616 | 6656 +d_a_obj_lv6bemos | 42.081031% | 3656 | 8688 +d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 +d_a_obj_swhang | 38.446450% | 3920 | 10196 +d_a_obj_kjgjs | 52.250804% | 1300 | 2488 +d_a_obj_drop | 30.227416% | 3828 | 12664 +d_a_obj_chandelier | 36.773256% | 2024 | 5504 +d_a_obj_lv7BsGate | 48.080279% | 2204 | 4584 +d_a_obj_volcball | 34.010759% | 4552 | 13384 +d_a_obj_heavySw | 41.214623% | 2796 | 6784 +d_a_obj_ikada | 40.697674% | 1960 | 4816 +d_a_obj_cho | 33.555219% | 4436 | 13220 +d_a_obj_hakai_ftr | 42.324888% | 2272 | 5368 +d_a_obj_stairBlock | 45.129643% | 2576 | 5708 +d_a_obj_brg | 22.881356% | 6696 | 29264 +d_a_obj_lv8UdFloor | 39.681529% | 2492 | 6280 +d_a_obj_zra_rock | 45.394112% | 1912 | 4212 +d_a_obj_kago | 31.956798% | 4024 | 12592 +d_a_obj_ice_s | 35.446009% | 2416 | 6816 +d_a_obj_klift00 | 37.650457% | 3128 | 8308 +d_a_obj_sakuita | 43.573382% | 1912 | 4388 +d_a_obj_ystone | 42.824944% | 2280 | 5324 +d_a_obj_bk_leaf | 41.935484% | 1144 | 2728 +d_a_obj_flag2 | 46.370840% | 5852 | 12620 +d_a_obj_flag3 | 33.292929% | 3296 | 9900 +d_a_obj_waterGate | 47.279550% | 2016 | 4264 +d_a_obj_lv1Candle01 | 44.344569% | 2368 | 5340 +d_a_obj_bosswarp | 39.728243% | 4912 | 12364 +d_a_obj_poCandle | 44.244604% | 2460 | 5560 +d_a_obj_vground | 44.817927% | 1280 | 2856 +d_a_obj_grave_stone | 42.700730% | 2340 | 5480 +d_a_obj_lv6elevta | 39.452780% | 1788 | 4532 +d_a_obj_bky_rock | 35.592460% | 3172 | 8912 +d_a_obj_burnbox | 45.251397% | 1620 | 3580 +d_a_obj_table | 45.544554% | 1656 | 3636 +d_a_obj_gm | 35.212957% | 4696 | 13336 +d_a_obj_szbridge | 43.280632% | 1752 | 4048 +d_a_obj_lv3Water | 44.263566% | 4568 | 10320 +d_a_obj_lv1Candle00 | 41.348158% | 2380 | 5756 +d_a_obj_ktonfire | 45.504087% | 2004 | 4404 +d_a_obj_sw | 27.590884% | 4068 | 14744 +d_a_obj_lv6bemos2 | 32.122093% | 7072 | 22016 +d_a_obj_kazeneko | 45.277127% | 2320 | 5124 +d_a_obj_fw | 43.368592% | 2132 | 4916 +d_a_obj_kamakiri | 30.171107% | 5572 | 18468 +d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 +d_a_obj_lv4digsand | 43.888433% | 2140 | 4876 +d_a_obj_kuwagata | 30.226537% | 5604 | 18540 +d_a_obj_food | 36.994728% | 3368 | 9104 +d_a_obj_hata | 39.059081% | 1428 | 3656 +d_a_obj_pleaf | 44.689221% | 2272 | 5084 +d_a_obj_dust | 40.406977% | 2224 | 5504 +d_a_obj_firepillar | 43.032015% | 1828 | 4248 +d_a_obj_brakeeff | 45.417515% | 1784 | 3928 +d_a_obj_lv9SwShutter | 48.128342% | 2160 | 4488 +d_a_obj_lv6SwGate | 40.186916% | 3784 | 9416 +d_a_obj_kwheel00 | 40.352811% | 2928 | 7256 +d_a_obj_crystal | 44.482173% | 1048 | 2356 +d_a_obj_hb | 29.310936% | 3420 | 11668 +d_a_obj_swchain | 24.473297% | 3996 | 16328 +d_a_obj_sword | 45.479963% | 1952 | 4292 +d_a_obj_shield | 34.160959% | 3192 | 9344 +d_a_obj_tmoon | 48.478702% | 956 | 1972 +d_a_obj_lv7bridge | 39.684569% | 3724 | 9384 +d_a_obj_lbox | 47.423510% | 2356 | 4968 +d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 +d_a_obj_sekidoor | 43.834383% | 1948 | 4444 +d_a_obj_pumpkin | 29.152971% | 4612 | 15820 +d_a_obj_bhashi | 31.443815% | 3772 | 11996 +d_a_obj_hhashi | 33.138856% | 3408 | 10284 +d_a_obj_riverrock | 37.311178% | 2964 | 7944 +d_a_obj_prop | 47.868217% | 988 | 2064 +d_a_obj_lv6Lblock | 46.958175% | 1976 | 4208 +d_a_obj_swBallC | 41.458222% | 3116 | 7516 +d_a_obj_digplace | 35.129068% | 1252 | 3564 +d_a_obj_lv4CandleTag | 50.114416% | 1752 | 3496 +d_a_obj_rw | 41.210834% | 3104 | 7532 +d_a_obj_syRock | 38.458961% | 4592 | 11940 +d_a_obj_bed | 42.310889% | 2036 | 4812 +d_a_obj_thdoor | 39.419319% | 2824 | 7164 +d_a_obj_kag | 32.055503% | 5452 | 17008 +d_a_obj_movebox | 36.691330% | 7736 | 21084 +d_a_obj_dan | 35.198921% | 4176 | 11864 +d_a_obj_magLiftRot | 40.697674% | 3080 | 7568 +d_a_obj_lv4SlideWall | 48.954373% | 2060 | 4208 +d_a_obj_toaru_maki | 46.596067% | 1232 | 2644 +d_a_obj_yel_bag | 33.773087% | 3584 | 10612 +d_a_obj_hsTarget | 57.317073% | 1504 | 2624 +d_a_obj_digsnow | 44.813278% | 2160 | 4820 +d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 +d_a_obj_well_cover | 45.704467% | 1596 | 3492 +d_a_obj_mato | 37.093023% | 2552 | 6880 +d_a_obj_lv4RailWall | 41.496973% | 3016 | 7268 +d_a_obj_stonemark | 52.549020% | 1072 | 2040 +d_a_obj_gomikabe | 37.032799% | 3884 | 10488 +d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 +d_a_obj_life_container | 34.456243% | 3764 | 10924 +d_a_obj_lv3waterEff | 48.122066% | 820 | 1704 +d_a_obj_kwheel01 | 41.610233% | 2212 | 5316 +d_a_obj_firepillar2 | 32.320564% | 2936 | 9084 +d_a_obj_h_saku | 37.610063% | 2392 | 6360 +d_a_obj_warp_kbrg | 34.066524% | 5080 | 14912 +d_a_obj_so | 31.698636% | 6412 | 20228 +d_a_obj_kshutter | 35.690936% | 4804 | 13460 +d_a_obj_lv4prwall | 38.593750% | 1976 | 5120 +d_a_obj_ari | 31.622322% | 5372 | 16988 +d_a_obj_swpush5 | 39.210384% | 2900 | 7396 +d_a_obj_crvfence | 37.146893% | 3156 | 8496 +d_a_obj_crvlh_down | 42.363776% | 2208 | 5212 +d_a_obj_rock | 40.423729% | 1908 | 4720 +d_a_obj_poFire | 36.999540% | 3216 | 8692 d_a_obj_stone | 26.135237% | 5272 | 20172 d_a_obj_lv4gear | 42.242704% | 1100 | 2604 -d_a_obj_mgate | 47.398844% | 1968 | 4152 -d_a_obj_swpush5 | 39.210384% | 2900 | 7396 -d_a_obj_digsnow | 44.813278% | 2160 | 4820 -d_a_obj_yobikusa | 39.095993% | 3356 | 8584 -d_a_obj_lv4CandleDemoTag | 46.972860% | 1800 | 3832 -d_a_obj_lv5SwIce | 46.408046% | 2584 | 5568 -d_a_obj_pdtile | 31.467607% | 2856 | 9076 -d_a_obj_cboard | 57.703927% | 1528 | 2648 -d_a_obj_lv8UdFloor | 39.681529% | 2492 | 6280 -d_a_obj_kanban2 | 30.775877% | 7124 | 23148 -d_a_obj_lv4HsTarget | 58.333333% | 1428 | 2448 -d_a_obj_key | 33.145009% | 3520 | 10620 -d_a_obj_scannon | 35.209799% | 5404 | 15348 -d_a_obj_waterGate | 47.279550% | 2016 | 4264 -d_a_obj_thashi | 49.534161% | 3828 | 7728 -d_a_obj_cb | 43.008475% | 2436 | 5664 -d_a_obj_keyhole | 33.394883% | 5064 | 15164 -d_a_obj_hakai_ftr | 42.324888% | 2272 | 5368 -d_a_obj_swpush | 31.657104% | 3752 | 11852 -d_a_obj_swturn | 31.295716% | 2396 | 7656 -d_a_obj_lv4sand | 46.461825% | 1996 | 4296 -d_a_obj_ktonfire | 45.504087% | 2004 | 4404 -d_a_obj_wdStick | 32.908234% | 4748 | 14428 -d_a_obj_kag | 32.055503% | 5452 | 17008 -d_a_obj_hasu2 | 41.190476% | 1384 | 3360 -d_a_obj_swchain | 24.473297% | 3996 | 16328 -d_a_obj_pumpkin | 29.152971% | 4612 | 15820 -d_a_obj_swallshutter | 41.268759% | 2420 | 5864 -d_a_obj_chest | 39.833795% | 2876 | 7220 -d_a_obj_kaisou | 41.645729% | 2652 | 6368 -d_a_obj_sword | 45.479963% | 1952 | 4292 -d_a_obj_thdoor | 39.419319% | 2824 | 7164 -d_a_obj_hbombkoya | 47.549020% | 3104 | 6528 -d_a_obj_lv5IceWall | 39.937435% | 3064 | 7672 +d_a_obj_wchain | 31.823745% | 3120 | 9804 +d_a_obj_spinLift | 41.107692% | 2672 | 6500 +d_a_obj_lv3Candle | 45.638126% | 2260 | 4952 +d_a_obj_smw_stone | 40.435606% | 1708 | 4224 d_a_obj_stick | 43.708609% | 2376 | 5436 -d_a_obj_udoor | 49.156627% | 1632 | 3320 -d_a_obj_taFence | 41.279360% | 3304 | 8004 -d_a_obj_nagaisu | 37.130271% | 2360 | 6356 -d_a_obj_mvstair | 35.209479% | 3328 | 9452 -d_a_obj_roten | 41.613588% | 1568 | 3768 -d_a_obj_crvhahen | 37.120623% | 1908 | 5140 -d_a_obj_tp | 35.262726% | 3436 | 9744 -d_a_obj_tobyhouse | 34.586466% | 3864 | 11172 -d_a_obj_Y_taihou | 37.379068% | 3400 | 9096 -d_a_obj_bubblePilar | 44.760583% | 2580 | 5764 -d_a_obj_usaku | 55.081301% | 1084 | 1968 -d_a_obj_bosswarp | 39.728243% | 4912 | 12364 -d_a_obj_lp | 29.557762% | 2620 | 8864 -d_a_obj_rope_bridge | 36.903633% | 4672 | 12660 -d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 -d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 -d_a_obj_mato | 37.093023% | 2552 | 6880 -d_a_obj_dan | 35.198921% | 4176 | 11864 -d_a_obj_TvCdlst | 43.547170% | 2308 | 5300 -d_a_obj_volcball | 34.010759% | 4552 | 13384 -d_a_obj_lv6Lblock | 46.958175% | 1976 | 4208 -d_a_obj_waterPillar | 37.877429% | 5068 | 13380 -d_a_obj_bhashi | 31.443815% | 3772 | 11996 -d_a_obj_zrTuraraRock | 46.299094% | 2452 | 5296 -d_a_obj_magLiftRot | 40.697674% | 3080 | 7568 -d_a_obj_lv3WaterB | 46.278317% | 1716 | 3708 -d_a_obj_kage | 50.520833% | 1164 | 2304 -d_a_obj_bmshutter | 41.338854% | 2396 | 5796 -d_a_obj_boumato | 40.192484% | 3508 | 8728 +d_a_obj_groundwater | 40.823478% | 3728 | 9132 +d_a_obj_stopper | 31.675996% | 3848 | 12148 +d_a_obj_ten | 30.064631% | 5396 | 17948 +d_a_obj_mhole | 35.548173% | 2140 | 6020 +d_a_obj_fmobj | 55.200000% | 1104 | 2000 +d_a_obj_swallshutter | 41.268759% | 2420 | 5864 +d_a_obj_takaraDai | 46.376812% | 2304 | 4968 +d_a_obj_ice_l | 34.815373% | 1848 | 5308 +d_a_obj_fallobj | 31.929604% | 2032 | 6364 +d_a_obj_crvsteel | 48.717949% | 1520 | 3120 +d_a_obj_lv3Water2 | 41.786571% | 2788 | 6672 +d_a_obj_cboard | 57.703927% | 1528 | 2648 +d_a_obj_crope | 26.014689% | 2692 | 10348 +d_a_obj_sakuita_rope | 30.817009% | 2580 | 8372 +d_a_obj_eff | 73.504274% | 688 | 936 +d_a_obj_thashi | 49.534161% | 3828 | 7728 +d_a_obj_itamato | 38.072602% | 3524 | 9256 +d_a_obj_knBullet | 43.076923% | 1568 | 3640 +d_a_obj_wsword | 48.936170% | 1380 | 2820 d_a_obj_smoke | 51.322751% | 776 | 1512 -d_a_obj_smallkey | 31.464798% | 3772 | 11988 -d_a_obj_bed | 42.310889% | 2036 | 4812 -d_a_obj_snowEffTag | 46.419098% | 1400 | 3016 -d_a_obj_kiPot | 53.782895% | 1308 | 2432 -d_a_obj_tmoon | 48.478702% | 956 | 1972 -d_a_obj_toby | 32.460733% | 3720 | 11460 -d_a_obj_shield | 34.160959% | 3192 | 9344 -d_a_obj_kjgjs | 52.250804% | 1300 | 2488 -d_a_obj_cdoor | 40.255786% | 2644 | 6568 -d_a_obj_laundry_rope | 34.459867% | 2284 | 6628 -d_a_obj_lv6ChangeGate | 41.732283% | 3816 | 9144 -d_a_obj_magLift | 41.319181% | 2180 | 5276 -d_a_obj_zcloth | 52.373418% | 1324 | 2528 -d_a_obj_magne_arm | 34.395028% | 7084 | 20596 +d_a_obj_swBallA | 35.803945% | 2396 | 6692 +d_a_obj_cwall | 30.455195% | 5968 | 19596 +d_a_obj_picture | 35.041841% | 4020 | 11472 +d_a_obj_ladder | 42.348485% | 2236 | 5280 +d_a_obj_gptaru | 33.238231% | 4660 | 14020 +d_a_obj_rotTrap | 45.877144% | 3316 | 7228 +d_a_obj_swspinner | 39.141631% | 1824 | 4660 +d_a_obj_lv3saka00 | 50.576369% | 1404 | 2776 +d_a_obj_metalbox | 50.268097% | 1500 | 2984 +d_a_obj_bmshutter | 41.338854% | 2396 | 5796 +d_a_obj_kkanban | 47.103514% | 1984 | 4212 +d_a_obj_goGate | 48.046181% | 2164 | 4504 +d_a_obj_lv8KekkaiTrap | 49.367089% | 2028 | 4108 +d_a_obj_lv6Tenbin | 40.000000% | 2848 | 7120 +d_a_obj_kbox | 35.736196% | 3728 | 10432 +d_a_obj_bbox | 48.606466% | 1744 | 3588 +d_a_obj_bombf | 46.875000% | 1020 | 2176 +d_a_obj_key | 33.145009% | 3520 | 10620 +d_a_obj_crvgate | 27.603513% | 4400 | 15940 +d_a_obj_iceleaf | 37.604212% | 3428 | 9116 +d_a_obj_tombo | 33.688640% | 4804 | 14260 +d_a_obj_lv5ychndlr | 40.267765% | 3128 | 7768 +d_a_obj_usaku | 55.081301% | 1084 | 1968 d_a_obj_gb | 41.063644% | 1884 | 4588 -d_a_obj_fchain | 30.649490% | 2284 | 7452 +d_a_obj_nougu | 42.325581% | 2548 | 6020 +d_a_obj_roten | 41.613588% | 1568 | 3768 +d_a_obj_timer | 46.691176% | 1016 | 2176 +d_a_obj_bhbridge | 39.936609% | 2016 | 5048 +d_a_obj_sekizo | 53.625171% | 1568 | 2924 +d_a_obj_saidan | 50.210970% | 1904 | 3792 +d_a_obj_grz_rock | 45.558087% | 1600 | 3512 +d_a_obj_kaisou | 41.645729% | 2652 | 6368 +d_a_obj_mvstair | 35.209479% | 3328 | 9452 +d_a_obj_pdoor | 37.254902% | 1900 | 5100 +d_a_obj_pdtile | 31.467607% | 2856 | 9076 +d_a_obj_inobone | 42.361111% | 1952 | 4608 +d_a_obj_msima | 35.108959% | 3480 | 9912 +d_a_obj_smgdoor | 41.383095% | 3016 | 7288 +d_a_obj_bemos | 32.943081% | 10580 | 32116 +d_a_obj_sekizoa | 32.789446% | 15112 | 46088 +d_a_obj_chest | 39.833795% | 2876 | 7220 +d_a_obj_snowEffTag | 46.419098% | 1400 | 3016 +d_a_obj_lv4sand | 46.461825% | 1996 | 4296 +d_a_obj_flag | 37.518248% | 2056 | 5480 +d_a_obj_maki | 45.531587% | 2364 | 5192 +d_a_obj_ss_drink | 36.026542% | 3692 | 10248 +d_a_obj_automata | 40.573951% | 3676 | 9060 +d_a_obj_geyser | 29.678068% | 3540 | 11928 +d_a_obj_cblock | 42.294713% | 3008 | 7112 +d_a_obj_taFence | 41.279360% | 3304 | 8004 +d_a_obj_window | 42.655602% | 2056 | 4820 +d_a_obj_swturn | 31.295716% | 2396 | 7656 +d_a_obj_rcircle | 43.989432% | 1332 | 3028 +d_a_obj_kanban2 | 30.775877% | 7124 | 23148 +d_a_obj_iceblock | 32.744340% | 4744 | 14488 +d_a_obj_lv6TogeTrap | 34.484536% | 5352 | 15520 +d_a_obj_wflag | 41.214286% | 2308 | 5600 +d_a_obj_cdoor | 40.255786% | 2644 | 6568 +d_a_obj_lv8Lift | 35.532359% | 3404 | 9580 +d_a_obj_zcloth | 52.373418% | 1324 | 2528 +d_a_obj_katatsumuri | 31.170697% | 5208 | 16708 +d_a_obj_togeTrap | 41.746183% | 3500 | 8384 +d_a_obj_web0 | 75.286533% | 4204 | 5584 +d_a_obj_ganonwall | 38.930481% | 1456 | 3740 +d_a_obj_kantera | 37.623762% | 2432 | 6464 +d_a_obj_gra_rock | 37.947123% | 2928 | 7716 +d_a_obj_lv5yiblltray | 33.403583% | 3804 | 11388 +d_a_obj_swLight | 40.346767% | 3444 | 8536 +d_a_obj_tks | 34.669261% | 7128 | 20560 +d_a_obj_nameplate | 39.726962% | 2328 | 5860 +d_a_obj_nagaisu | 37.130271% | 2360 | 6356 +d_a_obj_stopper2 | 38.987342% | 1848 | 4740 +d_a_obj_graWall | 55.725191% | 1168 | 2096 +d_a_obj_balloon | 42.722710% | 2724 | 6376 +d_a_obj_rgate | 36.466069% | 5696 | 15620 +d_a_obj_waterPillar | 37.877429% | 5068 | 13380 d_a_obj_swBallB | 34.276891% | 2664 | 7772 +d_a_obj_fan | 39.173554% | 2844 | 7260 +d_a_obj_lv4EdShutter | 45.846154% | 2384 | 5200 +d_a_obj_swpropeller | 39.765679% | 2308 | 5804 +d_a_obj_dmelevator | 35.600390% | 4376 | 12292 +d_a_obj_onsenTaru | 38.567616% | 3468 | 8992 +d_a_obj_wind_stone | 37.702265% | 1864 | 4944 +d_a_obj_kgate | 35.192216% | 5932 | 16856 +d_a_obj_lv6TogeRoll | 35.933806% | 4256 | 11844 +d_a_obj_ornament_cloth | 38.734568% | 2008 | 5184 +d_a_obj_ita | 42.717855% | 2804 | 6564 +d_a_obj_ndoor | 51.957831% | 1380 | 2656 +d_a_obj_kznkarm | 35.088583% | 2852 | 8128 +d_a_obj_zrTurara | 43.437672% | 3164 | 7284 +d_a_obj_wood_statue | 36.601579% | 3524 | 9628 +d_a_obj_rstair | 37.354086% | 2688 | 7196 +d_a_obj_lv6SzGate | 45.147151% | 2884 | 6388 +d_a_obj_tp | 35.262726% | 3436 | 9744 +d_a_obj_swpush | 31.657104% | 3752 | 11852 +d_a_obj_lv4Gate | 48.863636% | 2064 | 4224 +d_a_obj_ito | 30.588925% | 4176 | 13652 +d_a_obj_master_sword | 43.575419% | 2808 | 6444 +d_a_obj_carry | 29.827071% | 18352 | 61528 +d_a_obj_myogan | 51.677852% | 1848 | 3576 +d_a_obj_toby | 32.460733% | 3720 | 11460 +d_a_obj_lv5FloorBoard | 47.577093% | 2592 | 5448 +d_a_obj_smallkey | 31.464798% | 3772 | 11988 +d_a_obj_rfHole | 43.621701% | 2380 | 5456 +d_a_obj_tornado | 36.577869% | 1428 | 3904 +d_a_obj_rope_bridge | 36.903633% | 4672 | 12660 +d_a_obj_zraMark | 34.016942% | 3052 | 8972 +d_a_obj_ss_item | 38.313378% | 2944 | 7684 +d_a_obj_laundry | 39.077103% | 2676 | 6848 +d_a_obj_lv4chandelier | 26.284971% | 4848 | 18444 +d_a_obj_Lv5Key | 37.172105% | 2324 | 6252 +d_a_obj_zdoor | 45.037688% | 2868 | 6368 +d_a_obj_kage | 50.520833% | 1164 | 2304 +d_a_obj_magLift | 41.319181% | 2180 | 5276 +d_a_obj_timeFire | 43.483146% | 1548 | 3560 +d_a_obj_mie | 34.891676% | 3672 | 10524 +d_a_obj_octhashi | 35.325420% | 3452 | 9772 +d_a_obj_onsenFire | 61.419753% | 796 | 1296 +d_a_obj_cb | 43.008475% | 2436 | 5664 +d_a_obj_poTbox | 44.731739% | 2768 | 6188 +d_a_obj_kbacket | 33.053127% | 3932 | 11896 +d_a_obj_lv4prelvtr | 48.664688% | 1312 | 2696 +d_a_obj_ihasi | 43.372216% | 1636 | 3772 +d_a_obj_pdwall | 40.192308% | 1672 | 4160 +d_a_obj_web1 | 100.000000% | 5772 | 5772 +d_a_obj_hfuta | 39.073970% | 2768 | 7084 +d_a_obj_lv2candle | 38.160920% | 2656 | 6960 +d_a_obj_wood_pendulum | 44.455748% | 1748 | 3932 +d_a_obj_onsen | 49.239281% | 1424 | 2892 +d_a_obj_hasu2 | 41.190476% | 1384 | 3360 +d_a_obj_catdoor | 82.338611% | 2704 | 3284 +d_a_obj_bkdoor | 45.847554% | 1612 | 3516 +d_a_obj_mgate | 47.398844% | 1968 | 4152 +d_a_obj_ganonwall2 | 41.938675% | 1696 | 4044 +d_a_obj_hakai_brl | 40.491284% | 2044 | 5048 +d_a_obj_lp | 29.557762% | 2620 | 8864 +d_a_obj_gadget | 34.371565% | 3752 | 10916 +d_a_obj_tornado2 | 30.997110% | 1716 | 5536 +d_a_obj_amiShutter | 42.478422% | 2756 | 6488 +d_a_obj_lv6egate | 42.456719% | 2060 | 4852 +d_a_obj_snow_soup | 37.025948% | 1484 | 4008 +d_a_obj_kabuto | 30.226537% | 5604 | 18540 +d_a_obj_treesh | 48.098664% | 1872 | 3892 +d_a_obj_cowdoor | 56.672761% | 1240 | 2188 +d_a_obj_mirror_sand | 46.972860% | 1800 | 3832 +d_a_obj_mirror_chain | 34.916201% | 3500 | 10024 +d_a_obj_mirror_screw | 40.374532% | 2156 | 5340 d_a_obj_mirror_6pole | 49.656751% | 1736 | 3496 d_a_obj_mirror_table | 38.664122% | 4052 | 10480 -d_a_obj_mirror_sand | 46.972860% | 1800 | 3832 -d_a_obj_mirror_screw | 40.374532% | 2156 | 5340 -d_a_obj_mirror_chain | 34.916201% | 3500 | 10024 -d_a_door_knob00 | 37.500000% | 4608 | 12288 -d_a_door_shutter | 37.465797% | 14240 | 38008 -d_a_door_boss | 40.856890% | 3700 | 9056 -d_a_door_mbossL1 | 34.467633% | 10372 | 30092 -d_a_door_push | 37.997725% | 2672 | 7032 -d_a_door_spiral | 100.000000% | 504 | 504 -d_a_door_bossl1 | 39.355114% | 7372 | 18732 -d_a_door_bossL5 | 39.221790% | 4032 | 10280 -d_a_door_dbdoor00 | 40.734908% | 3104 | 7620 -d_a_npc_mk | 100.000000% | 632 | 632 -d_a_npc_kn | 34.989558% | 48252 | 137904 -d_a_npc_aru | 34.812103% | 12932 | 37148 -d_a_npc_kakashi | 39.139523% | 8988 | 22964 -d_a_npc_ykw | 33.875000% | 18428 | 54400 -d_a_npc_pouya | 40.447529% | 11424 | 28244 -d_a_npc_drainSol | 38.587732% | 4328 | 11216 -d_a_npc_bou | 36.186814% | 12800 | 35372 -d_a_npc_chat | 56.591640% | 32384 | 57224 -d_a_npc_toby | 35.857461% | 14168 | 39512 -d_a_npc_ins | 30.852199% | 10412 | 33748 -d_a_npc_post | 37.414676% | 10524 | 28128 -d_a_npc_doorboy | 35.898009% | 6420 | 17884 -d_a_npc_besu | 38.726854% | 19492 | 50332 -d_a_npc_len | 37.465709% | 11472 | 30620 -d_a_npc_ashB | 32.906995% | 8336 | 25332 -d_a_npc_bans | 34.954955% | 11640 | 33300 -d_a_npc_coach | 28.195770% | 12052 | 42744 -d_a_npc_zrc | 32.120762% | 10384 | 32328 -d_a_npc_kyury | 39.351296% | 9172 | 23308 -d_a_npc_inko | 32.502352% | 2764 | 8504 -d_a_npc_blue_ns | 31.763122% | 7552 | 23776 -d_a_npc_grc | 32.984636% | 8072 | 24472 -d_a_npc_raca | 38.792102% | 8016 | 20664 -d_a_npc_midp | 37.189356% | 6764 | 18188 -d_a_npc_kolinb | 41.382827% | 8116 | 19612 -d_a_npc_seirei | 39.691517% | 6176 | 15560 -d_a_npc_shad | 27.050485% | 14960 | 55304 -d_a_npc_grm | 38.118162% | 6968 | 18280 -d_a_npc_grr | 33.284338% | 8152 | 24492 -d_a_npc_tkj2 | 28.985507% | 5520 | 19044 -d_a_npc_sola | 39.560155% | 6116 | 15460 -d_a_npc_shaman | 40.368229% | 10612 | 26288 -d_a_npc_gro | 33.290996% | 9436 | 28344 -d_a_npc_shop0 | 38.731379% | 3224 | 8324 -d_a_npc_henna0 | 100.000000% | 504 | 504 -d_a_npc_theB | 34.129794% | 9256 | 27120 -d_a_npc_passer | 35.701424% | 8724 | 24436 -d_a_npc_chin | 33.958357% | 11808 | 34772 -d_a_npc_gra | 30.387241% | 20120 | 66212 -d_a_npc_zelda | 37.603569% | 7080 | 18828 -d_a_npc_shop_maro | 53.691275% | 2880 | 5364 -d_a_npc_df | 35.418672% | 2944 | 8312 -d_a_npc_pachi_besu | 42.797557% | 11492 | 26852 +d_a_npc_doc | 38.160961% | 8516 | 22316 d_a_npc_tkc | 32.075472% | 7820 | 24380 +d_a_npc_aru | 34.812103% | 12932 | 37148 +d_a_npc_kolinb | 41.382827% | 8116 | 19612 +d_a_npc_knj | 41.627219% | 5628 | 13520 +d_a_npc_fish | 79.939819% | 3188 | 3988 +d_a_npc_raca | 38.792102% | 8016 | 20664 +d_a_npc_pachi_taro | 42.126544% | 15420 | 36604 +d_a_npc_rafrel | 29.654182% | 10736 | 36204 +d_a_npc_seirei | 39.691517% | 6176 | 15560 +d_a_npc_doorboy | 35.898009% | 6420 | 17884 +d_a_npc_zra | 24.569698% | 26608 | 108296 +d_a_npc_chin | 33.958357% | 11808 | 34772 +d_a_npc_zant | 38.262795% | 6220 | 16256 +d_a_npc_kkri | 38.042823% | 10092 | 26528 +d_a_npc_zelRo | 37.784656% | 6836 | 18092 d_a_npc_zelR | 37.762547% | 6832 | 18092 -d_a_npc_kasi_hana | 29.810206% | 10492 | 35196 -d_a_npc_seid | 42.554557% | 5304 | 12464 -d_a_npc_henna | 27.446434% | 11836 | 43124 -d_a_npc_yamid | 36.895778% | 7236 | 19612 -d_a_npc_worm | 33.717579% | 2340 | 6940 d_a_npc_ne | 24.204919% | 12360 | 51064 d_a_npc_kasi_kyu | 33.587533% | 8104 | 24128 -d_a_npc_gnd | 36.965399% | 6880 | 18612 -d_a_npc_tk | 22.166176% | 12656 | 57096 -d_a_npc_knj | 41.627219% | 5628 | 13520 -d_a_npc_kolin | 35.754689% | 14412 | 40308 -d_a_npc_saru | 39.289415% | 10616 | 27020 -d_a_npc_uri | 34.281392% | 13596 | 39660 -d_a_npc_wrestler | 27.819607% | 28820 | 103596 -d_a_npc_moi | 34.114704% | 14728 | 43172 -d_a_npc_lud | 38.010021% | 12744 | 33528 -d_a_npc_fguard | 42.375887% | 2868 | 6768 +d_a_npc_shop_maro | 53.691275% | 2880 | 5364 d_a_npc_grs | 33.634658% | 7888 | 23452 -d_a_npc_doc | 38.160961% | 8516 | 22316 -d_a_npc_ykm | 32.908526% | 20348 | 61832 -d_a_npc_moir | 28.712188% | 11656 | 40596 -d_a_npc_zelRo | 37.784656% | 6836 | 18092 -d_a_npc_the | 34.936999% | 9760 | 27936 -d_a_npc_impal | 32.590326% | 8948 | 27456 -d_a_npc_fish | 79.939819% | 3188 | 3988 +d_a_npc_lf | 39.566396% | 2336 | 5904 +d_a_npc_wrestler | 27.819607% | 28820 | 103596 +d_a_npc_grm | 38.118162% | 6968 | 18280 +d_a_npc_besu | 38.726854% | 19492 | 50332 d_a_npc_yelia | 40.634175% | 13840 | 34060 +d_a_npc_bouS | 32.586831% | 9720 | 29828 +d_a_npc_kakashi | 39.139523% | 8988 | 22964 +d_a_npc_p2 | 100.000000% | 632 | 632 +d_a_npc_jagar | 33.736985% | 11924 | 35344 +d_a_npc_inko | 32.502352% | 2764 | 8504 +d_a_npc_len | 37.465709% | 11472 | 30620 +d_a_npc_moir | 28.712188% | 11656 | 40596 +d_a_npc_tkj2 | 28.985507% | 5520 | 19044 +d_a_npc_gro | 33.290996% | 9436 | 28344 +d_a_npc_kasi_mich | 33.749584% | 8108 | 24024 +d_a_npc_the | 34.936999% | 9760 | 27936 +d_a_npc_df | 35.418672% | 2944 | 8312 +d_a_npc_uri | 34.281392% | 13596 | 39660 +d_a_npc_grz | 31.010419% | 12620 | 40696 +d_a_npc_prayer | 36.469470% | 6140 | 16836 +d_a_npc_shop0 | 38.731379% | 3224 | 8324 +d_a_npc_bans | 34.954955% | 11640 | 33300 +d_a_npc_midp | 37.189356% | 6764 | 18188 +d_a_npc_bou | 36.186814% | 12800 | 35372 +d_a_npc_hanjo | 32.618297% | 14476 | 44380 +d_a_npc_fairy_seirei | 42.302956% | 5496 | 12992 +d_a_npc_du | 35.940410% | 3860 | 10740 +d_a_npc_sq | 39.651108% | 3364 | 8484 +d_a_npc_zrc | 32.120762% | 10384 | 32328 +d_a_npc_kdk | 100.000000% | 504 | 504 +d_a_npc_grc | 32.984636% | 8072 | 24472 +d_a_npc_fguard | 42.375887% | 2868 | 6768 +d_a_npc_ashB | 32.906995% | 8336 | 25332 +d_a_npc_kn | 34.989558% | 48252 | 137904 +d_a_npc_chat | 56.591640% | 32384 | 57224 +d_a_npc_ash | 31.737680% | 9892 | 31168 +d_a_npc_tr | 57.199682% | 2876 | 5028 +d_a_npc_blue_ns | 31.763122% | 7552 | 23776 +d_a_npc_yamid | 36.895778% | 7236 | 19612 d_a_npc_zanb | 37.827310% | 6992 | 18484 d_a_npc_tkj | 37.419769% | 6996 | 18696 -d_a_npc_guard | 35.071398% | 6484 | 18488 -d_a_npc_rafrel | 29.654182% | 10736 | 36204 -d_a_npc_ks | 24.232793% | 27448 | 113268 -d_a_npc_du | 35.940410% | 3860 | 10740 -d_a_npc_tks | 27.123246% | 14384 | 53032 -d_a_npc_hoz | 40.521518% | 14048 | 34668 -d_a_npc_kasi_mich | 33.749584% | 8108 | 24024 -d_a_npc_soldierB | 35.587267% | 6484 | 18220 -d_a_npc_myna2 | 33.448276% | 8924 | 26680 -d_a_npc_bouS | 32.586831% | 9720 | 29828 -d_a_npc_zant | 38.262795% | 6220 | 16256 -d_a_npc_ash | 31.737680% | 9892 | 31168 -d_a_npc_seira2 | 39.278557% | 10192 | 25948 -d_a_npc_soldierA | 34.996894% | 6760 | 19316 -d_a_npc_jagar | 33.736985% | 11924 | 35344 -d_a_npc_grmc | 40.486016% | 7064 | 17448 -d_a_npc_seib | 42.233442% | 5688 | 13468 -d_a_npc_zrz | 31.977232% | 13708 | 42868 -d_a_npc_taro | 38.152632% | 28996 | 76000 -d_a_npc_clerkt | 36.386139% | 7056 | 19392 -d_a_npc_maro | 36.380572% | 21872 | 60120 -d_a_npc_clerkb | 36.128920% | 8340 | 23084 -d_a_npc_tr | 57.199682% | 2876 | 5028 -d_a_npc_clerka | 36.659479% | 7480 | 20404 -d_a_npc_fairy | 39.344262% | 19776 | 50264 -d_a_npc_gwolf | 35.693780% | 11936 | 33440 -d_a_npc_grd | 33.161068% | 7700 | 23220 -d_a_npc_zra | 24.569698% | 26608 | 108296 -d_a_npc_pachi_taro | 42.126544% | 15420 | 36604 -d_a_npc_pachi_maro | 38.260301% | 9360 | 24464 -d_a_npc_p2 | 100.000000% | 632 | 632 -d_a_npc_yamit | 36.693548% | 7280 | 19840 d_a_npc_shoe | 36.629002% | 6224 | 16992 -d_a_npc_cdn3 | 34.686491% | 14184 | 40892 -d_a_npc_grz | 31.010419% | 12620 | 40696 -d_a_npc_hanjo | 32.618297% | 14476 | 44380 -d_a_npc_sq | 39.651108% | 3364 | 8484 -d_a_npc_kdk | 100.000000% | 504 | 504 -d_a_npc_seic | 42.554557% | 5304 | 12464 +d_a_npc_hoz | 40.521518% | 14048 | 34668 +d_a_npc_pachi_maro | 38.260301% | 9360 | 24464 +d_a_npc_seid | 42.554557% | 5304 | 12464 +d_a_npc_pachi_besu | 42.797557% | 11492 | 26852 +d_a_npc_gwolf | 35.693780% | 11936 | 33440 +d_a_npc_grmc | 40.486016% | 7064 | 17448 +d_a_npc_fairy | 39.344262% | 19776 | 50264 +d_a_npc_gra | 30.387241% | 20120 | 66212 +d_a_npc_tks | 27.123246% | 14384 | 53032 +d_a_npc_ykm | 32.908526% | 20348 | 61832 +d_a_npc_clerka | 36.659479% | 7480 | 20404 +d_a_npc_coach | 28.195770% | 12052 | 42744 +d_a_npc_worm | 33.717579% | 2340 | 6940 +d_a_npc_grr | 33.284338% | 8152 | 24492 +d_a_npc_kolin | 35.754689% | 14412 | 40308 +d_a_npc_clerkt | 36.386139% | 7056 | 19392 +d_a_npc_grd | 33.161068% | 7700 | 23220 +d_a_npc_theB | 34.129794% | 9256 | 27120 +d_a_npc_toby | 35.857461% | 14168 | 39512 +d_a_npc_yamit | 36.693548% | 7280 | 19840 +d_a_npc_maro | 36.380572% | 21872 | 60120 +d_a_npc_ins | 30.852199% | 10412 | 33748 d_a_npc_seira | 38.908741% | 11324 | 29104 -d_a_npc_yamis | 36.878425% | 7268 | 19708 -d_a_npc_lf | 39.566396% | 2336 | 5904 -d_a_npc_fairy_seirei | 42.302956% | 5496 | 12992 +d_a_npc_post | 37.414676% | 10524 | 28128 d_a_npc_passer2 | 37.528815% | 3256 | 8676 -d_a_npc_prayer | 36.469470% | 6140 | 16836 -d_a_npc_kkri | 38.042823% | 10092 | 26528 -d_a_b_mgn | 26.103833% | 15064 | 57708 -d_a_b_gm | 30.376176% | 11628 | 38280 -d_a_b_yo_ice | 28.297953% | 5972 | 21104 -d_a_b_ds | 26.627364% | 26016 | 97704 -d_a_b_tn | 24.850960% | 21176 | 85212 +d_a_npc_seib | 42.233442% | 5688 | 13468 +d_a_npc_mk | 100.000000% | 632 | 632 +d_a_npc_lud | 38.010021% | 12744 | 33528 +d_a_npc_drainSol | 38.587732% | 4328 | 11216 +d_a_npc_ykw | 33.875000% | 18428 | 54400 +d_a_npc_shad | 27.050485% | 14960 | 55304 +d_a_npc_soldierA | 34.996894% | 6760 | 19316 +d_a_npc_zrz | 31.977232% | 13708 | 42868 +d_a_npc_tk | 22.166176% | 12656 | 57096 +d_a_npc_soldierB | 35.587267% | 6484 | 18220 +d_a_npc_pouya | 40.447529% | 11424 | 28244 +d_a_npc_guard | 35.071398% | 6484 | 18488 +d_a_npc_yamis | 36.878425% | 7268 | 19708 +d_a_npc_sola | 39.560155% | 6116 | 15460 +d_a_npc_ks | 24.232793% | 27448 | 113268 +d_a_npc_taro | 38.152632% | 28996 | 76000 +d_a_npc_seira2 | 39.278557% | 10192 | 25948 +d_a_npc_henna0 | 100.000000% | 504 | 504 +d_a_npc_passer | 35.701424% | 8724 | 24436 +d_a_npc_moi | 34.114704% | 14728 | 43172 +d_a_npc_impal | 32.590326% | 8948 | 27456 +d_a_npc_kyury | 39.351296% | 9172 | 23308 +d_a_npc_saru | 39.289415% | 10616 | 27020 +d_a_npc_shaman | 40.368229% | 10612 | 26288 +d_a_npc_cdn3 | 34.686491% | 14184 | 40892 +d_a_npc_gnd | 36.965399% | 6880 | 18612 +d_a_npc_myna2 | 33.448276% | 8924 | 26680 +d_a_npc_kasi_hana | 29.810206% | 10492 | 35196 +d_a_npc_clerkb | 36.128920% | 8340 | 23084 +d_a_npc_zelda | 37.603569% | 7080 | 18828 +d_a_npc_henna | 27.446434% | 11836 | 43124 +d_a_npc_seic | 42.554557% | 5304 | 12464 +d_a_e_ws | 29.700483% | 6148 | 20700 +d_a_e_ym | 20.062370% | 13896 | 69264 +d_a_e_po | 23.824220% | 14204 | 59620 +d_a_e_dt | 27.760631% | 12952 | 46656 +d_a_e_bi | 30.767563% | 5676 | 18448 +d_a_e_tk | 32.077326% | 3916 | 12208 +d_a_e_ai | 28.308171% | 5100 | 18016 +d_a_e_md | 34.917814% | 3144 | 9004 +d_a_e_tk2 | 33.419577% | 3100 | 9276 +d_a_e_fk | 32.965394% | 4420 | 13408 +d_a_e_db_leaf | 57.582938% | 972 | 1688 +d_a_e_ms | 28.208138% | 5768 | 20448 +d_a_e_cr_egg | 43.296089% | 1860 | 4296 +d_a_e_mb | 29.067542% | 4252 | 14628 +d_a_e_yc | 30.733107% | 4712 | 15332 +d_a_e_pz | 27.469575% | 13904 | 50616 +d_a_e_mm | 27.438612% | 4872 | 17756 +d_a_e_db | 26.006517% | 9896 | 38052 +d_a_e_rb | 30.197628% | 4584 | 15180 +d_a_e_s1 | 28.078818% | 9804 | 34916 +d_a_e_gm | 28.274812% | 10404 | 36796 +d_a_e_sh | 30.953709% | 6660 | 21516 +d_a_e_sw | 21.949266% | 9864 | 44940 +d_a_e_ph | 23.274129% | 5556 | 23872 +d_a_e_df | 28.031364% | 4004 | 14284 +d_a_e_hzelda | 30.097531% | 7900 | 26248 +d_a_e_hb | 27.624471% | 7568 | 27396 +d_a_e_sg | 29.168221% | 6256 | 21448 +d_a_e_kk | 27.161029% | 7516 | 27672 +d_a_e_yr | 27.591936% | 9964 | 36112 +d_a_e_bi_leaf | 50.446429% | 904 | 1792 +d_a_e_vt | 24.313702% | 16332 | 67172 +d_a_e_th_ball | 29.462631% | 5724 | 19428 +d_a_e_mm_mt | 28.672856% | 4200 | 14648 +d_a_e_bug | 29.207138% | 5172 | 17708 +d_a_e_sm2 | 30.097087% | 8184 | 27192 +d_a_e_ww | 23.418134% | 10052 | 42924 +d_a_e_dk | 29.244060% | 5416 | 18520 +d_a_e_dd | 26.687870% | 7384 | 27668 +d_a_e_ba | 28.140394% | 5484 | 19488 +d_a_e_yd | 27.879315% | 7688 | 27576 +d_a_e_kr | 27.652396% | 9508 | 34384 +d_a_e_hm | 27.299426% | 8180 | 29964 +d_a_e_zs | 31.358336% | 3980 | 12692 +d_a_e_rd | 24.121965% | 25632 | 106260 +d_a_e_fm | 24.588144% | 15164 | 61672 +d_a_e_hz | 23.990326% | 7936 | 33080 +d_a_e_is | 31.728595% | 3928 | 12380 +d_a_e_st_line | 60.459770% | 1052 | 1740 +d_a_e_pm | 21.505129% | 11236 | 52248 +d_a_e_oc | 22.586920% | 11148 | 49356 +d_a_e_rdy | 25.649401% | 19788 | 77148 +d_a_e_zh | 27.029865% | 9268 | 34288 +d_a_e_hp | 28.231798% | 6840 | 24228 +d_a_e_sb | 28.045789% | 5488 | 19568 +d_a_e_mf | 25.211695% | 12624 | 50072 +d_a_e_gi | 30.183330% | 6388 | 21164 +d_a_e_bs | 32.320835% | 5448 | 16856 +d_a_e_nest | 29.119005% | 5804 | 19932 +d_a_e_rdb | 27.331887% | 9576 | 35036 +d_a_e_yh | 26.277603% | 9996 | 38040 +d_a_e_kg | 31.431080% | 4296 | 13668 +d_a_e_gs | 44.729606% | 1952 | 4364 +d_a_e_fs | 31.823996% | 4976 | 15636 +d_a_e_wb | 23.058129% | 20008 | 86772 +d_a_e_fz | 30.508860% | 5372 | 17608 +d_a_e_mk_bo | 29.776477% | 4476 | 15032 +d_a_e_th | 29.463680% | 6944 | 23568 +d_a_e_ga | 43.014395% | 2032 | 4724 +d_a_e_st | 26.260013% | 12588 | 47936 +d_a_e_hb_leaf | 55.309735% | 1000 | 1808 +d_a_e_sf | 29.821481% | 8152 | 27336 +d_a_e_tt | 27.836991% | 7104 | 25520 +d_a_e_ge | 24.669967% | 7176 | 29088 +d_a_e_arrow | 35.306882% | 4556 | 12904 +d_a_e_yk | 29.001484% | 5472 | 18868 +d_a_e_nz | 32.041969% | 4764 | 14868 +d_a_e_fb | 31.127328% | 4948 | 15896 +d_a_e_warpappear | 28.864569% | 4220 | 14620 +d_a_e_ot | 32.497589% | 5392 | 16592 +d_a_e_zm | 28.267015% | 5200 | 18396 +d_a_e_sm | 24.418880% | 8236 | 33728 +d_a_e_ymb | 23.798093% | 14672 | 61652 +d_a_e_gob | 26.683396% | 10208 | 38256 +d_a_e_oct_bg | 30.217151% | 6568 | 21736 +d_a_e_yg | 28.386013% | 7436 | 26196 +d_a_e_tk_ball | 33.349562% | 2740 | 8216 +d_a_e_bee | 30.316629% | 4864 | 16044 +d_a_e_ym_tag | 61.764706% | 672 | 1088 +d_a_e_gb | 26.939571% | 8292 | 30780 +d_a_e_mk | 25.747187% | 11716 | 45504 +d_a_e_dn | 25.842869% | 13460 | 52084 +d_a_e_cr | 34.481521% | 3844 | 11148 +d_a_e_yd_leaf | 54.022989% | 1128 | 2088 +d_a_e_bu | 30.436573% | 5912 | 19424 +d_a_e_bg | 27.665091% | 7256 | 26228 d_a_b_bh | 24.452445% | 6520 | 26664 -d_a_b_yo | 25.613486% | 14404 | 56236 -d_a_b_zant_sima | 40.995025% | 1648 | 4020 -d_a_b_zant | 22.203940% | 19432 | 87516 -d_a_b_ob | 26.856326% | 15784 | 58772 -d_a_b_gnd | 25.489573% | 19264 | 75576 -d_a_b_dr | 27.536664% | 18476 | 67096 -d_a_b_oh | 32.611348% | 4276 | 13112 -d_a_b_bq | 28.033347% | 11164 | 39824 +d_a_b_yo_ice | 28.297953% | 5972 | 21104 d_a_b_dre | 27.912731% | 4964 | 17784 +d_a_b_yo | 25.613486% | 14404 | 56236 +d_a_b_gnd | 25.489573% | 19264 | 75576 +d_a_b_oh | 32.611348% | 4276 | 13112 +d_a_b_go | 44.671347% | 2800 | 6268 d_a_b_zant_magic | 42.453480% | 2464 | 5804 +d_a_b_tn | 24.850960% | 21176 | 85212 +d_a_b_mgn | 26.103833% | 15064 | 57708 +d_a_b_ob | 26.856326% | 15784 | 58772 d_a_b_gg | 22.324410% | 17380 | 77852 +d_a_b_ds | 26.627364% | 26016 | 97704 +d_a_b_zant | 22.203940% | 19432 | 87516 d_a_b_gos | 43.551689% | 3404 | 7816 +d_a_b_dr | 27.536664% | 18476 | 67096 d_a_b_zant_mobile | 36.326402% | 4612 | 12696 d_a_b_oh2 | 100.000000% | 5532 | 5532 -d_a_b_go | 44.671347% | 2800 | 6268 +d_a_b_bq | 28.033347% | 11164 | 39824 +d_a_b_zant_sima | 40.995025% | 1648 | 4020 +d_a_b_gm | 30.376176% | 11628 | 38280 Total | 33.041295% | 3799856 | 11500324 diff --git a/asm/dolphin/ai/ai/AIRegisterDMACallback.s b/asm/dolphin/ai/ai/AIRegisterDMACallback.s deleted file mode 100644 index 50799d1f853..00000000000 --- a/asm/dolphin/ai/ai/AIRegisterDMACallback.s +++ /dev/null @@ -1,18 +0,0 @@ -lbl_8034FC70: -/* 8034FC70 7C 08 02 A6 */ mflr r0 -/* 8034FC74 90 01 00 04 */ stw r0, 4(r1) -/* 8034FC78 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 8034FC7C 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034FC80 93 C1 00 10 */ stw r30, 0x10(r1) -/* 8034FC84 7C 7E 1B 78 */ mr r30, r3 -/* 8034FC88 83 ED 92 FC */ lwz r31, __AID_Callback(r13) -/* 8034FC8C 4B FE DA 69 */ bl OSDisableInterrupts -/* 8034FC90 93 CD 92 FC */ stw r30, __AID_Callback(r13) -/* 8034FC94 4B FE DA 89 */ bl OSRestoreInterrupts -/* 8034FC98 7F E3 FB 78 */ mr r3, r31 -/* 8034FC9C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034FCA0 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8034FCA4 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 8034FCA8 38 21 00 18 */ addi r1, r1, 0x18 -/* 8034FCAC 7C 08 03 A6 */ mtlr r0 -/* 8034FCB0 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSInterrupt/__OSDispatchInterrupt.s b/asm/dolphin/os/OSInterrupt/__OSDispatchInterrupt.s deleted file mode 100644 index 57410c3a73a..00000000000 --- a/asm/dolphin/os/OSInterrupt/__OSDispatchInterrupt.s +++ /dev/null @@ -1,245 +0,0 @@ -lbl_8033DBCC: -/* 8033DBCC 7C 08 02 A6 */ mflr r0 -/* 8033DBD0 90 01 00 04 */ stw r0, 4(r1) -/* 8033DBD4 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 8033DBD8 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8033DBDC 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8033DBE0 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 8033DBE4 7C 9E 23 78 */ mr r30, r4 -/* 8033DBE8 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC003000@ha */ -/* 8033DBEC 83 E3 30 00 */ lwz r31, 0x3000(r3) /* 0xCC003000@l */ -/* 8033DBF0 57 FF 04 1C */ rlwinm r31, r31, 0, 0x10, 0xe -/* 8033DBF4 28 1F 00 00 */ cmplwi r31, 0 -/* 8033DBF8 41 82 00 18 */ beq lbl_8033DC10 -/* 8033DBFC 38 63 30 00 */ addi r3, r3, 0x3000 -/* 8033DC00 80 03 00 04 */ lwz r0, 4(r3) -/* 8033DC04 7F E0 00 38 */ and r0, r31, r0 -/* 8033DC08 28 00 00 00 */ cmplwi r0, 0 -/* 8033DC0C 40 82 00 0C */ bne lbl_8033DC18 -lbl_8033DC10: -/* 8033DC10 7F C3 F3 78 */ mr r3, r30 -/* 8033DC14 4B FF E3 0D */ bl OSLoadContext -lbl_8033DC18: -/* 8033DC18 57 E0 06 30 */ rlwinm r0, r31, 0, 0x18, 0x18 -/* 8033DC1C 28 00 00 00 */ cmplwi r0, 0 -/* 8033DC20 38 00 00 00 */ li r0, 0 -/* 8033DC24 41 82 00 60 */ beq lbl_8033DC84 -/* 8033DC28 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC004000@ha */ -/* 8033DC2C 38 63 40 00 */ addi r3, r3, 0x4000 /* 0xCC004000@l */ -/* 8033DC30 A0 83 00 1E */ lhz r4, 0x1e(r3) -/* 8033DC34 54 83 07 FE */ clrlwi r3, r4, 0x1f -/* 8033DC38 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC3C 41 82 00 08 */ beq lbl_8033DC44 -/* 8033DC40 64 00 80 00 */ oris r0, r0, 0x8000 -lbl_8033DC44: -/* 8033DC44 54 83 07 BC */ rlwinm r3, r4, 0, 0x1e, 0x1e -/* 8033DC48 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC4C 41 82 00 08 */ beq lbl_8033DC54 -/* 8033DC50 64 00 40 00 */ oris r0, r0, 0x4000 -lbl_8033DC54: -/* 8033DC54 54 83 07 7A */ rlwinm r3, r4, 0, 0x1d, 0x1d -/* 8033DC58 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC5C 41 82 00 08 */ beq lbl_8033DC64 -/* 8033DC60 64 00 20 00 */ oris r0, r0, 0x2000 -lbl_8033DC64: -/* 8033DC64 54 83 07 38 */ rlwinm r3, r4, 0, 0x1c, 0x1c -/* 8033DC68 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC6C 41 82 00 08 */ beq lbl_8033DC74 -/* 8033DC70 64 00 10 00 */ oris r0, r0, 0x1000 -lbl_8033DC74: -/* 8033DC74 54 83 06 F6 */ rlwinm r3, r4, 0, 0x1b, 0x1b -/* 8033DC78 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC7C 41 82 00 08 */ beq lbl_8033DC84 -/* 8033DC80 64 00 08 00 */ oris r0, r0, 0x800 -lbl_8033DC84: -/* 8033DC84 57 E3 06 72 */ rlwinm r3, r31, 0, 0x19, 0x19 -/* 8033DC88 28 03 00 00 */ cmplwi r3, 0 -/* 8033DC8C 41 82 00 40 */ beq lbl_8033DCCC -/* 8033DC90 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC005000@ha */ -/* 8033DC94 38 63 50 00 */ addi r3, r3, 0x5000 /* 0xCC005000@l */ -/* 8033DC98 A0 83 00 0A */ lhz r4, 0xa(r3) -/* 8033DC9C 54 83 07 38 */ rlwinm r3, r4, 0, 0x1c, 0x1c -/* 8033DCA0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCA4 41 82 00 08 */ beq lbl_8033DCAC -/* 8033DCA8 64 00 04 00 */ oris r0, r0, 0x400 -lbl_8033DCAC: -/* 8033DCAC 54 83 06 B4 */ rlwinm r3, r4, 0, 0x1a, 0x1a -/* 8033DCB0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCB4 41 82 00 08 */ beq lbl_8033DCBC -/* 8033DCB8 64 00 02 00 */ oris r0, r0, 0x200 -lbl_8033DCBC: -/* 8033DCBC 54 83 06 30 */ rlwinm r3, r4, 0, 0x18, 0x18 -/* 8033DCC0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCC4 41 82 00 08 */ beq lbl_8033DCCC -/* 8033DCC8 64 00 01 00 */ oris r0, r0, 0x100 -lbl_8033DCCC: -/* 8033DCCC 57 E3 06 B4 */ rlwinm r3, r31, 0, 0x1a, 0x1a -/* 8033DCD0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCD4 41 82 00 1C */ beq lbl_8033DCF0 -/* 8033DCD8 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006C00@ha */ -/* 8033DCDC 80 63 6C 00 */ lwz r3, 0x6C00(r3) /* 0xCC006C00@l */ -/* 8033DCE0 54 63 07 38 */ rlwinm r3, r3, 0, 0x1c, 0x1c -/* 8033DCE4 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCE8 41 82 00 08 */ beq lbl_8033DCF0 -/* 8033DCEC 64 00 00 80 */ oris r0, r0, 0x80 -lbl_8033DCF0: -/* 8033DCF0 57 E3 06 F6 */ rlwinm r3, r31, 0, 0x1b, 0x1b -/* 8033DCF4 28 03 00 00 */ cmplwi r3, 0 -/* 8033DCF8 41 82 00 A4 */ beq lbl_8033DD9C -/* 8033DCFC 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006800@ha */ -/* 8033DD00 80 83 68 00 */ lwz r4, 0x6800(r3) /* 0xCC006800@l */ -/* 8033DD04 54 83 07 BC */ rlwinm r3, r4, 0, 0x1e, 0x1e -/* 8033DD08 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD0C 41 82 00 08 */ beq lbl_8033DD14 -/* 8033DD10 64 00 00 40 */ oris r0, r0, 0x40 -lbl_8033DD14: -/* 8033DD14 54 83 07 38 */ rlwinm r3, r4, 0, 0x1c, 0x1c -/* 8033DD18 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD1C 41 82 00 08 */ beq lbl_8033DD24 -/* 8033DD20 64 00 00 20 */ oris r0, r0, 0x20 -lbl_8033DD24: -/* 8033DD24 54 83 05 28 */ rlwinm r3, r4, 0, 0x14, 0x14 -/* 8033DD28 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD2C 41 82 00 08 */ beq lbl_8033DD34 -/* 8033DD30 64 00 00 10 */ oris r0, r0, 0x10 -lbl_8033DD34: -/* 8033DD34 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006800@ha */ -/* 8033DD38 38 63 68 00 */ addi r3, r3, 0x6800 /* 0xCC006800@l */ -/* 8033DD3C 80 83 00 14 */ lwz r4, 0x14(r3) -/* 8033DD40 54 83 07 BC */ rlwinm r3, r4, 0, 0x1e, 0x1e -/* 8033DD44 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD48 41 82 00 08 */ beq lbl_8033DD50 -/* 8033DD4C 64 00 00 08 */ oris r0, r0, 8 -lbl_8033DD50: -/* 8033DD50 54 83 07 38 */ rlwinm r3, r4, 0, 0x1c, 0x1c -/* 8033DD54 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD58 41 82 00 08 */ beq lbl_8033DD60 -/* 8033DD5C 64 00 00 04 */ oris r0, r0, 4 -lbl_8033DD60: -/* 8033DD60 54 83 05 28 */ rlwinm r3, r4, 0, 0x14, 0x14 -/* 8033DD64 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD68 41 82 00 08 */ beq lbl_8033DD70 -/* 8033DD6C 64 00 00 02 */ oris r0, r0, 2 -lbl_8033DD70: -/* 8033DD70 3C 60 CC 00 */ lis r3, 0xCC00 /* 0xCC006800@ha */ -/* 8033DD74 38 63 68 00 */ addi r3, r3, 0x6800 /* 0xCC006800@l */ -/* 8033DD78 80 83 00 28 */ lwz r4, 0x28(r3) -/* 8033DD7C 54 83 07 BC */ rlwinm r3, r4, 0, 0x1e, 0x1e -/* 8033DD80 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD84 41 82 00 08 */ beq lbl_8033DD8C -/* 8033DD88 64 00 00 01 */ oris r0, r0, 1 -lbl_8033DD8C: -/* 8033DD8C 54 83 07 38 */ rlwinm r3, r4, 0, 0x1c, 0x1c -/* 8033DD90 28 03 00 00 */ cmplwi r3, 0 -/* 8033DD94 41 82 00 08 */ beq lbl_8033DD9C -/* 8033DD98 60 00 80 00 */ ori r0, r0, 0x8000 -lbl_8033DD9C: -/* 8033DD9C 57 E3 04 A4 */ rlwinm r3, r31, 0, 0x12, 0x12 -/* 8033DDA0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDA4 41 82 00 08 */ beq lbl_8033DDAC -/* 8033DDA8 60 00 00 20 */ ori r0, r0, 0x20 -lbl_8033DDAC: -/* 8033DDAC 57 E3 04 E6 */ rlwinm r3, r31, 0, 0x13, 0x13 -/* 8033DDB0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDB4 41 82 00 08 */ beq lbl_8033DDBC -/* 8033DDB8 60 00 00 40 */ ori r0, r0, 0x40 -lbl_8033DDBC: -/* 8033DDBC 57 E3 05 6A */ rlwinm r3, r31, 0, 0x15, 0x15 -/* 8033DDC0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDC4 41 82 00 08 */ beq lbl_8033DDCC -/* 8033DDC8 60 00 10 00 */ ori r0, r0, 0x1000 -lbl_8033DDCC: -/* 8033DDCC 57 E3 05 AC */ rlwinm r3, r31, 0, 0x16, 0x16 -/* 8033DDD0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDD4 41 82 00 08 */ beq lbl_8033DDDC -/* 8033DDD8 60 00 20 00 */ ori r0, r0, 0x2000 -lbl_8033DDDC: -/* 8033DDDC 57 E3 05 EE */ rlwinm r3, r31, 0, 0x17, 0x17 -/* 8033DDE0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDE4 41 82 00 08 */ beq lbl_8033DDEC -/* 8033DDE8 60 00 00 80 */ ori r0, r0, 0x80 -lbl_8033DDEC: -/* 8033DDEC 57 E3 07 38 */ rlwinm r3, r31, 0, 0x1c, 0x1c -/* 8033DDF0 28 03 00 00 */ cmplwi r3, 0 -/* 8033DDF4 41 82 00 08 */ beq lbl_8033DDFC -/* 8033DDF8 60 00 08 00 */ ori r0, r0, 0x800 -lbl_8033DDFC: -/* 8033DDFC 57 E3 07 7A */ rlwinm r3, r31, 0, 0x1d, 0x1d -/* 8033DE00 28 03 00 00 */ cmplwi r3, 0 -/* 8033DE04 41 82 00 08 */ beq lbl_8033DE0C -/* 8033DE08 60 00 04 00 */ ori r0, r0, 0x400 -lbl_8033DE0C: -/* 8033DE0C 57 E3 07 BC */ rlwinm r3, r31, 0, 0x1e, 0x1e -/* 8033DE10 28 03 00 00 */ cmplwi r3, 0 -/* 8033DE14 41 82 00 08 */ beq lbl_8033DE1C -/* 8033DE18 60 00 02 00 */ ori r0, r0, 0x200 -lbl_8033DE1C: -/* 8033DE1C 57 E3 05 28 */ rlwinm r3, r31, 0, 0x14, 0x14 -/* 8033DE20 28 03 00 00 */ cmplwi r3, 0 -/* 8033DE24 41 82 00 08 */ beq lbl_8033DE2C -/* 8033DE28 60 00 40 00 */ ori r0, r0, 0x4000 -lbl_8033DE2C: -/* 8033DE2C 57 E3 07 FE */ clrlwi r3, r31, 0x1f -/* 8033DE30 28 03 00 00 */ cmplwi r3, 0 -/* 8033DE34 41 82 00 08 */ beq lbl_8033DE3C -/* 8033DE38 60 00 01 00 */ ori r0, r0, 0x100 -lbl_8033DE3C: -/* 8033DE3C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000C4@ha */ -/* 8033DE40 80 83 00 C4 */ lwz r4, 0x00C4(r3) /* 0x800000C4@l */ -/* 8033DE44 80 63 00 C8 */ lwz r3, 0xc8(r3) -/* 8033DE48 7C 83 1B 78 */ or r3, r4, r3 -/* 8033DE4C 7C 04 18 78 */ andc r4, r0, r3 -/* 8033DE50 28 04 00 00 */ cmplwi r4, 0 -/* 8033DE54 41 82 00 98 */ beq lbl_8033DEEC -/* 8033DE58 3C 60 80 3D */ lis r3, InterruptPrioTable@ha /* 0x803D0758@ha */ -/* 8033DE5C 38 03 07 58 */ addi r0, r3, InterruptPrioTable@l /* 0x803D0758@l */ -/* 8033DE60 7C 03 03 78 */ mr r3, r0 -/* 8033DE64 48 00 00 04 */ b lbl_8033DE68 -lbl_8033DE68: -/* 8033DE68 48 00 00 04 */ b lbl_8033DE6C -lbl_8033DE6C: -/* 8033DE6C 80 03 00 00 */ lwz r0, 0(r3) -/* 8033DE70 7C 80 00 38 */ and r0, r4, r0 -/* 8033DE74 28 00 00 00 */ cmplwi r0, 0 -/* 8033DE78 41 82 00 10 */ beq lbl_8033DE88 -/* 8033DE7C 7C 00 00 34 */ cntlzw r0, r0 -/* 8033DE80 7C 1D 07 34 */ extsh r29, r0 -/* 8033DE84 48 00 00 0C */ b lbl_8033DE90 -lbl_8033DE88: -/* 8033DE88 38 63 00 04 */ addi r3, r3, 4 -/* 8033DE8C 4B FF FF E0 */ b lbl_8033DE6C -lbl_8033DE90: -/* 8033DE90 80 6D 90 F0 */ lwz r3, InterruptHandlerTable(r13) -/* 8033DE94 57 A0 10 3A */ slwi r0, r29, 2 -/* 8033DE98 7F E3 00 2E */ lwzx r31, r3, r0 -/* 8033DE9C 28 1F 00 00 */ cmplwi r31, 0 -/* 8033DEA0 41 82 00 4C */ beq lbl_8033DEEC -/* 8033DEA4 2C 1D 00 04 */ cmpwi r29, 4 -/* 8033DEA8 40 81 00 1C */ ble lbl_8033DEC4 -/* 8033DEAC B3 AD 90 F8 */ sth r29, __OSLastInterrupt(r13) -/* 8033DEB0 48 00 48 4D */ bl OSGetTime -/* 8033DEB4 90 8D 91 04 */ stw r4, __OSLastInterruptTime+0x4(r13) -/* 8033DEB8 90 6D 91 00 */ stw r3, __OSLastInterruptTime(r13) -/* 8033DEBC 80 1E 01 98 */ lwz r0, 0x198(r30) -/* 8033DEC0 90 0D 90 F4 */ stw r0, __OSLastInterruptSrr0(r13) -lbl_8033DEC4: -/* 8033DEC4 48 00 2E 01 */ bl OSDisableScheduler -/* 8033DEC8 7F A3 EB 78 */ mr r3, r29 -/* 8033DECC 7F C4 F3 78 */ mr r4, r30 -/* 8033DED0 7F EC FB 78 */ mr r12, r31 -/* 8033DED4 7D 88 03 A6 */ mtlr r12 -/* 8033DED8 4E 80 00 21 */ blrl -/* 8033DEDC 48 00 2E 29 */ bl OSEnableScheduler -/* 8033DEE0 48 00 33 41 */ bl __OSReschedule -/* 8033DEE4 7F C3 F3 78 */ mr r3, r30 -/* 8033DEE8 4B FF E0 39 */ bl OSLoadContext -lbl_8033DEEC: -/* 8033DEEC 7F C3 F3 78 */ mr r3, r30 -/* 8033DEF0 4B FF E0 31 */ bl OSLoadContext -/* 8033DEF4 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 8033DEF8 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8033DEFC 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8033DF00 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 8033DF04 38 21 00 28 */ addi r1, r1, 0x28 -/* 8033DF08 7C 08 03 A6 */ mtlr r0 -/* 8033DF0C 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/CheckThreadQueue.s b/asm/dolphin/os/OSThread/CheckThreadQueue.s deleted file mode 100644 index 99b0e15bf8b..00000000000 --- a/asm/dolphin/os/OSThread/CheckThreadQueue.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80341E64: -/* 80341E64 80 83 00 00 */ lwz r4, 0(r3) -/* 80341E68 28 04 00 00 */ cmplwi r4, 0 -/* 80341E6C 41 82 00 18 */ beq lbl_80341E84 -/* 80341E70 80 04 02 E4 */ lwz r0, 0x2e4(r4) -/* 80341E74 28 00 00 00 */ cmplwi r0, 0 -/* 80341E78 41 82 00 0C */ beq lbl_80341E84 -/* 80341E7C 38 60 00 00 */ li r3, 0 -/* 80341E80 4E 80 00 20 */ blr -lbl_80341E84: -/* 80341E84 80 63 00 04 */ lwz r3, 4(r3) -/* 80341E88 28 03 00 00 */ cmplwi r3, 0 -/* 80341E8C 41 82 00 18 */ beq lbl_80341EA4 -/* 80341E90 80 03 02 E0 */ lwz r0, 0x2e0(r3) -/* 80341E94 28 00 00 00 */ cmplwi r0, 0 -/* 80341E98 41 82 00 0C */ beq lbl_80341EA4 -/* 80341E9C 38 60 00 00 */ li r3, 0 -/* 80341EA0 4E 80 00 20 */ blr -lbl_80341EA4: -/* 80341EA4 7C 85 23 78 */ mr r5, r4 -/* 80341EA8 48 00 00 48 */ b lbl_80341EF0 -lbl_80341EAC: -/* 80341EAC 80 65 02 E0 */ lwz r3, 0x2e0(r5) -/* 80341EB0 28 03 00 00 */ cmplwi r3, 0 -/* 80341EB4 41 82 00 18 */ beq lbl_80341ECC -/* 80341EB8 80 03 02 E4 */ lwz r0, 0x2e4(r3) -/* 80341EBC 7C 05 00 40 */ cmplw r5, r0 -/* 80341EC0 41 82 00 0C */ beq lbl_80341ECC -/* 80341EC4 38 60 00 00 */ li r3, 0 -/* 80341EC8 4E 80 00 20 */ blr -lbl_80341ECC: -/* 80341ECC 80 85 02 E4 */ lwz r4, 0x2e4(r5) -/* 80341ED0 28 04 00 00 */ cmplwi r4, 0 -/* 80341ED4 41 82 00 18 */ beq lbl_80341EEC -/* 80341ED8 80 04 02 E0 */ lwz r0, 0x2e0(r4) -/* 80341EDC 7C 05 00 40 */ cmplw r5, r0 -/* 80341EE0 41 82 00 0C */ beq lbl_80341EEC -/* 80341EE4 38 60 00 00 */ li r3, 0 -/* 80341EE8 4E 80 00 20 */ blr -lbl_80341EEC: -/* 80341EEC 7C 65 1B 78 */ mr r5, r3 -lbl_80341EF0: -/* 80341EF0 28 05 00 00 */ cmplwi r5, 0 -/* 80341EF4 40 82 FF B8 */ bne lbl_80341EAC -/* 80341EF8 38 60 00 01 */ li r3, 1 -/* 80341EFC 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSCancelThread.s b/asm/dolphin/os/OSThread/OSCancelThread.s deleted file mode 100644 index a5f18fe32cf..00000000000 --- a/asm/dolphin/os/OSThread/OSCancelThread.s +++ /dev/null @@ -1,131 +0,0 @@ -lbl_80341558: -/* 80341558 7C 08 02 A6 */ mflr r0 -/* 8034155C 90 01 00 04 */ stw r0, 4(r1) -/* 80341560 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80341564 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80341568 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8034156C 7C 7E 1B 78 */ mr r30, r3 -/* 80341570 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80341574 4B FF C1 81 */ bl OSDisableInterrupts -/* 80341578 A0 1E 02 C8 */ lhz r0, 0x2c8(r30) -/* 8034157C 3B E3 00 00 */ addi r31, r3, 0 -/* 80341580 2C 00 00 03 */ cmpwi r0, 3 -/* 80341584 41 82 00 DC */ beq lbl_80341660 -/* 80341588 40 80 00 14 */ bge lbl_8034159C -/* 8034158C 2C 00 00 01 */ cmpwi r0, 1 -/* 80341590 41 82 00 18 */ beq lbl_803415A8 -/* 80341594 40 80 00 2C */ bge lbl_803415C0 -/* 80341598 48 00 00 C8 */ b lbl_80341660 -lbl_8034159C: -/* 8034159C 2C 00 00 05 */ cmpwi r0, 5 -/* 803415A0 40 80 00 C0 */ bge lbl_80341660 -/* 803415A4 48 00 00 28 */ b lbl_803415CC -lbl_803415A8: -/* 803415A8 80 1E 02 CC */ lwz r0, 0x2cc(r30) -/* 803415AC 2C 00 00 00 */ cmpwi r0, 0 -/* 803415B0 41 81 00 BC */ bgt lbl_8034166C -/* 803415B4 7F C3 F3 78 */ mr r3, r30 -/* 803415B8 4B FF F7 8D */ bl UnsetRun -/* 803415BC 48 00 00 B0 */ b lbl_8034166C -lbl_803415C0: -/* 803415C0 38 00 00 01 */ li r0, 1 -/* 803415C4 90 0D 91 44 */ stw r0, RunQueueHint(r13) -/* 803415C8 48 00 00 A4 */ b lbl_8034166C -lbl_803415CC: -/* 803415CC 80 9E 02 E0 */ lwz r4, 0x2e0(r30) -/* 803415D0 80 BE 02 E4 */ lwz r5, 0x2e4(r30) -/* 803415D4 28 04 00 00 */ cmplwi r4, 0 -/* 803415D8 40 82 00 10 */ bne lbl_803415E8 -/* 803415DC 80 7E 02 DC */ lwz r3, 0x2dc(r30) -/* 803415E0 90 A3 00 04 */ stw r5, 4(r3) -/* 803415E4 48 00 00 08 */ b lbl_803415EC -lbl_803415E8: -/* 803415E8 90 A4 02 E4 */ stw r5, 0x2e4(r4) -lbl_803415EC: -/* 803415EC 28 05 00 00 */ cmplwi r5, 0 -/* 803415F0 40 82 00 10 */ bne lbl_80341600 -/* 803415F4 80 7E 02 DC */ lwz r3, 0x2dc(r30) -/* 803415F8 90 83 00 00 */ stw r4, 0(r3) -/* 803415FC 48 00 00 08 */ b lbl_80341604 -lbl_80341600: -/* 80341600 90 85 02 E0 */ stw r4, 0x2e0(r5) -lbl_80341604: -/* 80341604 38 00 00 00 */ li r0, 0 -/* 80341608 90 1E 02 DC */ stw r0, 0x2dc(r30) -/* 8034160C 80 1E 02 CC */ lwz r0, 0x2cc(r30) -/* 80341610 2C 00 00 00 */ cmpwi r0, 0 -/* 80341614 41 81 00 58 */ bgt lbl_8034166C -/* 80341618 80 7E 02 F0 */ lwz r3, 0x2f0(r30) -/* 8034161C 28 03 00 00 */ cmplwi r3, 0 -/* 80341620 41 82 00 4C */ beq lbl_8034166C -/* 80341624 83 A3 00 08 */ lwz r29, 8(r3) -lbl_80341628: -/* 80341628 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 8034162C 2C 00 00 00 */ cmpwi r0, 0 -/* 80341630 41 81 00 3C */ bgt lbl_8034166C -/* 80341634 7F A3 EB 78 */ mr r3, r29 -/* 80341638 4B FF F7 75 */ bl __OSGetEffectivePriority -/* 8034163C 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80341640 38 83 00 00 */ addi r4, r3, 0 -/* 80341644 7C 00 20 00 */ cmpw r0, r4 -/* 80341648 41 82 00 24 */ beq lbl_8034166C -/* 8034164C 7F A3 EB 78 */ mr r3, r29 -/* 80341650 4B FF F7 99 */ bl SetEffectivePriority -/* 80341654 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80341658 40 82 FF D0 */ bne lbl_80341628 -/* 8034165C 48 00 00 10 */ b lbl_8034166C -lbl_80341660: -/* 80341660 7F E3 FB 78 */ mr r3, r31 -/* 80341664 4B FF C0 B9 */ bl OSRestoreInterrupts -/* 80341668 48 00 00 90 */ b lbl_803416F8 -lbl_8034166C: -/* 8034166C 7F C3 F3 78 */ mr r3, r30 -/* 80341670 4B FF A9 91 */ bl OSClearContext -/* 80341674 A0 1E 02 CA */ lhz r0, 0x2ca(r30) -/* 80341678 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 8034167C 41 82 00 48 */ beq lbl_803416C4 -/* 80341680 80 9E 02 FC */ lwz r4, 0x2fc(r30) -/* 80341684 80 BE 03 00 */ lwz r5, 0x300(r30) -/* 80341688 28 04 00 00 */ cmplwi r4, 0 -/* 8034168C 40 82 00 10 */ bne lbl_8034169C -/* 80341690 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000E0@ha */ -/* 80341694 90 A3 00 E0 */ stw r5, 0x00E0(r3) /* 0x800000E0@l */ -/* 80341698 48 00 00 08 */ b lbl_803416A0 -lbl_8034169C: -/* 8034169C 90 A4 03 00 */ stw r5, 0x300(r4) -lbl_803416A0: -/* 803416A0 28 05 00 00 */ cmplwi r5, 0 -/* 803416A4 40 82 00 10 */ bne lbl_803416B4 -/* 803416A8 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 803416AC 90 83 00 DC */ stw r4, 0x00DC(r3) /* 0x800000DC@l */ -/* 803416B0 48 00 00 08 */ b lbl_803416B8 -lbl_803416B4: -/* 803416B4 90 85 02 FC */ stw r4, 0x2fc(r5) -lbl_803416B8: -/* 803416B8 38 00 00 00 */ li r0, 0 -/* 803416BC B0 1E 02 C8 */ sth r0, 0x2c8(r30) -/* 803416C0 48 00 00 0C */ b lbl_803416CC -lbl_803416C4: -/* 803416C4 38 00 00 08 */ li r0, 8 -/* 803416C8 B0 1E 02 C8 */ sth r0, 0x2c8(r30) -lbl_803416CC: -/* 803416CC 7F C3 F3 78 */ mr r3, r30 -/* 803416D0 4B FF DB 15 */ bl __OSUnlockAllMutex -/* 803416D4 38 7E 02 E8 */ addi r3, r30, 0x2e8 -/* 803416D8 48 00 05 C1 */ bl OSWakeupThread -/* 803416DC 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 803416E0 2C 00 00 00 */ cmpwi r0, 0 -/* 803416E4 41 82 00 0C */ beq lbl_803416F0 -/* 803416E8 38 60 00 00 */ li r3, 0 -/* 803416EC 4B FF F9 0D */ bl SelectThread -lbl_803416F0: -/* 803416F0 7F E3 FB 78 */ mr r3, r31 -/* 803416F4 4B FF C0 29 */ bl OSRestoreInterrupts -lbl_803416F8: -/* 803416F8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 803416FC 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80341700 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80341704 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80341708 38 21 00 20 */ addi r1, r1, 0x20 -/* 8034170C 7C 08 03 A6 */ mtlr r0 -/* 80341710 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSCheckActiveThreads.s b/asm/dolphin/os/OSThread/OSCheckActiveThreads.s deleted file mode 100644 index 6b4b499a344..00000000000 --- a/asm/dolphin/os/OSThread/OSCheckActiveThreads.s +++ /dev/null @@ -1,521 +0,0 @@ -lbl_80341F00: -/* 80341F00 7C 08 02 A6 */ mflr r0 -/* 80341F04 3C 80 80 3D */ lis r4, lit_831@ha /* 0x803D0838@ha */ -/* 80341F08 90 01 00 04 */ stw r0, 4(r1) -/* 80341F0C 3C 60 80 45 */ lis r3, RunQueue@ha /* 0x8044BB78@ha */ -/* 80341F10 94 21 FF C8 */ stwu r1, -0x38(r1) -/* 80341F14 BF 41 00 20 */ stmw r26, 0x20(r1) -/* 80341F18 3B C4 08 38 */ addi r30, r4, lit_831@l /* 0x803D0838@l */ -/* 80341F1C 3B E3 BB 78 */ addi r31, r3, RunQueue@l /* 0x8044BB78@l */ -/* 80341F20 3B 80 00 00 */ li r28, 0 -/* 80341F24 4B FF B7 D1 */ bl OSDisableInterrupts -/* 80341F28 3B 63 00 00 */ addi r27, r3, 0 -/* 80341F2C 3B BF 00 00 */ addi r29, r31, 0 -/* 80341F30 3B 40 00 00 */ li r26, 0 -lbl_80341F34: -/* 80341F34 20 1A 00 1F */ subfic r0, r26, 0x1f -/* 80341F38 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 80341F3C 38 60 00 01 */ li r3, 1 -/* 80341F40 7C 60 00 30 */ slw r0, r3, r0 -/* 80341F44 7C 80 00 39 */ and. r0, r4, r0 -/* 80341F48 41 82 00 44 */ beq lbl_80341F8C -/* 80341F4C 80 1D 00 00 */ lwz r0, 0(r29) -/* 80341F50 28 00 00 00 */ cmplwi r0, 0 -/* 80341F54 41 82 00 10 */ beq lbl_80341F64 -/* 80341F58 80 1D 00 04 */ lwz r0, 4(r29) -/* 80341F5C 28 00 00 00 */ cmplwi r0, 0 -/* 80341F60 40 82 00 68 */ bne lbl_80341FC8 -lbl_80341F64: -/* 80341F64 38 7E 00 00 */ addi r3, r30, 0 -/* 80341F68 4C C6 31 82 */ crclr 6 -/* 80341F6C 38 80 05 E0 */ li r4, 0x5e0 -/* 80341F70 4B CC 4B 4D */ bl OSReport -/* 80341F74 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80341F78 4C C6 31 82 */ crclr 6 -/* 80341F7C 38 80 05 E0 */ li r4, 0x5e0 -/* 80341F80 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80341F84 4B CC 4E F9 */ bl OSPanic -/* 80341F88 48 00 00 40 */ b lbl_80341FC8 -lbl_80341F8C: -/* 80341F8C 80 1D 00 00 */ lwz r0, 0(r29) -/* 80341F90 28 00 00 00 */ cmplwi r0, 0 -/* 80341F94 40 82 00 10 */ bne lbl_80341FA4 -/* 80341F98 80 1D 00 04 */ lwz r0, 4(r29) -/* 80341F9C 28 00 00 00 */ cmplwi r0, 0 -/* 80341FA0 41 82 00 28 */ beq lbl_80341FC8 -lbl_80341FA4: -/* 80341FA4 38 7E 00 6C */ addi r3, r30, 0x6c -/* 80341FA8 4C C6 31 82 */ crclr 6 -/* 80341FAC 38 80 05 E5 */ li r4, 0x5e5 -/* 80341FB0 4B CC 4B 0D */ bl OSReport -/* 80341FB4 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80341FB8 4C C6 31 82 */ crclr 6 -/* 80341FBC 38 80 05 E5 */ li r4, 0x5e5 -/* 80341FC0 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80341FC4 4B CC 4E B9 */ bl OSPanic -lbl_80341FC8: -/* 80341FC8 7F A3 EB 78 */ mr r3, r29 -/* 80341FCC 4B FF FE 99 */ bl CheckThreadQueue -/* 80341FD0 2C 03 00 00 */ cmpwi r3, 0 -/* 80341FD4 40 82 00 28 */ bne lbl_80341FFC -/* 80341FD8 38 7E 00 CC */ addi r3, r30, 0xcc -/* 80341FDC 4C C6 31 82 */ crclr 6 -/* 80341FE0 38 80 05 E7 */ li r4, 0x5e7 -/* 80341FE4 4B CC 4A D9 */ bl OSReport -/* 80341FE8 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80341FEC 4C C6 31 82 */ crclr 6 -/* 80341FF0 38 80 05 E7 */ li r4, 0x5e7 -/* 80341FF4 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80341FF8 4B CC 4E 85 */ bl OSPanic -lbl_80341FFC: -/* 80341FFC 3B 5A 00 01 */ addi r26, r26, 1 -/* 80342000 2C 1A 00 1F */ cmpwi r26, 0x1f -/* 80342004 3B BD 00 08 */ addi r29, r29, 8 -/* 80342008 40 81 FF 2C */ ble lbl_80341F34 -/* 8034200C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 80342010 80 63 00 DC */ lwz r3, 0x00DC(r3) /* 0x800000DC@l */ -/* 80342014 28 03 00 00 */ cmplwi r3, 0 -/* 80342018 41 82 00 34 */ beq lbl_8034204C -/* 8034201C 80 03 03 00 */ lwz r0, 0x300(r3) -/* 80342020 28 00 00 00 */ cmplwi r0, 0 -/* 80342024 41 82 00 28 */ beq lbl_8034204C -/* 80342028 38 7E 01 14 */ addi r3, r30, 0x114 -/* 8034202C 4C C6 31 82 */ crclr 6 -/* 80342030 38 80 05 EC */ li r4, 0x5ec -/* 80342034 4B CC 4A 89 */ bl OSReport -/* 80342038 38 7E 00 60 */ addi r3, r30, 0x60 -/* 8034203C 4C C6 31 82 */ crclr 6 -/* 80342040 38 80 05 EC */ li r4, 0x5ec -/* 80342044 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342048 4B CC 4E 35 */ bl OSPanic -lbl_8034204C: -/* 8034204C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 80342050 38 63 00 DC */ addi r3, r3, 0x00DC /* 0x800000DC@l */ -/* 80342054 80 63 00 04 */ lwz r3, 4(r3) -/* 80342058 28 03 00 00 */ cmplwi r3, 0 -/* 8034205C 41 82 00 34 */ beq lbl_80342090 -/* 80342060 80 03 02 FC */ lwz r0, 0x2fc(r3) -/* 80342064 28 00 00 00 */ cmplwi r0, 0 -/* 80342068 41 82 00 28 */ beq lbl_80342090 -/* 8034206C 38 7E 01 94 */ addi r3, r30, 0x194 -/* 80342070 4C C6 31 82 */ crclr 6 -/* 80342074 38 80 05 EE */ li r4, 0x5ee -/* 80342078 4B CC 4A 45 */ bl OSReport -/* 8034207C 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342080 4C C6 31 82 */ crclr 6 -/* 80342084 38 80 05 EE */ li r4, 0x5ee -/* 80342088 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 8034208C 4B CC 4D F1 */ bl OSPanic -lbl_80342090: -/* 80342090 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 80342094 83 A3 00 DC */ lwz r29, 0x00DC(r3) /* 0x800000DC@l */ -/* 80342098 48 00 05 90 */ b lbl_80342628 -lbl_8034209C: -/* 8034209C 80 7D 02 FC */ lwz r3, 0x2fc(r29) -/* 803420A0 3B 9C 00 01 */ addi r28, r28, 1 -/* 803420A4 28 03 00 00 */ cmplwi r3, 0 -/* 803420A8 41 82 00 34 */ beq lbl_803420DC -/* 803420AC 80 03 03 00 */ lwz r0, 0x300(r3) -/* 803420B0 7C 1D 00 40 */ cmplw r29, r0 -/* 803420B4 41 82 00 28 */ beq lbl_803420DC -/* 803420B8 38 7E 02 14 */ addi r3, r30, 0x214 -/* 803420BC 4C C6 31 82 */ crclr 6 -/* 803420C0 38 80 05 F6 */ li r4, 0x5f6 -/* 803420C4 4B CC 49 F9 */ bl OSReport -/* 803420C8 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803420CC 4C C6 31 82 */ crclr 6 -/* 803420D0 38 80 05 F6 */ li r4, 0x5f6 -/* 803420D4 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803420D8 4B CC 4D A5 */ bl OSPanic -lbl_803420DC: -/* 803420DC 80 7D 03 00 */ lwz r3, 0x300(r29) -/* 803420E0 28 03 00 00 */ cmplwi r3, 0 -/* 803420E4 41 82 00 34 */ beq lbl_80342118 -/* 803420E8 80 03 02 FC */ lwz r0, 0x2fc(r3) -/* 803420EC 7C 1D 00 40 */ cmplw r29, r0 -/* 803420F0 41 82 00 28 */ beq lbl_80342118 -/* 803420F4 38 7E 02 90 */ addi r3, r30, 0x290 -/* 803420F8 4C C6 31 82 */ crclr 6 -/* 803420FC 38 80 05 F8 */ li r4, 0x5f8 -/* 80342100 4B CC 49 BD */ bl OSReport -/* 80342104 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342108 4C C6 31 82 */ crclr 6 -/* 8034210C 38 80 05 F8 */ li r4, 0x5f8 -/* 80342110 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342114 4B CC 4D 69 */ bl OSPanic -lbl_80342118: -/* 80342118 80 7D 03 08 */ lwz r3, 0x308(r29) -/* 8034211C 80 63 00 00 */ lwz r3, 0(r3) -/* 80342120 3C 03 21 53 */ addis r0, r3, 0x2153 -/* 80342124 28 00 BA BE */ cmplwi r0, 0xbabe -/* 80342128 41 82 00 28 */ beq lbl_80342150 -/* 8034212C 38 7E 03 0C */ addi r3, r30, 0x30c -/* 80342130 4C C6 31 82 */ crclr 6 -/* 80342134 38 80 05 FB */ li r4, 0x5fb -/* 80342138 4B CC 49 85 */ bl OSReport -/* 8034213C 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342140 4C C6 31 82 */ crclr 6 -/* 80342144 38 80 05 FB */ li r4, 0x5fb -/* 80342148 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 8034214C 4B CC 4D 31 */ bl OSPanic -lbl_80342150: -/* 80342150 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80342154 2C 00 00 00 */ cmpwi r0, 0 -/* 80342158 41 80 00 0C */ blt lbl_80342164 -/* 8034215C 2C 00 00 20 */ cmpwi r0, 0x20 -/* 80342160 40 81 00 28 */ ble lbl_80342188 -lbl_80342164: -/* 80342164 38 7E 03 60 */ addi r3, r30, 0x360 -/* 80342168 4C C6 31 82 */ crclr 6 -/* 8034216C 38 80 05 FE */ li r4, 0x5fe -/* 80342170 4B CC 49 4D */ bl OSReport -/* 80342174 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342178 4C C6 31 82 */ crclr 6 -/* 8034217C 38 80 05 FE */ li r4, 0x5fe -/* 80342180 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342184 4B CC 4C F9 */ bl OSPanic -lbl_80342188: -/* 80342188 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 8034218C 2C 00 00 00 */ cmpwi r0, 0 -/* 80342190 40 80 00 28 */ bge lbl_803421B8 -/* 80342194 38 7E 03 D4 */ addi r3, r30, 0x3d4 -/* 80342198 4C C6 31 82 */ crclr 6 -/* 8034219C 38 80 05 FF */ li r4, 0x5ff -/* 803421A0 4B CC 49 1D */ bl OSReport -/* 803421A4 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803421A8 4C C6 31 82 */ crclr 6 -/* 803421AC 38 80 05 FF */ li r4, 0x5ff -/* 803421B0 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803421B4 4B CC 4C C9 */ bl OSPanic -lbl_803421B8: -/* 803421B8 38 7D 02 E8 */ addi r3, r29, 0x2e8 -/* 803421BC 4B FF FC A9 */ bl CheckThreadQueue -/* 803421C0 2C 03 00 00 */ cmpwi r3, 0 -/* 803421C4 40 82 00 28 */ bne lbl_803421EC -/* 803421C8 38 7E 04 10 */ addi r3, r30, 0x410 -/* 803421CC 4C C6 31 82 */ crclr 6 -/* 803421D0 38 80 06 00 */ li r4, 0x600 -/* 803421D4 4B CC 48 E9 */ bl OSReport -/* 803421D8 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803421DC 4C C6 31 82 */ crclr 6 -/* 803421E0 38 80 06 00 */ li r4, 0x600 -/* 803421E4 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803421E8 4B CC 4C 95 */ bl OSPanic -lbl_803421EC: -/* 803421EC A0 9D 02 C8 */ lhz r4, 0x2c8(r29) -/* 803421F0 2C 04 00 04 */ cmpwi r4, 4 -/* 803421F4 41 82 02 00 */ beq lbl_803423F4 -/* 803421F8 40 80 00 1C */ bge lbl_80342214 -/* 803421FC 2C 04 00 02 */ cmpwi r4, 2 -/* 80342200 41 82 01 2C */ beq lbl_8034232C -/* 80342204 40 80 03 C8 */ bge lbl_803425CC -/* 80342208 2C 04 00 01 */ cmpwi r4, 1 -/* 8034220C 40 80 00 14 */ bge lbl_80342220 -/* 80342210 48 00 03 BC */ b lbl_803425CC -lbl_80342214: -/* 80342214 2C 04 00 08 */ cmpwi r4, 8 -/* 80342218 41 82 03 74 */ beq lbl_8034258C -/* 8034221C 48 00 03 B0 */ b lbl_803425CC -lbl_80342220: -/* 80342220 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 80342224 2C 00 00 00 */ cmpwi r0, 0 -/* 80342228 41 81 03 C8 */ bgt lbl_803425F0 -/* 8034222C 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80342230 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 80342234 54 00 18 38 */ slwi r0, r0, 3 -/* 80342238 7C 1F 02 14 */ add r0, r31, r0 -/* 8034223C 7C 03 00 40 */ cmplw r3, r0 -/* 80342240 41 82 00 28 */ beq lbl_80342268 -/* 80342244 38 7E 04 5C */ addi r3, r30, 0x45c -/* 80342248 4C C6 31 82 */ crclr 6 -/* 8034224C 38 80 06 06 */ li r4, 0x606 -/* 80342250 4B CC 48 6D */ bl OSReport -/* 80342254 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342258 4C C6 31 82 */ crclr 6 -/* 8034225C 38 80 06 06 */ li r4, 0x606 -/* 80342260 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342264 4B CC 4C 19 */ bl OSPanic -lbl_80342268: -/* 80342268 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 8034226C 54 00 18 38 */ slwi r0, r0, 3 -/* 80342270 7C 7F 00 2E */ lwzx r3, r31, r0 -/* 80342274 48 00 00 18 */ b lbl_8034228C -lbl_80342278: -/* 80342278 7C 1D 18 40 */ cmplw r29, r3 -/* 8034227C 40 82 00 0C */ bne lbl_80342288 -/* 80342280 38 00 00 01 */ li r0, 1 -/* 80342284 48 00 00 14 */ b lbl_80342298 -lbl_80342288: -/* 80342288 80 63 02 E0 */ lwz r3, 0x2e0(r3) -lbl_8034228C: -/* 8034228C 28 03 00 00 */ cmplwi r3, 0 -/* 80342290 40 82 FF E8 */ bne lbl_80342278 -/* 80342294 38 00 00 00 */ li r0, 0 -lbl_80342298: -/* 80342298 2C 00 00 00 */ cmpwi r0, 0 -/* 8034229C 40 82 00 28 */ bne lbl_803422C4 -/* 803422A0 38 7E 04 B0 */ addi r3, r30, 0x4b0 -/* 803422A4 4C C6 31 82 */ crclr 6 -/* 803422A8 38 80 06 07 */ li r4, 0x607 -/* 803422AC 4B CC 48 11 */ bl OSReport -/* 803422B0 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803422B4 4C C6 31 82 */ crclr 6 -/* 803422B8 38 80 06 07 */ li r4, 0x607 -/* 803422BC 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803422C0 4B CC 4B BD */ bl OSPanic -lbl_803422C4: -/* 803422C4 80 9D 02 D4 */ lwz r4, 0x2d4(r29) -/* 803422C8 80 7D 02 F4 */ lwz r3, 0x2f4(r29) -/* 803422CC 48 00 00 24 */ b lbl_803422F0 -lbl_803422D0: -/* 803422D0 80 A3 00 00 */ lwz r5, 0(r3) -/* 803422D4 28 05 00 00 */ cmplwi r5, 0 -/* 803422D8 41 82 00 14 */ beq lbl_803422EC -/* 803422DC 80 05 02 D0 */ lwz r0, 0x2d0(r5) -/* 803422E0 7C 00 20 00 */ cmpw r0, r4 -/* 803422E4 40 80 00 08 */ bge lbl_803422EC -/* 803422E8 7C 04 03 78 */ mr r4, r0 -lbl_803422EC: -/* 803422EC 80 63 00 10 */ lwz r3, 0x10(r3) -lbl_803422F0: -/* 803422F0 28 03 00 00 */ cmplwi r3, 0 -/* 803422F4 40 82 FF DC */ bne lbl_803422D0 -/* 803422F8 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 803422FC 7C 00 20 00 */ cmpw r0, r4 -/* 80342300 41 82 02 F0 */ beq lbl_803425F0 -/* 80342304 38 7E 05 04 */ addi r3, r30, 0x504 -/* 80342308 4C C6 31 82 */ crclr 6 -/* 8034230C 38 80 06 08 */ li r4, 0x608 -/* 80342310 4B CC 47 AD */ bl OSReport -/* 80342314 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342318 4C C6 31 82 */ crclr 6 -/* 8034231C 38 80 06 08 */ li r4, 0x608 -/* 80342320 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342324 4B CC 4B 59 */ bl OSPanic -/* 80342328 48 00 02 C8 */ b lbl_803425F0 -lbl_8034232C: -/* 8034232C 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 80342330 2C 00 00 00 */ cmpwi r0, 0 -/* 80342334 40 81 00 28 */ ble lbl_8034235C -/* 80342338 38 7E 05 60 */ addi r3, r30, 0x560 -/* 8034233C 4C C6 31 82 */ crclr 6 -/* 80342340 38 80 06 0C */ li r4, 0x60c -/* 80342344 4B CC 47 79 */ bl OSReport -/* 80342348 38 7E 00 60 */ addi r3, r30, 0x60 -/* 8034234C 4C C6 31 82 */ crclr 6 -/* 80342350 38 80 06 0C */ li r4, 0x60c -/* 80342354 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342358 4B CC 4B 25 */ bl OSPanic -lbl_8034235C: -/* 8034235C 80 1D 02 DC */ lwz r0, 0x2dc(r29) -/* 80342360 28 00 00 00 */ cmplwi r0, 0 -/* 80342364 41 82 00 28 */ beq lbl_8034238C -/* 80342368 38 7E 05 A4 */ addi r3, r30, 0x5a4 -/* 8034236C 4C C6 31 82 */ crclr 6 -/* 80342370 38 80 06 0D */ li r4, 0x60d -/* 80342374 4B CC 47 49 */ bl OSReport -/* 80342378 38 7E 00 60 */ addi r3, r30, 0x60 -/* 8034237C 4C C6 31 82 */ crclr 6 -/* 80342380 38 80 06 0D */ li r4, 0x60d -/* 80342384 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342388 4B CC 4A F5 */ bl OSPanic -lbl_8034238C: -/* 8034238C 80 9D 02 D4 */ lwz r4, 0x2d4(r29) -/* 80342390 80 7D 02 F4 */ lwz r3, 0x2f4(r29) -/* 80342394 48 00 00 24 */ b lbl_803423B8 -lbl_80342398: -/* 80342398 80 A3 00 00 */ lwz r5, 0(r3) -/* 8034239C 28 05 00 00 */ cmplwi r5, 0 -/* 803423A0 41 82 00 14 */ beq lbl_803423B4 -/* 803423A4 80 05 02 D0 */ lwz r0, 0x2d0(r5) -/* 803423A8 7C 00 20 00 */ cmpw r0, r4 -/* 803423AC 40 80 00 08 */ bge lbl_803423B4 -/* 803423B0 7C 04 03 78 */ mr r4, r0 -lbl_803423B4: -/* 803423B4 80 63 00 10 */ lwz r3, 0x10(r3) -lbl_803423B8: -/* 803423B8 28 03 00 00 */ cmplwi r3, 0 -/* 803423BC 40 82 FF DC */ bne lbl_80342398 -/* 803423C0 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 803423C4 7C 00 20 00 */ cmpw r0, r4 -/* 803423C8 41 82 02 28 */ beq lbl_803425F0 -/* 803423CC 38 7E 05 04 */ addi r3, r30, 0x504 -/* 803423D0 4C C6 31 82 */ crclr 6 -/* 803423D4 38 80 06 0E */ li r4, 0x60e -/* 803423D8 4B CC 46 E5 */ bl OSReport -/* 803423DC 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803423E0 4C C6 31 82 */ crclr 6 -/* 803423E4 38 80 06 0E */ li r4, 0x60e -/* 803423E8 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803423EC 4B CC 4A 91 */ bl OSPanic -/* 803423F0 48 00 02 00 */ b lbl_803425F0 -lbl_803423F4: -/* 803423F4 80 1D 02 DC */ lwz r0, 0x2dc(r29) -/* 803423F8 28 00 00 00 */ cmplwi r0, 0 -/* 803423FC 40 82 00 28 */ bne lbl_80342424 -/* 80342400 38 7E 05 E0 */ addi r3, r30, 0x5e0 -/* 80342404 4C C6 31 82 */ crclr 6 -/* 80342408 38 80 06 11 */ li r4, 0x611 -/* 8034240C 4B CC 46 B1 */ bl OSReport -/* 80342410 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342414 4C C6 31 82 */ crclr 6 -/* 80342418 38 80 06 11 */ li r4, 0x611 -/* 8034241C 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342420 4B CC 4A 5D */ bl OSPanic -lbl_80342424: -/* 80342424 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 80342428 4B FF FA 3D */ bl CheckThreadQueue -/* 8034242C 2C 03 00 00 */ cmpwi r3, 0 -/* 80342430 40 82 00 28 */ bne lbl_80342458 -/* 80342434 38 7E 06 1C */ addi r3, r30, 0x61c -/* 80342438 4C C6 31 82 */ crclr 6 -/* 8034243C 38 80 06 12 */ li r4, 0x612 -/* 80342440 4B CC 46 7D */ bl OSReport -/* 80342444 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342448 4C C6 31 82 */ crclr 6 -/* 8034244C 38 80 06 12 */ li r4, 0x612 -/* 80342450 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342454 4B CC 4A 29 */ bl OSPanic -lbl_80342458: -/* 80342458 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 8034245C 80 63 00 00 */ lwz r3, 0(r3) -/* 80342460 48 00 00 18 */ b lbl_80342478 -lbl_80342464: -/* 80342464 7C 1D 18 40 */ cmplw r29, r3 -/* 80342468 40 82 00 0C */ bne lbl_80342474 -/* 8034246C 38 00 00 01 */ li r0, 1 -/* 80342470 48 00 00 14 */ b lbl_80342484 -lbl_80342474: -/* 80342474 80 63 02 E0 */ lwz r3, 0x2e0(r3) -lbl_80342478: -/* 80342478 28 03 00 00 */ cmplwi r3, 0 -/* 8034247C 40 82 FF E8 */ bne lbl_80342464 -/* 80342480 38 00 00 00 */ li r0, 0 -lbl_80342484: -/* 80342484 2C 00 00 00 */ cmpwi r0, 0 -/* 80342488 40 82 00 28 */ bne lbl_803424B0 -/* 8034248C 38 7E 06 60 */ addi r3, r30, 0x660 -/* 80342490 4C C6 31 82 */ crclr 6 -/* 80342494 38 80 06 13 */ li r4, 0x613 -/* 80342498 4B CC 46 25 */ bl OSReport -/* 8034249C 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803424A0 4C C6 31 82 */ crclr 6 -/* 803424A4 38 80 06 13 */ li r4, 0x613 -/* 803424A8 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803424AC 4B CC 49 D1 */ bl OSPanic -lbl_803424B0: -/* 803424B0 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 803424B4 2C 00 00 00 */ cmpwi r0, 0 -/* 803424B8 41 81 00 6C */ bgt lbl_80342524 -/* 803424BC 80 9D 02 D4 */ lwz r4, 0x2d4(r29) -/* 803424C0 80 7D 02 F4 */ lwz r3, 0x2f4(r29) -/* 803424C4 48 00 00 24 */ b lbl_803424E8 -lbl_803424C8: -/* 803424C8 80 A3 00 00 */ lwz r5, 0(r3) -/* 803424CC 28 05 00 00 */ cmplwi r5, 0 -/* 803424D0 41 82 00 14 */ beq lbl_803424E4 -/* 803424D4 80 05 02 D0 */ lwz r0, 0x2d0(r5) -/* 803424D8 7C 00 20 00 */ cmpw r0, r4 -/* 803424DC 40 80 00 08 */ bge lbl_803424E4 -/* 803424E0 7C 04 03 78 */ mr r4, r0 -lbl_803424E4: -/* 803424E4 80 63 00 10 */ lwz r3, 0x10(r3) -lbl_803424E8: -/* 803424E8 28 03 00 00 */ cmplwi r3, 0 -/* 803424EC 40 82 FF DC */ bne lbl_803424C8 -/* 803424F0 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 803424F4 7C 00 20 00 */ cmpw r0, r4 -/* 803424F8 41 82 00 5C */ beq lbl_80342554 -/* 803424FC 38 7E 05 04 */ addi r3, r30, 0x504 -/* 80342500 4C C6 31 82 */ crclr 6 -/* 80342504 38 80 06 16 */ li r4, 0x616 -/* 80342508 4B CC 45 B5 */ bl OSReport -/* 8034250C 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342510 4C C6 31 82 */ crclr 6 -/* 80342514 38 80 06 16 */ li r4, 0x616 -/* 80342518 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 8034251C 4B CC 49 61 */ bl OSPanic -/* 80342520 48 00 00 34 */ b lbl_80342554 -lbl_80342524: -/* 80342524 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80342528 2C 00 00 20 */ cmpwi r0, 0x20 -/* 8034252C 41 82 00 28 */ beq lbl_80342554 -/* 80342530 38 7E 06 A4 */ addi r3, r30, 0x6a4 -/* 80342534 4C C6 31 82 */ crclr 6 -/* 80342538 38 80 06 1A */ li r4, 0x61a -/* 8034253C 4B CC 45 81 */ bl OSReport -/* 80342540 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342544 4C C6 31 82 */ crclr 6 -/* 80342548 38 80 06 1A */ li r4, 0x61a -/* 8034254C 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342550 4B CC 49 2D */ bl OSPanic -lbl_80342554: -/* 80342554 7F A3 EB 78 */ mr r3, r29 -/* 80342558 4B FF CF CD */ bl __OSCheckDeadLock -/* 8034255C 2C 03 00 00 */ cmpwi r3, 0 -/* 80342560 41 82 00 90 */ beq lbl_803425F0 -/* 80342564 38 7E 06 E0 */ addi r3, r30, 0x6e0 -/* 80342568 4C C6 31 82 */ crclr 6 -/* 8034256C 38 80 06 1C */ li r4, 0x61c -/* 80342570 4B CC 45 4D */ bl OSReport -/* 80342574 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342578 4C C6 31 82 */ crclr 6 -/* 8034257C 38 80 06 1C */ li r4, 0x61c -/* 80342580 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342584 4B CC 48 F9 */ bl OSPanic -/* 80342588 48 00 00 68 */ b lbl_803425F0 -lbl_8034258C: -/* 8034258C 80 1D 02 F4 */ lwz r0, 0x2f4(r29) -/* 80342590 28 00 00 00 */ cmplwi r0, 0 -/* 80342594 40 82 00 10 */ bne lbl_803425A4 -/* 80342598 80 1D 02 F8 */ lwz r0, 0x2f8(r29) -/* 8034259C 28 00 00 00 */ cmplwi r0, 0 -/* 803425A0 41 82 00 50 */ beq lbl_803425F0 -lbl_803425A4: -/* 803425A4 38 7E 07 20 */ addi r3, r30, 0x720 -/* 803425A8 4C C6 31 82 */ crclr 6 -/* 803425AC 38 80 06 20 */ li r4, 0x620 -/* 803425B0 4B CC 45 0D */ bl OSReport -/* 803425B4 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803425B8 4C C6 31 82 */ crclr 6 -/* 803425BC 38 80 06 20 */ li r4, 0x620 -/* 803425C0 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803425C4 4B CC 48 B9 */ bl OSPanic -/* 803425C8 48 00 00 28 */ b lbl_803425F0 -lbl_803425CC: -/* 803425CC 4C C6 31 82 */ crclr 6 -/* 803425D0 38 BD 00 00 */ addi r5, r29, 0 -/* 803425D4 38 7E 07 88 */ addi r3, r30, 0x788 -/* 803425D8 4B CC 44 E5 */ bl OSReport -/* 803425DC 38 7E 00 60 */ addi r3, r30, 0x60 -/* 803425E0 4C C6 31 82 */ crclr 6 -/* 803425E4 38 80 06 26 */ li r4, 0x626 -/* 803425E8 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 803425EC 4B CC 48 91 */ bl OSPanic -lbl_803425F0: -/* 803425F0 7F A3 EB 78 */ mr r3, r29 -/* 803425F4 4B FF CF 69 */ bl __OSCheckMutexes -/* 803425F8 2C 03 00 00 */ cmpwi r3, 0 -/* 803425FC 40 82 00 28 */ bne lbl_80342624 -/* 80342600 38 7E 07 D0 */ addi r3, r30, 0x7d0 -/* 80342604 4C C6 31 82 */ crclr 6 -/* 80342608 38 80 06 2B */ li r4, 0x62b -/* 8034260C 4B CC 44 B1 */ bl OSReport -/* 80342610 38 7E 00 60 */ addi r3, r30, 0x60 -/* 80342614 4C C6 31 82 */ crclr 6 -/* 80342618 38 80 06 2B */ li r4, 0x62b -/* 8034261C 38 AD 84 3C */ la r5, lit_833(r13) /* 804509BC-_SDA_BASE_ */ -/* 80342620 4B CC 48 5D */ bl OSPanic -lbl_80342624: -/* 80342624 83 BD 02 FC */ lwz r29, 0x2fc(r29) -lbl_80342628: -/* 80342628 28 1D 00 00 */ cmplwi r29, 0 -/* 8034262C 40 82 FA 70 */ bne lbl_8034209C -/* 80342630 7F 63 DB 78 */ mr r3, r27 -/* 80342634 4B FF B0 E9 */ bl OSRestoreInterrupts -/* 80342638 7F 83 E3 78 */ mr r3, r28 -/* 8034263C BB 41 00 20 */ lmw r26, 0x20(r1) -/* 80342640 80 01 00 3C */ lwz r0, 0x3c(r1) -/* 80342644 38 21 00 38 */ addi r1, r1, 0x38 -/* 80342648 7C 08 03 A6 */ mtlr r0 -/* 8034264C 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSClearStack.s b/asm/dolphin/os/OSThread/OSClearStack.s deleted file mode 100644 index 677aa7e1ab3..00000000000 --- a/asm/dolphin/os/OSThread/OSClearStack.s +++ /dev/null @@ -1,48 +0,0 @@ -lbl_80342650: -/* 80342650 7C 08 02 A6 */ mflr r0 -/* 80342654 90 01 00 04 */ stw r0, 4(r1) -/* 80342658 54 60 82 1E */ rlwinm r0, r3, 0x10, 8, 0xf -/* 8034265C 50 60 C0 0E */ rlwimi r0, r3, 0x18, 0, 7 -/* 80342660 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80342664 50 60 44 2E */ rlwimi r0, r3, 8, 0x10, 0x17 -/* 80342668 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034266C 7C 1F 03 78 */ mr r31, r0 -/* 80342670 50 7F 06 3E */ rlwimi r31, r3, 0, 0x18, 0x1f -/* 80342674 4B FF 99 85 */ bl OSGetStackPointer -/* 80342678 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000E4@ha */ -/* 8034267C 80 A4 00 E4 */ lwz r5, 0x00E4(r4) /* 0x800000E4@l */ -/* 80342680 38 83 00 03 */ addi r4, r3, 3 -/* 80342684 80 A5 03 08 */ lwz r5, 0x308(r5) -/* 80342688 38 A5 00 04 */ addi r5, r5, 4 -/* 8034268C 7C 05 18 40 */ cmplw r5, r3 -/* 80342690 7C 85 20 50 */ subf r4, r5, r4 -/* 80342694 54 84 F0 BE */ srwi r4, r4, 2 -/* 80342698 40 80 00 50 */ bge lbl_803426E8 -/* 8034269C 54 80 E8 FF */ rlwinm. r0, r4, 0x1d, 3, 0x1f -/* 803426A0 7C 09 03 A6 */ mtctr r0 -/* 803426A4 41 82 00 34 */ beq lbl_803426D8 -lbl_803426A8: -/* 803426A8 93 E5 00 00 */ stw r31, 0(r5) -/* 803426AC 93 E5 00 04 */ stw r31, 4(r5) -/* 803426B0 93 E5 00 08 */ stw r31, 8(r5) -/* 803426B4 93 E5 00 0C */ stw r31, 0xc(r5) -/* 803426B8 93 E5 00 10 */ stw r31, 0x10(r5) -/* 803426BC 93 E5 00 14 */ stw r31, 0x14(r5) -/* 803426C0 93 E5 00 18 */ stw r31, 0x18(r5) -/* 803426C4 93 E5 00 1C */ stw r31, 0x1c(r5) -/* 803426C8 38 A5 00 20 */ addi r5, r5, 0x20 -/* 803426CC 42 00 FF DC */ bdnz lbl_803426A8 -/* 803426D0 70 84 00 07 */ andi. r4, r4, 7 -/* 803426D4 41 82 00 14 */ beq lbl_803426E8 -lbl_803426D8: -/* 803426D8 7C 89 03 A6 */ mtctr r4 -lbl_803426DC: -/* 803426DC 93 E5 00 00 */ stw r31, 0(r5) -/* 803426E0 38 A5 00 04 */ addi r5, r5, 4 -/* 803426E4 42 00 FF F8 */ bdnz lbl_803426DC -lbl_803426E8: -/* 803426E8 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803426EC 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 803426F0 38 21 00 18 */ addi r1, r1, 0x18 -/* 803426F4 7C 08 03 A6 */ mtlr r0 -/* 803426F8 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSCreateThread.s b/asm/dolphin/os/OSThread/OSCreateThread.s deleted file mode 100644 index 616d67cb48c..00000000000 --- a/asm/dolphin/os/OSThread/OSCreateThread.s +++ /dev/null @@ -1,130 +0,0 @@ -lbl_8034128C: -/* 8034128C 7C 08 02 A6 */ mflr r0 -/* 80341290 2C 08 00 00 */ cmpwi r8, 0 -/* 80341294 90 01 00 04 */ stw r0, 4(r1) -/* 80341298 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8034129C BF 61 00 3C */ stmw r27, 0x3c(r1) -/* 803412A0 3B E3 00 00 */ addi r31, r3, 0 -/* 803412A4 3B 65 00 00 */ addi r27, r5, 0 -/* 803412A8 3B 86 00 00 */ addi r28, r6, 0 -/* 803412AC 3B A7 00 00 */ addi r29, r7, 0 -/* 803412B0 41 80 00 0C */ blt lbl_803412BC -/* 803412B4 2C 08 00 1F */ cmpwi r8, 0x1f -/* 803412B8 40 81 00 0C */ ble lbl_803412C4 -lbl_803412BC: -/* 803412BC 38 60 00 00 */ li r3, 0 -/* 803412C0 48 00 01 A0 */ b lbl_80341460 -lbl_803412C4: -/* 803412C4 38 C0 00 01 */ li r6, 1 -/* 803412C8 B0 DF 02 C8 */ sth r6, 0x2c8(r31) -/* 803412CC 55 20 07 FE */ clrlwi r0, r9, 0x1f -/* 803412D0 57 87 00 38 */ rlwinm r7, r28, 0, 0, 0x1c -/* 803412D4 B0 1F 02 CA */ sth r0, 0x2ca(r31) -/* 803412D8 38 00 FF FF */ li r0, -1 -/* 803412DC 3B C0 00 00 */ li r30, 0 -/* 803412E0 91 1F 02 D4 */ stw r8, 0x2d4(r31) -/* 803412E4 38 7F 00 00 */ addi r3, r31, 0 -/* 803412E8 38 A7 FF F8 */ addi r5, r7, -8 -/* 803412EC 91 1F 02 D0 */ stw r8, 0x2d0(r31) -/* 803412F0 90 DF 02 CC */ stw r6, 0x2cc(r31) -/* 803412F4 90 1F 02 D8 */ stw r0, 0x2d8(r31) -/* 803412F8 93 DF 02 F0 */ stw r30, 0x2f0(r31) -/* 803412FC 93 DF 02 EC */ stw r30, 0x2ec(r31) -/* 80341300 93 DF 02 E8 */ stw r30, 0x2e8(r31) -/* 80341304 93 DF 02 F8 */ stw r30, 0x2f8(r31) -/* 80341308 93 DF 02 F4 */ stw r30, 0x2f4(r31) -/* 8034130C 93 C7 FF F8 */ stw r30, -8(r7) -/* 80341310 93 C7 FF FC */ stw r30, -4(r7) -/* 80341314 4B FF AD 11 */ bl OSInitContext -/* 80341318 3C 60 80 34 */ lis r3, OSExitThread@ha /* 0x80341474@ha */ -/* 8034131C 38 03 14 74 */ addi r0, r3, OSExitThread@l /* 0x80341474@l */ -/* 80341320 90 1F 00 84 */ stw r0, 0x84(r31) -/* 80341324 3C 60 DE AE */ lis r3, 0xDEAE /* 0xDEADBABE@ha */ -/* 80341328 7C 9D E0 50 */ subf r4, r29, r28 -/* 8034132C 93 7F 00 0C */ stw r27, 0xc(r31) -/* 80341330 38 03 BA BE */ addi r0, r3, 0xBABE /* 0xDEADBABE@l */ -/* 80341334 93 9F 03 04 */ stw r28, 0x304(r31) -/* 80341338 90 9F 03 08 */ stw r4, 0x308(r31) -/* 8034133C 80 7F 03 08 */ lwz r3, 0x308(r31) -/* 80341340 90 03 00 00 */ stw r0, 0(r3) -/* 80341344 93 DF 03 0C */ stw r30, 0x30c(r31) -/* 80341348 93 DF 03 10 */ stw r30, 0x310(r31) -/* 8034134C 93 DF 03 14 */ stw r30, 0x314(r31) -/* 80341350 4B FF C3 A5 */ bl OSDisableInterrupts -/* 80341354 3C 80 80 45 */ lis r4, __OSErrorTable@ha /* 0x8044BAD0@ha */ -/* 80341358 38 84 BA D0 */ addi r4, r4, __OSErrorTable@l /* 0x8044BAD0@l */ -/* 8034135C 80 04 00 40 */ lwz r0, 0x40(r4) -/* 80341360 28 00 00 00 */ cmplwi r0, 0 -/* 80341364 41 82 00 C4 */ beq lbl_80341428 -/* 80341368 80 9F 01 9C */ lwz r4, 0x19c(r31) -/* 8034136C 38 00 00 04 */ li r0, 4 -/* 80341370 7C 09 03 A6 */ mtctr r0 -/* 80341374 38 BF 00 00 */ addi r5, r31, 0 -/* 80341378 60 80 09 00 */ ori r0, r4, 0x900 -/* 8034137C 90 1F 01 9C */ stw r0, 0x19c(r31) -/* 80341380 A0 1F 01 A2 */ lhz r0, 0x1a2(r31) -/* 80341384 60 00 00 01 */ ori r0, r0, 1 -/* 80341388 B0 1F 01 A2 */ sth r0, 0x1a2(r31) -/* 8034138C 80 0D 84 20 */ lwz r0, __OSFpscrEnableBits(r13) -/* 80341390 54 00 06 38 */ rlwinm r0, r0, 0, 0x18, 0x1c -/* 80341394 60 00 00 04 */ ori r0, r0, 4 -/* 80341398 90 1F 01 94 */ stw r0, 0x194(r31) -lbl_8034139C: -/* 8034139C 38 00 FF FF */ li r0, -1 -/* 803413A0 90 05 00 94 */ stw r0, 0x94(r5) -/* 803413A4 90 05 00 90 */ stw r0, 0x90(r5) -/* 803413A8 90 05 01 CC */ stw r0, 0x1cc(r5) -/* 803413AC 90 05 01 C8 */ stw r0, 0x1c8(r5) -/* 803413B0 90 05 00 9C */ stw r0, 0x9c(r5) -/* 803413B4 90 05 00 98 */ stw r0, 0x98(r5) -/* 803413B8 90 05 01 D4 */ stw r0, 0x1d4(r5) -/* 803413BC 90 05 01 D0 */ stw r0, 0x1d0(r5) -/* 803413C0 90 05 00 A4 */ stw r0, 0xa4(r5) -/* 803413C4 90 05 00 A0 */ stw r0, 0xa0(r5) -/* 803413C8 90 05 01 DC */ stw r0, 0x1dc(r5) -/* 803413CC 90 05 01 D8 */ stw r0, 0x1d8(r5) -/* 803413D0 90 05 00 AC */ stw r0, 0xac(r5) -/* 803413D4 90 05 00 A8 */ stw r0, 0xa8(r5) -/* 803413D8 90 05 01 E4 */ stw r0, 0x1e4(r5) -/* 803413DC 90 05 01 E0 */ stw r0, 0x1e0(r5) -/* 803413E0 90 05 00 B4 */ stw r0, 0xb4(r5) -/* 803413E4 90 05 00 B0 */ stw r0, 0xb0(r5) -/* 803413E8 90 05 01 EC */ stw r0, 0x1ec(r5) -/* 803413EC 90 05 01 E8 */ stw r0, 0x1e8(r5) -/* 803413F0 90 05 00 BC */ stw r0, 0xbc(r5) -/* 803413F4 90 05 00 B8 */ stw r0, 0xb8(r5) -/* 803413F8 90 05 01 F4 */ stw r0, 0x1f4(r5) -/* 803413FC 90 05 01 F0 */ stw r0, 0x1f0(r5) -/* 80341400 90 05 00 C4 */ stw r0, 0xc4(r5) -/* 80341404 90 05 00 C0 */ stw r0, 0xc0(r5) -/* 80341408 90 05 01 FC */ stw r0, 0x1fc(r5) -/* 8034140C 90 05 01 F8 */ stw r0, 0x1f8(r5) -/* 80341410 90 05 00 CC */ stw r0, 0xcc(r5) -/* 80341414 90 05 00 C8 */ stw r0, 0xc8(r5) -/* 80341418 90 05 02 04 */ stw r0, 0x204(r5) -/* 8034141C 90 05 02 00 */ stw r0, 0x200(r5) -/* 80341420 38 A5 00 40 */ addi r5, r5, 0x40 -/* 80341424 42 00 FF 78 */ bdnz lbl_8034139C -lbl_80341428: -/* 80341428 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000DC@ha */ -/* 8034142C 38 A4 00 DC */ addi r5, r4, 0x00DC /* 0x800000DC@l */ -/* 80341430 84 C5 00 04 */ lwzu r6, 4(r5) -/* 80341434 28 06 00 00 */ cmplwi r6, 0 -/* 80341438 40 82 00 0C */ bne lbl_80341444 -/* 8034143C 93 E4 00 DC */ stw r31, 0xdc(r4) -/* 80341440 48 00 00 08 */ b lbl_80341448 -lbl_80341444: -/* 80341444 93 E6 02 FC */ stw r31, 0x2fc(r6) -lbl_80341448: -/* 80341448 90 DF 03 00 */ stw r6, 0x300(r31) -/* 8034144C 38 00 00 00 */ li r0, 0 -/* 80341450 90 1F 02 FC */ stw r0, 0x2fc(r31) -/* 80341454 93 E5 00 00 */ stw r31, 0(r5) -/* 80341458 4B FF C2 C5 */ bl OSRestoreInterrupts -/* 8034145C 38 60 00 01 */ li r3, 1 -lbl_80341460: -/* 80341460 BB 61 00 3C */ lmw r27, 0x3c(r1) -/* 80341464 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80341468 38 21 00 50 */ addi r1, r1, 0x50 -/* 8034146C 7C 08 03 A6 */ mtlr r0 -/* 80341470 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSDetachThread.s b/asm/dolphin/os/OSThread/OSDetachThread.s deleted file mode 100644 index 1b839448f6d..00000000000 --- a/asm/dolphin/os/OSThread/OSDetachThread.s +++ /dev/null @@ -1,46 +0,0 @@ -lbl_80341714: -/* 80341714 7C 08 02 A6 */ mflr r0 -/* 80341718 90 01 00 04 */ stw r0, 4(r1) -/* 8034171C 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80341720 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80341724 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80341728 7C 7E 1B 78 */ mr r30, r3 -/* 8034172C 4B FF BF C9 */ bl OSDisableInterrupts -/* 80341730 A0 1E 02 CA */ lhz r0, 0x2ca(r30) -/* 80341734 3B E3 00 00 */ addi r31, r3, 0 -/* 80341738 60 00 00 01 */ ori r0, r0, 1 -/* 8034173C B0 1E 02 CA */ sth r0, 0x2ca(r30) -/* 80341740 A0 1E 02 C8 */ lhz r0, 0x2c8(r30) -/* 80341744 28 00 00 08 */ cmplwi r0, 8 -/* 80341748 40 82 00 44 */ bne lbl_8034178C -/* 8034174C 80 9E 02 FC */ lwz r4, 0x2fc(r30) -/* 80341750 80 BE 03 00 */ lwz r5, 0x300(r30) -/* 80341754 28 04 00 00 */ cmplwi r4, 0 -/* 80341758 40 82 00 10 */ bne lbl_80341768 -/* 8034175C 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000E0@ha */ -/* 80341760 90 A3 00 E0 */ stw r5, 0x00E0(r3) /* 0x800000E0@l */ -/* 80341764 48 00 00 08 */ b lbl_8034176C -lbl_80341768: -/* 80341768 90 A4 03 00 */ stw r5, 0x300(r4) -lbl_8034176C: -/* 8034176C 28 05 00 00 */ cmplwi r5, 0 -/* 80341770 40 82 00 10 */ bne lbl_80341780 -/* 80341774 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 80341778 90 83 00 DC */ stw r4, 0x00DC(r3) /* 0x800000DC@l */ -/* 8034177C 48 00 00 08 */ b lbl_80341784 -lbl_80341780: -/* 80341780 90 85 02 FC */ stw r4, 0x2fc(r5) -lbl_80341784: -/* 80341784 38 00 00 00 */ li r0, 0 -/* 80341788 B0 1E 02 C8 */ sth r0, 0x2c8(r30) -lbl_8034178C: -/* 8034178C 38 7E 02 E8 */ addi r3, r30, 0x2e8 -/* 80341790 48 00 05 09 */ bl OSWakeupThread -/* 80341794 7F E3 FB 78 */ mr r3, r31 -/* 80341798 4B FF BF 85 */ bl OSRestoreInterrupts -/* 8034179C 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 803417A0 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 803417A4 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 803417A8 38 21 00 18 */ addi r1, r1, 0x18 -/* 803417AC 7C 08 03 A6 */ mtlr r0 -/* 803417B0 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSDisableScheduler.s b/asm/dolphin/os/OSThread/OSDisableScheduler.s deleted file mode 100644 index 9c9b3c5bb68..00000000000 --- a/asm/dolphin/os/OSThread/OSDisableScheduler.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80340CC4: -/* 80340CC4 7C 08 02 A6 */ mflr r0 -/* 80340CC8 90 01 00 04 */ stw r0, 4(r1) -/* 80340CCC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80340CD0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80340CD4 4B FF CA 21 */ bl OSDisableInterrupts -/* 80340CD8 80 8D 91 48 */ lwz r4, Reschedule(r13) -/* 80340CDC 38 04 00 01 */ addi r0, r4, 1 -/* 80340CE0 90 0D 91 48 */ stw r0, Reschedule(r13) -/* 80340CE4 7C 9F 23 78 */ mr r31, r4 -/* 80340CE8 4B FF CA 35 */ bl OSRestoreInterrupts -/* 80340CEC 7F E3 FB 78 */ mr r3, r31 -/* 80340CF0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80340CF4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80340CF8 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340CFC 7C 08 03 A6 */ mtlr r0 -/* 80340D00 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSEnableScheduler.s b/asm/dolphin/os/OSThread/OSEnableScheduler.s deleted file mode 100644 index 7056360ab3c..00000000000 --- a/asm/dolphin/os/OSThread/OSEnableScheduler.s +++ /dev/null @@ -1,17 +0,0 @@ -lbl_80340D04: -/* 80340D04 7C 08 02 A6 */ mflr r0 -/* 80340D08 90 01 00 04 */ stw r0, 4(r1) -/* 80340D0C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80340D10 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80340D14 4B FF C9 E1 */ bl OSDisableInterrupts -/* 80340D18 80 8D 91 48 */ lwz r4, Reschedule(r13) -/* 80340D1C 38 04 FF FF */ addi r0, r4, -1 -/* 80340D20 90 0D 91 48 */ stw r0, Reschedule(r13) -/* 80340D24 7C 9F 23 78 */ mr r31, r4 -/* 80340D28 4B FF C9 F5 */ bl OSRestoreInterrupts -/* 80340D2C 7F E3 FB 78 */ mr r3, r31 -/* 80340D30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80340D34 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80340D38 38 21 00 10 */ addi r1, r1, 0x10 -/* 80340D3C 7C 08 03 A6 */ mtlr r0 -/* 80340D40 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSExitThread.s b/asm/dolphin/os/OSThread/OSExitThread.s deleted file mode 100644 index b14ba2e22ae..00000000000 --- a/asm/dolphin/os/OSThread/OSExitThread.s +++ /dev/null @@ -1,65 +0,0 @@ -lbl_80341474: -/* 80341474 7C 08 02 A6 */ mflr r0 -/* 80341478 90 01 00 04 */ stw r0, 4(r1) -/* 8034147C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80341480 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80341484 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80341488 93 A1 00 14 */ stw r29, 0x14(r1) -/* 8034148C 93 81 00 10 */ stw r28, 0x10(r1) -/* 80341490 7C 7C 1B 78 */ mr r28, r3 -/* 80341494 4B FF C2 61 */ bl OSDisableInterrupts -/* 80341498 3F E0 80 00 */ lis r31, 0x8000 /* 0x800000E4@ha */ -/* 8034149C 83 DF 00 E4 */ lwz r30, 0x00E4(r31) /* 0x800000E4@l */ -/* 803414A0 3B A3 00 00 */ addi r29, r3, 0 -/* 803414A4 38 7E 00 00 */ addi r3, r30, 0 -/* 803414A8 4B FF AB 59 */ bl OSClearContext -/* 803414AC A0 1E 02 CA */ lhz r0, 0x2ca(r30) -/* 803414B0 54 00 07 FF */ clrlwi. r0, r0, 0x1f -/* 803414B4 41 82 00 44 */ beq lbl_803414F8 -/* 803414B8 80 9E 02 FC */ lwz r4, 0x2fc(r30) -/* 803414BC 80 BE 03 00 */ lwz r5, 0x300(r30) -/* 803414C0 28 04 00 00 */ cmplwi r4, 0 -/* 803414C4 40 82 00 0C */ bne lbl_803414D0 -/* 803414C8 90 BF 00 E0 */ stw r5, 0xe0(r31) -/* 803414CC 48 00 00 08 */ b lbl_803414D4 -lbl_803414D0: -/* 803414D0 90 A4 03 00 */ stw r5, 0x300(r4) -lbl_803414D4: -/* 803414D4 28 05 00 00 */ cmplwi r5, 0 -/* 803414D8 40 82 00 10 */ bne lbl_803414E8 -/* 803414DC 3C 60 80 00 */ lis r3, 0x8000 /* 0x800000DC@ha */ -/* 803414E0 90 83 00 DC */ stw r4, 0x00DC(r3) /* 0x800000DC@l */ -/* 803414E4 48 00 00 08 */ b lbl_803414EC -lbl_803414E8: -/* 803414E8 90 85 02 FC */ stw r4, 0x2fc(r5) -lbl_803414EC: -/* 803414EC 38 00 00 00 */ li r0, 0 -/* 803414F0 B0 1E 02 C8 */ sth r0, 0x2c8(r30) -/* 803414F4 48 00 00 10 */ b lbl_80341504 -lbl_803414F8: -/* 803414F8 38 00 00 08 */ li r0, 8 -/* 803414FC B0 1E 02 C8 */ sth r0, 0x2c8(r30) -/* 80341500 93 9E 02 D8 */ stw r28, 0x2d8(r30) -lbl_80341504: -/* 80341504 7F C3 F3 78 */ mr r3, r30 -/* 80341508 4B FF DC DD */ bl __OSUnlockAllMutex -/* 8034150C 38 7E 02 E8 */ addi r3, r30, 0x2e8 -/* 80341510 48 00 07 89 */ bl OSWakeupThread -/* 80341514 38 00 00 01 */ li r0, 1 -/* 80341518 90 0D 91 44 */ stw r0, RunQueueHint(r13) -/* 8034151C 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341520 2C 00 00 00 */ cmpwi r0, 0 -/* 80341524 41 82 00 0C */ beq lbl_80341530 -/* 80341528 38 60 00 00 */ li r3, 0 -/* 8034152C 4B FF FA CD */ bl SelectThread -lbl_80341530: -/* 80341530 7F A3 EB 78 */ mr r3, r29 -/* 80341534 4B FF C1 E9 */ bl OSRestoreInterrupts -/* 80341538 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8034153C 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80341540 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80341544 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80341548 83 81 00 10 */ lwz r28, 0x10(r1) -/* 8034154C 38 21 00 20 */ addi r1, r1, 0x20 -/* 80341550 7C 08 03 A6 */ mtlr r0 -/* 80341554 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSResumeThread.s b/asm/dolphin/os/OSThread/OSResumeThread.s deleted file mode 100644 index a98246247b9..00000000000 --- a/asm/dolphin/os/OSThread/OSResumeThread.s +++ /dev/null @@ -1,189 +0,0 @@ -lbl_803417B4: -/* 803417B4 7C 08 02 A6 */ mflr r0 -/* 803417B8 90 01 00 04 */ stw r0, 4(r1) -/* 803417BC 94 21 FF D8 */ stwu r1, -0x28(r1) -/* 803417C0 93 E1 00 24 */ stw r31, 0x24(r1) -/* 803417C4 93 C1 00 20 */ stw r30, 0x20(r1) -/* 803417C8 93 A1 00 1C */ stw r29, 0x1c(r1) -/* 803417CC 7C 7D 1B 78 */ mr r29, r3 -/* 803417D0 4B FF BF 25 */ bl OSDisableInterrupts -/* 803417D4 80 9D 02 CC */ lwz r4, 0x2cc(r29) -/* 803417D8 3B E3 00 00 */ addi r31, r3, 0 -/* 803417DC 38 04 FF FF */ addi r0, r4, -1 -/* 803417E0 90 1D 02 CC */ stw r0, 0x2cc(r29) -/* 803417E4 7C 9E 23 78 */ mr r30, r4 -/* 803417E8 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 803417EC 2C 00 00 00 */ cmpwi r0, 0 -/* 803417F0 40 80 00 10 */ bge lbl_80341800 -/* 803417F4 38 00 00 00 */ li r0, 0 -/* 803417F8 90 1D 02 CC */ stw r0, 0x2cc(r29) -/* 803417FC 48 00 02 18 */ b lbl_80341A14 -lbl_80341800: -/* 80341800 40 82 02 14 */ bne lbl_80341A14 -/* 80341804 A0 1D 02 C8 */ lhz r0, 0x2c8(r29) -/* 80341808 2C 00 00 04 */ cmpwi r0, 4 -/* 8034180C 41 82 00 B8 */ beq lbl_803418C4 -/* 80341810 40 80 01 F0 */ bge lbl_80341A00 -/* 80341814 2C 00 00 01 */ cmpwi r0, 1 -/* 80341818 41 82 00 08 */ beq lbl_80341820 -/* 8034181C 48 00 01 E4 */ b lbl_80341A00 -lbl_80341820: -/* 80341820 80 1D 02 D4 */ lwz r0, 0x2d4(r29) -/* 80341824 80 7D 02 F4 */ lwz r3, 0x2f4(r29) -/* 80341828 48 00 00 24 */ b lbl_8034184C -lbl_8034182C: -/* 8034182C 80 83 00 00 */ lwz r4, 0(r3) -/* 80341830 28 04 00 00 */ cmplwi r4, 0 -/* 80341834 41 82 00 14 */ beq lbl_80341848 -/* 80341838 80 84 02 D0 */ lwz r4, 0x2d0(r4) -/* 8034183C 7C 04 00 00 */ cmpw r4, r0 -/* 80341840 40 80 00 08 */ bge lbl_80341848 -/* 80341844 7C 80 23 78 */ mr r0, r4 -lbl_80341848: -/* 80341848 80 63 00 10 */ lwz r3, 0x10(r3) -lbl_8034184C: -/* 8034184C 28 03 00 00 */ cmplwi r3, 0 -/* 80341850 40 82 FF DC */ bne lbl_8034182C -/* 80341854 90 1D 02 D0 */ stw r0, 0x2d0(r29) -/* 80341858 3C 60 80 45 */ lis r3, RunQueue@ha /* 0x8044BB78@ha */ -/* 8034185C 38 03 BB 78 */ addi r0, r3, RunQueue@l /* 0x8044BB78@l */ -/* 80341860 80 7D 02 D0 */ lwz r3, 0x2d0(r29) -/* 80341864 54 63 18 38 */ slwi r3, r3, 3 -/* 80341868 7C 00 1A 14 */ add r0, r0, r3 -/* 8034186C 90 1D 02 DC */ stw r0, 0x2dc(r29) -/* 80341870 80 9D 02 DC */ lwz r4, 0x2dc(r29) -/* 80341874 80 64 00 04 */ lwz r3, 4(r4) -/* 80341878 28 03 00 00 */ cmplwi r3, 0 -/* 8034187C 40 82 00 0C */ bne lbl_80341888 -/* 80341880 93 A4 00 00 */ stw r29, 0(r4) -/* 80341884 48 00 00 08 */ b lbl_8034188C -lbl_80341888: -/* 80341888 93 A3 02 E0 */ stw r29, 0x2e0(r3) -lbl_8034188C: -/* 8034188C 90 7D 02 E4 */ stw r3, 0x2e4(r29) -/* 80341890 38 00 00 00 */ li r0, 0 -/* 80341894 38 60 00 01 */ li r3, 1 -/* 80341898 90 1D 02 E0 */ stw r0, 0x2e0(r29) -/* 8034189C 80 9D 02 DC */ lwz r4, 0x2dc(r29) -/* 803418A0 93 A4 00 04 */ stw r29, 4(r4) -/* 803418A4 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 803418A8 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 803418AC 20 00 00 1F */ subfic r0, r0, 0x1f -/* 803418B0 7C 60 00 30 */ slw r0, r3, r0 -/* 803418B4 7C 80 03 78 */ or r0, r4, r0 -/* 803418B8 90 0D 91 40 */ stw r0, RunQueueBits(r13) -/* 803418BC 90 6D 91 44 */ stw r3, RunQueueHint(r13) -/* 803418C0 48 00 01 40 */ b lbl_80341A00 -lbl_803418C4: -/* 803418C4 80 9D 02 E0 */ lwz r4, 0x2e0(r29) -/* 803418C8 80 BD 02 E4 */ lwz r5, 0x2e4(r29) -/* 803418CC 28 04 00 00 */ cmplwi r4, 0 -/* 803418D0 40 82 00 10 */ bne lbl_803418E0 -/* 803418D4 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 803418D8 90 A3 00 04 */ stw r5, 4(r3) -/* 803418DC 48 00 00 08 */ b lbl_803418E4 -lbl_803418E0: -/* 803418E0 90 A4 02 E4 */ stw r5, 0x2e4(r4) -lbl_803418E4: -/* 803418E4 28 05 00 00 */ cmplwi r5, 0 -/* 803418E8 40 82 00 10 */ bne lbl_803418F8 -/* 803418EC 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 803418F0 90 83 00 00 */ stw r4, 0(r3) -/* 803418F4 48 00 00 08 */ b lbl_803418FC -lbl_803418F8: -/* 803418F8 90 85 02 E0 */ stw r4, 0x2e0(r5) -lbl_803418FC: -/* 803418FC 80 1D 02 D4 */ lwz r0, 0x2d4(r29) -/* 80341900 80 7D 02 F4 */ lwz r3, 0x2f4(r29) -/* 80341904 48 00 00 24 */ b lbl_80341928 -lbl_80341908: -/* 80341908 80 83 00 00 */ lwz r4, 0(r3) -/* 8034190C 28 04 00 00 */ cmplwi r4, 0 -/* 80341910 41 82 00 14 */ beq lbl_80341924 -/* 80341914 80 84 02 D0 */ lwz r4, 0x2d0(r4) -/* 80341918 7C 04 00 00 */ cmpw r4, r0 -/* 8034191C 40 80 00 08 */ bge lbl_80341924 -/* 80341920 7C 80 23 78 */ mr r0, r4 -lbl_80341924: -/* 80341924 80 63 00 10 */ lwz r3, 0x10(r3) -lbl_80341928: -/* 80341928 28 03 00 00 */ cmplwi r3, 0 -/* 8034192C 40 82 FF DC */ bne lbl_80341908 -/* 80341930 90 1D 02 D0 */ stw r0, 0x2d0(r29) -/* 80341934 80 9D 02 DC */ lwz r4, 0x2dc(r29) -/* 80341938 80 A4 00 00 */ lwz r5, 0(r4) -/* 8034193C 48 00 00 08 */ b lbl_80341944 -lbl_80341940: -/* 80341940 80 A5 02 E0 */ lwz r5, 0x2e0(r5) -lbl_80341944: -/* 80341944 28 05 00 00 */ cmplwi r5, 0 -/* 80341948 41 82 00 14 */ beq lbl_8034195C -/* 8034194C 80 65 02 D0 */ lwz r3, 0x2d0(r5) -/* 80341950 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80341954 7C 03 00 00 */ cmpw r3, r0 -/* 80341958 40 81 FF E8 */ ble lbl_80341940 -lbl_8034195C: -/* 8034195C 28 05 00 00 */ cmplwi r5, 0 -/* 80341960 40 82 00 34 */ bne lbl_80341994 -/* 80341964 80 64 00 04 */ lwz r3, 4(r4) -/* 80341968 28 03 00 00 */ cmplwi r3, 0 -/* 8034196C 40 82 00 0C */ bne lbl_80341978 -/* 80341970 93 A4 00 00 */ stw r29, 0(r4) -/* 80341974 48 00 00 08 */ b lbl_8034197C -lbl_80341978: -/* 80341978 93 A3 02 E0 */ stw r29, 0x2e0(r3) -lbl_8034197C: -/* 8034197C 90 7D 02 E4 */ stw r3, 0x2e4(r29) -/* 80341980 38 00 00 00 */ li r0, 0 -/* 80341984 90 1D 02 E0 */ stw r0, 0x2e0(r29) -/* 80341988 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 8034198C 93 A3 00 04 */ stw r29, 4(r3) -/* 80341990 48 00 00 2C */ b lbl_803419BC -lbl_80341994: -/* 80341994 90 BD 02 E0 */ stw r5, 0x2e0(r29) -/* 80341998 80 65 02 E4 */ lwz r3, 0x2e4(r5) -/* 8034199C 93 A5 02 E4 */ stw r29, 0x2e4(r5) -/* 803419A0 28 03 00 00 */ cmplwi r3, 0 -/* 803419A4 90 7D 02 E4 */ stw r3, 0x2e4(r29) -/* 803419A8 40 82 00 10 */ bne lbl_803419B8 -/* 803419AC 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 803419B0 93 A3 00 00 */ stw r29, 0(r3) -/* 803419B4 48 00 00 08 */ b lbl_803419BC -lbl_803419B8: -/* 803419B8 93 A3 02 E0 */ stw r29, 0x2e0(r3) -lbl_803419BC: -/* 803419BC 80 7D 02 F0 */ lwz r3, 0x2f0(r29) -/* 803419C0 28 03 00 00 */ cmplwi r3, 0 -/* 803419C4 41 82 00 3C */ beq lbl_80341A00 -/* 803419C8 83 A3 00 08 */ lwz r29, 8(r3) -lbl_803419CC: -/* 803419CC 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 803419D0 2C 00 00 00 */ cmpwi r0, 0 -/* 803419D4 41 81 00 2C */ bgt lbl_80341A00 -/* 803419D8 7F A3 EB 78 */ mr r3, r29 -/* 803419DC 4B FF F3 D1 */ bl __OSGetEffectivePriority -/* 803419E0 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 803419E4 38 83 00 00 */ addi r4, r3, 0 -/* 803419E8 7C 00 20 00 */ cmpw r0, r4 -/* 803419EC 41 82 00 14 */ beq lbl_80341A00 -/* 803419F0 7F A3 EB 78 */ mr r3, r29 -/* 803419F4 4B FF F3 F5 */ bl SetEffectivePriority -/* 803419F8 7C 7D 1B 79 */ or. r29, r3, r3 -/* 803419FC 40 82 FF D0 */ bne lbl_803419CC -lbl_80341A00: -/* 80341A00 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341A04 2C 00 00 00 */ cmpwi r0, 0 -/* 80341A08 41 82 00 0C */ beq lbl_80341A14 -/* 80341A0C 38 60 00 00 */ li r3, 0 -/* 80341A10 4B FF F5 E9 */ bl SelectThread -lbl_80341A14: -/* 80341A14 7F E3 FB 78 */ mr r3, r31 -/* 80341A18 4B FF BD 05 */ bl OSRestoreInterrupts -/* 80341A1C 7F C3 F3 78 */ mr r3, r30 -/* 80341A20 80 01 00 2C */ lwz r0, 0x2c(r1) -/* 80341A24 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80341A28 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80341A2C 83 A1 00 1C */ lwz r29, 0x1c(r1) -/* 80341A30 38 21 00 28 */ addi r1, r1, 0x28 -/* 80341A34 7C 08 03 A6 */ mtlr r0 -/* 80341A38 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSSetSwitchThreadCallback.s b/asm/dolphin/os/OSThread/OSSetSwitchThreadCallback.s deleted file mode 100644 index be8d2761167..00000000000 --- a/asm/dolphin/os/OSThread/OSSetSwitchThreadCallback.s +++ /dev/null @@ -1,34 +0,0 @@ -lbl_80340AA8: -/* 80340AA8 7C 08 02 A6 */ mflr r0 -/* 80340AAC 90 01 00 04 */ stw r0, 4(r1) -/* 80340AB0 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80340AB4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80340AB8 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80340ABC 7C 7E 1B 78 */ mr r30, r3 -/* 80340AC0 4B FF CC 35 */ bl OSDisableInterrupts -/* 80340AC4 28 1E 00 00 */ cmplwi r30, 0 -/* 80340AC8 83 ED 84 38 */ lwz r31, SwitchThreadCallback(r13) -/* 80340ACC 41 82 00 0C */ beq lbl_80340AD8 -/* 80340AD0 7F C0 F3 78 */ mr r0, r30 -/* 80340AD4 48 00 00 0C */ b lbl_80340AE0 -lbl_80340AD8: -/* 80340AD8 3C 80 80 34 */ lis r4, DefaultSwitchThreadCallback@ha /* 0x80340AA4@ha */ -/* 80340ADC 38 04 0A A4 */ addi r0, r4, DefaultSwitchThreadCallback@l /* 0x80340AA4@l */ -lbl_80340AE0: -/* 80340AE0 90 0D 84 38 */ stw r0, SwitchThreadCallback(r13) -/* 80340AE4 4B FF CC 39 */ bl OSRestoreInterrupts -/* 80340AE8 3C 60 80 34 */ lis r3, DefaultSwitchThreadCallback@ha /* 0x80340AA4@ha */ -/* 80340AEC 38 03 0A A4 */ addi r0, r3, DefaultSwitchThreadCallback@l /* 0x80340AA4@l */ -/* 80340AF0 7C 1F 00 40 */ cmplw r31, r0 -/* 80340AF4 40 82 00 0C */ bne lbl_80340B00 -/* 80340AF8 38 60 00 00 */ li r3, 0 -/* 80340AFC 48 00 00 08 */ b lbl_80340B04 -lbl_80340B00: -/* 80340B00 7F E3 FB 78 */ mr r3, r31 -lbl_80340B04: -/* 80340B04 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80340B08 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80340B0C 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80340B10 38 21 00 18 */ addi r1, r1, 0x18 -/* 80340B14 7C 08 03 A6 */ mtlr r0 -/* 80340B18 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSSetThreadPriority.s b/asm/dolphin/os/OSThread/OSSetThreadPriority.s deleted file mode 100644 index 03b5afd8464..00000000000 --- a/asm/dolphin/os/OSThread/OSSetThreadPriority.s +++ /dev/null @@ -1,55 +0,0 @@ -lbl_80341D9C: -/* 80341D9C 7C 08 02 A6 */ mflr r0 -/* 80341DA0 90 01 00 04 */ stw r0, 4(r1) -/* 80341DA4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80341DA8 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80341DAC 7C 9F 23 79 */ or. r31, r4, r4 -/* 80341DB0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80341DB4 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80341DB8 3B A3 00 00 */ addi r29, r3, 0 -/* 80341DBC 41 80 00 0C */ blt lbl_80341DC8 -/* 80341DC0 2C 1F 00 1F */ cmpwi r31, 0x1f -/* 80341DC4 40 81 00 0C */ ble lbl_80341DD0 -lbl_80341DC8: -/* 80341DC8 38 60 00 00 */ li r3, 0 -/* 80341DCC 48 00 00 74 */ b lbl_80341E40 -lbl_80341DD0: -/* 80341DD0 4B FF B9 25 */ bl OSDisableInterrupts -/* 80341DD4 80 1D 02 D4 */ lwz r0, 0x2d4(r29) -/* 80341DD8 3B C3 00 00 */ addi r30, r3, 0 -/* 80341DDC 7C 00 F8 00 */ cmpw r0, r31 -/* 80341DE0 41 82 00 54 */ beq lbl_80341E34 -/* 80341DE4 93 FD 02 D4 */ stw r31, 0x2d4(r29) -/* 80341DE8 7F BF EB 78 */ mr r31, r29 -lbl_80341DEC: -/* 80341DEC 80 1F 02 CC */ lwz r0, 0x2cc(r31) -/* 80341DF0 2C 00 00 00 */ cmpwi r0, 0 -/* 80341DF4 41 81 00 2C */ bgt lbl_80341E20 -/* 80341DF8 7F E3 FB 78 */ mr r3, r31 -/* 80341DFC 4B FF EF B1 */ bl __OSGetEffectivePriority -/* 80341E00 80 1F 02 D0 */ lwz r0, 0x2d0(r31) -/* 80341E04 38 83 00 00 */ addi r4, r3, 0 -/* 80341E08 7C 00 20 00 */ cmpw r0, r4 -/* 80341E0C 41 82 00 14 */ beq lbl_80341E20 -/* 80341E10 7F E3 FB 78 */ mr r3, r31 -/* 80341E14 4B FF EF D5 */ bl SetEffectivePriority -/* 80341E18 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80341E1C 40 82 FF D0 */ bne lbl_80341DEC -lbl_80341E20: -/* 80341E20 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341E24 2C 00 00 00 */ cmpwi r0, 0 -/* 80341E28 41 82 00 0C */ beq lbl_80341E34 -/* 80341E2C 38 60 00 00 */ li r3, 0 -/* 80341E30 4B FF F1 C9 */ bl SelectThread -lbl_80341E34: -/* 80341E34 7F C3 F3 78 */ mr r3, r30 -/* 80341E38 4B FF B8 E5 */ bl OSRestoreInterrupts -/* 80341E3C 38 60 00 01 */ li r3, 1 -lbl_80341E40: -/* 80341E40 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80341E44 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80341E48 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80341E4C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80341E50 38 21 00 20 */ addi r1, r1, 0x20 -/* 80341E54 7C 08 03 A6 */ mtlr r0 -/* 80341E58 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSSleepThread.s b/asm/dolphin/os/OSThread/OSSleepThread.s deleted file mode 100644 index 5ebaadb6954..00000000000 --- a/asm/dolphin/os/OSThread/OSSleepThread.s +++ /dev/null @@ -1,69 +0,0 @@ -lbl_80341BAC: -/* 80341BAC 7C 08 02 A6 */ mflr r0 -/* 80341BB0 90 01 00 04 */ stw r0, 4(r1) -/* 80341BB4 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80341BB8 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80341BBC 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80341BC0 7C 7E 1B 78 */ mr r30, r3 -/* 80341BC4 4B FF BB 31 */ bl OSDisableInterrupts -/* 80341BC8 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000E4@ha */ -/* 80341BCC 80 84 00 E4 */ lwz r4, 0x00E4(r4) /* 0x800000E4@l */ -/* 80341BD0 38 00 00 04 */ li r0, 4 -/* 80341BD4 7C 7F 1B 78 */ mr r31, r3 -/* 80341BD8 B0 04 02 C8 */ sth r0, 0x2c8(r4) -/* 80341BDC 93 C4 02 DC */ stw r30, 0x2dc(r4) -/* 80341BE0 80 BE 00 00 */ lwz r5, 0(r30) -/* 80341BE4 48 00 00 08 */ b lbl_80341BEC -lbl_80341BE8: -/* 80341BE8 80 A5 02 E0 */ lwz r5, 0x2e0(r5) -lbl_80341BEC: -/* 80341BEC 28 05 00 00 */ cmplwi r5, 0 -/* 80341BF0 41 82 00 14 */ beq lbl_80341C04 -/* 80341BF4 80 65 02 D0 */ lwz r3, 0x2d0(r5) -/* 80341BF8 80 04 02 D0 */ lwz r0, 0x2d0(r4) -/* 80341BFC 7C 03 00 00 */ cmpw r3, r0 -/* 80341C00 40 81 FF E8 */ ble lbl_80341BE8 -lbl_80341C04: -/* 80341C04 28 05 00 00 */ cmplwi r5, 0 -/* 80341C08 40 82 00 30 */ bne lbl_80341C38 -/* 80341C0C 80 7E 00 04 */ lwz r3, 4(r30) -/* 80341C10 28 03 00 00 */ cmplwi r3, 0 -/* 80341C14 40 82 00 0C */ bne lbl_80341C20 -/* 80341C18 90 9E 00 00 */ stw r4, 0(r30) -/* 80341C1C 48 00 00 08 */ b lbl_80341C24 -lbl_80341C20: -/* 80341C20 90 83 02 E0 */ stw r4, 0x2e0(r3) -lbl_80341C24: -/* 80341C24 90 64 02 E4 */ stw r3, 0x2e4(r4) -/* 80341C28 38 00 00 00 */ li r0, 0 -/* 80341C2C 90 04 02 E0 */ stw r0, 0x2e0(r4) -/* 80341C30 90 9E 00 04 */ stw r4, 4(r30) -/* 80341C34 48 00 00 28 */ b lbl_80341C5C -lbl_80341C38: -/* 80341C38 90 A4 02 E0 */ stw r5, 0x2e0(r4) -/* 80341C3C 80 65 02 E4 */ lwz r3, 0x2e4(r5) -/* 80341C40 90 85 02 E4 */ stw r4, 0x2e4(r5) -/* 80341C44 28 03 00 00 */ cmplwi r3, 0 -/* 80341C48 90 64 02 E4 */ stw r3, 0x2e4(r4) -/* 80341C4C 40 82 00 0C */ bne lbl_80341C58 -/* 80341C50 90 9E 00 00 */ stw r4, 0(r30) -/* 80341C54 48 00 00 08 */ b lbl_80341C5C -lbl_80341C58: -/* 80341C58 90 83 02 E0 */ stw r4, 0x2e0(r3) -lbl_80341C5C: -/* 80341C5C 38 00 00 01 */ li r0, 1 -/* 80341C60 90 0D 91 44 */ stw r0, RunQueueHint(r13) -/* 80341C64 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341C68 2C 00 00 00 */ cmpwi r0, 0 -/* 80341C6C 41 82 00 0C */ beq lbl_80341C78 -/* 80341C70 38 60 00 00 */ li r3, 0 -/* 80341C74 4B FF F3 85 */ bl SelectThread -lbl_80341C78: -/* 80341C78 7F E3 FB 78 */ mr r3, r31 -/* 80341C7C 4B FF BA A1 */ bl OSRestoreInterrupts -/* 80341C80 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80341C84 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80341C88 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80341C8C 38 21 00 18 */ addi r1, r1, 0x18 -/* 80341C90 7C 08 03 A6 */ mtlr r0 -/* 80341C94 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSSuspendThread.s b/asm/dolphin/os/OSThread/OSSuspendThread.s deleted file mode 100644 index 56c357749f3..00000000000 --- a/asm/dolphin/os/OSThread/OSSuspendThread.s +++ /dev/null @@ -1,106 +0,0 @@ -lbl_80341A3C: -/* 80341A3C 7C 08 02 A6 */ mflr r0 -/* 80341A40 90 01 00 04 */ stw r0, 4(r1) -/* 80341A44 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80341A48 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80341A4C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80341A50 93 A1 00 14 */ stw r29, 0x14(r1) -/* 80341A54 7C 7D 1B 78 */ mr r29, r3 -/* 80341A58 4B FF BC 9D */ bl OSDisableInterrupts -/* 80341A5C 80 9D 02 CC */ lwz r4, 0x2cc(r29) -/* 80341A60 3B E3 00 00 */ addi r31, r3, 0 -/* 80341A64 38 04 00 01 */ addi r0, r4, 1 -/* 80341A68 7C 9E 23 79 */ or. r30, r4, r4 -/* 80341A6C 90 1D 02 CC */ stw r0, 0x2cc(r29) -/* 80341A70 40 82 01 14 */ bne lbl_80341B84 -/* 80341A74 A0 1D 02 C8 */ lhz r0, 0x2c8(r29) -/* 80341A78 2C 00 00 03 */ cmpwi r0, 3 -/* 80341A7C 41 82 00 F4 */ beq lbl_80341B70 -/* 80341A80 40 80 00 14 */ bge lbl_80341A94 -/* 80341A84 2C 00 00 01 */ cmpwi r0, 1 -/* 80341A88 41 82 00 28 */ beq lbl_80341AB0 -/* 80341A8C 40 80 00 14 */ bge lbl_80341AA0 -/* 80341A90 48 00 00 E0 */ b lbl_80341B70 -lbl_80341A94: -/* 80341A94 2C 00 00 05 */ cmpwi r0, 5 -/* 80341A98 40 80 00 D8 */ bge lbl_80341B70 -/* 80341A9C 48 00 00 20 */ b lbl_80341ABC -lbl_80341AA0: -/* 80341AA0 38 00 00 01 */ li r0, 1 -/* 80341AA4 90 0D 91 44 */ stw r0, RunQueueHint(r13) -/* 80341AA8 B0 1D 02 C8 */ sth r0, 0x2c8(r29) -/* 80341AAC 48 00 00 C4 */ b lbl_80341B70 -lbl_80341AB0: -/* 80341AB0 7F A3 EB 78 */ mr r3, r29 -/* 80341AB4 4B FF F2 91 */ bl UnsetRun -/* 80341AB8 48 00 00 B8 */ b lbl_80341B70 -lbl_80341ABC: -/* 80341ABC 80 9D 02 E0 */ lwz r4, 0x2e0(r29) -/* 80341AC0 80 BD 02 E4 */ lwz r5, 0x2e4(r29) -/* 80341AC4 28 04 00 00 */ cmplwi r4, 0 -/* 80341AC8 40 82 00 10 */ bne lbl_80341AD8 -/* 80341ACC 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 80341AD0 90 A3 00 04 */ stw r5, 4(r3) -/* 80341AD4 48 00 00 08 */ b lbl_80341ADC -lbl_80341AD8: -/* 80341AD8 90 A4 02 E4 */ stw r5, 0x2e4(r4) -lbl_80341ADC: -/* 80341ADC 28 05 00 00 */ cmplwi r5, 0 -/* 80341AE0 40 82 00 10 */ bne lbl_80341AF0 -/* 80341AE4 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 80341AE8 90 83 00 00 */ stw r4, 0(r3) -/* 80341AEC 48 00 00 08 */ b lbl_80341AF4 -lbl_80341AF0: -/* 80341AF0 90 85 02 E0 */ stw r4, 0x2e0(r5) -lbl_80341AF4: -/* 80341AF4 38 00 00 20 */ li r0, 0x20 -/* 80341AF8 90 1D 02 D0 */ stw r0, 0x2d0(r29) -/* 80341AFC 80 9D 02 DC */ lwz r4, 0x2dc(r29) -/* 80341B00 80 64 00 04 */ lwz r3, 4(r4) -/* 80341B04 28 03 00 00 */ cmplwi r3, 0 -/* 80341B08 40 82 00 0C */ bne lbl_80341B14 -/* 80341B0C 93 A4 00 00 */ stw r29, 0(r4) -/* 80341B10 48 00 00 08 */ b lbl_80341B18 -lbl_80341B14: -/* 80341B14 93 A3 02 E0 */ stw r29, 0x2e0(r3) -lbl_80341B18: -/* 80341B18 90 7D 02 E4 */ stw r3, 0x2e4(r29) -/* 80341B1C 38 00 00 00 */ li r0, 0 -/* 80341B20 90 1D 02 E0 */ stw r0, 0x2e0(r29) -/* 80341B24 80 7D 02 DC */ lwz r3, 0x2dc(r29) -/* 80341B28 93 A3 00 04 */ stw r29, 4(r3) -/* 80341B2C 80 7D 02 F0 */ lwz r3, 0x2f0(r29) -/* 80341B30 28 03 00 00 */ cmplwi r3, 0 -/* 80341B34 41 82 00 3C */ beq lbl_80341B70 -/* 80341B38 83 A3 00 08 */ lwz r29, 8(r3) -lbl_80341B3C: -/* 80341B3C 80 1D 02 CC */ lwz r0, 0x2cc(r29) -/* 80341B40 2C 00 00 00 */ cmpwi r0, 0 -/* 80341B44 41 81 00 2C */ bgt lbl_80341B70 -/* 80341B48 7F A3 EB 78 */ mr r3, r29 -/* 80341B4C 4B FF F2 61 */ bl __OSGetEffectivePriority -/* 80341B50 80 1D 02 D0 */ lwz r0, 0x2d0(r29) -/* 80341B54 38 83 00 00 */ addi r4, r3, 0 -/* 80341B58 7C 00 20 00 */ cmpw r0, r4 -/* 80341B5C 41 82 00 14 */ beq lbl_80341B70 -/* 80341B60 7F A3 EB 78 */ mr r3, r29 -/* 80341B64 4B FF F2 85 */ bl SetEffectivePriority -/* 80341B68 7C 7D 1B 79 */ or. r29, r3, r3 -/* 80341B6C 40 82 FF D0 */ bne lbl_80341B3C -lbl_80341B70: -/* 80341B70 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341B74 2C 00 00 00 */ cmpwi r0, 0 -/* 80341B78 41 82 00 0C */ beq lbl_80341B84 -/* 80341B7C 38 60 00 00 */ li r3, 0 -/* 80341B80 4B FF F4 79 */ bl SelectThread -lbl_80341B84: -/* 80341B84 7F E3 FB 78 */ mr r3, r31 -/* 80341B88 4B FF BB 95 */ bl OSRestoreInterrupts -/* 80341B8C 7F C3 F3 78 */ mr r3, r30 -/* 80341B90 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80341B94 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 80341B98 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 80341B9C 83 A1 00 14 */ lwz r29, 0x14(r1) -/* 80341BA0 38 21 00 20 */ addi r1, r1, 0x20 -/* 80341BA4 7C 08 03 A6 */ mtlr r0 -/* 80341BA8 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/OSWakeupThread.s b/asm/dolphin/os/OSThread/OSWakeupThread.s deleted file mode 100644 index 9c00ce24e9b..00000000000 --- a/asm/dolphin/os/OSThread/OSWakeupThread.s +++ /dev/null @@ -1,73 +0,0 @@ -lbl_80341C98: -/* 80341C98 7C 08 02 A6 */ mflr r0 -/* 80341C9C 90 01 00 04 */ stw r0, 4(r1) -/* 80341CA0 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80341CA4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80341CA8 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80341CAC 7C 7E 1B 78 */ mr r30, r3 -/* 80341CB0 4B FF BA 45 */ bl OSDisableInterrupts -/* 80341CB4 3C 80 80 45 */ lis r4, RunQueue@ha /* 0x8044BB78@ha */ -/* 80341CB8 3B E3 00 00 */ addi r31, r3, 0 -/* 80341CBC 38 A4 BB 78 */ addi r5, r4, RunQueue@l /* 0x8044BB78@l */ -/* 80341CC0 48 00 00 9C */ b lbl_80341D5C -lbl_80341CC4: -/* 80341CC4 80 66 02 E0 */ lwz r3, 0x2e0(r6) -/* 80341CC8 28 03 00 00 */ cmplwi r3, 0 -/* 80341CCC 40 82 00 10 */ bne lbl_80341CDC -/* 80341CD0 38 00 00 00 */ li r0, 0 -/* 80341CD4 90 1E 00 04 */ stw r0, 4(r30) -/* 80341CD8 48 00 00 0C */ b lbl_80341CE4 -lbl_80341CDC: -/* 80341CDC 38 00 00 00 */ li r0, 0 -/* 80341CE0 90 03 02 E4 */ stw r0, 0x2e4(r3) -lbl_80341CE4: -/* 80341CE4 90 7E 00 00 */ stw r3, 0(r30) -/* 80341CE8 38 00 00 01 */ li r0, 1 -/* 80341CEC B0 06 02 C8 */ sth r0, 0x2c8(r6) -/* 80341CF0 80 06 02 CC */ lwz r0, 0x2cc(r6) -/* 80341CF4 2C 00 00 00 */ cmpwi r0, 0 -/* 80341CF8 41 81 00 64 */ bgt lbl_80341D5C -/* 80341CFC 80 06 02 D0 */ lwz r0, 0x2d0(r6) -/* 80341D00 54 00 18 38 */ slwi r0, r0, 3 -/* 80341D04 7C 05 02 14 */ add r0, r5, r0 -/* 80341D08 90 06 02 DC */ stw r0, 0x2dc(r6) -/* 80341D0C 80 86 02 DC */ lwz r4, 0x2dc(r6) -/* 80341D10 80 64 00 04 */ lwz r3, 4(r4) -/* 80341D14 28 03 00 00 */ cmplwi r3, 0 -/* 80341D18 40 82 00 0C */ bne lbl_80341D24 -/* 80341D1C 90 C4 00 00 */ stw r6, 0(r4) -/* 80341D20 48 00 00 08 */ b lbl_80341D28 -lbl_80341D24: -/* 80341D24 90 C3 02 E0 */ stw r6, 0x2e0(r3) -lbl_80341D28: -/* 80341D28 90 66 02 E4 */ stw r3, 0x2e4(r6) -/* 80341D2C 38 00 00 00 */ li r0, 0 -/* 80341D30 38 60 00 01 */ li r3, 1 -/* 80341D34 90 06 02 E0 */ stw r0, 0x2e0(r6) -/* 80341D38 80 86 02 DC */ lwz r4, 0x2dc(r6) -/* 80341D3C 90 C4 00 04 */ stw r6, 4(r4) -/* 80341D40 80 06 02 D0 */ lwz r0, 0x2d0(r6) -/* 80341D44 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 80341D48 20 00 00 1F */ subfic r0, r0, 0x1f -/* 80341D4C 7C 60 00 30 */ slw r0, r3, r0 -/* 80341D50 7C 80 03 78 */ or r0, r4, r0 -/* 80341D54 90 0D 91 40 */ stw r0, RunQueueBits(r13) -/* 80341D58 90 6D 91 44 */ stw r3, RunQueueHint(r13) -lbl_80341D5C: -/* 80341D5C 80 DE 00 00 */ lwz r6, 0(r30) -/* 80341D60 28 06 00 00 */ cmplwi r6, 0 -/* 80341D64 40 82 FF 60 */ bne lbl_80341CC4 -/* 80341D68 80 0D 91 44 */ lwz r0, RunQueueHint(r13) -/* 80341D6C 2C 00 00 00 */ cmpwi r0, 0 -/* 80341D70 41 82 00 0C */ beq lbl_80341D7C -/* 80341D74 38 60 00 00 */ li r3, 0 -/* 80341D78 4B FF F2 81 */ bl SelectThread -lbl_80341D7C: -/* 80341D7C 7F E3 FB 78 */ mr r3, r31 -/* 80341D80 4B FF B9 9D */ bl OSRestoreInterrupts -/* 80341D84 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80341D88 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80341D8C 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80341D90 38 21 00 18 */ addi r1, r1, 0x18 -/* 80341D94 7C 08 03 A6 */ mtlr r0 -/* 80341D98 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/SelectThread.s b/asm/dolphin/os/OSThread/SelectThread.s deleted file mode 100644 index be05df93b71..00000000000 --- a/asm/dolphin/os/OSThread/SelectThread.s +++ /dev/null @@ -1,153 +0,0 @@ -lbl_80340FF8: -/* 80340FF8 7C 08 02 A6 */ mflr r0 -/* 80340FFC 3C 80 80 45 */ lis r4, RunQueue@ha /* 0x8044BB78@ha */ -/* 80341000 90 01 00 04 */ stw r0, 4(r1) -/* 80341004 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80341008 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8034100C 3B E4 BB 78 */ addi r31, r4, RunQueue@l /* 0x8044BB78@l */ -/* 80341010 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80341014 3B C3 00 00 */ addi r30, r3, 0 -/* 80341018 80 0D 91 48 */ lwz r0, Reschedule(r13) -/* 8034101C 2C 00 00 00 */ cmpwi r0, 0 -/* 80341020 40 81 00 0C */ ble lbl_8034102C -/* 80341024 38 60 00 00 */ li r3, 0 -/* 80341028 48 00 01 E0 */ b lbl_80341208 -lbl_8034102C: -/* 8034102C 4B FF AE 69 */ bl OSGetCurrentContext -/* 80341030 3C 80 80 00 */ lis r4, 0x8000 /* 0x800000E4@ha */ -/* 80341034 80 C4 00 E4 */ lwz r6, 0x00E4(r4) /* 0x800000E4@l */ -/* 80341038 7C 03 30 40 */ cmplw r3, r6 -/* 8034103C 38 66 00 00 */ addi r3, r6, 0 -/* 80341040 41 82 00 0C */ beq lbl_8034104C -/* 80341044 38 60 00 00 */ li r3, 0 -/* 80341048 48 00 01 C0 */ b lbl_80341208 -lbl_8034104C: -/* 8034104C 28 06 00 00 */ cmplwi r6, 0 -/* 80341050 41 82 00 BC */ beq lbl_8034110C -/* 80341054 A0 06 02 C8 */ lhz r0, 0x2c8(r6) -/* 80341058 28 00 00 02 */ cmplwi r0, 2 -/* 8034105C 40 82 00 90 */ bne lbl_803410EC -/* 80341060 2C 1E 00 00 */ cmpwi r30, 0 -/* 80341064 40 82 00 20 */ bne lbl_80341084 -/* 80341068 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 8034106C 80 06 02 D0 */ lwz r0, 0x2d0(r6) -/* 80341070 7C 84 00 34 */ cntlzw r4, r4 -/* 80341074 7C 00 20 00 */ cmpw r0, r4 -/* 80341078 41 81 00 0C */ bgt lbl_80341084 -/* 8034107C 38 60 00 00 */ li r3, 0 -/* 80341080 48 00 01 88 */ b lbl_80341208 -lbl_80341084: -/* 80341084 38 00 00 01 */ li r0, 1 -/* 80341088 B0 06 02 C8 */ sth r0, 0x2c8(r6) -/* 8034108C 80 06 02 D0 */ lwz r0, 0x2d0(r6) -/* 80341090 54 00 18 38 */ slwi r0, r0, 3 -/* 80341094 7C 1F 02 14 */ add r0, r31, r0 -/* 80341098 90 06 02 DC */ stw r0, 0x2dc(r6) -/* 8034109C 80 A6 02 DC */ lwz r5, 0x2dc(r6) -/* 803410A0 80 85 00 04 */ lwz r4, 4(r5) -/* 803410A4 28 04 00 00 */ cmplwi r4, 0 -/* 803410A8 40 82 00 0C */ bne lbl_803410B4 -/* 803410AC 90 C5 00 00 */ stw r6, 0(r5) -/* 803410B0 48 00 00 08 */ b lbl_803410B8 -lbl_803410B4: -/* 803410B4 90 C4 02 E0 */ stw r6, 0x2e0(r4) -lbl_803410B8: -/* 803410B8 90 86 02 E4 */ stw r4, 0x2e4(r6) -/* 803410BC 38 00 00 00 */ li r0, 0 -/* 803410C0 38 80 00 01 */ li r4, 1 -/* 803410C4 90 06 02 E0 */ stw r0, 0x2e0(r6) -/* 803410C8 80 A6 02 DC */ lwz r5, 0x2dc(r6) -/* 803410CC 90 C5 00 04 */ stw r6, 4(r5) -/* 803410D0 80 06 02 D0 */ lwz r0, 0x2d0(r6) -/* 803410D4 80 AD 91 40 */ lwz r5, RunQueueBits(r13) -/* 803410D8 20 00 00 1F */ subfic r0, r0, 0x1f -/* 803410DC 7C 80 00 30 */ slw r0, r4, r0 -/* 803410E0 7C A0 03 78 */ or r0, r5, r0 -/* 803410E4 90 0D 91 40 */ stw r0, RunQueueBits(r13) -/* 803410E8 90 8D 91 44 */ stw r4, RunQueueHint(r13) -lbl_803410EC: -/* 803410EC A0 06 01 A2 */ lhz r0, 0x1a2(r6) -/* 803410F0 54 00 07 BD */ rlwinm. r0, r0, 0, 0x1e, 0x1e -/* 803410F4 40 82 00 18 */ bne lbl_8034110C -/* 803410F8 4B FF AD A9 */ bl OSSaveContext -/* 803410FC 28 03 00 00 */ cmplwi r3, 0 -/* 80341100 41 82 00 0C */ beq lbl_8034110C -/* 80341104 38 60 00 00 */ li r3, 0 -/* 80341108 48 00 01 00 */ b lbl_80341208 -lbl_8034110C: -/* 8034110C 80 0D 91 40 */ lwz r0, RunQueueBits(r13) -/* 80341110 28 00 00 00 */ cmplwi r0, 0 -/* 80341114 40 82 00 54 */ bne lbl_80341168 -/* 80341118 81 8D 84 38 */ lwz r12, SwitchThreadCallback(r13) -/* 8034111C 3F C0 80 00 */ lis r30, 0x8000 /* 0x800000E4@ha */ -/* 80341120 80 7E 00 E4 */ lwz r3, 0x00E4(r30) /* 0x800000E4@l */ -/* 80341124 38 80 00 00 */ li r4, 0 -/* 80341128 7D 88 03 A6 */ mtlr r12 -/* 8034112C 4E 80 00 21 */ blrl -/* 80341130 38 00 00 00 */ li r0, 0 -/* 80341134 90 1E 00 E4 */ stw r0, 0xe4(r30) -/* 80341138 38 7F 07 30 */ addi r3, r31, 0x730 -/* 8034113C 4B FF AC FD */ bl OSSetCurrentContext -lbl_80341140: -/* 80341140 4B FF C5 C9 */ bl OSEnableInterrupts -lbl_80341144: -/* 80341144 80 0D 91 40 */ lwz r0, RunQueueBits(r13) -/* 80341148 28 00 00 00 */ cmplwi r0, 0 -/* 8034114C 41 82 FF F8 */ beq lbl_80341144 -/* 80341150 4B FF C5 A5 */ bl OSDisableInterrupts -/* 80341154 80 0D 91 40 */ lwz r0, RunQueueBits(r13) -/* 80341158 28 00 00 00 */ cmplwi r0, 0 -/* 8034115C 41 82 FF E4 */ beq lbl_80341140 -/* 80341160 38 7F 07 30 */ addi r3, r31, 0x730 -/* 80341164 4B FF AE 9D */ bl OSClearContext -lbl_80341168: -/* 80341168 38 60 00 00 */ li r3, 0 -/* 8034116C 90 6D 91 44 */ stw r3, RunQueueHint(r13) -/* 80341170 80 0D 91 40 */ lwz r0, RunQueueBits(r13) -/* 80341174 7C 07 00 34 */ cntlzw r7, r0 -/* 80341178 54 E0 18 38 */ slwi r0, r7, 3 -/* 8034117C 7C 9F 02 14 */ add r4, r31, r0 -/* 80341180 80 A4 00 00 */ lwz r5, 0(r4) -/* 80341184 80 C5 02 E0 */ lwz r6, 0x2e0(r5) -/* 80341188 3B C5 00 00 */ addi r30, r5, 0 -/* 8034118C 28 06 00 00 */ cmplwi r6, 0 -/* 80341190 40 82 00 0C */ bne lbl_8034119C -/* 80341194 90 64 00 04 */ stw r3, 4(r4) -/* 80341198 48 00 00 08 */ b lbl_803411A0 -lbl_8034119C: -/* 8034119C 90 66 02 E4 */ stw r3, 0x2e4(r6) -lbl_803411A0: -/* 803411A0 90 C4 00 00 */ stw r6, 0(r4) -/* 803411A4 80 04 00 00 */ lwz r0, 0(r4) -/* 803411A8 28 00 00 00 */ cmplwi r0, 0 -/* 803411AC 40 82 00 1C */ bne lbl_803411C8 -/* 803411B0 20 07 00 1F */ subfic r0, r7, 0x1f -/* 803411B4 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 803411B8 38 60 00 01 */ li r3, 1 -/* 803411BC 7C 60 00 30 */ slw r0, r3, r0 -/* 803411C0 7C 80 00 78 */ andc r0, r4, r0 -/* 803411C4 90 0D 91 40 */ stw r0, RunQueueBits(r13) -lbl_803411C8: -/* 803411C8 38 00 00 00 */ li r0, 0 -/* 803411CC 90 1E 02 DC */ stw r0, 0x2dc(r30) -/* 803411D0 38 00 00 02 */ li r0, 2 -/* 803411D4 3F E0 80 00 */ lis r31, 0x8000 /* 0x800000E4@ha */ -/* 803411D8 B0 1E 02 C8 */ sth r0, 0x2c8(r30) -/* 803411DC 7F C4 F3 78 */ mr r4, r30 -/* 803411E0 81 8D 84 38 */ lwz r12, SwitchThreadCallback(r13) -/* 803411E4 80 7F 00 E4 */ lwz r3, 0x00E4(r31) /* 0x800000E4@l */ -/* 803411E8 7D 88 03 A6 */ mtlr r12 -/* 803411EC 4E 80 00 21 */ blrl -/* 803411F0 93 DF 00 E4 */ stw r30, 0xe4(r31) -/* 803411F4 7F C3 F3 78 */ mr r3, r30 -/* 803411F8 4B FF AC 41 */ bl OSSetCurrentContext -/* 803411FC 7F C3 F3 78 */ mr r3, r30 -/* 80341200 4B FF AD 21 */ bl OSLoadContext -/* 80341204 7F C3 F3 78 */ mr r3, r30 -lbl_80341208: -/* 80341208 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 8034120C 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80341210 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80341214 38 21 00 18 */ addi r1, r1, 0x18 -/* 80341218 7C 08 03 A6 */ mtlr r0 -/* 8034121C 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/SetEffectivePriority.s b/asm/dolphin/os/OSThread/SetEffectivePriority.s deleted file mode 100644 index 09eb2024436..00000000000 --- a/asm/dolphin/os/OSThread/SetEffectivePriority.s +++ /dev/null @@ -1,133 +0,0 @@ -lbl_80340DE8: -/* 80340DE8 7C 08 02 A6 */ mflr r0 -/* 80340DEC 90 01 00 04 */ stw r0, 4(r1) -/* 80340DF0 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80340DF4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80340DF8 7C 7F 1B 78 */ mr r31, r3 -/* 80340DFC 93 C1 00 10 */ stw r30, 0x10(r1) -/* 80340E00 3B C4 00 00 */ addi r30, r4, 0 -/* 80340E04 A0 03 02 C8 */ lhz r0, 0x2c8(r3) -/* 80340E08 2C 00 00 03 */ cmpwi r0, 3 -/* 80340E0C 41 82 01 80 */ beq lbl_80340F8C -/* 80340E10 40 80 00 14 */ bge lbl_80340E24 -/* 80340E14 2C 00 00 01 */ cmpwi r0, 1 -/* 80340E18 41 82 00 18 */ beq lbl_80340E30 -/* 80340E1C 40 80 01 64 */ bge lbl_80340F80 -/* 80340E20 48 00 01 6C */ b lbl_80340F8C -lbl_80340E24: -/* 80340E24 2C 00 00 05 */ cmpwi r0, 5 -/* 80340E28 40 80 01 64 */ bge lbl_80340F8C -/* 80340E2C 48 00 00 7C */ b lbl_80340EA8 -lbl_80340E30: -/* 80340E30 7F E3 FB 78 */ mr r3, r31 -/* 80340E34 4B FF FF 11 */ bl UnsetRun -/* 80340E38 93 DF 02 D0 */ stw r30, 0x2d0(r31) -/* 80340E3C 3C 60 80 45 */ lis r3, RunQueue@ha /* 0x8044BB78@ha */ -/* 80340E40 38 03 BB 78 */ addi r0, r3, RunQueue@l /* 0x8044BB78@l */ -/* 80340E44 80 7F 02 D0 */ lwz r3, 0x2d0(r31) -/* 80340E48 54 63 18 38 */ slwi r3, r3, 3 -/* 80340E4C 7C 00 1A 14 */ add r0, r0, r3 -/* 80340E50 90 1F 02 DC */ stw r0, 0x2dc(r31) -/* 80340E54 80 9F 02 DC */ lwz r4, 0x2dc(r31) -/* 80340E58 80 64 00 04 */ lwz r3, 4(r4) -/* 80340E5C 28 03 00 00 */ cmplwi r3, 0 -/* 80340E60 40 82 00 0C */ bne lbl_80340E6C -/* 80340E64 93 E4 00 00 */ stw r31, 0(r4) -/* 80340E68 48 00 00 08 */ b lbl_80340E70 -lbl_80340E6C: -/* 80340E6C 93 E3 02 E0 */ stw r31, 0x2e0(r3) -lbl_80340E70: -/* 80340E70 90 7F 02 E4 */ stw r3, 0x2e4(r31) -/* 80340E74 38 00 00 00 */ li r0, 0 -/* 80340E78 38 60 00 01 */ li r3, 1 -/* 80340E7C 90 1F 02 E0 */ stw r0, 0x2e0(r31) -/* 80340E80 80 9F 02 DC */ lwz r4, 0x2dc(r31) -/* 80340E84 93 E4 00 04 */ stw r31, 4(r4) -/* 80340E88 80 1F 02 D0 */ lwz r0, 0x2d0(r31) -/* 80340E8C 80 8D 91 40 */ lwz r4, RunQueueBits(r13) -/* 80340E90 20 00 00 1F */ subfic r0, r0, 0x1f -/* 80340E94 7C 60 00 30 */ slw r0, r3, r0 -/* 80340E98 7C 80 03 78 */ or r0, r4, r0 -/* 80340E9C 90 0D 91 40 */ stw r0, RunQueueBits(r13) -/* 80340EA0 90 6D 91 44 */ stw r3, RunQueueHint(r13) -/* 80340EA4 48 00 00 E8 */ b lbl_80340F8C -lbl_80340EA8: -/* 80340EA8 80 9F 02 E0 */ lwz r4, 0x2e0(r31) -/* 80340EAC 80 BF 02 E4 */ lwz r5, 0x2e4(r31) -/* 80340EB0 28 04 00 00 */ cmplwi r4, 0 -/* 80340EB4 40 82 00 10 */ bne lbl_80340EC4 -/* 80340EB8 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80340EBC 90 A3 00 04 */ stw r5, 4(r3) -/* 80340EC0 48 00 00 08 */ b lbl_80340EC8 -lbl_80340EC4: -/* 80340EC4 90 A4 02 E4 */ stw r5, 0x2e4(r4) -lbl_80340EC8: -/* 80340EC8 28 05 00 00 */ cmplwi r5, 0 -/* 80340ECC 40 82 00 10 */ bne lbl_80340EDC -/* 80340ED0 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80340ED4 90 83 00 00 */ stw r4, 0(r3) -/* 80340ED8 48 00 00 08 */ b lbl_80340EE0 -lbl_80340EDC: -/* 80340EDC 90 85 02 E0 */ stw r4, 0x2e0(r5) -lbl_80340EE0: -/* 80340EE0 93 DF 02 D0 */ stw r30, 0x2d0(r31) -/* 80340EE4 80 9F 02 DC */ lwz r4, 0x2dc(r31) -/* 80340EE8 80 A4 00 00 */ lwz r5, 0(r4) -/* 80340EEC 48 00 00 08 */ b lbl_80340EF4 -lbl_80340EF0: -/* 80340EF0 80 A5 02 E0 */ lwz r5, 0x2e0(r5) -lbl_80340EF4: -/* 80340EF4 28 05 00 00 */ cmplwi r5, 0 -/* 80340EF8 41 82 00 14 */ beq lbl_80340F0C -/* 80340EFC 80 65 02 D0 */ lwz r3, 0x2d0(r5) -/* 80340F00 80 1F 02 D0 */ lwz r0, 0x2d0(r31) -/* 80340F04 7C 03 00 00 */ cmpw r3, r0 -/* 80340F08 40 81 FF E8 */ ble lbl_80340EF0 -lbl_80340F0C: -/* 80340F0C 28 05 00 00 */ cmplwi r5, 0 -/* 80340F10 40 82 00 34 */ bne lbl_80340F44 -/* 80340F14 80 64 00 04 */ lwz r3, 4(r4) -/* 80340F18 28 03 00 00 */ cmplwi r3, 0 -/* 80340F1C 40 82 00 0C */ bne lbl_80340F28 -/* 80340F20 93 E4 00 00 */ stw r31, 0(r4) -/* 80340F24 48 00 00 08 */ b lbl_80340F2C -lbl_80340F28: -/* 80340F28 93 E3 02 E0 */ stw r31, 0x2e0(r3) -lbl_80340F2C: -/* 80340F2C 90 7F 02 E4 */ stw r3, 0x2e4(r31) -/* 80340F30 38 00 00 00 */ li r0, 0 -/* 80340F34 90 1F 02 E0 */ stw r0, 0x2e0(r31) -/* 80340F38 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80340F3C 93 E3 00 04 */ stw r31, 4(r3) -/* 80340F40 48 00 00 2C */ b lbl_80340F6C -lbl_80340F44: -/* 80340F44 90 BF 02 E0 */ stw r5, 0x2e0(r31) -/* 80340F48 80 65 02 E4 */ lwz r3, 0x2e4(r5) -/* 80340F4C 93 E5 02 E4 */ stw r31, 0x2e4(r5) -/* 80340F50 28 03 00 00 */ cmplwi r3, 0 -/* 80340F54 90 7F 02 E4 */ stw r3, 0x2e4(r31) -/* 80340F58 40 82 00 10 */ bne lbl_80340F68 -/* 80340F5C 80 7F 02 DC */ lwz r3, 0x2dc(r31) -/* 80340F60 93 E3 00 00 */ stw r31, 0(r3) -/* 80340F64 48 00 00 08 */ b lbl_80340F6C -lbl_80340F68: -/* 80340F68 93 E3 02 E0 */ stw r31, 0x2e0(r3) -lbl_80340F6C: -/* 80340F6C 80 7F 02 F0 */ lwz r3, 0x2f0(r31) -/* 80340F70 28 03 00 00 */ cmplwi r3, 0 -/* 80340F74 41 82 00 18 */ beq lbl_80340F8C -/* 80340F78 80 63 00 08 */ lwz r3, 8(r3) -/* 80340F7C 48 00 00 14 */ b lbl_80340F90 -lbl_80340F80: -/* 80340F80 38 00 00 01 */ li r0, 1 -/* 80340F84 90 0D 91 44 */ stw r0, RunQueueHint(r13) -/* 80340F88 93 DF 02 D0 */ stw r30, 0x2d0(r31) -lbl_80340F8C: -/* 80340F8C 38 60 00 00 */ li r3, 0 -lbl_80340F90: -/* 80340F90 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80340F94 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80340F98 83 C1 00 10 */ lwz r30, 0x10(r1) -/* 80340F9C 38 21 00 18 */ addi r1, r1, 0x18 -/* 80340FA0 7C 08 03 A6 */ mtlr r0 -/* 80340FA4 4E 80 00 20 */ blr diff --git a/asm/dolphin/os/OSThread/__OSPromoteThread.s b/asm/dolphin/os/OSThread/__OSPromoteThread.s deleted file mode 100644 index 09a12a15272..00000000000 --- a/asm/dolphin/os/OSThread/__OSPromoteThread.s +++ /dev/null @@ -1,23 +0,0 @@ -lbl_80340FA8: -/* 80340FA8 7C 08 02 A6 */ mflr r0 -/* 80340FAC 90 01 00 04 */ stw r0, 4(r1) -/* 80340FB0 94 21 FF E8 */ stwu r1, -0x18(r1) -/* 80340FB4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 80340FB8 7C 9F 23 78 */ mr r31, r4 -lbl_80340FBC: -/* 80340FBC 80 03 02 CC */ lwz r0, 0x2cc(r3) -/* 80340FC0 2C 00 00 00 */ cmpwi r0, 0 -/* 80340FC4 41 81 00 20 */ bgt lbl_80340FE4 -/* 80340FC8 80 03 02 D0 */ lwz r0, 0x2d0(r3) -/* 80340FCC 7C 00 F8 00 */ cmpw r0, r31 -/* 80340FD0 40 81 00 14 */ ble lbl_80340FE4 -/* 80340FD4 7F E4 FB 78 */ mr r4, r31 -/* 80340FD8 4B FF FE 11 */ bl SetEffectivePriority -/* 80340FDC 28 03 00 00 */ cmplwi r3, 0 -/* 80340FE0 40 82 FF DC */ bne lbl_80340FBC -lbl_80340FE4: -/* 80340FE4 80 01 00 1C */ lwz r0, 0x1c(r1) -/* 80340FE8 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 80340FEC 38 21 00 18 */ addi r1, r1, 0x18 -/* 80340FF0 7C 08 03 A6 */ mtlr r0 -/* 80340FF4 4E 80 00 20 */ blr diff --git a/include/dolphin/os/OSThread.h b/include/dolphin/os/OSThread.h index b7009c7f042..888e668d5d0 100644 --- a/include/dolphin/os/OSThread.h +++ b/include/dolphin/os/OSThread.h @@ -104,9 +104,9 @@ void OSSleepThread(OSThreadQueue* queue); void OSWakeupThread(OSThreadQueue* queue); s32 OSSetThreadPriority(OSThread* thread, s32 priority); s32 OSGetThreadPriority(OSThread* thread); -static s32 CheckThreadQueue(OSThread* thread); +static s32 CheckThreadQueue(OSThreadQueue* thread); s32 OSCheckActiveThreads(void); -static void OSClearStack(u32 value); +static void OSClearStack(u8 value); extern u8 data_804516D0[8]; #ifdef __cplusplus diff --git a/libs/dolphin/ai/ai.c b/libs/dolphin/ai/ai.c index c5f864b7346..f497ba29beb 100644 --- a/libs/dolphin/ai/ai.c +++ b/libs/dolphin/ai/ai.c @@ -21,15 +21,16 @@ static AISCallback __AIS_Callback; static AIDCallback __AID_Callback; /* 8034FC70-8034FCB4 34A5B0 0044+00 0/0 1/1 0/0 .text AIRegisterDMACallback */ -// need compiler epilogue patch -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm AIDCallback AIRegisterDMACallback(AIDCallback callback) { - nofralloc -#include "asm/dolphin/ai/ai/AIRegisterDMACallback.s" +AIDCallback AIRegisterDMACallback(AIDCallback callback) { + s32 oldInts; + AIDCallback ret; + + ret = __AID_Callback; + oldInts = OSDisableInterrupts(); + __AID_Callback = callback; + OSRestoreInterrupts(oldInts); + return ret; } -#pragma pop /* 8034FCB4-8034FD3C 34A5F4 0088+00 0/0 2/2 0/0 .text AIInitDMA */ void AIInitDMA(u32 addr, u32 length) { diff --git a/libs/dolphin/os/OSInterrupt.c b/libs/dolphin/os/OSInterrupt.c index e86ded77fae..086dbb8ee40 100644 --- a/libs/dolphin/os/OSInterrupt.c +++ b/libs/dolphin/os/OSInterrupt.c @@ -315,8 +315,6 @@ extern u32 __OSLastInterruptSrr0; u32 __OSLastInterruptSrr0; /* 8033DBCC-8033DF10 33850C 0344+00 1/1 0/0 0/0 .text __OSDispatchInterrupt */ -// need compiler epilogue patch -#ifdef NONMATCHING void __OSDispatchInterrupt(__OSException exception, OSContext* context) { u32 intsr; u32 reg; @@ -435,16 +433,6 @@ void __OSDispatchInterrupt(__OSException exception, OSContext* context) { OSLoadContext(context); } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __OSDispatchInterrupt(__OSException exception, OSContext* context) { - nofralloc -#include "asm/dolphin/os/OSInterrupt/__OSDispatchInterrupt.s" -} -#pragma pop -#endif /* 8033DF10-8033DF60 338850 0050+00 1/1 0/0 0/0 .text ExternalInterruptHandler */ static asm void ExternalInterruptHandler(register OSInterrupt type, register OSContext* context) { diff --git a/libs/dolphin/os/OSThread.c b/libs/dolphin/os/OSThread.c index 1bd8360ce02..b6cf5bd25d1 100644 --- a/libs/dolphin/os/OSThread.c +++ b/libs/dolphin/os/OSThread.c @@ -79,7 +79,7 @@ volatile OSContext* __OSFPUContext : OS_BASE_CACHED + 0x00D8; // External References: // -extern u8 __OSErrorTable[68 + 12 /* padding */]; +extern OSErrorHandlerEx __OSErrorTable[17]; extern u32 __OSFpscrEnableBits; void _epilog(); @@ -92,17 +92,27 @@ static void DefaultSwitchThreadCallback(OSThread* from, OSThread* to) {} /* ############################################################################################## */ /* 804509B8-804509BC -00001 0004+00 3/3 0/0 0/0 .sdata SwitchThreadCallback */ -SECTION_SDATA static OSSwitchThreadCallback SwitchThreadCallback = DefaultSwitchThreadCallback; +static OSSwitchThreadCallback SwitchThreadCallback = DefaultSwitchThreadCallback; /* 80340AA8-80340B1C 33B3E8 0074+00 0/0 1/1 0/0 .text OSSetSwitchThreadCallback */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback func) { - nofralloc -#include "asm/dolphin/os/OSThread/OSSetSwitchThreadCallback.s" +OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback func) { + BOOL enable = OSDisableInterrupts(); + OSSwitchThreadCallback prev = SwitchThreadCallback; + OSSwitchThreadCallback temp; + if (func) { + temp = func; + } else { + temp = DefaultSwitchThreadCallback; + } + SwitchThreadCallback = temp; + + OSRestoreInterrupts(enable); + if (prev == DefaultSwitchThreadCallback) { + return NULL; + } + + return prev; } -#pragma pop /* ############################################################################################## */ /* 8044BB78-8044BC78 078898 0100+00 6/6 0/0 0/0 .bss RunQueue */ @@ -127,10 +137,10 @@ static OSContext IdleContext; #pragma pop /* 804516C0-804516C4 000BC0 0004+00 7/7 0/0 0/0 .sbss RunQueueBits */ -static u32 RunQueueBits; +static vu32 RunQueueBits; /* 804516C4-804516C8 000BC4 0004+00 11/11 0/0 0/0 .sbss RunQueueHint */ -static BOOL RunQueueHint; +static volatile BOOL RunQueueHint; /* 804516C8-804516D0 000BC8 0004+04 4/4 0/0 0/0 .sbss Reschedule */ static volatile s32 Reschedule; @@ -213,24 +223,20 @@ BOOL OSIsThreadTerminated(OSThread* thread) { } /* 80340CC4-80340D04 33B604 0040+00 0/0 8/8 0/0 .text OSDisableScheduler */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSDisableScheduler(void) { - nofralloc -#include "asm/dolphin/os/OSThread/OSDisableScheduler.s" +s32 OSDisableScheduler(void) { + BOOL intr = OSDisableInterrupts(); + s32 ret = Reschedule++; + OSRestoreInterrupts(intr); + return ret; } -#pragma pop /* 80340D04-80340D44 33B644 0040+00 0/0 10/10 0/0 .text OSEnableScheduler */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSEnableScheduler(void) { - nofralloc -#include "asm/dolphin/os/OSThread/OSEnableScheduler.s" +s32 OSEnableScheduler(void) { + BOOL intr = OSDisableInterrupts(); + s32 ret = Reschedule--; + OSRestoreInterrupts(intr); + return ret; } -#pragma pop static inline void SetRun(OSThread* thread) { thread->queue = &RunQueue[thread->effective_priority]; @@ -240,7 +246,8 @@ static inline void SetRun(OSThread* thread) { } /* 80340D44-80340DAC 33B684 0068+00 3/3 0/0 0/0 .text UnsetRun */ -static void UnsetRun(OSThread* thread) { +#pragma dont_inline on +static void UnsetRun(OSThread* thread) { OSThreadQueue* queue; OSThread* next; OSThread* prev; @@ -267,6 +274,7 @@ static void UnsetRun(OSThread* thread) { thread->queue = NULL; } +#pragma dont_inline reset /* 80340DAC-80340DE8 33B6EC 003C+00 4/4 2/2 0/0 .text __OSGetEffectivePriority */ s32 __OSGetEffectivePriority(OSThread* thread) { @@ -284,8 +292,6 @@ s32 __OSGetEffectivePriority(OSThread* thread) { } /* 80340DE8-80340FA8 33B728 01C0+00 5/5 0/0 0/0 .text SetEffectivePriority */ -// needs compiler epilogue patch -#ifdef NONMATCHING static OSThread* SetEffectivePriority(OSThread* thread, s32 priority) { switch (thread->state) { case OS_THREAD_STATE_READY: @@ -308,26 +314,32 @@ static OSThread* SetEffectivePriority(OSThread* thread, s32 priority) { } return NULL; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm OSThread* SetEffectivePriority(OSThread* thread, s32 priority) { - nofralloc -#include "asm/dolphin/os/OSThread/SetEffectivePriority.s" + +static void UpdatePriority(OSThread* thread) { + OSPriority priority; + + do { + if (0 < thread->suspend_count) { + break; + } + priority = __OSGetEffectivePriority(thread); + if (thread->effective_priority == priority) { + break; + } + thread = SetEffectivePriority(thread, priority); + } while (thread); } -#pragma pop -#endif /* 80340FA8-80340FF8 33B8E8 0050+00 0/0 1/1 0/0 .text __OSPromoteThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void __OSPromoteThread(OSThread* thread, s32 priority) { - nofralloc -#include "asm/dolphin/os/OSThread/__OSPromoteThread.s" +void __OSPromoteThread(OSThread* thread, s32 priority) { + do { + if (thread->suspend_count > 0 || thread->effective_priority <= priority) { + break; + } + + thread = SetEffectivePriority(thread, priority); + } while(thread != NULL); } -#pragma pop static inline void __OSSwitchThread(OSThread* nextThread) { OSSetCurrentThread(nextThread); @@ -336,7 +348,6 @@ static inline void __OSSwitchThread(OSThread* nextThread) { } /* 80340FF8-80341220 33B938 0228+00 9/9 0/0 0/0 .text SelectThread */ -#ifdef NONMATCHING inline OSThread* i_OSGetCurrentThread(void) { return OS_CURRENT_THREAD; } @@ -376,8 +387,8 @@ static OSThread* SelectThread(BOOL yield) { } } - OSSetCurrentThread(NULL); if (RunQueueBits == 0) { + OSSetCurrentThread(NULL); OSSetCurrentContext(&IdleContext); do { OSEnableInterrupts(); @@ -402,16 +413,6 @@ static OSThread* SelectThread(BOOL yield) { __OSSwitchThread(nextThread); return nextThread; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm OSThread* SelectThread(BOOL yield) { - nofralloc -#include "asm/dolphin/os/OSThread/SelectThread.s" -} -#pragma pop -#endif /* 80341220-80341250 33BB60 0030+00 0/0 3/3 0/0 .text __OSReschedule */ void __OSReschedule(void) { @@ -432,95 +433,258 @@ void OSYieldThread(void) { } /* 8034128C-80341474 33BBCC 01E8+00 0/0 5/5 3/3 .text OSCreateThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stackBase, u32 stackSize, - s32 priority, u16 attribute) { - nofralloc -#include "asm/dolphin/os/OSThread/OSCreateThread.s" +BOOL OSCreateThread(OSThread* thread_, void* func, void* param, void* stackBase, u32 stackSize, + s32 priority, u16 attribute) { + BOOL enabled; + u32 i; + u32* stack; + OSThread* thread; + u32 stack1, stack2; + + if (priority < 0 || priority > 31) { + return FALSE; + } + + thread = thread_; + + thread->state = OS_THREAD_STATE_READY; + thread->attributes = attribute & 1; + thread->base_priority = priority; + thread->effective_priority = priority; + thread->suspend_count = 1; + thread->exit_value = (void*)-1; + thread->mutex = NULL; + thread->join_queue.tail = NULL; + thread->join_queue.head = NULL; + thread->owned_mutexes.tail = NULL; + thread->owned_mutexes.head = NULL; + stack = (u32*)((u32)stackBase & 0xfffffff8); + stack[-2] = 0; + stack[-1] = 0; + OSInitContext(&thread->context, (u32)func,(u32)stack - 8); + thread->context.lr = (u32) OSExitThread; + thread->context.gpr[3] = (u32) param; + thread->stack_base = (u8*)stackBase; + thread->stack_end = (void*)((u32)stackBase - stackSize); + *(u32*)thread->stack_end = OS_THREAD_STACK_MAGIC; + thread->error_code = NULL; + thread->data[0] = NULL; + thread->data[1] = NULL; + enabled = OSDisableInterrupts(); + if (__OSErrorTable[16]) { + thread->context.srr1 |= 0x900; + thread->context.state |= 1; + thread->context.fpscr = (__OSFpscrEnableBits & 0xf8) | 4; + for (i = 0; i < 32; ++i) { + *(u64*)&thread->context.fpr[i] = (u64)0xffffffffffffffffLL; + *(u64*)&thread->context.ps[i] = (u64)0xffffffffffffffffLL; + } + } + + AddTail(&OS_THREAD_QUEUE, thread, active_threads_link); + OSRestoreInterrupts(enabled); + return TRUE; } -#pragma pop /* 80341474-80341558 33BDB4 00E4+00 1/1 1/1 0/0 .text OSExitThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSExitThread(void* exitValue) { - nofralloc -#include "asm/dolphin/os/OSThread/OSExitThread.s" +void OSExitThread(void* exitValue) { + OSThread* currentThread; + BOOL enabled; + enabled = OSDisableInterrupts(); + currentThread = OS_CURRENT_THREAD; + OSClearContext(¤tThread->context); + + if (currentThread->attributes & OS_THREAD_ATTR_DETACH) { + RemoveItem(&OS_THREAD_QUEUE, currentThread, active_threads_link); + currentThread->state = OS_THREAD_STATE_UNINITIALIZED; + } else { + currentThread->state = OS_THREAD_STATE_DEAD; + currentThread->exit_value = exitValue; + } + + __OSUnlockAllMutex(currentThread); + OSWakeupThread(¤tThread->join_queue); + RunQueueHint = TRUE; + + if (RunQueueHint) { + SelectThread(FALSE); + } + + OSRestoreInterrupts(enabled); } -#pragma pop /* 80341558-80341714 33BE98 01BC+00 0/0 4/4 3/3 .text OSCancelThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSCancelThread(OSThread* thread) { - nofralloc -#include "asm/dolphin/os/OSThread/OSCancelThread.s" +void OSCancelThread(OSThread* thread) { + BOOL enabled; + + enabled = OSDisableInterrupts(); + + switch (thread->state) { + case OS_THREAD_STATE_READY: + if (!(0 < thread->suspend_count)) { + UnsetRun(thread); + } + break; + case OS_THREAD_STATE_RUNNING: + RunQueueHint = TRUE; + break; + case OS_THREAD_STATE_WAITING: + RemoveItem(thread->queue, thread, link); + thread->queue = NULL; + if (!(0 < thread->suspend_count) && thread->mutex) { + UpdatePriority(thread->mutex->thread); + } + break; + default: + OSRestoreInterrupts(enabled); + return; + } + + OSClearContext(&thread->context); + if (thread->attributes & OS_THREAD_ATTR_DETACH) { + RemoveItem(&__OSActiveThreadQueue, thread, active_threads_link); + thread->state = 0; + } else { + thread->state = OS_THREAD_STATE_DEAD; + } + + __OSUnlockAllMutex(thread); + + OSWakeupThread(&thread->join_queue); + + __OSReschedule(); + OSRestoreInterrupts(enabled); } -#pragma pop /* 80341714-803417B4 33C054 00A0+00 0/0 2/2 0/0 .text OSDetachThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSDetachThread(OSThread* thread) { - nofralloc -#include "asm/dolphin/os/OSThread/OSDetachThread.s" +void OSDetachThread(OSThread* thread) { + BOOL enabled; + + enabled = OSDisableInterrupts(); + thread->attributes |= OS_THREAD_ATTR_DETACH; + + if (thread->state == OS_THREAD_STATE_DEAD) { + RemoveItem(&__OSActiveThreadQueue, thread, active_threads_link); + thread->state = OS_THREAD_STATE_UNINITIALIZED; + } + + OSWakeupThread(&thread->join_queue); + OSRestoreInterrupts(enabled); } -#pragma pop /* 803417B4-80341A3C 33C0F4 0288+00 0/0 13/13 3/3 .text OSResumeThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSResumeThread(OSThread* thread) { - nofralloc -#include "asm/dolphin/os/OSThread/OSResumeThread.s" +s32 OSResumeThread(OSThread* thread) { + BOOL enabled; + s32 suspendCount; + + enabled = OSDisableInterrupts(); + suspendCount = thread->suspend_count--; + if (thread->suspend_count < 0) { + thread->suspend_count = 0; + } else if (thread->suspend_count == 0) { + switch (thread->state) { + case OS_THREAD_STATE_READY: + thread->effective_priority = __OSGetEffectivePriority(thread); + SetRun(thread); + break; + case OS_THREAD_STATE_WAITING: + RemoveItem(thread->queue, thread, link); + thread->effective_priority = __OSGetEffectivePriority(thread); + AddPrio(thread->queue, thread, link); + if (thread->mutex) { + UpdatePriority(thread->mutex->thread); + } + break; + } + __OSReschedule(); + } + OSRestoreInterrupts(enabled); + return suspendCount; } -#pragma pop /* 80341A3C-80341BAC 33C37C 0170+00 0/0 7/7 4/4 .text OSSuspendThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSSuspendThread(OSThread* thread) { - nofralloc -#include "asm/dolphin/os/OSThread/OSSuspendThread.s" +s32 OSSuspendThread(OSThread* thread) { + BOOL enabled; + s32 suspendCount; + + enabled = OSDisableInterrupts(); + suspendCount = thread->suspend_count++; + if (suspendCount == 0) { + switch (thread->state) { + case OS_THREAD_STATE_RUNNING: + RunQueueHint = TRUE; + thread->state = OS_THREAD_STATE_READY; + break; + case OS_THREAD_STATE_READY: + UnsetRun(thread); + break; + case OS_THREAD_STATE_WAITING: + RemoveItem(thread->queue, thread, link); + thread->effective_priority = 32; + AddTail(thread->queue, thread, link); + if (thread->mutex) { + UpdatePriority(thread->mutex->thread); + } + break; + } + + __OSReschedule(); + } + OSRestoreInterrupts(enabled); + return suspendCount; } -#pragma pop /* 80341BAC-80341C98 33C4EC 00EC+00 0/0 12/12 0/0 .text OSSleepThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSSleepThread(OSThreadQueue* queue) { - nofralloc -#include "asm/dolphin/os/OSThread/OSSleepThread.s" +void OSSleepThread(OSThreadQueue* queue) { + BOOL enabled; + OSThread* currentThread; + + enabled = OSDisableInterrupts(); + currentThread = OSGetCurrentThread(); + + currentThread->state = OS_THREAD_STATE_WAITING; + currentThread->queue = queue; + AddPrio(queue, currentThread, link); + RunQueueHint = TRUE; + __OSReschedule(); + OSRestoreInterrupts(enabled); } -#pragma pop /* 80341C98-80341D9C 33C5D8 0104+00 3/3 13/13 0/0 .text OSWakeupThread */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void OSWakeupThread(OSThreadQueue* queue) { - nofralloc -#include "asm/dolphin/os/OSThread/OSWakeupThread.s" +void OSWakeupThread(OSThreadQueue* queue) { + BOOL enabled; + OSThread* thread; + + enabled = OSDisableInterrupts(); + while (queue->head) { + RemoveHead(queue, thread, link); + thread->state = OS_THREAD_STATE_READY; + if (!(0 < thread->suspend_count)) { + SetRun(thread); + } + } + __OSReschedule(); + OSRestoreInterrupts(enabled); } -#pragma pop /* 80341D9C-80341E5C 33C6DC 00C0+00 0/0 1/1 0/0 .text OSSetThreadPriority */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSSetThreadPriority(OSThread* thread, s32 priority) { - nofralloc -#include "asm/dolphin/os/OSThread/OSSetThreadPriority.s" +s32 OSSetThreadPriority(OSThread* thread, s32 priority) { + BOOL enabled; + + if (priority < 0 || priority > 31) { + return FALSE; + } + + enabled = OSDisableInterrupts(); + if ((s32)thread->base_priority != priority) { + thread->base_priority = priority; + + UpdatePriority(thread); + __OSReschedule(); + } + OSRestoreInterrupts(enabled); + return TRUE; } -#pragma pop /* 80341E5C-80341E64 33C79C 0008+00 0/0 4/4 0/0 .text OSGetThreadPriority */ s32 OSGetThreadPriority(OSThread* thread) { @@ -528,210 +692,218 @@ s32 OSGetThreadPriority(OSThread* thread) { } /* 80341E64-80341F00 33C7A4 009C+00 1/1 0/0 0/0 .text CheckThreadQueue */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm s32 CheckThreadQueue(OSThread* thread) { - nofralloc -#include "asm/dolphin/os/OSThread/CheckThreadQueue.s" +s32 CheckThreadQueue(OSThreadQueue* thread) { + OSThread* current; + if (thread->head && thread->head->link.prev) { + return 0; + } + + if (thread->tail && thread->tail->link.next) { + return 0; + } + + current = thread->head; + + while(current) { + if (current->link.next && current != current->link.next->link.prev) { + return 0; + } + + if (current->link.prev && current != current->link.prev->link.next) { + return 0; + } + + current = current->link.next; + } + + return 1; } -#pragma pop -/* ############################################################################################## */ -/* 803D0838-803D0898 02D958 005F+01 1/1 0/0 0/0 .data @831 */ -SECTION_DATA static char lit_831[] = "OSCheckActiveThreads: Failed RunQueue[prio].head != NULL && " - "RunQueue[prio].tail != NULL in %d\n"; +static BOOL isMember(OSThreadQueue* queue, OSThread* thread) { + OSThread* current = queue->head; + while (current != NULL) { + if (thread == current) { + return TRUE; + } -/* 803D0898-803D08A4 02D9B8 000B+01 0/1 0/0 0/0 .data @832 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_832[] = "OSThread.c"; -#pragma pop - -/* 803D08A4-803D0904 02D9C4 005F+01 0/1 0/0 0/0 .data @834 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_834[] = "OSCheckActiveThreads: Failed RunQueue[prio].head == NULL && " - "RunQueue[prio].tail == NULL in %d\n"; -#pragma pop - -/* 803D0904-803D094C 02DA24 0046+02 0/1 0/0 0/0 .data @835 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_835[] = - "OSCheckActiveThreads: Failed CheckThreadQueue(&RunQueue[prio]) in %d\n"; -#pragma pop - -/* 803D094C-803D09CC 02DA6C 007E+02 0/1 0/0 0/0 .data @836 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_836[] = - "OSCheckActiveThreads: Failed __OSActiveThreadQueue.head == NULL || " - "__OSActiveThreadQueue.head->linkActive.prev == NULL in %d\n"; -#pragma pop - -/* 803D09CC-803D0A4C 02DAEC 007E+02 0/1 0/0 0/0 .data @837 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_837[] = - "OSCheckActiveThreads: Failed __OSActiveThreadQueue.tail == NULL || " - "__OSActiveThreadQueue.tail->linkActive.next == NULL in %d\n"; -#pragma pop - -/* 803D0A4C-803D0AC8 02DB6C 007A+02 0/1 0/0 0/0 .data @838 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_838[] = - "OSCheckActiveThreads: Failed thread->linkActive.next == NULL || thread == " - "thread->linkActive.next->linkActive.prev in %d\n"; -#pragma pop - -/* 803D0AC8-803D0B44 02DBE8 007A+02 0/1 0/0 0/0 .data @839 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_839[] = - "OSCheckActiveThreads: Failed thread->linkActive.prev == NULL || thread == " - "thread->linkActive.prev->linkActive.next in %d\n"; -#pragma pop - -/* 803D0B44-803D0B98 02DC64 0051+03 0/1 0/0 0/0 .data @840 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_840[] = - "OSCheckActiveThreads: Failed *(thread->stackEnd) == OS_THREAD_STACK_MAGIC in %d\n"; -#pragma pop - -/* 803D0B98-803D0C0C 02DCB8 0071+03 0/1 0/0 0/0 .data @841 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_841[] = - "OSCheckActiveThreads: Failed OS_PRIORITY_MIN <= thread->priority && thread->priority <= " - "OS_PRIORITY_MAX+1 in %d\n"; -#pragma pop - -/* 803D0C0C-803D0C48 02DD2C 0039+03 0/1 0/0 0/0 .data @842 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_842[] = "OSCheckActiveThreads: Failed 0 <= thread->suspend in %d\n"; -#pragma pop - -/* 803D0C48-803D0C94 02DD68 0049+03 0/1 0/0 0/0 .data @843 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_843[] = - "OSCheckActiveThreads: Failed CheckThreadQueue(&thread->queueJoin) in %d\n"; -#pragma pop - -/* 803D0C94-803D0CE8 02DDB4 0051+03 0/1 0/0 0/0 .data @844 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_844[] = - "OSCheckActiveThreads: Failed thread->queue == &RunQueue[thread->priority] in %d\n"; -#pragma pop - -/* 803D0CE8-803D0D3C 02DE08 0052+02 0/1 0/0 0/0 .data @845 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_845[] = - "OSCheckActiveThreads: Failed IsMember(&RunQueue[thread->priority], thread) in %d\n"; -#pragma pop - -/* 803D0D3C-803D0D98 02DE5C 0059+03 0/1 0/0 0/0 .data @846 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_846[] = - "OSCheckActiveThreads: Failed thread->priority == __OSGetEffectivePriority(thread) in %d\n"; -#pragma pop - -/* 803D0D98-803D0DDC 02DEB8 0042+02 0/1 0/0 0/0 .data @847 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_847[] = - "OSCheckActiveThreads: Failed !IsSuspended(thread->suspend) in %d\n"; -#pragma pop - -/* 803D0DDC-803D0E18 02DEFC 003A+02 0/1 0/0 0/0 .data @848 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_848[] = "OSCheckActiveThreads: Failed thread->queue == NULL in %d\n"; -#pragma pop - -/* 803D0E18-803D0E54 02DF38 003A+02 0/1 0/0 0/0 .data @849 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_849[] = "OSCheckActiveThreads: Failed thread->queue != NULL in %d\n"; -#pragma pop - -/* 803D0E54-803D0E98 02DF74 0044+00 0/1 0/0 0/0 .data @850 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_850[] = - "OSCheckActiveThreads: Failed CheckThreadQueue(thread->queue) in %d\n"; -#pragma pop - -/* 803D0E98-803D0EDC 02DFB8 0044+00 0/1 0/0 0/0 .data @851 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_851[] = - "OSCheckActiveThreads: Failed IsMember(thread->queue, thread) in %d\n"; -#pragma pop - -/* 803D0EDC-803D0F18 02DFFC 003B+01 0/1 0/0 0/0 .data @852 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_852[] = "OSCheckActiveThreads: Failed thread->priority == 32 in %d\n"; -#pragma pop - -/* 803D0F18-803D0F58 02E038 003F+01 0/1 0/0 0/0 .data @853 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_853[] = - "OSCheckActiveThreads: Failed !__OSCheckDeadLock(thread) in %d\n"; -#pragma pop - -/* 803D0F58-803D0FC0 02E078 0067+01 0/1 0/0 0/0 .data @854 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_854[] = "OSCheckActiveThreads: Failed thread->queueMutex.head == NULL " - "&& thread->queueMutex.tail == NULL in %d\n"; -#pragma pop - -/* 803D0FC0-803D1008 02E0E0 0045+03 0/1 0/0 0/0 .data @855 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_855[] = - "OSCheckActiveThreads: Failed. unkown thread state (%d) of thread %p\n"; -#pragma pop - -/* 803D1008-803D1048 02E128 003D+03 0/1 0/0 0/0 .data @856 */ -#pragma push -#pragma force_active on -SECTION_DATA static char lit_856[] = - "OSCheckActiveThreads: Failed __OSCheckMutexes(thread) in %d\n"; -#pragma pop - -/* 804509BC-804509C0 00043C 0001+03 1/1 0/0 0/0 .sdata @833 */ -SECTION_SDATA static char lit_833[] = ""; + current = current->link.next; + } + return FALSE; +} /* 80341F00-80342650 33C840 0750+00 0/0 1/1 0/0 .text OSCheckActiveThreads */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm s32 OSCheckActiveThreads(void) { - nofralloc -#include "asm/dolphin/os/OSThread/OSCheckActiveThreads.s" +s32 OSCheckActiveThreads(void) { + s32 i; + OSThread* thread; + s32 rv = 0; + BOOL enabled; + enabled = OSDisableInterrupts(); + + for (i = 0; i <= 31; i++) { + if (RunQueueBits & (1 << (31-i))) { + if (RunQueue[i].head == NULL || RunQueue[i].tail == NULL) { + OSReport("OSCheckActiveThreads: Failed RunQueue[prio].head != NULL && RunQueue[prio].tail != NULL in %d\n", 0x5e0); + OSPanic(__FILE__, 0x5e0, ""); + } + } else { + if (RunQueue[i].head != NULL || RunQueue[i].tail != NULL) { + OSReport("OSCheckActiveThreads: Failed RunQueue[prio].head == NULL && RunQueue[prio].tail == NULL in %d\n", 0x5e5); + OSPanic(__FILE__, 0x5e5, ""); + } + } + + if (CheckThreadQueue(&RunQueue[i]) == 0) { + OSReport("OSCheckActiveThreads: Failed CheckThreadQueue(&RunQueue[prio]) in %d\n", 0x5e7); + OSPanic(__FILE__, 0x5e7, ""); + } + } + + if (OS_THREAD_QUEUE.head != NULL && OS_THREAD_QUEUE.head->active_threads_link.prev != NULL) { + OSReport("OSCheckActiveThreads: Failed __OSActiveThreadQueue.head == NULL || __OSActiveThreadQueue.head->linkActive.prev == NULL in %d\n", 0x5ec); + OSPanic(__FILE__, 0x5ec, ""); + } + + if (OS_THREAD_QUEUE.tail != NULL && OS_THREAD_QUEUE.tail->active_threads_link.next != NULL) { + OSReport("OSCheckActiveThreads: Failed __OSActiveThreadQueue.tail == NULL || __OSActiveThreadQueue.tail->linkActive.next == NULL in %d\n", 0x5ee); + OSPanic(__FILE__, 0x5ee, ""); + } + + thread = OS_THREAD_QUEUE.head; + + while (thread != NULL) { + rv++; + if (thread->active_threads_link.next != NULL && thread != thread->active_threads_link.next->active_threads_link.prev) { + OSReport("OSCheckActiveThreads: Failed thread->linkActive.next == NULL || thread == thread->linkActive.next->linkActive.prev in %d\n", 0x5f6); + OSPanic(__FILE__, 0x5f6, ""); + } + + if (thread->active_threads_link.prev != NULL && thread != thread->active_threads_link.prev->active_threads_link.next) { + OSReport("OSCheckActiveThreads: Failed thread->linkActive.prev == NULL || thread == thread->linkActive.prev->linkActive.next in %d\n", 0x5f8); + OSPanic(__FILE__, 0x5f8, ""); + } + + if (*(u32*)thread->stack_end != OS_THREAD_STACK_MAGIC) { + OSReport("OSCheckActiveThreads: Failed *(thread->stackEnd) == OS_THREAD_STACK_MAGIC in %d\n", 0x5fb); + OSPanic(__FILE__, 0x5fb, ""); + } + + if (OS_PRIORITY_MIN > thread->effective_priority || thread->effective_priority > OS_PRIORITY_MAX+1) { + OSReport("OSCheckActiveThreads: Failed OS_PRIORITY_MIN <= thread->priority && thread->priority <= OS_PRIORITY_MAX+1 in %d\n", 0x5fe); + OSPanic(__FILE__, 0x5fe, ""); + } + + if (thread->suspend_count < 0) { + OSReport("OSCheckActiveThreads: Failed 0 <= thread->suspend in %d\n", 0x5ff); + OSPanic(__FILE__, 0x5ff, ""); + } + + if (!CheckThreadQueue(&thread->join_queue)) { + OSReport("OSCheckActiveThreads: Failed CheckThreadQueue(&thread->queueJoin) in %d\n", 0x600); + OSPanic(__FILE__, 0x600, ""); + } + + switch (thread->state) { + case OS_THREAD_STATE_READY: + if (thread->suspend_count <= 0) { + if (thread->queue != &RunQueue[thread->effective_priority]) { + OSReport("OSCheckActiveThreads: Failed thread->queue == &RunQueue[thread->priority] in %d\n", 0x606); + OSPanic(__FILE__, 0x606, ""); + } + + if (!isMember(&RunQueue[thread->effective_priority], thread)) { + OSReport("OSCheckActiveThreads: Failed IsMember(&RunQueue[thread->priority], thread) in %d\n", 0x607); + OSPanic(__FILE__, 0x607, ""); + } + + if (thread->effective_priority != __OSGetEffectivePriority(thread)) { + OSReport("OSCheckActiveThreads: Failed thread->priority == __OSGetEffectivePriority(thread) in %d\n", 0x608); + OSPanic(__FILE__, 0x608, ""); + } + } + break; + case OS_THREAD_STATE_RUNNING: + if (thread->suspend_count > 0) { + OSReport("OSCheckActiveThreads: Failed !IsSuspended(thread->suspend) in %d\n", 0x60c); + OSPanic(__FILE__, 0x60c, ""); + } + + if (thread->queue != NULL) { + OSReport("OSCheckActiveThreads: Failed thread->queue == NULL in %d\n", 0x60d); + OSPanic(__FILE__, 0x60d, ""); + } + + if (thread->effective_priority != __OSGetEffectivePriority(thread)) { + OSReport("OSCheckActiveThreads: Failed thread->priority == __OSGetEffectivePriority(thread) in %d\n", 0x60e); + OSPanic(__FILE__, 0x60e, ""); + } + break; + case OS_THREAD_STATE_WAITING: + if (thread->queue == NULL) { + OSReport("OSCheckActiveThreads: Failed thread->queue != NULL in %d\n", 0x611); + OSPanic(__FILE__, 0x611, ""); + } + + if (CheckThreadQueue(thread->queue) == 0) { + OSReport("OSCheckActiveThreads: Failed CheckThreadQueue(thread->queue) in %d\n", 0x612); + OSPanic(__FILE__, 0x612, ""); + } + + if (!isMember(thread->queue, thread)) { + OSReport("OSCheckActiveThreads: Failed IsMember(thread->queue, thread) in %d\n", 0x613); + OSPanic(__FILE__, 0x613, ""); + } + + if (thread->suspend_count <= 0) { + if (thread->effective_priority != __OSGetEffectivePriority(thread)) { + OSReport("OSCheckActiveThreads: Failed thread->priority == __OSGetEffectivePriority(thread) in %d\n", 0x616); + OSPanic(__FILE__, 0x616, ""); + } + } else if (thread->effective_priority != 32) { + OSReport("OSCheckActiveThreads: Failed thread->priority == 32 in %d\n", 0x61a); + OSPanic(__FILE__, 0x61a, ""); + } + + if (__OSCheckDeadLock(thread)) { + OSReport("OSCheckActiveThreads: Failed !__OSCheckDeadLock(thread) in %d\n", 0x61c); + OSPanic(__FILE__, 0x61c, ""); + } + break; + case OS_THREAD_STATE_DEAD: + if (thread->owned_mutexes.head != NULL || thread->owned_mutexes.tail != NULL) { + OSReport("OSCheckActiveThreads: Failed thread->queueMutex.head == NULL && thread->queueMutex.tail == NULL in %d\n", 0x620); + OSPanic(__FILE__, 0x620, ""); + } + break; + default: + OSReport("OSCheckActiveThreads: Failed. unkown thread state (%d) of thread %p\n", thread->state, thread); + OSPanic(__FILE__, 0x626, ""); + break; + } + + if (!__OSCheckMutexes(thread)) { + OSReport("OSCheckActiveThreads: Failed __OSCheckMutexes(thread) in %d\n", 0x62b); + OSPanic(__FILE__, 0x62b, ""); + } + + thread = thread->active_threads_link.next; + } + + OSRestoreInterrupts(enabled); + return rv; } -#pragma pop /* 80342650-803426FC 33CF90 00AC+00 1/1 0/0 0/0 .text OSClearStack */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void OSClearStack(u32 value) { - nofralloc -#include "asm/dolphin/os/OSThread/OSClearStack.s" +void OSClearStack(u8 val) { + u32* sp; + u32* p; + u32 pattern; + + pattern = ((u32)val << 24) | ((u32)val << 16) | ((u32)val << 8) | (u32)val; + sp = (u32*)OSGetStackPointer(); + for (p = ((u32*)__OSCurrentThread->stack_end) + 1; p < sp; ++p) { + *p = pattern; + } } -#pragma pop /* ############################################################################################## */ /* 804516D0-804516D8 000BD0 0008+00 0/0 2/1 0/0 .sbss None */