summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2002-08-22 19:22:35 +0000
committerNick Clifton <nickc@redhat.com>2002-08-22 19:22:35 +0000
commit9761af4502db8214e815aa2f96f4358954655112 (patch)
treeb309c81a643f004278dd0dce886f90fcabe67f82
parentbefb819bd64b26027ef331acda0305a4db02efc5 (diff)
downloadgdb-9761af4502db8214e815aa2f96f4358954655112.tar.gz
opcodes: Fix definition of "in rd,imm16" opcode.
gas: Adjust ptr variable also in "case 0" case.
-rw-r--r--opcodes/ChangeLog7
-rw-r--r--opcodes/z8k-dis.c4
-rw-r--r--opcodes/z8k-opc.h4
-rw-r--r--opcodes/z8kgen.c2
4 files changed, 12 insertions, 5 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index b7c59eb1b5b..8bbcdffb45b 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2002-08-19 Elena Zannoni <ezannoni@redhat.com>
From matthew green <mrg@redhat.com>
diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index d375e6908d2..6c1913892c8 100644
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -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;
diff --git a/opcodes/z8k-opc.h b/opcodes/z8k-opc.h
index 025cfabdd65..0e478bfd0e8 100644
--- a/opcodes/z8k-opc.h
+++ b/opcodes/z8k-opc.h
@@ -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 */
diff --git a/opcodes/z8kgen.c b/opcodes/z8kgen.c
index fa8505939a9..5bd9240c021 100644
--- a/opcodes/z8kgen.c
+++ b/opcodes/z8kgen.c
@@ -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,