Replace target_ulong with target_phys_addr_t

[mirror_qemu.git] / arm-dis.c

diff --git a/arm-dis.c b/arm-dis.c
index adacd898b620a5c30af1bd5b6b83990f2b231d3f..1e027efc7081397a1de4bd6135eee62adc50da9c 100644 (file)
--- a/arm-dis.c
+++ b/arm-dis.c
@@ -560,8 +560,8 @@ static arm_regname regnames[] =
     { "a1", "a2", "a3", "a4", "v1", "v2", "v3", "WR", "v5", "SB", "SL",  "FP",  "IP",  "SP",  "LR",  "PC" }}
 };
 
-/* Default to GCC register name set.  */
-static unsigned int regname_selected = 1;
+/* Default to STD register name set.  */
+static unsigned int regname_selected = 2;
 
 #define NUM_ARM_REGNAMES  NUM_ELEM (regnames)
 #define arm_regnames      regnames[regname_selected].reg_names
@@ -1556,6 +1556,11 @@ print_insn_arm (pc, info)
     }
   
   is_thumb = force_thumb;
+  if (pc & 1)
+    {
+      is_thumb = 1;
+      pc &= ~(bfd_vma) 1;
+    }
   
 #if 0
   if (!is_thumb && info->symbols != NULL)