2003-12-15 David Carlton <carlton@kealia.com>

	* Merge with mainline; tag is carlton_dictionary-20031215-merge.
	* cp-support.c (class_name_from_physname): Add DMGL_PARAMS to call
	to cplus_demangle.
	(method_name_from_physname): Ditto.

1 files changed, 113 insertions, 113 deletions

diff --git a/opcodes/z8k-opc.h b/opcodes/z8k-opc.h
index c714bde..4caedd4 100644
--- a/opcodes/z8k-opc.h
+++ b/opcodes/z8k-opc.h
@@ -1,117 +1,117 @@
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-
    This file is automatically generated by z8kgen.  */
 
-#define ARG_MASK 0x0f
-#define ARG_SRC 0x01
-#define ARG_DST 0x02
-#define ARG_RS 0x01
-#define ARG_RD 0x02
-#define ARG_RA 0x03
-#define ARG_RB 0x04
-#define ARG_RR 0x05
-#define ARG_RX 0x06
-#define ARG_IMM4 0x01
-#define ARG_IMM8 0x02
-#define ARG_IMM16 0x03
-#define ARG_IMM32 0x04
-#define ARG_IMMN 0x05
-#define ARG_IMMNMINUS1 0x05
-#define ARG_IMM_1 0x06
-#define ARG_IMM_2 0x07
-#define ARG_DISP16 0x08
-#define ARG_NIM8 0x09
-#define ARG_IMM2 0x0a
-#define ARG_IMM1OR2 0x0b
-#define ARG_DISP12 0x0b
-#define ARG_NIM4 0x0c
-#define ARG_DISP8 0x0c
-#define ARG_IMM4M1 0x0d
-#define CLASS_X 0x10
-#define CLASS_BA 0x20
-#define CLASS_DA 0x30
-#define CLASS_BX 0x40
-#define CLASS_DISP 0x50
-#define CLASS_IMM 0x60
-#define CLASS_CC 0x70
-#define CLASS_CTRL 0x80
-#define CLASS_IGNORE 0x90
-#define CLASS_ADDRESS 0xd0
-#define CLASS_0CCC 0xe0
-#define CLASS_1CCC 0xf0
-#define CLASS_0DISP7 0x100
-#define CLASS_1DISP7 0x200
-#define CLASS_01II 0x300
-#define CLASS_00II 0x400
-#define CLASS_BIT 0x500
-#define CLASS_FLAGS 0x600
-#define CLASS_IR 0x700
+#define ARG_MASK         0x0f
+#define ARG_SRC          0x01
+#define ARG_DST          0x02
+#define ARG_RS           0x01
+#define ARG_RD           0x02
+#define ARG_RA           0x03
+#define ARG_RB           0x04
+#define ARG_RR           0x05
+#define ARG_RX           0x06
+#define ARG_IMM4         0x01
+#define ARG_IMM8         0x02
+#define ARG_IMM16        0x03
+#define ARG_IMM32        0x04
+#define ARG_IMMN         0x05
+#define ARG_IMMNMINUS1   0x05
+#define ARG_IMM_1        0x06
+#define ARG_IMM_2        0x07
+#define ARG_DISP16       0x08
+#define ARG_NIM8         0x09
+#define ARG_IMM2         0x0a
+#define ARG_IMM1OR2      0x0b
+#define ARG_DISP12       0x0b
+#define ARG_NIM4         0x0c
+#define ARG_DISP8        0x0c
+#define ARG_IMM4M1       0x0d
+#define CLASS_X          0x10
+#define CLASS_BA         0x20
+#define CLASS_DA         0x30
+#define CLASS_BX         0x40
+#define CLASS_DISP       0x50
+#define CLASS_IMM        0x60
+#define CLASS_CC         0x70
+#define CLASS_CTRL       0x80
+#define CLASS_IGNORE     0x90
+#define CLASS_ADDRESS    0xd0
+#define CLASS_0CCC       0xe0
+#define CLASS_1CCC       0xf0
+#define CLASS_0DISP7    0x100
+#define CLASS_1DISP7    0x200
+#define CLASS_01II      0x300
+#define CLASS_00II      0x400
+#define CLASS_BIT       0x500
+#define CLASS_FLAGS     0x600
+#define CLASS_IR        0x700
 #define CLASS_IRO       0x800
 #define CLASS_DISP8     0x900
 #define CLASS_BIT_1OR2  0xa00
-#define CLASS_REG 0x7000
-#define CLASS_REG_BYTE 0x2000
-#define CLASS_REG_WORD 0x3000
-#define CLASS_REG_QUAD 0x4000
-#define CLASS_REG_LONG 0x5000
-#define CLASS_REGN0 0x8000
-#define CLASS_PR 0x10000
+#define CLASS_REG       0x7000
+#define CLASS_REG_BYTE  0x2000
+#define CLASS_REG_WORD  0x3000
+#define CLASS_REG_QUAD  0x4000
+#define CLASS_REG_LONG  0x5000
+#define CLASS_REGN0     0x8000
+#define CLASS_PR       0x10000
 #define CLASS_MASK     0x1fff0
-#define OPC_adc 0
-#define OPC_adcb 1
-#define OPC_add 2
-#define OPC_addb 3
-#define OPC_addl 4
-#define OPC_and 5
-#define OPC_andb 6
-#define OPC_bit 7
-#define OPC_bitb 8
-#define OPC_call 9
-#define OPC_calr 10
-#define OPC_clr 11
-#define OPC_clrb 12
-#define OPC_com 13
-#define OPC_comb 14
-#define OPC_comflg 15
-#define OPC_cp 16
-#define OPC_cpb 17
-#define OPC_cpd 18
-#define OPC_cpdb 19
-#define OPC_cpdr 20
-#define OPC_cpdrb 21
-#define OPC_cpi 22
-#define OPC_cpib 23
-#define OPC_cpir 24
-#define OPC_cpirb 25
-#define OPC_cpl 26
-#define OPC_cpsd 27
-#define OPC_cpsdb 28
-#define OPC_cpsdr 29
-#define OPC_cpsdrb 30
-#define OPC_cpsi 31
-#define OPC_cpsib 32
-#define OPC_cpsir 33
-#define OPC_cpsirb 34
-#define OPC_dab 35
-#define OPC_dbjnz 36
-#define OPC_dec 37
-#define OPC_decb 38
-#define OPC_di 39
-#define OPC_div 40
-#define OPC_divl 41
-#define OPC_djnz 42
-#define OPC_ei 43
-#define OPC_ex 44
-#define OPC_exb 45
-#define OPC_exts 46
-#define OPC_extsb 47
-#define OPC_extsl 48
-#define OPC_halt 49
-#define OPC_in 50
-#define OPC_inb 51
-#define OPC_inc 52
-#define OPC_incb 53
-#define OPC_ind 54
-#define OPC_indb 55
+#define OPC_adc      0
+#define OPC_adcb     1
+#define OPC_add      2
+#define OPC_addb     3
+#define OPC_addl     4
+#define OPC_and      5
+#define OPC_andb     6
+#define OPC_bit      7
+#define OPC_bitb     8
+#define OPC_call     9
+#define OPC_calr    10
+#define OPC_clr     11
+#define OPC_clrb    12
+#define OPC_com     13
+#define OPC_comb    14
+#define OPC_comflg  15
+#define OPC_cp      16
+#define OPC_cpb     17
+#define OPC_cpd     18
+#define OPC_cpdb    19
+#define OPC_cpdr    20
+#define OPC_cpdrb   21
+#define OPC_cpi     22
+#define OPC_cpib    23
+#define OPC_cpir    24
+#define OPC_cpirb   25
+#define OPC_cpl     26
+#define OPC_cpsd    27
+#define OPC_cpsdb   28
+#define OPC_cpsdr   29
+#define OPC_cpsdrb  30
+#define OPC_cpsi    31
+#define OPC_cpsib   32
+#define OPC_cpsir   33
+#define OPC_cpsirb  34
+#define OPC_dab     35
+#define OPC_dbjnz   36
+#define OPC_dec     37
+#define OPC_decb    38
+#define OPC_di      39
+#define OPC_div     40
+#define OPC_divl    41
+#define OPC_djnz    42
+#define OPC_ei      43
+#define OPC_ex      44
+#define OPC_exb     45
+#define OPC_exts    46
+#define OPC_extsb   47
+#define OPC_extsl   48
+#define OPC_halt    49
+#define OPC_in      50
+#define OPC_inb     51
+#define OPC_inc     52
+#define OPC_incb    53
+#define OPC_ind     54
+#define OPC_indb    55
 #define OPC_indr    56
 #define OPC_indrb   57
 #define OPC_ini     58
@@ -1801,21 +1801,21 @@ const opcode_entry_type z8k_table[] = {
 "ldb",OPC_ldb,0,{CLASS_REG_BYTE+(ARG_RD),CLASS_X+(ARG_RS),},
 	{CLASS_BIT+6,CLASS_BIT+0,CLASS_REGN0+(ARG_RS),CLASS_REG+(ARG_RD),CLASS_ADDRESS+(ARG_SRC),0,0,0,0,},2,4,74},
 
-/* 0010 0000 0000 dddd imm8 imm8 *** ldb rbd,imm8 */
+/* 1100 dddd imm8 *** ldb rbd,imm8 */
 {
 #ifdef NICENAMES
-"ldb rbd,imm8",8,7,0x00,
+"ldb rbd,imm8",8,5,0x00,
 #endif
 "ldb",OPC_ldb,0,{CLASS_REG_BYTE+(ARG_RD),CLASS_IMM+(ARG_IMM8),},
-	{CLASS_BIT+2,CLASS_BIT+0,CLASS_BIT+0,CLASS_REG+(ARG_RD),CLASS_IMM+(ARG_IMM8),CLASS_IMM+(ARG_IMM8),0,0,0,},2,4,74},
+	{CLASS_BIT+0xc,CLASS_REG+(ARG_RD),CLASS_IMM+(ARG_IMM8),0,0,0,0,0,0,},2,2,74},
 
-/* 1100 dddd imm8 *** ldb rbd,imm8 */
+/* 0010 0000 0000 dddd imm8 imm8 *** ldb rbd,imm8 */
 {
 #ifdef NICENAMES
-"ldb rbd,imm8",8,5,0x00,
+"ldb rbd,imm8",8,7,0x00,
 #endif
 "ldb",OPC_ldb,0,{CLASS_REG_BYTE+(ARG_RD),CLASS_IMM+(ARG_IMM8),},
-	{CLASS_BIT+0xc,CLASS_REG+(ARG_RD),CLASS_IMM+(ARG_IMM8),0,0,0,0,0,0,},2,2,74},
+	{CLASS_BIT+2,CLASS_BIT+0,CLASS_BIT+0,CLASS_REG+(ARG_RD),CLASS_IMM+(ARG_IMM8),CLASS_IMM+(ARG_IMM8),0,0,0,},2,4,74},
 
 /* 1010 0000 ssss dddd *** ldb rbd,rbs */
 {