summary refs log tree commit diff stats
path: root/cris-dis.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-01-12 17:39:36 +0200
committerMichael S. Tsirkin <mst@redhat.com>2011-01-12 17:39:36 +0200
commitc2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0 (patch)
tree9ee42d082f17ebb559a69e90a3e7c3f0fa6cad54 /cris-dis.c
parentb36e391441906c36ed0856b69de84001860402bf (diff)
parent05bf441eb69a813d3893174d54faa6afa8c0d39b (diff)
downloadfocaccia-qemu-c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0.tar.gz
focaccia-qemu-c2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0.zip
Merge remote branch 'origin/master' into pci
Diffstat (limited to 'cris-dis.c')
-rw-r--r--cris-dis.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/cris-dis.c b/cris-dis.c
index afd775c29b..5fa67d9f29 100644
--- a/cris-dis.c
+++ b/cris-dis.c
@@ -2767,7 +2767,6 @@ print_insn_cris_generic (bfd_vma memaddr,
 }
 
 /* Disassemble, prefixing register names with `$'.  CRIS v0..v10.  */
-#if 0
 static int
 print_insn_cris_with_register_prefix (bfd_vma vma,
 				      disassemble_info *info)
@@ -2777,7 +2776,6 @@ print_insn_cris_with_register_prefix (bfd_vma vma,
     return -1;
   return print_insn_cris_generic (vma, info, true);
 }
-#endif
 /* Disassemble, prefixing register names with `$'.  CRIS v32.  */
 
 static int
@@ -2843,6 +2841,13 @@ print_insn_crisv10_v32_without_register_prefix (bfd_vma vma,
 #endif
 
 int
+print_insn_crisv10 (bfd_vma vma,
+		    disassemble_info *info)
+{
+  return print_insn_cris_with_register_prefix(vma, info);
+}
+
+int
 print_insn_crisv32 (bfd_vma vma,
 		    disassemble_info *info)
 {