#include "defs.h"
#include "symtab.h"
+#define OLD_TABLE
#include "opcode/hppa.h"
-char *control_reg[] = {"rctr", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",
- "pidr1", "pidr2", "ccr", "sar", "pidr3", "pidr4",
- "iva", "eiem", "itmr", "pcsq", "pcoq", "iir", "isr",
- "ior", "ipsw", "eirr", "tr0", "tr1", "tr2", "tr3",
- "tr4", "tr5", "tr6", "tr7"
- };
-
-char *compare_cond_names[] = {"", ",=", ",<", ",<=", ",<<", ",<<=", ",sv",
- ",od", ",tr", ",<>", ",>=", ",>", ",>>=",
- ",>>", ",nsv", ",ev"
- };
-char *add_cond_names[] = {"", ",=", ",<", ",<=", ",nuv", ",znv", ",sv",
- ",od", ",tr", ",<>", ",>=", ",>", ",uv",
- ",vnz", ",nsv", ",ev"
- };
-char *logical_cond_names[] = {"", ",=", ",<", ",<=", 0, 0, 0, ",od",
- ",tr", ",<>", ",>=", ",>", 0, 0, 0, ",ev"};
-char *unit_cond_names[] = {"", 0, ",sbz", ",shz", ",sdc", 0, ",sbc", ",shc",
- ",tr", 0, ",nbz", ",nhz", ",ndc", 0, ",nbc", ",nhc"
- };
-char *shift_cond_names[] = {"", ",=", ",<", ",od", ",tr", ",<>", ",>=", ",ev"};
-
-char *index_compl_names[] = {"", ",m", ",s", ",sm"};
-char *short_ldst_compl_names[] = {"", ",ma", "", ",mb"};
-char *short_bytes_compl_names[] = {"", ",b,m", ",e", ",e,m"};
-char *float_format_names[] = {",sgl", ",dbl", ",quad"};
-char *float_comp_names[] =
+static char *control_reg[] =
+{ "rctr", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7",
+ "pidr1", "pidr2", "ccr", "sar", "pidr3", "pidr4",
+ "iva", "eiem", "itmr", "pcsq", "pcoq", "iir", "isr",
+ "ior", "ipsw", "eirr", "tr0", "tr1", "tr2", "tr3",
+ "tr4", "tr5", "tr6", "tr7"
+ };
+
+static char *compare_cond_names[] =
+{ "", ",=", ",<", ",<=", ",<<", ",<<=", ",sv",
+ ",od", ",tr", ",<>", ",>=", ",>", ",>>=",
+ ",>>", ",nsv", ",ev"
+ };
+
+static char *add_cond_names[] =
+{ "", ",=", ",<", ",<=", ",nuv", ",znv", ",sv",
+ ",od", ",tr", ",<>", ",>=", ",>", ",uv",
+ ",vnz", ",nsv", ",ev"
+ };
+
+static char *logical_cond_names[] =
+{ "", ",=", ",<", ",<=", 0, 0, 0, ",od",
+ ",tr", ",<>", ",>=", ",>", 0, 0, 0, ",ev"
+ };
+
+static char *unit_cond_names[] =
+{ "", 0, ",sbz", ",shz", ",sdc", 0, ",sbc", ",shc",
+ ",tr", 0, ",nbz", ",nhz", ",ndc", 0, ",nbc", ",nhc"
+ };
+
+static char *shift_cond_names[] =
+{"", ",=", ",<", ",od", ",tr", ",<>", ",>=", ",ev"};
+
+static char *index_compl_names[] = {"", ",m", ",s", ",sm"};
+static char *short_ldst_compl_names[] = {"", ",ma", "", ",mb"};
+static char *short_bytes_compl_names[] = {"", ",b,m", ",e", ",e,m"};
+static char *float_format_names[] = {",sgl", ",dbl", ",quad"};
+static char *float_comp_names[] =
{",false?", ",false", ",?", ",!<=>", ",=", ",=t", ",?=", ",!<>",
",!?>=", ",<", ",?<", ",!>=", ",!?>", ",<=", ",?<=", ",!>",
",!?<=", ",>", ",?>", ",!<=", ",!?<", ",>=", ",?>=", ",!<",
#define GET_COND(insn) (GET_FIELD ((insn), 16, 18) + \
(GET_FIELD ((insn), 19, 19) ? 8 : 0))
-void fput_reg (), fput_const ();
+static void fput_reg PARAMS ((unsigned reg, FILE *stream));
+static void fput_const PARAMS ((unsigned num, FILE *stream));
+static void fput_reg_r PARAMS ((unsigned reg, FILE *stream));
+static void fput_creg PARAMS ((unsigned reg, FILE *stream));
/* Print one instruction from MEMADDR on STREAM. */
int
CORE_ADDR memaddr;
FILE *stream;
{
- unsigned int insn, i, op;
+ long insn;
+ unsigned int i, op;
- read_memory (memaddr, &insn, sizeof (insn));
+ insn = read_memory_integer (memaddr, sizeof (insn));
for (i = 0; i < NUMOPCODES; ++i)
{
fputs_filtered (opcode->name, stream);
- if (!index ("cCY<?!@-+&U>~nZFM", opcode->args[0]))
+ if (!index ("cCY<?!@-+&U>~nZFIM", opcode->args[0]))
fputs_filtered (" ", stream);
for (s = opcode->args; *s != '\0'; ++s)
{
case 'V':
fput_const (extract_5_store (insn), stream);
break;
+ case 'r':
+ fput_const (extract_5r_store (insn), stream);
+ break;
+ case 'R':
+ fput_const (extract_5R_store (insn), stream);
+ break;
case 'i':
fput_const (extract_11 (insn), stream);
break;
print_address (memaddr + 8 + extract_12 (insn), stream);
break;
case 'W':
- /* don't interpret an address if it's an external branch
- instruction. */
op = GET_FIELD (insn, 0, 5);
- if (op != 0x38 /* be */ && op != 0x39 /* ble */)
- print_address (memaddr + 8 + extract_17 (insn), stream);
- else
+
+ if (op == 0x38 /* be */ || op == 0x39 /* ble */)
fput_const (extract_17 (insn), stream);
+ else
+ print_address (memaddr + 8 + extract_17 (insn), stream);
+
break;
case 'B':
{
fprintf_filtered (stream, "%d",
GET_FIELD (insn, 22, 26));
break;
+ case 'Q':
+ fprintf_filtered (stream, "%d",
+ GET_FIELD (insn, 11, 15));
+ break;
case 'T':
fprintf_filtered (stream, "%d",
32 - GET_FIELD (insn, 27, 31));
fputs_filtered (float_format_names[GET_FIELD
(insn, 26, 26)], stream);
break;
+ case 'I':
+ /* if no destination completer, need a space here */
+ if (GET_FIELD (insn, 21, 22) == 1)
+ fputs_filtered (float_format_names[GET_FIELD (insn, 20, 20)],
+ stream);
+ else
+ fprintf_filtered (stream, "%s ",
+ float_format_names[GET_FIELD
+ (insn, 20, 20)]);
+ break;
+ case 'J':
+ if (GET_FIELD (insn, 24, 24))
+ fput_reg_r (GET_FIELD (insn, 6, 10), stream);
+ else
+ fput_reg (GET_FIELD (insn, 6, 10), stream);
+
+ break;
+ case 'K':
+ if (GET_FIELD (insn, 19, 19))
+ fput_reg_r (GET_FIELD (insn, 11, 15), stream);
+ else
+ fput_reg (GET_FIELD (insn, 11, 15), stream);
+ break;
case 'M':
fputs_filtered (float_comp_names[GET_FIELD (insn, 27, 31)],
stream);
break;
}
}
+
+/* If this is an external branch, examine the previous instruction and see if
+ it was an ldil that loaded something into the same base reg. If so, then
+ calculate the branch target from the constants in both instructions, and
+ print it out. */
+
+ op = GET_FIELD (insn, 0, 5);
+ if (op == 0x38 /* be */ || op == 0x39 /* ble */)
+ {
+ CORE_ADDR target_address;
+ long prev_insn;
+ int basereg, basereg_prev;
+
+ target_address = extract_17 (insn);
+ basereg = GET_FIELD (insn, 6, 10);
+ if (basereg != 0)
+ {
+ prev_insn = read_memory_integer (memaddr - 4,
+ sizeof(prev_insn));
+ basereg_prev = GET_FIELD (prev_insn, 6, 10);
+
+ if ((prev_insn & 0xfc000000) == 0x20000000 /* ldil */
+ && basereg == basereg_prev)
+ target_address += extract_21 (prev_insn);
+ }
+ fprintf_filtered (stream, "\t! ");
+ print_address (target_address, stream);
+ }
+
return sizeof(insn);
}
}
/* Utility function to print registers */
-void
+static void
fput_reg (reg, stream)
unsigned reg;
FILE *stream;