Merge pull request #1458 from bet4it/patch

Port some patches from Unicorn1 to Unicorn2
2021-11-03 20:59:42 +01:00
parent 9818840f4e aaf340d9e4
commit 6b5529fcb7
12 changed files with 165 additions and 23 deletions
--- a/qemu/target/arm/unicorn_arm.c
+++ b/qemu/target/arm/unicorn_arm.c
@ -468,7 +468,7 @@ static uc_err arm_query(struct uc_struct *uc, uc_query_type type,
        // zero out ARM/THUMB mode
        mode = uc->mode & ~(UC_MODE_ARM | UC_MODE_THUMB);
        // THUMB mode or ARM MOde
-        mode +=
+        mode |=
            ((ARM_CPU(mycpu)->env.thumb != 0) ? UC_MODE_THUMB : UC_MODE_ARM);
        *result = mode;
        return UC_ERR_OK;