diff options
| -rw-r--r-- | miasm/arch/arm/sem.py | 6 | ||||
| -rw-r--r-- | miasm/os_dep/win_api_x86_32.py | 1 | ||||
| -rw-r--r-- | test/arch/arm/arch.py | 5 |
3 files changed, 9 insertions, 3 deletions
diff --git a/miasm/arch/arm/sem.py b/miasm/arch/arm/sem.py index 7d72b956..027c3a6a 100644 --- a/miasm/arch/arm/sem.py +++ b/miasm/arch/arm/sem.py @@ -1752,6 +1752,9 @@ mnemo_condm0 = {'add': add, 'sdiv': sdiv, 'udiv': udiv, + 'mrc': mrc, + 'mcr': mcr, + 'mul': mul, 'umull': umull, 'umlal': umlal, @@ -1810,9 +1813,6 @@ mnemo_condm1 = {'adds': add, 'bics': bics, 'mvns': mvns, - 'mrc': mrc, - 'mcr': mcr, - 'mrs': mrs, 'msr': msr, diff --git a/miasm/os_dep/win_api_x86_32.py b/miasm/os_dep/win_api_x86_32.py index c7c67a78..146ce192 100644 --- a/miasm/os_dep/win_api_x86_32.py +++ b/miasm/os_dep/win_api_x86_32.py @@ -1913,6 +1913,7 @@ def ntdll_LdrLoadDll(jitter): libname = s.lower() ad = winobjs.runtime_dll.lib_get_add_base(libname) + log.info("Loading %r ret 0x%x", s, ad) jitter.vm.set_u32(args.modhandle, ad) jitter.func_ret_stdcall(ret_ad, 0) diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py index 55b9a9c2..740655da 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -237,6 +237,11 @@ reg_tests_arm = [ '110f11ee'), ('XXXXXXXX MCR p15, 0x0, R8, c2, c0, 0x0', '108f02ee'), + ('XXXXXXXX MRCNE p15, 0x0, R0, c1, c1, 0x0', + '110f111e'), + ('XXXXXXXX MCRCC p15, 0x0, R8, c2, c0, 0x1', + '308f023e'), + ] ts = time.time() |