revert(integration): drop the §378 casts for the 25 chain candidates that did not bank

cast_self_callers casts a function's call sites in PREPARATION for banking it.
When the draft then fails, the cast must come back out — the tool journals every
edit for exactly that, and I did not run the undo.

The cost was concrete: the leftover cast on func_8017F8B8 made ov_SC07_000 fail
to COMPILE at HEAD, so every subsequent gate verdict on that binary was measuring
a broken baseline rather than the draft. Two drafting agents reported it as
BASELINE-RED before I noticed.

24 casts reverted across 11 files in 7 binaries; all 7 rebuild green. This is the
discipline recover_integration already documents ('REVERTS the caller edits for
anything that doesn't bank') applied to the new tool.
This commit is contained in:
Drew T
2026-09-01 10:35:29 -06:00
parent d8d4f8ac6f
commit 4949acdf31
11 changed files with 21 additions and 21 deletions
+2 -2
View File
@@ -262,7 +262,7 @@ s32 func_800CB3D8(s32 arg0, s32 arg1) {
extern void func_8012F14C(s32, s32, s32);
extern void func_80015978(s32, s32 *);
extern void func_80015954(s32, s32);
extern s32 func_800CB4EC(s32 a0);
extern s32 func_800CB4EC();
struct S { s32 f[8]; };
struct S st;
@@ -281,7 +281,7 @@ s32 func_800CB3D8(s32 arg0, s32 arg1) {
*(u16 *)(arg0 + 6) += out2[0];
*(u16 *)(arg0 + 0xA) += out2[1];
*(u16 *)(arg0 + 0xE) += out2[2];
ret = ((s32 (*)())func_800CB4EC)(arg0);
ret = func_800CB4EC(arg0);
func_80015954((s32)out1, arg0 + 4);
return ret;
}
+4 -4
View File
@@ -3893,7 +3893,7 @@ void func_8017E258(void) {
extern s32 func_801399F0(s32);
extern s32 func_80014ED4(s32);
extern s16 func_8014168C(s16);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern void func_80139954(void);
extern void func_8002D4C8(s32, s32);
extern void func_8017E6BC(void);
@@ -3914,7 +3914,7 @@ void func_8017E258(void) {
u16 t;
t = D_8011511A;
if (D_80115138[t] == 8) {
((s32 (*)())func_8017F2D4)(0xF, func_8014168C(t));
func_8017F2D4(0xF, func_8014168C(t));
}
if (D_801CD870 != 0) {
func_80139954();
@@ -3958,7 +3958,7 @@ extern void func_8002D4C8(s32 a0, s32 a1);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern void func_8017DEFC(void);
s32 func_8017E3DC(void) {
@@ -3994,7 +3994,7 @@ s32 func_8017E3DC(void) {
c = D_80115138[*p11a];
if ((flags & 0x40) != 0) {
ret = ((s32 (*)())func_8017F2D4)(c, ret);
ret = func_8017F2D4(c, ret);
nz = ret != 0;
return ret & -nz;
}
+1 -1
View File
@@ -2718,7 +2718,7 @@ extern void func_8017E384(void);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern s32 func_8017E3DC(void);
extern void func_8017E6BC(void);
extern u16 D_8011511A;
+1 -1
View File
@@ -2718,7 +2718,7 @@ extern void func_8017E384(void);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern s32 func_8017E3DC(void);
extern void func_8017E6BC(void);
extern u16 D_8011511A;
+4 -4
View File
@@ -3905,7 +3905,7 @@ void func_8017E258(void) {
extern s32 func_801399F0(s32);
extern s32 func_80014ED4(s32);
extern s16 func_8014168C(s16);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern void func_80139954(void);
extern void func_8002D4C8(s32, s32);
extern void func_8017E6BC(void);
@@ -3926,7 +3926,7 @@ void func_8017E258(void) {
u16 t;
t = D_8011511A;
if (D_80115138[t] == 8) {
((s32 (*)())func_8017F2D4)(0xF, func_8014168C(t));
func_8017F2D4(0xF, func_8014168C(t));
}
if (D_801CD870 != 0) {
func_80139954();
@@ -3971,7 +3971,7 @@ extern void func_8002D4C8(s32 a0, s32 a1);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern void func_8017DEFC(void);
s32 func_8017E3DC(void) {
@@ -4007,7 +4007,7 @@ s32 func_8017E3DC(void) {
c = D_80115138[*p11a];
if ((flags & 0x40) != 0) {
ret = ((s32 (*)())func_8017F2D4)(c, ret);
ret = func_8017F2D4(c, ret);
nz = ret != 0;
return ret & -nz;
}
+1 -1
View File
@@ -2712,7 +2712,7 @@ extern void func_8017E384(void);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern s32 func_8017E3DC(void);
extern void func_8017E6BC(void);
extern void func_80024054(void *a0, void *a1);
+1 -1
View File
@@ -2711,7 +2711,7 @@ extern void func_8017E384(void);
extern s32 func_80014ED4(s32 a0);
extern s32 func_80015018(s32 a0);
extern s16 func_8014168C(s16 a0);
extern s32 func_8017F2D4(s32 a0, s32 a1);
extern s32 func_8017F2D4();
extern void func_8017DEFC(void);
extern s32 func_8017E3DC(void);
extern void func_8017E6BC(void);
+2 -2
View File
@@ -2987,7 +2987,7 @@ void func_80180D6C(s32 param_1) {
}
extern void func_8017F950(s32 a0);
extern void func_8017F950();
extern s32 D_801270D8;
extern s16 D_8018E6CC;
extern s16 D_8018E6D0;
@@ -3011,7 +3011,7 @@ void func_8018127C(s32 param_1) {
u16 t;
if ((*(u16 *)(param_1 + 0x5C) & 1) != 0) {
((void (*)())func_8017F950)();
func_8017F950();
}
if ((*(u16 *)(param_1 + 0x70) & 0x400) != 0 && D_801270D8 != 0 &&
*(u16 *)(param_1 + 0x2) != 0xA) {
+2 -2
View File
@@ -2987,7 +2987,7 @@ void func_80180D6C(s32 param_1) {
}
extern void func_8017F950(s32 a0);
extern void func_8017F950();
extern s32 D_801270D8;
extern s16 D_8018E6CC;
extern s16 D_8018E6D0;
@@ -3011,7 +3011,7 @@ void func_8018127C(s32 param_1) {
u16 t;
if ((*(u16 *)(param_1 + 0x5C) & 1) != 0) {
((void (*)())func_8017F950)();
func_8017F950();
}
if ((*(u16 *)(param_1 + 0x70) & 0x400) != 0 && D_801270D8 != 0 &&
*(u16 *)(param_1 + 0x2) != 0xA) {
+1 -1
View File
@@ -5382,7 +5382,7 @@ void func_80180CEC(s32 a0) {
if (*(u16 *)&D_801D0B7C == 4) {
func_8017F554(s0);
}
((void (*)())func_8017F8B8)(s0);
func_8017F8B8(s0);
}
+2 -2
View File
@@ -955,7 +955,7 @@ s32 func_800CFE60(void) {
extern s32 func_80029504(void);
extern s32 func_80029178(s32);
extern s32 func_8002F658(void);
extern void func_800D00E4(s32 arg0);
extern void func_800D00E4();
extern s32 CdReadRequest(void *, void *, s32, s32);
register u8 *base __asm__("$20");
@@ -1020,7 +1020,7 @@ s32 func_800CFE60(void) {
}
if (mode == 0 && (res & 1)) {
((void (*)())func_800D00E4)((((u32)D_800D34AC[*(s16 *)(base + 0xA3D8) & 0xFFFF0FFF]) >> 12) & 0xF);
func_800D00E4((((u32)D_800D34AC[*(s16 *)(base + 0xA3D8) & 0xFFFF0FFF]) >> 12) & 0xF);
}
return res;
}