Too many changes and fixes to mention them all here

This commit is contained in:
ceriel
1990-10-11 08:42:07 +00:00
parent 7f8a099a15
commit 3672f835fe
23 changed files with 942 additions and 426 deletions

View File

@@ -19,12 +19,15 @@
#include "expr.h"
extern FILE *db_out;
extern t_lineno currline, listline;
extern t_lineno currline;
static t_lineno listline;
extern long pointer_size;
extern char *strrindex();
extern int interrupted;
p_tree run_command;
p_tree print_command;
static int wsize = 10;
/*VARARGS1*/
p_tree
@@ -41,6 +44,7 @@ mknode(va_alist)
p->t_oper = va_arg(ap, int);
switch(p->t_oper) {
case OP_NAME:
case OP_HELP:
p->t_idf = va_arg(ap, struct idf *);
p->t_str = va_arg(ap, char *);
break;
@@ -58,7 +62,6 @@ mknode(va_alist)
case OP_NEXT:
case OP_STEP:
case OP_REGS:
case OP_DELETE:
case OP_RESTORE:
case OP_WHERE:
p->t_ival = va_arg(ap, long);
@@ -76,21 +79,6 @@ mknode(va_alist)
return p;
}
adjust_oper(pp)
p_tree *pp;
{
register p_tree p = *pp, p1;
switch(p->t_whichoper) {
case E_DERSELECT:
p1 = mknode(OP_UNOP, p->t_args[0]);
p1->t_whichoper = E_DEREF;
p->t_args[0] = p1;
p->t_whichoper = E_SELECT;
break;
}
}
freenode(p)
register p_tree p;
{
@@ -164,8 +152,16 @@ print_node(p, top_level)
if (p->t_args[0]) {
print_node(p->t_args[0], 0);
if (p->t_args[1]) {
fputs(", ", db_out);
print_node(p->t_args[1], 0);
if (p->t_args[1]->t_ival >= 0) {
fputs(", ", db_out);
print_node(p->t_args[1], 0);
}
else {
if (p->t_args[1]->t_ival < -100000000) {
fputs("-", db_out);
}
else print_node(p->t_args[1], 0);
}
}
}
break;
@@ -173,10 +169,23 @@ print_node(p, top_level)
fputs("print ", db_out);
print_node(p->t_args[0], 0);
break;
case OP_ENABLE:
fputs("enable ", db_out);
print_node(p->t_args[0], 0);
break;
case OP_DISABLE:
fputs("disable ", db_out);
print_node(p->t_args[0], 0);
break;
case OP_DISPLAY:
fputs("display ", db_out);
print_node(p->t_args[0], 0);
break;
case OP_LINK:
print_node(p->t_args[0], 0);
fputs(", ", db_out);
print_node(p->t_args[1], 0);
break;
case OP_FILE:
fputs("file ", db_out);
print_node(p->t_args[0], 0);
@@ -196,7 +205,8 @@ print_node(p, top_level)
print_node(p->t_args[0], 0);
break;
case OP_DELETE:
fprintf(db_out, "delete %ld", p->t_ival);
fputs("delete ", db_out);
print_node(p->t_args[0], 0);
break;
case OP_REGS:
fprintf(db_out, "regs %ld", p->t_ival);
@@ -221,6 +231,10 @@ print_node(p, top_level)
fputs("where", db_out);
if (p->t_ival != 0x7fffffff) fprintf(db_out, " %ld", p->t_ival);
break;
case OP_HELP:
fputs("help", db_out);
if (p->t_str != 0) fprintf(db_out, " %s", p->t_str);
break;
case OP_CONT:
fputs("cont", db_out);
if (p->t_args[0]) {
@@ -303,6 +317,11 @@ print_node(p, top_level)
case OP_REAL:
fprintf(db_out, currlang->real_fmt, p->t_fval);
break;
case OP_FORMAT:
print_node(p->t_args[0], 0);
fputs("\\", db_out);
print_node(p->t_args[1], 0);
break;
case OP_UNOP:
case OP_BINOP:
(*currlang->printop)(p);
@@ -317,11 +336,19 @@ repeatable(com)
{
switch(com->t_oper) {
case OP_CONT:
com->t_args[0]->t_ival = 1;
freenode(com->t_args[1]);
com->t_args[1] = 0;
return 1;
case OP_NEXT:
case OP_STEP:
com->t_ival = 1;
return 1;
case OP_LIST:
case OP_STATUS:
case OP_PRINT:
freenode(com->t_args[0]);
com->t_args[0] = 0;
freenode(com->t_args[1]);
com->t_args[1] = 0;
return 1;
}
return 0;
@@ -345,7 +372,7 @@ in_status(com)
eval(p)
p_tree p;
{
if (p) (*operators[p->t_oper].op_fun)(p);
if (p && operators[p->t_oper].op_fun) (*operators[p->t_oper].op_fun)(p);
}
do_list(p)
@@ -353,15 +380,25 @@ do_list(p)
{
int l1, l2;
if (p->t_args[1]) {
l2 = p->t_args[1]->t_ival;
if (l2 >= 0) {
if (l2 == 0) l2 = 1;
wsize = l2;
}
}
else l2 = wsize;
if (! p->t_args[0]) {
l1 = listline;
l2 = listline + 9;
if (! l1) {
listline = currline - (wsize/2);
l1 = listline;
}
}
else {
if (p->t_args[0]->t_oper == OP_INTEGER) {
l1 = p->t_args[0]->t_ival;
assert(p->t_args[1] != 0);
l2 = p->t_args[1]->t_ival;
}
else {
t_addr a = get_addr_from_node(p->t_args[0]);
@@ -372,16 +409,20 @@ do_list(p)
}
pos = get_position_from_addr(a);
newfile(str2idf(pos->filename, 1));
l1 = pos->lineno - 5;
l1 = pos->lineno - (l2 > 0 ? l2 : wsize)/2;
if (l1 < 1) l1 = 1;
l2 = l1+9;
}
}
if (listfile) {
if (l2 < 0) {
l2 = -l2;
if (l1 > l2) l2 = 1;
else l2 -= l1 - 1;
}
lines(listfile->sy_file, l1, l2);
listline = l2+1;
listline = l1 + l2;
}
else fprintf(db_out, "no current file\n");
else error("no current file");
}
do_file(p)
@@ -391,7 +432,7 @@ do_file(p)
newfile(p->t_args[0]->t_idf);
}
else if (listfile) fprintf(db_out, "%s\n", listfile->sy_idf->id_text);
else fprintf(db_out, "no current file\n");
else error("no current file");
}
newfile(id)
@@ -409,55 +450,102 @@ newfile(id)
find_language(strrindex(id->id_text, '.'));
}
do_stop(p)
setstop(p, kind)
p_tree p;
int kind;
{
t_addr a = get_addr_from_node(p->t_args[0]);
if (a == ILL_ADDR) {
return;
}
if (a == ILL_ADDR) return 0;
p->t_address = a;
add_to_item_list(p);
if (a != NO_ADDR) {
if (! set_or_clear_breakpoint(a, SETBP)) {
error("could not set breakpoint");
if (! set_or_clear_breakpoint(a, kind)) {
error("could not %s breakpoint", kind == SETBP ? "set" : "clear");
return 0;
}
}
return 1;
}
do_stop(p)
p_tree p;
{
if (! setstop(p, SETBP)) {
return;
}
add_to_item_list(p);
}
settrace(p, kind)
p_tree p;
int kind;
{
t_addr a, e;
a = get_addr_from_node(p->t_args[0]);
if (a == NO_ADDR) return 1;
if (a == ILL_ADDR) return 0;
if (p->t_args[0]->t_oper == OP_AT) {
e = a;
p->t_address = a;
}
else {
p_scope sc = get_next_scope_from_addr(a+1);
if (sc) e = sc->sc_start - 1;
else e = 0xffffffff;
}
if (! set_or_clear_trace(a, e, kind)) {
error("could not %s trace", kind == SETTRACE ? "set" : "clear");
return 0;
}
return 1;
}
do_trace(p)
p_tree p;
{
t_addr a;
t_addr e;
p->t_address = NO_ADDR;
if (p->t_args[0]) {
a = get_addr_from_node(p->t_args[0]);
if (a == ILL_ADDR) return;
if (p->t_args[0]->t_oper == OP_AT) {
e = a;
p->t_address = a;
}
else {
p_scope sc = get_next_scope_from_addr(a+1);
if (sc) e = sc->sc_start - 1;
else e = 0xffffffff;
}
if (! set_or_clear_trace(a, e, SETTRACE)) {
error("could not set trace");
}
if (! settrace(p, SETTRACE)) {
return;
}
add_to_item_list(p);
}
static
able(p, kind)
p_tree p;
int kind;
{
switch(p->t_oper) {
case OP_LINK:
able(p->t_args[0], kind);
able(p->t_args[1], kind);
break;
case OP_INTEGER:
able_item((int)p->t_ival, kind);
break;
}
}
do_enable(p)
p_tree p;
{
able(p->t_args[0], 0);
}
do_disable(p)
p_tree p;
{
able(p->t_args[0], 1);
}
do_continue(p)
p_tree p;
{
int count;
int first_time = 1;
if (p) {
count = p->t_args[0]->t_ival;
@@ -476,9 +564,10 @@ do_continue(p)
else count = 1;
while (count--) {
if (! send_cont(count==0)) {
error("no debuggee");
if (first_time) error("no process");
break;
}
first_time = 0;
}
}
@@ -486,7 +575,7 @@ do_step(p)
p_tree p;
{
if (! do_single_step(SETSS, p->t_ival)) {
error("no debuggee");
if (! interrupted) error("no process");
}
}
@@ -495,7 +584,7 @@ do_next(p)
{
if (! do_single_step(SETSSF, p->t_ival)) {
error("no debuggee");
if (! interrupted) error("no process");
}
}
@@ -508,7 +597,7 @@ do_regs(p)
int n = p->t_ival;
if (! (buf = get_EM_regs(n))) {
error("no debuggee");
if (! interrupted) error("no process");
return;
}
fprintf(db_out, "EM registers %d levels back:\n", n);
@@ -526,17 +615,30 @@ do_where(p)
{
int i = 0;
unsigned int cnt;
unsigned int maxcnt = p->t_ival;
p_scope sc;
t_addr *buf;
t_addr PC;
for (cnt = p->t_ival; cnt != 0; cnt--) {
t_addr AB;
t_addr PC;
p_scope sc;
t_addr *buf;
if (! (buf = get_EM_regs(i++))) {
error("no debuggee");
return;
if (p->t_ival < 0) {
for (;;) {
buf = get_EM_regs(i++);
if (! buf || ! buf[AB_OFF]) break;
PC = buf[PC_OFF];
sc = base_scope(get_scope_from_addr(PC));
if (! sc || sc->sc_start > PC) break;
if (interrupted) return;
}
i--;
maxcnt = - p->t_ival;
i -= maxcnt;
if (i < 0) i = 0;
}
for (cnt = maxcnt; cnt != 0; cnt--) {
t_addr AB;
if (interrupted) return;
if (! (buf = get_EM_regs(i++))) break;
AB = buf[AB_OFF];
PC = buf[PC_OFF];
if (! AB) break;
@@ -550,63 +652,60 @@ do_where(p)
}
}
/*ARGSUSED*/
do_status(p)
p_tree p;
{
print_items();
}
extern p_tree remove_from_item_list();
do_delete(p)
p_tree p;
{
p = remove_from_item_list((int) p->t_ival);
if (p) switch(p->t_oper) {
case OP_WHEN:
case OP_STOP: {
t_addr a = get_addr_from_node(p->t_args[0]);
if (a != ILL_ADDR && a != NO_ADDR) {
set_or_clear_breakpoint(a, CLRBP);
}
switch(p->t_oper) {
case OP_DELETE:
do_delete(p->t_args[0]);
break;
}
case OP_TRACE: {
t_addr a = get_addr_from_node(p->t_args[0]);
if (a != ILL_ADDR && a != NO_ADDR) {
t_addr e;
if (p->t_args[0]->t_oper == OP_AT) {
e = a;
}
else {
p_scope sc = get_next_scope_from_addr(a+1);
if (sc) e = sc->sc_start - 1;
else e = 0xffffffff;
}
set_or_clear_trace(a, e, CLRTRACE);
}
case OP_LINK:
do_delete(p->t_args[0]);
do_delete(p->t_args[1]);
break;
case OP_INTEGER:
p = remove_from_item_list((int) p->t_ival);
if (p) switch(p->t_oper) {
case OP_WHEN:
case OP_STOP:
setstop(p, CLRBP);
break;
case OP_TRACE:
settrace(p, CLRTRACE);
break;
case OP_DUMP:
free_dump(p);
}
freenode(p);
break;
}
case OP_DUMP:
free_dump(p);
}
freenode(p);
}
do_print(p)
p_tree p;
{
char *buf;
char *buf = 0;
char *format = 0;
long size;
p_type tp;
switch(p->t_oper) {
case OP_PRINT:
if (p->t_args[0] == 0) {
p = print_command;
if (p == 0) {
error("no previous print command");
break;
}
}
else if (p != print_command) {
freenode(print_command);
print_command = p;
}
/* fall through */
case OP_DISPLAY:
do_print(p->t_args[0]);
break;
@@ -615,10 +714,13 @@ do_print(p)
do_print(p->t_args[1]);
break;
default:
if (! eval_expr(p, &buf, &size, &tp)) return;
if (interrupted || ! eval_expr(p, &buf, &size, &tp)) return;
print_node(p, 0);
fputs(" = ", db_out);
print_val(tp, size, buf, 0, 0);
if (p->t_oper == OP_FORMAT) {
format = p->t_args[1]->t_str;
}
print_val(tp, size, buf, 0, 0, format);
if (buf) free(buf);
fputs("\n", db_out);
break;
@@ -633,13 +735,17 @@ do_set(p)
p_type tp, tp2;
t_addr a;
if (! eval_desig(p->t_args[0], &a, &size, &tp) ||
if (interrupted || ! eval_desig(p->t_args[0], &a, &size, &tp) ||
! eval_expr(p->t_args[1], &buf, &size2, &tp2) ||
! convert(&buf, &size2, &tp2, tp, size)) {
if (buf) free(buf);
return;
}
if (interrupted) {
free(buf);
return;
}
if (! set_bytes(size, buf, a)) {
error("could not handle this SET request");
}
@@ -652,11 +758,14 @@ perform(p, a)
{
switch(p->t_oper) {
case OP_WHEN:
if (p->t_args[1] && ! eval_cond(p->t_args[1])) break;
p = p->t_args[2];
while (p->t_oper == OP_LINK) {
if (interrupted) return;
eval(p->t_args[0]);
p = p->t_args[1];
}
if (interrupted) return;
eval(p);
break;
case OP_TRACE:
@@ -667,6 +776,8 @@ perform(p, a)
break;
}
}
if (interrupted) return;
if (p->t_args[1] && ! eval_cond(p->t_args[1])) break;
list_position(get_position_from_addr(a));
if (p->t_args[2]) do_print(p->t_args[2]);
break;
@@ -681,6 +792,6 @@ list_position(pos)
newfile(str2idf(pos->filename, 1));
currfile = listfile;
currline = pos->lineno;
listline = currline-5;
lines(currfile->sy_file, (int)currline, (int)currline);
lines(currfile->sy_file, (int)currline, (int)1);
listline = 0;
}