* z8k-dis.c (unparse_instr): prettier tabs

	* z8kgen.c -> z8k-opc.h: bug fixes in tables

3 files changed, 35 insertions, 30 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 6b0c73b..5d2f3387 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 29 12:20:21 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
+
+	* z8k-dis.c (unparse_instr): prettier tabs
+	* z8kgen.c -> z8k-opc.h: bug fixes in tables
+
 Fri Sep 25 12:50:32 1992  Stu Grossman  (grossman at cygnus.com)
 
 	* configure.in:  Add ncr* configuration.
diff --git a/opcodes/z8k-dis.c b/opcodes/z8k-dis.c
index f3c6362..2a2d3c3 100644
--- a/opcodes/z8k-dis.c
+++ b/opcodes/z8k-dis.c
@@ -428,7 +428,7 @@ instr_data_s  *instr_data;
    int            loop, loop_limit;
    char           out_str[80], tmp_str[25];
 
-   sprintf( out_str, "\t%-10s", z8k_table[instr_data->tabl_index].name );
+   sprintf( out_str, "\t%s\t", z8k_table[instr_data->tabl_index].name );
 
    loop_limit = z8k_table[instr_data->tabl_index].noperands;
    for( loop = 0; loop < loop_limit; loop++ )
diff --git a/opcodes/z8kgen.c b/opcodes/z8kgen.c
index 8eb38f4..9549425 100644
--- a/opcodes/z8kgen.c
+++ b/opcodes/z8kgen.c
@@ -50,12 +50,12 @@ struct op opt[] =
 "0101 1111 ddN0 0000 address","call address(rd)",
 "1101 disp12","calr disp12",
 "0000 1101 ddN0 1000","clr @rd",
-"0100 1101 0000 1000","clr address",
-"0100 1101 ddN0 1000","clr address(rd)",
+"0100 1101 0000 1000 address","clr address",
+"0100 1101 ddN0 1000 address","clr address(rd)",
 "1000 1101 dddd 1000","clr rd",
 "0000 1100 ddN0 1000","clrb @rd",
-"0100 1100 0000 1000","clrb address",
-"0100 1100 ddN0 1000","clrb address(rd)",
+"0100 1100 0000 1000 address","clrb address",
+"0100 1100 ddN0 1000 address","clrb address(rd)",
 "1000 1100 dddd 1000","clrb rbd",
 "1011 1011 ssN0 1010 0000 rrrr ddN0 cccc","cpsd @rd,@rs,rr,cc",
 "1011 1010 ssN0 1010 0000 rrrr ddN0 cccc","cpsdb @rd,@rs,rr,cc",
@@ -66,12 +66,12 @@ struct op opt[] =
 "1011 1011 ssN0 0110 0000 rrrr ddN0 cccc","cpsir @rd,@rs,rr,cc",
 "1011 1010 ssN0 0110 0000 rrrr ddN0 cccc","cpsirb @rd,@rs,rr,cc",
 "0000 1101 ddN0 0000","com @rd",
-"0100 1101 0000 0000","com address",
-"0100 1101 ddN0 0000","com address(rd)",
+"0100 1101 0000 0000 address","com address",
+"0100 1101 ddN0 0000 address","com address(rd)",
 "1000 1101 dddd 0000","com rd",
 "0000 1100 ddN0 0000","comb @rd",
-"0100 1100 0000 0000","comb address",
-"0100 1100 ddN0 0000","comb address(rd)",
+"0100 1100 0000 0000 address","comb address",
+"0100 1100 ddN0 0000 address","comb address(rd)",
 "1000 1100 dddd 0000","comb rbd",
 "1000 1101 imm4 0101","comflg flags",
 "0000 1101 ddN0 0001 imm16","cp @rd,imm16",
@@ -166,18 +166,18 @@ struct op opt[] =
 "0100 1101 0000 0101 address imm16","ld address,imm16",
 "0110 1111 0000 ssss address","ld address,rs",
 "0011 0011 ddN0 ssss disp16","ld rd(disp16),rs",
