From 440ce411f70a9952b87e25ff04ad7cbdf90aa2a6 Mon Sep 17 00:00:00 2001 From: tkchia Date: Wed, 28 Sep 2022 18:38:21 +0000 Subject: [PATCH] [metal] Remove v_ape_realslacksectors, no longer needed (#574) --- ape/ape.S | 2 -- ape/ape.lds | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/ape/ape.S b/ape/ape.S index 13546b444..9398a8fad 100644 --- a/ape/ape.S +++ b/ape/ape.S @@ -251,7 +251,6 @@ pc: cld xor %cx,%cx # current cylinder xor %dh,%dh # current head mov $v_ape_realsectors,%di # total sectors - sub $v_ape_realslacksectors,%di 3: call pcread dec %di jnz 3b @@ -1587,7 +1586,6 @@ kernel: movabs $ape_stack_vaddr,%rsp .ldsvar _end .ldsvar _etext .ldsvar v_ape_realsectors - .ldsvar v_ape_realslacksectors .ldsvar v_ape_highsectors .ldsvar ape_idata_ro .ldsvar ape_pad_rodata diff --git a/ape/ape.lds b/ape/ape.lds index 05cee5ba1..d1d9bce60 100644 --- a/ape/ape.lds +++ b/ape/ape.lds @@ -565,10 +565,7 @@ SHSTUB2(ape_loader_dd_count, #if SupportsMetal() HIDDEN(v_ape_realsectors = MIN(0x70000 - IMAGE_BASE_REAL, - ROUNDUP(RVA(_edata), 4096)) / 512); -HIDDEN(v_ape_realslacksectors = - v_ape_realsectors - MIN(0x70000 - IMAGE_BASE_REAL, - ROUNDUP(RVA(_edata), 512)) / 512); + ROUNDUP(RVA(_edata), 512)) / 512); HIDDEN(v_ape_realpages = v_ape_realsectors / (4096 / 512)); HIDDEN(v_ape_highsectors = (ROUNDUP(RVA(_edata), 512) / 512) - v_ape_realsectors);