X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fhppa-dis.c;h=23c926ae771f93e393a9149a8e0291c67cf27aa5;hb=4b14d3e4e0d9ba2ff2f9397312f884f8fc9a1135;hp=c8f1e9a3a3f18f6950c5396733a64fc926dfeaea;hpb=e4df56c400334a4ccdd4686ccfdead78e2d81661;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/hppa-dis.c b/opcodes/hppa-dis.c index c8f1e9a3a3..23c926ae77 100644 --- a/opcodes/hppa-dis.c +++ b/opcodes/hppa-dis.c @@ -18,7 +18,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include #include "sysdep.h" #include "dis-asm.h" #include "libhppa.h" @@ -43,12 +42,13 @@ static const char *const fp_reg_names[] = typedef unsigned int CORE_ADDR; -/* Get at various relevent fields of an instruction word. */ +/* Get at various relevent fields of an instruction word. */ #define MASK_5 0x1f #define MASK_10 0x3ff #define MASK_11 0x7ff #define MASK_14 0x3fff +#define MASK_16 0xffff #define MASK_21 0x1fffff /* This macro gets bit fields using HP's numbering (MSB = 0) */ @@ -97,8 +97,8 @@ static const char *const logical_cond_64_names[] = { "", ",*=", ",*<", ",*<=", 0, 0, 0, ",*od", ",*tr", ",*<>", ",*>=", ",*>", 0, 0, 0, ",*ev"}; static const char *const unit_cond_names[] = { - "", 0, ",sbz", ",shz", ",sdc", 0, ",sbc", ",shc", - ",tr", 0, ",nbz", ",nhz", ",ndc", 0, ",nbc", ",nhc" + "", ",swz", ",sbz", ",shz", ",sdc", ",swc", ",sbc", ",shc", + ",tr", ",nwz", ",nbz", ",nhz", ",ndc", ",nwc", ",nbc", ",nhc" }; static const char *const unit_cond_64_names[] = { "", ",*swz", ",*sbz", ",*shz", ",*sdc", ",*swc", ",*sbc", ",*shc", @@ -133,7 +133,7 @@ static const char *const read_write_names[] = {",r", ",w"}; static const char *const add_compl_names[] = { 0, "", ",l", ",tsv" }; /* For a bunch of different instructions form an index into a - completer name table. */ + completer name table. */ #define GET_COMPL(insn) (GET_FIELD (insn, 26, 26) | \ GET_FIELD (insn, 18, 18) << 1) @@ -182,7 +182,7 @@ fput_creg (reg, info) (*info->fprintf_func) (info->stream, control_reg[reg]); } -/* print constants with sign */ +/* Print constants with sign. */ static void fput_const (num, info) @@ -196,9 +196,9 @@ fput_const (num, info) } /* Routines to extract various sized constants out of hppa - instructions. */ + instructions. */ -/* extract a 3-bit space register number from a be, ble, mtsp or mfsp */ +/* Extract a 3-bit space register number from a be, ble, mtsp or mfsp. */ static int extract_3 (word) unsigned word; @@ -213,7 +213,7 @@ extract_5_load (word) return low_sign_extend (word >> 16 & MASK_5, 5); } -/* extract the immediate field from a st{bhw}s instruction */ +/* Extract the immediate field from a st{bhw}s instruction. */ static int extract_5_store (word) unsigned word; @@ -221,7 +221,7 @@ extract_5_store (word) return low_sign_extend (word & MASK_5, 5); } -/* extract the immediate field from a break instruction */ +/* Extract the immediate field from a break instruction. */ static unsigned extract_5r_store (word) unsigned word; @@ -229,7 +229,7 @@ extract_5r_store (word) return (word & MASK_5); } -/* extract the immediate field from a {sr}sm instruction */ +/* Extract the immediate field from a {sr}sm instruction. */ static unsigned extract_5R_store (word) unsigned word; @@ -237,7 +237,7 @@ extract_5R_store (word) return (word >> 16 & MASK_5); } -/* extract the 10 bit immediate field from a {sr}sm instruction */ +/* Extract the 10 bit immediate field from a {sr}sm instruction. */ static unsigned extract_10U_store (word) unsigned word; @@ -245,7 +245,7 @@ extract_10U_store (word) return (word >> 16 & MASK_10); } -/* extract the immediate field from a bb instruction */ +/* Extract the immediate field from a bb instruction. */ static unsigned extract_5Q_store (word) unsigned word; @@ -253,7 +253,7 @@ extract_5Q_store (word) return (word >> 21 & MASK_5); } -/* extract an 11 bit immediate field */ +/* Extract an 11 bit immediate field. */ static int extract_11 (word) unsigned word; @@ -261,7 +261,7 @@ extract_11 (word) return low_sign_extend (word & MASK_11, 11); } -/* extract a 14 bit immediate field */ +/* Extract a 14 bit immediate field. */ static int extract_14 (word) unsigned word; @@ -269,7 +269,21 @@ extract_14 (word) return low_sign_extend (word & MASK_14, 14); } -/* extract a 21 bit constant */ +/* Extract a 16 bit immediate field (PA2.0 wide only). */ +static int +extract_16 (word) + unsigned word; +{ + int m15, m0, m1; + m0 = GET_BIT (word, 16); + m1 = GET_BIT (word, 17); + m15 = GET_BIT (word, 31); + word = (word >> 1) & 0x1fff; + word = word | (m15 << 15) | ((m15 ^ m0) << 14) | ((m15 ^ m1) << 13); + return sign_extend (word, 16); +} + +/* Extract a 21 bit constant. */ static int extract_21 (word) @@ -291,7 +305,7 @@ extract_21 (word) return sign_extend (val, 21) << 11; } -/* extract a 12 bit constant from branch instructions */ +/* Extract a 12 bit constant from branch instructions. */ static int extract_12 (word) @@ -302,8 +316,8 @@ extract_12 (word) (word & 0x1) << 11, 12) << 2; } -/* extract a 17 bit constant from branch instructions, returning the - 19 bit signed value. */ +/* Extract a 17 bit constant from branch instructions, returning the + 19 bit signed value. */ static int extract_17 (word) @@ -353,7 +367,10 @@ print_insn_hppa (memaddr, info) if ((insn & opcode->mask) == opcode->match) { register const char *s; - +#ifndef BFD64 + if (opcode->arch == pa20w) + continue; +#endif (*info->fprintf_func) (info->stream, "%s", opcode->name); if (!strchr ("cfCY?-+nHNZFIuv", opcode->args[0])) @@ -474,13 +491,25 @@ print_insn_hppa (memaddr, info) fput_fp_reg (reg, info); break; } + + /* 'fe' will not generate a space before the register + name. Normally that is fine. Except that it + causes problems with fstw fe,y(b) which has no FP + format completer. */ + case 'E': + fputs_filtered (" ", info); + + /* FALLTHRU */ + case 'e': - if (GET_FIELD (insn, 25, 25)) + if (GET_FIELD (insn, 30, 30)) fput_fp_reg_r (GET_FIELD (insn, 11, 15), info); else fput_fp_reg (GET_FIELD (insn, 11, 15), info); break; - + case 'x': + fput_fp_reg (GET_FIELD (insn, 11, 15), info); + break; } break; @@ -512,8 +541,36 @@ print_insn_hppa (memaddr, info) (*info->fprintf_func) (info->stream, "%s ", short_bytes_compl_names[GET_COMPL (insn)]); break; + case 'c': + case 'C': + switch (GET_FIELD (insn, 20, 21)) + { + case 1: + (*info->fprintf_func) (info->stream, ",bc "); + break; + case 2: + (*info->fprintf_func) (info->stream, ",sl "); + break; + default: + (*info->fprintf_func) (info->stream, " "); + } + break; + case 'd': + switch (GET_FIELD (insn, 20, 21)) + { + case 1: + (*info->fprintf_func) (info->stream, ",co "); + break; + default: + (*info->fprintf_func) (info->stream, " "); + } + break; + case 'o': + (*info->fprintf_func) (info->stream, ",o"); + break; case 'g': (*info->fprintf_func) (info->stream, ",gate"); + break; case 'p': (*info->fprintf_func) (info->stream, ",l,push"); break; @@ -647,7 +704,7 @@ print_insn_hppa (memaddr, info) break; } - case 'c': + case 'e': { int opcode = GET_FIELD (insn, 0, 5); @@ -693,26 +750,18 @@ print_insn_hppa (memaddr, info) fputs_filtered (compare_cond_names[GET_FIELD (insn, 16, 18)], info); break; - case 'T': + case 'n': fputs_filtered (compare_cond_names[GET_FIELD (insn, 16, 18) - + 8], info); - break; - case 'r': - fputs_filtered (compare_cond_64_names[GET_FIELD (insn, 16, 18)], - info); + + GET_FIELD (insn, 4, 4) * 8], info); break; - case 'R': + case 'N': fputs_filtered (compare_cond_64_names[GET_FIELD (insn, 16, 18) - + 8], info); + + GET_FIELD (insn, 2, 2) * 8], info); break; case 'Q': fputs_filtered (cmpib_cond_64_names[GET_FIELD (insn, 16, 18)], info); break; - case 'n': - fputs_filtered (compare_cond_names[GET_FIELD (insn, 16, 18) - + GET_FIELD (insn, 4, 4) * 8], info); - break; case '@': fputs_filtered (add_cond_names[GET_FIELD (insn, 16, 18) + GET_FIELD (insn, 4, 4) * 8], info); @@ -738,21 +787,11 @@ print_insn_hppa (memaddr, info) add_cond_names[GET_FIELD (insn, 16, 18)]); break; - case 'D': - (*info->fprintf_func) (info->stream, "%s", - add_cond_names[GET_FIELD (insn, 16, 18) - + 8]); - break; - case 'w': - (*info->fprintf_func) - (info->stream, "%s", - wide_add_cond_names[GET_FIELD (insn, 16, 18)]); - break; - case 'W': (*info->fprintf_func) (info->stream, "%s", - wide_add_cond_names[GET_FIELD (insn, 16, 18) + 8]); + wide_add_cond_names[GET_FIELD (insn, 16, 18) + + GET_FIELD (insn, 4, 4) * 8]); break; case 'l': @@ -813,6 +852,7 @@ print_insn_hppa (memaddr, info) case 'U': fput_const (extract_10U_store (insn), info); break; + case 'B': case 'Q': fput_const (extract_5Q_store (insn), info); break; @@ -825,6 +865,10 @@ print_insn_hppa (memaddr, info) case 'k': fput_const (extract_21 (insn), info); break; + case 'l': + /* 16-bit long disp., PA2.0 wide only. */ + fput_const (extract_16 (insn), info); + break; case 'n': if (insn & 0x2) (*info->fprintf_func) (info->stream, ",n "); @@ -866,6 +910,10 @@ print_insn_hppa (memaddr, info) (*info->fprintf_func) (info->stream, "%%sr0,%%r31"); break; + case '@': + (*info->fprintf_func) (info->stream, "0"); + break; + case '.': (*info->fprintf_func) (info->stream, "%d", GET_FIELD (insn, 24, 25)); @@ -1027,6 +1075,24 @@ print_insn_hppa (memaddr, info) break; } + case 'y': + { + /* 16-bit long disp., PA2.0 wide only. */ + int disp = extract_16 (insn); + disp &= ~3; + fput_const (disp, info); + break; + } + + case '&': + { + /* 16-bit long disp., PA2.0 wide only. */ + int disp = extract_16 (insn); + disp &= ~7; + fput_const (disp, info); + break; + } + /* ?!? FIXME */ case '_': case '{':