-"0111 0011 ddN0 ssss 0000 xxN0 0000 0000","ld rd(rx),rs",
+"0111 0011 ddN0 ssss 0000 xxxx 0000 0000","ld rd(rx),rs",
 "0010 0001 ssN0 dddd","ld rd,@rs",
 "0110 0001 0000 dddd address","ld rd,address",
 "0110 0001 ssN0 dddd address","ld rd,address(rs)",
 "0010 0001 0000 dddd imm16","ld rd,imm16",
 "1010 0001 ssss dddd","ld rd,rs",
 "0011 0001 ssN0 dddd disp16","ld rd,rs(disp16)",
-"0111 0001 ssN0 dddd 0000 xxN0 0000 0000","ld rd,rs(rx)",
+"0111 0001 ssN0 dddd 0000 xxxx 0000 0000","ld rd,rs(rx)",
 "0111 0110 0000 dddd address","lda rd,address",
 "0111 0110 ssN0 dddd address","lda rd,address(rs)",
 "0011 0100 ssN0 dddd disp16","lda rd,rs(disp16)",
-"0111 0100 ssN0 dddd 0000 xxN0 0000 0000","lda rd,rs(rx)",
+"0111 0100 ssN0 dddd 0000 xxxx 0000 0000","lda rd,rs(rx)",
 "0011 0100 0000 dddd disp16","ldar rd,disp16",
 "0000 1100 ddN0 0101 imm8 imm8","ldb @rd,imm8",
 "0010 1110 ddN0 ssss","ldb @rd,rbs",
@@ -192,23 +192,23 @@ struct op opt[] =
 "0010 0000 0000 dddd imm8 imm8","ldb rbd,imm8",
 "1010 0000 ssss dddd","ldb rbd,rbs",
 "0011 0000 ssN0 dddd disp16","ldb rbd,rs(disp16)",
-"0111 0000 ssN0 dddd 0000 xxN0 0000 0000","ldb rbd,rs(rx)",
+"0111 0000 ssN0 dddd 0000 xxxx 0000 0000","ldb rbd,rs(rx)",
 "0011 0010 ddN0 ssss disp16","ldb rd(disp16),rbs",
-"0111 0010 ddN0 ssss 0000 xxN0 0000 0000","ldb rd(rx),rbs",
+"0111 0010 ddN0 ssss 0000 xxxx 0000 0000","ldb rd(rx),rbs",
 "0111 1101 ssss 1ccc","ldctl ctrl,rs",
 "0111 1101 dddd 0ccc","ldctl rd,ctrl",
 "0001 1101 ddN0 ssss","ldl @rd,rrs",
 "0101 1101 ddN0 ssss address","ldl address(rd),rrs",
 "0101 1101 0000 ssss address","ldl address,rrs",
 "0011 0111 ddN0 ssss disp16","ldl rd(disp16),rrs",
-"0111 0111 ddN0 ssss 0000 xxN0 0000 0000","ldl rd(rx),rrs",
+"0111 0111 ddN0 ssss 0000 xxxx 0000 0000","ldl rd(rx),rrs",
 "0001 0100 ssN0 dddd","ldl rrd,@rs",
 "0101 0100 0000 dddd address","ldl rrd,address",
 "0101 0100 ssN0 dddd address","ldl rrd,address(rs)",
 "0001 0100 0000 dddd imm32","ldl rrd,imm32",
 "1001 0100 ssss dddd","ldl rrd,rrs",
 "0011 0101 ssN0 dddd disp16","ldl rrd,rs(disp16)",
