fix z8k assembly and disassembly

diff --git a/gas/ChangeLog b/gas/ChangeLog
index fea3a09..72217a0 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-09  Christian Groessler <cpg@aladdin.de>
+
+       * config/tc-z8k.c: Include opcodes/z8k-opc.h after bfd.h
+       since z8k-opc.h now uses the PARAMS macro.
+
 2001-10-09  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/tc-arm.c: Change MAVERIK to MAVERICK.

diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index 924ce9c..bf83b27 100644 (file)
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -24,11 +24,10 @@
 #define DEFINE_TABLE
 #include <stdio.h>
 
-#include "opcodes/z8k-opc.h"
-
 #include "as.h"
 #include "bfd.h"
 #include "safe-ctype.h"
+#include "opcodes/z8k-opc.h"
 
 const char comment_chars[] = "!";
 const char line_comment_chars[] = "#";

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d4bbe2e..bda4ed7 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-24  Christian Groessler <cpg@aladdin.de>
+
+       * z8k-dis.c (unparse_intstr): Fixed formatting. Change
+       disassembly of indirect register memory accesses to be same
+       format the assembler accepts.
+
 2001-10-09  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * sh-opc.h: Fix encoding of least significant nibble of the

diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index dcba775..091d937 100644 (file)
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -540,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:
@@ -549,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: