sasheg/lumia-emulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b25: S12v2-full + B66-ELF + S16 baked

Browse Source
This commit is contained in:
lumia-emu
2026-09-13 12:01:19 +00:00
parent 48969c60f3
commit 7eef1340b6
4 changed files with 197 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/sbl_patch.py
+89
View File
@@ -955,6 +955,95 @@ def main():
save(d, 'img0_b24.elf')
# b25 = b24 + helper-pop S16 chain (0x8007B66 pop{r4,pc} -> bx ip):
# the pop reads scratch ([sp+4] = counters 0..4, frames marched by
# null-cycles) instead of pushed lr. bx ip uses ip preset by S12
# (ARM stub at 0x8006964) to S16 (0x08006CC0, scaffold): restore r7
# (peripheral base) and jump to poll-loop resumption 0x8007779.
# 2B patch, no eating (bx ip = 0x47c0 fits the pop slot).
d = bytearray(base)
for va, (a, b) in BLX2BL.items():
set4(d, va, b)
for va, exp, new in [
(0x802F664, 'e4f77efc', 'c046c046'),
(0x802F672, 'e6f7bbfa', 'c046c046'),
(0x802F678, 'e9f7fef9', 'c046c046'),
(0x801B71E, '9847fee7', 'c046c046'),
(0x8008396, 'fef780f9', 'c046c046'),
(0x8016184, 'fdf790fc', 'c046c046'),
(0x801B76C, '280b0508', '00000708'),
(0x8017AFC, 'bde8fc87', 'eef74fb8'),
(0x802F690, '9847fee7', 'c046c046'),
(0x801671C, '9847fee7', 'c046c046'),
(0x8013BAC, 'f8bd0a4a', 'f3f730b8'),
(0x801B6BE, 'bde8f081', 'ebf7c3ba'),
(0x8016720, '10bd0000', 'f0f7b2ba'),
]:
assert hx(d, va) == exp, (hex(va), hx(d, va))
set4(d, va, new)
# Full bl idiom at 0x8006682 (bl + pop, 6B) -> NOPs (see b18).
o = off(0x8006682)
assert d[o:o + 6].hex() == '00f001f807bd', hx(d, 0x8006682, 6)
d[o:o + 6] = bytes.fromhex('c046c046c046')
o = off(0x8013AA8)
assert d[o:o + 4].hex() == '07f026be', hx(d, 0x8013AA8)
d[o:o + 4] = bytes.fromhex('c046c046')
o = off(0x8013BA6)
assert d[o:o + 2].hex() == 'b888', (hex(0x8013BA6), hx(d, 0x8013BA6, 2))
d[o:o + 2] = bytes.fromhex('ff20')
# Logger S8 (see b21).
o = off(0x8034810)
assert d[o:o + 4].hex() == 'bde8fc87', hx(d, 0x8034810)
d[o:o + 2] = bytes.fromhex('7047')
# Clock S11 (see b24).
o = off(0x800E988)
assert d[o:o + 2].hex() == '10bd', hx(d, 0x800E988, 2)
d[o:o + 2] = bytes.fromhex('7047')
# Helper-pop S16 chain: pop{r4,pc} (2B 10bd) -> bx ip (2B 4760;
# ip preset by S12 to S16). 0x47c0 would be bx lr (wrong reg!).
o = off(0x8007B66)
assert d[o:o + 2].hex() == '10bd', hx(d, 0x8007B66, 2)
d[o:o + 2] = bytes.fromhex('6047')
save(d, 'img0_b25.elf')
tools/sbl_uni.py
+63 -7
View File
@@ -104,6 +104,12 @@ def main():
calls = [] if "--calltrace" in sys.argv else None
rets = [] if "--retrace" in sys.argv else None
qlog = [] if "--querylog" in sys.argv else None
_traps = []
_trap_n = [0]
if "--trap" in sys.argv:
_traps = [int(x, 0) for x in sys.argv[sys.argv.index("--trap") + 1].split(",")]
if "--trapn" in sys.argv:
_trap_n = [int(sys.argv[sys.argv.index("--trapn") + 1])]
_spmax = [0x085FFF00]
_splog = [] if "--spytrack" in sys.argv else None
elog = [] if "--entrylog" in sys.argv else None
@@ -145,6 +151,23 @@ def main():
except Exception:
thumb = 1
hist.append((addr, thumb))
if _traps and addr in _traps:
try:
vals = [mu.reg_read(_REGS[i]) for i in range(8)]
except Exception:
vals = []
print(f"TRAP {addr:#x} insn#{count[0]} r0-r7={[hex(x) for x in vals]} sp={mu.reg_read(UC_ARM_REG_SP):#x} lr={mu.reg_read(_LR):#x}")
try:
print(f" [73A100]={bytes(mu.mem_read(0x073A100, 4)).hex()}")
except Exception as e:
print(f" [73A100] unreadable: {e}")
_trap_n[0] -= 1
if _trap_n[0] <= 0 and "--trapn" in sys.argv:
mu.emu_stop()
return
if "--trapn" not in sys.argv:
mu.emu_stop()
return
if qlog is not None and addr in (0x8017EA4, 0x8017C60):
try:
vals = [mu.reg_read(_REGS[i]) for i in range(8)]
@@ -163,6 +186,9 @@ def main():
except Exception:
_th = -1
elog.append((count[0], _prev[0], addr, _th))
if not inside and _inrng[_i]:
if len(elog) < 20000:
elog.append((count[0], _prev[0], -addr, 2))
_inrng[_i] = inside
_prev[0] = addr
if calls is not None and size in (2, 4):
@@ -186,6 +212,15 @@ def main():
bxt = -1
if len(calls) < 8000:
calls.append((addr, 100 + bxrm, bxt))
# pop {..,pc} (0xBD00+): log stacked target
if calls is not None and (h & 0xFF00) == 0xBD00:
try:
_sp = mu.reg_read(UC_ARM_REG_SP)
_tgt = struct.unpack("<I", mu.mem_read(_sp, 4))[0]
except Exception:
_tgt = -1
if len(calls) < 12000:
calls.append((addr, 300, _tgt))
if rets is not None and 0x8017E00 <= addr < 0x8018000:
# pop {..,pc} (0xBD00+) or bx lr (0x4770)
if h == 0x4770 or (h & 0xFF00) == 0xBD00:
@@ -345,10 +380,19 @@ def main():
# to the dispatcher via stale lr (TZ bringup deferred).
# NOTE: overwrites 4B of real ARM trampoline (recoverable from ELF).
mu.mem_write(0x00221EF8, bytes([0x00, 0x20, 0x70, 0x47]))
# S12-stub (b25): blx #0x8006964 lands in file-zero padding (PBL
# would place an ARM helper there at runtime). Caller ignores r0
# (movs r0,#0 after), so bx lr no-op return is safe.
mu.mem_write(0x08006964, bytes([0x70, 0x47]))
# S12-stub (b25): blx #0x8006964 (BLX-imm to even => ARM mode!) lands
# in file-zero padding (PBL would place an ARM helper). ARM version:
# movw/movt ip (=S16 addr, for the pop-site chain); ldr r3,[pc,#12]
# (literal [0x8006980] = 0x073A100); ACK peripheral bit1 (the real
# helper's side effect that poll#2 waits for); bx lr.
mu.mem_write(0x08006964, bytes.fromhex(
"c1cc06e300c840e30c309fe5002093e5022082e3002083e5"
"1eff2fe100a17300"))
# S16-stublet (b25, 18B @0x08006CC0): helper-pop chain exit.
# restore r7 (=0x73A000 peripheral base, trashed by labyrinth pops);
# jump to poll-loop resumption 0x8007779 via ip.
mu.mem_write(0x08006CC0, bytes.fromhex(
"4af20007c0f2730747f2797cc0f6000c6047"))
# stack zone fill (STUBV odd)
mu.mem_write(0x085F0000, struct.pack("<I", STUBV) * (0x10000 // 4))
# pop-site slots (sp values from traces)
@@ -385,7 +429,7 @@ def main():
# --- end parity ---
# stub range is readonly on HW/QEMU: ignore SBL heap-clobber writes,
# keep maze/stublets intact (restore-on-write with reentrancy guard)
STUB_LO, STUB_HI = 0x080068C0, 0x08006CA0 # +S7/S9/S10 + banner
STUB_LO, STUB_HI = 0x080068C0, 0x08006CE0 # +S7/S9/S10/S16 + banner
stub_snap = bytes(mu.mem_read(STUB_LO, STUB_HI - STUB_LO))
_inww = [False]
_swn = [0]
@@ -498,9 +542,15 @@ def main():
if elog is not None:
print(f"entries: {len(elog)}")
for n, prev, cur, th in elog[:10]:
print(f" FIRST insn#{n} {prev:#x} -> {cur:#x}{'t' if th == 1 else ('a' if th == 0 else '?')}")
if cur < 0:
print(f" FIRST EXIT insn#{n} {prev:#x} -> {(-cur):#x}")
else:
print(f" FIRST insn#{n} {prev:#x} -> {cur:#x}{'t' if th == 1 else ('a' if th == 0 else '?')}")
for n, prev, cur, th in elog[-10:]:
print(f" LAST insn#{n} {prev:#x} -> {cur:#x}{'t' if th == 1 else ('a' if th == 0 else '?')}")
if cur < 0:
print(f" LAST EXIT insn#{n} {prev:#x} -> {(-cur):#x}")
else:
print(f" LAST insn#{n} {prev:#x} -> {cur:#x}{'t' if th == 1 else ('a' if th == 0 else '?')}")
if _splog is not None:
print(f"sp-highs: {len(_splog)}")
for n, pc, sp in _splog:
@@ -523,6 +573,12 @@ def main():
print(f"bl-immed: {len(bls)}")
for pc, tgt in bls[-30:]:
print(f" {pc:#x}: bl #{tgt:#x}")
pops = [(pc, tgt) for pc, rm, tgt in calls if rm == 300]
print(f"pop-pc: {len(pops)}")
for pc, tgt in pops[:15]:
print(f" FIRST {pc:#x}: pop-> {tgt:#x}" if tgt >= 0 else f" FIRST {pc:#x}: pop-> ?")
for pc, tgt in pops[-15:]:
print(f" LAST {pc:#x}: pop-> {tgt:#x}" if tgt >= 0 else f" LAST {pc:#x}: pop-> ?")
for pc, rm, tgt in calls[-12:]:
if rm == 200:
continue