-"0111 0101 ssN0 dddd 0000 xxN0 0000 0000","ldl rrd,rs(rx)",
+"0111 0101 ssN0 dddd 0000 xxxx 0000 0000","ldl rrd,rs(rx)",
 "0001 1100 ddN0 1001 0000 ssss 0000 nminus1","ldm @rd,rs,n",
 "0101 1100 ddN0 1001 0000 ssN0 0000 nminus1 address","ldm address(rd),rs,n",
 "0101 1100 0000 1001 0000 ssss 0000 nminus1 address","ldm address,rs,n",
@@ -243,13 +243,13 @@ struct op opt[] =
 "0001 1000 0000 dddd imm32","multl rqd,imm32",
 "1001 1000 ssss dddd","multl rqd,rrs",
 "0000 1101 ddN0 0010","neg @rd",
-"0100 1101 0000 0010","neg address",
-"0100 1101 ddN0 0010","neg address(rd)",
+"0100 1101 0000 0010 address","neg address",
+"0100 1101 ddN0 0010 address","neg address(rd)",
 "1000 1101 dddd 0010","neg rd",
 "0000 1100 ddN0 0010","negb @rd",
-"0100 1100 0000 0010","negb address",
-"0100 1100 ddN0 0010","negb address(rd)",
-"1000 1100 dddd 0010","negb rd",
+"0100 1100 0000 0010 address","negb address",
+"0100 1100 ddN0 0010 address","negb address(rd)",
+"1000 1100 dddd 0010","negb rbd",
 "1000 1101 0000 0111","nop",
 "0000 0101 ssN0 dddd","or rd,@rs",
 "0100 0101 0000 dddd address","or rd,address",
@@ -377,15 +377,15 @@ struct op opt[] =
 "1010 1111 dddd cccc","tcc cc,rd",
 "1010 1110 dddd cccc","tccb cc,rbd",
 "0000 1101 ddN0 0100","test @rd",
-"0100 1101 0000 0100","test address",
-"0100 1101 ddN0 0100","test address(rd)",
+"0100 1101 0000 0100 address","test address",
+"0100 1101 ddN0 0100 address","test address(rd)",
 "1000 1101 dddd 0100","test rd",
 "0000 1100 ddN0 0100","testb @rd",
-"0100 1100 0000 0100","testb address",
-"0100 1100 ddN0 0100","testb address(rd)",
+"0100 1100 0000 0100 address","testb address",
+"0100 1100 ddN0 0100 address","testb address(rd)",
 "1000 1100 dddd 0100","testb rbd",
 "0001 1100 ddN0 1000","testl @rd",
-"0101 1100 0000 1000","testl address",
+"0101 1100 0000 1000 address","testl address",
 "1001 1100 dddd 1000","testl rrd",
 "1011 1000 ddN0 1000 0000 aaaa ssN0 0000","trdb @rd,@rs,rba",
 "1011 1000 ddN0 1100 0000 aaaa ssN0 0000","trdrb @rd,@rs,rba",
@@ -396,12 +396,12 @@ struct op opt[] =
 "1011 1000 aaN0 0110 0000 rrrr bbN0 1110","trtirb @ra,@rb,rbr",
 "1011 1000 aaN0 1010 0000 rrrr bbN0 0000","trtrb @ra,@rb,rbr",
 "0000 1101 ddN0 0110","tset @rd",
-"0100 1101 0000 0110","tset address",
-"0100 1101 ddN0 0110","tset address(rd)",
+"0100 1101 0000 0110 address","tset address",
+"0100 1101 ddN0 0110 address","tset address(rd)",
 "1000 1101 dddd 0110","tset rd",
 "0000 1100 ddN0 0110","tsetb @rd",
-"0100 1100 0000 0110","tsetb address",
-"0100 1100 ddN0 0110","tsetb address(rd)",
+"0100 1100 0000 0110 address","tsetb address",
+"0100 1100 ddN0 0110 address","tsetb address(rd)",
 "1000 1100 dddd 0110","tsetb rbd",
 "0000 1001 ssN0 dddd","xor rd,@rs",
 "0100 1001 0000 dddd address","xor rd,address",