Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-30 02:10:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

proxyutils.py: Allow mrs/msr to pass region (for EL1 etc)

Browse source 
Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2021-05-13 20:10:51 +09:00
parent 757213b7a9
commit 11ef3bb461
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
proxyclient/hacr_trap_bits.py
View file

@ -37,8 +37,11 @@ AUX = [
AFSR1_EL1,
AFSR1_EL2,
AIDR_EL1,
AIDR2_EL1,
AMAIR_EL1,
AMAIR_EL2,
APCTL_EL1,
APSTS_EL1,
]
def test():
@ -69,7 +72,7 @@ def test():
i += 1
for enc in AUX:
try:
v = u.mrs(enc, call=p.el1_call, silent=True)
v = u.mrs(enc, call=p.el1_call, silent=True, region=0)
if v != BAD:
yield enc
except:

12
proxyclient/proxyutils.py
View file

@ -42,24 +42,24 @@ class ProxyUtils(object):
self.adt_data = None
self.adt = LazyADT(self)
def mrs(self, reg, *, silent=False, call=None):
def mrs(self, reg, *, silent=False, call=None, region=REGION_RX_EL1):
op0, op1, CRn, CRm, op2 = reg
op = (((op0 & 1) << 19) | (op1 << 16) | (CRn << 12) |
(CRm << 8) | (op2 << 5) | 0xd5300000)
return self.exec(op, call=call, silent=silent)
return self.exec(op, call=call, silent=silent, region=region)
def msr(self, reg, val, *, silent=False, call=None):
def msr(self, reg, val, *, silent=False, call=None, region=REGION_RX_EL1):
op0, op1, CRn, CRm, op2 = reg
op = (((op0 & 1) << 19) | (op1 << 16) | (CRn << 12) |
(CRm << 8) | (op2 << 5) | 0xd5100000)
self.exec(op, val, call=call, silent=silent)
self.exec(op, val, call=call, silent=silent, region=region)
def exec(self, op, r0=0, r1=0, r2=0, r3=0, *, silent=False, call=None):
def exec(self, op, r0=0, r1=0, r2=0, r3=0, *, silent=False, call=None, region=REGION_RX_EL1):
if call is None:
call = self.proxy.call
if isinstance(op, int):
@ -75,7 +75,7 @@ class ProxyUtils(object):
self.proxy.ic_ivau(self.code_buffer, 8)
self.proxy.set_exc_guard(GUARD.SKIP | (GUARD.SILENT if silent else 0))
ret = call(self.code_buffer | REGION_RX_EL1, r0, r1, r2, r3)
ret = call(self.code_buffer | region, r0, r1, r2, r3)
cnt = self.proxy.get_exc_count()
self.proxy.set_exc_guard(GUARD.OFF)
if cnt: