From 14e11bd6a2c8b36457b150cb16619b0ecd780e13 Mon Sep 17 00:00:00 2001 From: Ryan Myers Date: Fri, 15 Oct 2021 07:53:00 -0400 Subject: [PATCH] Rename some unknown variables to be more descriptive --- .../non_matchings/sched/__scHandleRetrace.s | 32 +++++++++---------- lib/src/mips1/sc/sched.c | 30 ++++++++--------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/lib/asm/non_matchings/sched/__scHandleRetrace.s b/lib/asm/non_matchings/sched/__scHandleRetrace.s index 69db475e..dc6d796c 100644 --- a/lib/asm/non_matchings/sched/__scHandleRetrace.s +++ b/lib/asm/non_matchings/sched/__scHandleRetrace.s @@ -11,22 +11,22 @@ glabel __scHandleRetrace /* 07A43C 8007983C 00808825 */ move $s1, $a0 /* 07A440 80079840 11C00007 */ beqz $t6, .L80079860 /* 07A444 80079844 00008025 */ move $s0, $zero -/* 07A448 80079848 3C03800E */ lui $v1, %hi(D_800DE754) # $v1, 0x800e -/* 07A44C 8007984C 2463E754 */ addiu $v1, %lo(D_800DE754) # addiu $v1, $v1, -0x18ac +/* 07A448 80079848 3C03800E */ lui $v1, %hi(gCurRSPTaskCounter) # $v1, 0x800e +/* 07A44C 8007984C 2463E754 */ addiu $v1, %lo(gCurRSPTaskCounter) # addiu $v1, $v1, -0x18ac /* 07A450 80079850 8C6F0000 */ lw $t7, ($v1) /* 07A454 80079854 00000000 */ nop /* 07A458 80079858 25F80001 */ addiu $t8, $t7, 1 /* 07A45C 8007985C AC780000 */ sw $t8, ($v1) .L80079860: /* 07A460 80079860 8E390278 */ lw $t9, 0x278($s1) -/* 07A464 80079864 3C03800E */ lui $v1, %hi(D_800DE754) # $v1, 0x800e +/* 07A464 80079864 3C03800E */ lui $v1, %hi(gCurRSPTaskCounter) # $v1, 0x800e /* 07A468 80079868 13200006 */ beqz $t9, .L80079884 -/* 07A46C 8007986C 2463E754 */ addiu $v1, %lo(D_800DE754) # addiu $v1, $v1, -0x18ac -/* 07A470 80079870 3C08800E */ lui $t0, %hi(D_800DE758) # $t0, 0x800e -/* 07A474 80079874 8D08E758 */ lw $t0, %lo(D_800DE758)($t0) -/* 07A478 80079878 3C01800E */ lui $at, %hi(D_800DE758) # $at, 0x800e +/* 07A46C 8007986C 2463E754 */ addiu $v1, %lo(gCurRSPTaskCounter) # addiu $v1, $v1, -0x18ac +/* 07A470 80079870 3C08800E */ lui $t0, %hi(gCurRDPTaskCounter) # $t0, 0x800e +/* 07A474 80079874 8D08E758 */ lw $t0, %lo(gCurRDPTaskCounter)($t0) +/* 07A478 80079878 3C01800E */ lui $at, %hi(gCurRDPTaskCounter) # $at, 0x800e /* 07A47C 8007987C 25090001 */ addiu $t1, $t0, 1 -/* 07A480 80079880 AC29E758 */ sw $t1, %lo(D_800DE758)($at) +/* 07A480 80079880 AC29E758 */ sw $t1, %lo(gCurRDPTaskCounter)($at) .L80079884: /* 07A484 80079884 8C6A0000 */ lw $t2, ($v1) /* 07A488 80079888 8E220274 */ lw $v0, 0x274($s1) @@ -44,11 +44,11 @@ glabel __scHandleRetrace .L800798B8: /* 07A4B8 800798B8 10400003 */ beqz $v0, .L800798C8 /* 07A4BC 800798BC 240B0001 */ li $t3, 1 -/* 07A4C0 800798C0 3C018012 */ lui $at, %hi(D_80126110) # $at, 0x8012 -/* 07A4C4 800798C4 AC2B6110 */ sw $t3, %lo(D_80126110)($at) +/* 07A4C0 800798C0 3C018012 */ lui $at, %hi(gCurRSPTaskIsSet) # $at, 0x8012 +/* 07A4C4 800798C4 AC2B6110 */ sw $t3, %lo(gCurRSPTaskIsSet)($at) .L800798C8: -/* 07A4C8 800798C8 3C0C800E */ lui $t4, %hi(D_800DE758) # $t4, 0x800e -/* 07A4CC 800798CC 8D8CE758 */ lw $t4, %lo(D_800DE758)($t4) +/* 07A4C8 800798C8 3C0C800E */ lui $t4, %hi(gCurRDPTaskCounter) # $t4, 0x800e +/* 07A4CC 800798CC 8D8CE758 */ lw $t4, %lo(gCurRDPTaskCounter)($t4) /* 07A4D0 800798D0 8E220278 */ lw $v0, 0x278($s1) /* 07A4D4 800798D4 2981000B */ slti $at, $t4, 0xb /* 07A4D8 800798D8 14200016 */ bnez $at, .L80079934 @@ -66,9 +66,9 @@ glabel __scHandleRetrace /* 07A504 80079904 240E0001 */ li $t6, 1 /* 07A508 80079908 A3AE0032 */ sb $t6, 0x32($sp) /* 07A50C 8007990C AE200280 */ sw $zero, 0x280($s1) -/* 07A510 80079910 3C01800E */ lui $at, %hi(D_800DE758) # $at, 0x800e +/* 07A510 80079910 3C01800E */ lui $at, %hi(gCurRDPTaskCounter) # $at, 0x800e /* 07A514 80079914 3C0400AA */ lui $a0, (0x00AAAA82 >> 16) # lui $a0, 0xaa -/* 07A518 80079918 AC20E758 */ sw $zero, %lo(D_800DE758)($at) +/* 07A518 80079918 AC20E758 */ sw $zero, %lo(gCurRDPTaskCounter)($at) /* 07A51C 8007991C 0C033490 */ jal __osSpSetStatus /* 07A520 80079920 3484AA82 */ ori $a0, (0x00AAAA82 & 0xFFFF) # ori $a0, $a0, 0xaa82 /* 07A524 80079924 0C033494 */ jal osDpSetStatus @@ -78,8 +78,8 @@ glabel __scHandleRetrace .L80079934: /* 07A534 80079934 10400003 */ beqz $v0, .L80079944 /* 07A538 80079938 240F0001 */ li $t7, 1 -/* 07A53C 8007993C 3C018012 */ lui $at, %hi(D_80126114) # $at, 0x8012 -/* 07A540 80079940 AC2F6114 */ sw $t7, %lo(D_80126114)($at) +/* 07A53C 8007993C 3C018012 */ lui $at, %hi(gCurRDPTaskIsSet) # $at, 0x8012 +/* 07A540 80079940 AC2F6114 */ sw $t7, %lo(gCurRDPTaskIsSet)($at) .L80079944: /* 07A544 80079944 12000002 */ beqz $s0, .L80079950 /* 07A548 80079948 26240078 */ addiu $a0, $s1, 0x78 diff --git a/lib/src/mips1/sc/sched.c b/lib/src/mips1/sc/sched.c index 3d120b16..b7b10a68 100644 --- a/lib/src/mips1/sc/sched.c +++ b/lib/src/mips1/sc/sched.c @@ -28,9 +28,9 @@ f32 D_800DE748 = 0; f32 D_800DE74C = 0; s32 D_800DE750 = 0; // Currently unknown, might be a different type. -s32 D_800DE754 = 0; -s32 D_800DE758 = 0; -s32 D_800DE75C = 0; // Currently unknown, might be a different type. +s32 gCurRSPTaskCounter = 0; +s32 gCurRDPTaskCounter = 0; +s32 D_800DE75C = 0; u64 gRetraceCount = 0; @@ -60,8 +60,8 @@ const char D_800E7958[] = "\tdata_size\t\t= %u\n"; /************ .bss ************/ -s32 D_80126110; -s32 D_80126114; +s32 gCurRSPTaskIsSet; +s32 gCurRDPTaskIsSet; OSTime gYieldTime; s32 D_80126120; u32 D_80126124; @@ -233,32 +233,32 @@ void __scHandleRetrace(OSSched *sc) { s32 i; if (sc->curRSPTask) { - D_800DE754++; + gCurRSPTaskCounter++; } if (sc->curRDPTask) { - D_800DE758++; + gCurRDPTaskCounter++; } - if ((D_800DE754 > 10) && (sc->curRSPTask)) { - D_800DE754 = 0; + if ((gCurRSPTaskCounter > 10) && (sc->curRSPTask)) { + gCurRSPTaskCounter = 0; set_curRSPTask_NULL = TRUE; __osSpSetStatus(SP_SET_HALT | SP_CLR_INTR_BREAK | SP_CLR_SIG0 | SP_CLR_SIG1 | SP_CLR_SIG2 | SP_CLR_SIG3 | SP_CLR_SIG4 | SP_CLR_SIG5 | SP_CLR_SIG6 | SP_CLR_SIG7); } else if (sc->curRSPTask) { - D_80126110 = 1; + gCurRSPTaskIsSet = TRUE; } - if ((D_800DE758 > 10) && (sc->curRDPTask)) { + if ((gCurRDPTaskCounter > 10) && (sc->curRDPTask)) { if (sc->curRDPTask->unk68 == 0) { osSendMesg(sc->curRDPTask->msgQ, &D_800DE738, OS_MESG_BLOCK); } set_curRDPTask_NULL = TRUE; sc->frameCount = 0; - D_800DE758 = 0; + gCurRDPTaskCounter = 0; __osSpSetStatus(SP_SET_HALT | SP_CLR_INTR_BREAK | SP_CLR_SIG0 | SP_CLR_SIG1 | SP_CLR_SIG2 | SP_CLR_SIG3 | SP_CLR_SIG4 | @@ -267,7 +267,7 @@ void __scHandleRetrace(OSSched *sc) { osDpSetStatus(DPC_SET_XBUS_DMEM_DMA | DPC_CLR_FREEZE | DPC_CLR_FLUSH | DPC_CLR_TMEM_CTR | DPC_CLR_PIPE_CTR | DPC_CLR_CMD_CTR); } else if (sc->curRDPTask) { - D_80126114 = 1; + gCurRDPTaskIsSet = TRUE; } if (set_curRSPTask_NULL) { @@ -471,8 +471,8 @@ void __scExec(OSSched *sc, OSScTask *sp, OSScTask *dp) { sp->state &= ~(OS_SC_YIELD | OS_SC_YIELDED); osSpTaskLoad(&sp->list); osSpTaskStartGo(&sp->list); - D_800DE754 = 0; - D_800DE758 = 0; + gCurRSPTaskCounter = 0; + gCurRDPTaskCounter = 0; sc->curRSPTask = sp; if (sp == dp)