some more z8k fixes

Christian Groessler chris@groessler.org
Fri Aug 16 14:15:00 GMT 2002


Hi,

some small fixes for the z8k...

regards,
chris
 


gas/ChangeLog:

2002-08-16  Christian Groessler <chris@groessler.org>

        * config/tc-z8k.c (get_operands): Adjust ptr variable also in
          "case 0" case.


opcodes/ChangeLog:

2002-08-16  Christian Groessler <chris@groessler.org>

        * z8k-dis.c (unparse_instr): case CLASS_BA: Designate hex
          values as those.
        * z8kgen.c (opt): Fix definition of "in rd,imm16" opcode.
        * z8k-opc.h: Regenerated with new z8kgen.c.


-----------------------------------------
Index: gas/config/tc-z8k.c
===================================================================
RCS file: /nfs/soft/src/CVSdepot/m20binutils/src/gas/config/tc-z8k.c,v
retrieving revision 1.1.1.5
retrieving revision 1.8
diff -u -p -r1.1.1.5 -r1.8
--- gas/config/tc-z8k.c	2002/08/15 21:26:47	1.1.1.5
+++ gas/config/tc-z8k.c	2002/08/15 22:18:14	1.8
@@ -734,6 +734,7 @@ get_operands (opcode, op_end, operand)
   switch (opcode->noperands)
     {
     case 0:
+      ptr++;
       operand[0].mode = 0;
       operand[1].mode = 0;
       break;
Index: opcodes/z8k-dis.c
===================================================================
RCS file: /nfs/soft/src/CVSdepot/m20binutils/src/opcodes/z8k-dis.c,v
retrieving revision 1.1.1.3
retrieving revision 1.8
diff -u -p -r1.1.1.3 -r1.8
--- opcodes/z8k-dis.c	2002/04/25 14:51:36	1.1.1.3
+++ opcodes/z8k-dis.c	2002/08/15 23:49:56	1.8
@@ -515,10 +515,10 @@ unparse_instr (instr_data, is_segmented)
 	  break;
 	case CLASS_BA:
           if (is_segmented)
-            sprintf (tmp_str, "rr%ld(#%lx)", instr_data->arg_reg[datum_value],
+            sprintf (tmp_str, "rr%ld(#0x%lx)", instr_data->arg_reg[datum_value],
                      instr_data->immediate);
           else
-            sprintf (tmp_str, "r%ld(#%lx)", instr_data->arg_reg[datum_value],
+            sprintf (tmp_str, "r%ld(#0x%lx)", instr_data->arg_reg[datum_value],
                      instr_data->immediate);
 	  strcat (out_str, tmp_str);
 	  break;
Index: opcodes/z8k-opc.h
===================================================================
RCS file: /nfs/soft/src/CVSdepot/m20binutils/src/opcodes/z8k-opc.h,v
retrieving revision 1.1.1.2
retrieving revision 1.7
diff -u -p -r1.1.1.2 -r1.7
--- opcodes/z8k-opc.h	2002/04/25 14:51:36	1.1.1.2
+++ opcodes/z8k-opc.h	2002/08/16 20:26:38	1.7
@@ -1621,14 +1621,14 @@ opcode_entry_type z8k_table[] = {
 	{CLASS_BIT+3,CLASS_BIT+0xd,CLASS_REGN0+(ARG_RS),CLASS_REG+(ARG_RD),0,0,0,0,0,},2,2,135},
 
 
-/* 0011 1101 dddd 0100 imm16 *** in rd,imm16 */
+/* 0011 1011 dddd 0100 imm16 *** in rd,imm16 */
 {
 #ifdef NICENAMES
 "in rd,imm16",16,12,
 0x00,
 #endif
 "in",OPC_in,0,{CLASS_REG_WORD+(ARG_RD),CLASS_IMM+(ARG_IMM16),},
-	{CLASS_BIT+3,CLASS_BIT+0xd,CLASS_REG+(ARG_RD),CLASS_BIT+4,CLASS_IMM+(ARG_IMM16),0,0,0,0,},2,4,136},
+	{CLASS_BIT+3,CLASS_BIT+0xb,CLASS_REG+(ARG_RD),CLASS_BIT+4,CLASS_IMM+(ARG_IMM16),0,0,0,0,},2,4,136},
 
 
 /* 0011 1100 ssN0 dddd *** inb rbd,@rs */
Index: opcodes/z8kgen.c
===================================================================
RCS file: /nfs/soft/src/CVSdepot/m20binutils/src/opcodes/z8kgen.c,v
retrieving revision 1.1.1.2
retrieving revision 1.4
diff -u -p -r1.1.1.2 -r1.4
--- opcodes/z8kgen.c	2002/04/25 14:51:36	1.1.1.2
+++ opcodes/z8kgen.c	2002/08/16 20:25:46	1.4
@@ -209,8 +209,8 @@ struct op opt[] =
 
   "------", 8, 16, "0111 1010 0000 0000", "halt", 0,
   "------", 10, 16, "0011 1101 ssN0 dddd", "in rd,@rs", 0,
-  "------", 12, 16, "0011 1101 dddd 0100 imm16", "in rd,imm16", 0,
   "------", 12, 8, "0011 1100 ssN0 dddd", "inb rbd,@rs", 0,
+  "------", 12, 16, "0011 1011 dddd 0100 imm16", "in rd,imm16", 0,
   "------", 10, 8, "0011 1010 dddd 0100 imm16", "inb rbd,imm16", 0,
   "-ZSV--", 11, 16, "0010 1001 ddN0 imm4m1", "inc @rd,imm4m1", 0,
   "-ZSV--", 14, 16, "0110 1001 ddN0 imm4m1 address_dst", "inc address_dst(rd),imm4m1", 0,
-----------------------------------------



More information about the Binutils mailing list