* alpha-tdep.c (alpha_breakpoint_from_pc): New function.

[deliverable/binutils-gdb.git] / opcodes / z8k-dis.c

diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index 754540f1ae0b9b55a49b84bc74a3489b1ea4fd70..091d9379dddef933d68255a7268664243b08f5df 100644 (file)
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -50,6 +50,9 @@ typedef struct {
   unsigned long interrupts;
 } instr_data_s;
 
+static int fetch_data PARAMS ((struct disassemble_info *, int));
+
+
 /* Make sure that bytes from INFO->PRIVATE_DATA->BUFFER (inclusive)
    to ADDR (exclusive) are valid.  Returns 1 for success, longjmps
    on error.  */
@@ -134,6 +137,7 @@ static char *ctrl_names[8] = {
 };
 
 static int seg_length;
+static int print_insn_z8k PARAMS ((bfd_vma, disassemble_info *, int));
 int z8k_lookup_instr PARAMS ((unsigned char *, disassemble_info *));
 static void output_instr
   PARAMS ((instr_data_s *, unsigned long, disassemble_info *));
@@ -274,7 +278,7 @@ z8k_lookup_instr (nibbles, info)
 static void
 output_instr (instr_data, addr, info)
      instr_data_s *instr_data;
-     unsigned long addr;
+     unsigned long addr ATTRIBUTE_UNUSED;
      disassemble_info *info;
 {
   int loop, loop_limit;
@@ -536,7 +540,10 @@ unparse_instr (instr_data, is_segmented)
          strcat (out_str, tmp_str);
          break;
        case CLASS_IR:
-         sprintf (tmp_str, "@R%ld", instr_data->arg_reg[datum_value]);
+         if (is_segmented)
+           sprintf (tmp_str, "@rr%ld", instr_data->arg_reg[datum_value]);
+         else
+           sprintf (tmp_str, "@r%ld", instr_data->arg_reg[datum_value]);
          strcat (out_str, tmp_str);
          break;
        case CLASS_FLAGS:
@@ -545,14 +552,10 @@ unparse_instr (instr_data, is_segmented)
          break;
        case CLASS_REG_BYTE:
          if (instr_data->arg_reg[datum_value] >= 0x8)
-           {
-             sprintf (tmp_str, "rl%ld",
-                      instr_data->arg_reg[datum_value] - 0x8);
-           }
+           sprintf (tmp_str, "rl%ld",
+                    instr_data->arg_reg[datum_value] - 0x8);
          else
-           {
-             sprintf (tmp_str, "rh%ld", instr_data->arg_reg[datum_value]);
-           }
+           sprintf (tmp_str, "rh%ld", instr_data->arg_reg[datum_value]);
          strcat (out_str, tmp_str);
          break;
        case CLASS_REG_WORD: