*** empty log message ***
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@1012 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
f8c098f917
commit
11790dbca8
14 changed files with 720 additions and 625 deletions
|
|
@ -7,10 +7,10 @@
|
|||
#######################################################################
|
||||
|
||||
# These are the files that make up the WAD core
|
||||
WADSRCS = io.c memory.c return.c default.c stack.c stab.c elf.c object.c init.c segment.c signal.c
|
||||
WADOBJS = io.o memory.o return.o default.o stack.o stab.o elf.o object.o signal.o segment.o init.o
|
||||
WADSRCS = vars.c default.c io.c memory.c return.c stack.c stab.c elf.c object.c init.c segment.c signal.c
|
||||
WADOBJS = vars.o default.o io.o memory.o return.o stack.o stab.o elf.o object.o signal.o segment.o init.o
|
||||
INCLUDE = -I../Include -I. $(SINCLUDE)
|
||||
WADOPT = -DWAD_SOLARIS
|
||||
WADOPT = -DWAD_LINUX
|
||||
|
||||
# Location of your Python installation
|
||||
PYINCLUDE = -I/usr/local/include/python2.0
|
||||
|
|
@ -23,21 +23,21 @@ TCLSRCS = wadtcl.cxx
|
|||
TCLOBJS = wadtcl.o
|
||||
|
||||
# Location of your Perl installation
|
||||
PERLINCLUDE = -I/usr/perl5/5.00503/sun4-solaris/CORE
|
||||
PERLINCLUDE = -I/usr/lib/perl5/5.00503/i386-linux/CORE
|
||||
PERLSRCS = wadpl.cxx
|
||||
PERLOBJS = wadpl.o
|
||||
|
||||
# C Compiler
|
||||
CC = cc
|
||||
CFLAGS = #
|
||||
CC = gcc
|
||||
CFLAGS = #-fpic
|
||||
|
||||
# C++ Compiler
|
||||
CXX = CC
|
||||
CXXFLAGS = #-Kpic
|
||||
CXX = c++
|
||||
CXXFLAGS = #-fpic
|
||||
|
||||
# Linking options
|
||||
CLINK =
|
||||
CXXLINK = CC -G
|
||||
CXXLINK = g++ -shared
|
||||
|
||||
# Rules for creation of a .o file from .cxx
|
||||
.SUFFIXES: .cxx
|
||||
|
|
@ -67,7 +67,7 @@ wad_perl_handler.c:
|
|||
python makehandler.py
|
||||
|
||||
debug::
|
||||
cc -g debug.c $(INCLUDE) -L. -R. -lwad
|
||||
cc -g debug.c $(INCLUDE) -L. -Xlinker -rpath . -lwad
|
||||
|
||||
plus::
|
||||
CC -g debug.cxx $(INCLUDE) -L. -R. -lwad
|
||||
|
|
@ -76,7 +76,7 @@ wc::
|
|||
wc $(SRCS)
|
||||
|
||||
semi::
|
||||
egrep ";" $(SRCS) wadpy.cxx | wc
|
||||
egrep ";" $(WADSRCS) wadpy.cxx | wc
|
||||
|
||||
|
||||
clean::
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#######################################################################
|
||||
|
||||
# These are the files that make up the WAD core
|
||||
WADSRCS = io.c memory.c return.c default.c stack.c stab.c elf.c object.c init.c segment.c signal.c
|
||||
WADOBJS = io.o memory.o return.o default.o stack.o stab.o elf.o object.o signal.o segment.o init.o
|
||||
WADSRCS = vars.c io.c memory.c return.c default.c stack.c stab.c elf.c object.c init.c segment.c signal.c
|
||||
WADOBJS = vars.o io.o memory.o return.o default.o stack.o stab.o elf.o object.o signal.o segment.o init.o
|
||||
INCLUDE = -I../Include -I. $(SINCLUDE)
|
||||
WADOPT = @WADOPT@
|
||||
|
||||
|
|
|
|||
|
|
@ -3,9 +3,21 @@
|
|||
#include "wad.h"
|
||||
#include <assert.h>
|
||||
|
||||
int seg_crash(int n) {
|
||||
typedef struct Foo {
|
||||
double a;
|
||||
double b;
|
||||
float c;
|
||||
} Foo;
|
||||
|
||||
static int type_crash(int n, short m, char c, double x, float y, Foo f, void *ptr) {
|
||||
int *a = 0;
|
||||
if (n > 0) seg_crash(n-1);
|
||||
*a = 3;
|
||||
return 1;
|
||||
}
|
||||
static int seg_crash(int n, double x,
|
||||
float y) {
|
||||
int *a = 0;
|
||||
if (n > 0) seg_crash(n-1,x,y);
|
||||
*a = 3;
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -61,23 +73,26 @@ static int test(int x, int (*f)(int)) {
|
|||
int main(int argc, char **argv) {
|
||||
int n;
|
||||
int (*f)(int);
|
||||
Foo foo = { 3.14, 28.18, 1.0 };
|
||||
|
||||
printf("starting.\n");
|
||||
|
||||
if (strcmp(argv[1],"abort") == 0) {
|
||||
abort_crash(0);
|
||||
} else if (strcmp(argv[1],"seg") ==0) {
|
||||
seg_crash(0);
|
||||
seg_crash(0,1,2);
|
||||
} else if (strcmp(argv[1],"bus") == 0) {
|
||||
bus_crash(0);
|
||||
} else if (strcmp(argv[1],"ret") == 0) {
|
||||
call_func(4,seg_crash);
|
||||
call_func(4,abort_crash);
|
||||
} else if (strcmp(argv[1],"test") == 0) {
|
||||
test(-1000,seg_crash);
|
||||
test(-1000,abort_crash);
|
||||
} else if (strcmp(argv[1],"double") == 0) {
|
||||
double_crash(3.14159,2.1828);
|
||||
} else if (strcmp(argv[1],"math") == 0) {
|
||||
math_crash(3,0);
|
||||
} else if (strcmp(argv[1],"type") == 0) {
|
||||
type_crash(34,42,17, 3.14159, 2.1828, foo, &foo);
|
||||
}
|
||||
multi(3,5,10,3.14);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ char *wad_arg_string(WadFrame *frame) {
|
|||
long *nextstack;
|
||||
int i;
|
||||
WadFrame *nf;
|
||||
|
||||
|
||||
nf = frame->next;
|
||||
if (nf)
|
||||
nextstack = (long *) nf->psp;
|
||||
nextstack = (long *) nf->stack;
|
||||
else
|
||||
nextstack = 0;
|
||||
|
||||
str[0] = 0;
|
||||
stack = (long *) frame->psp;
|
||||
stack = (long *) frame->stack;
|
||||
|
||||
#ifdef WAD_LINUX
|
||||
if (!nf) {
|
||||
|
|
@ -42,7 +42,7 @@ char *wad_arg_string(WadFrame *frame) {
|
|||
}
|
||||
#endif
|
||||
|
||||
if (frame->nargs < 0) {
|
||||
if (frame->debug_nargs < 0) {
|
||||
/* No argument information is available. If we are on SPARC, we'll dump
|
||||
the %in registers since these usually hold input parameters. On
|
||||
Linux, we do nothing */
|
||||
|
|
@ -57,52 +57,16 @@ char *wad_arg_string(WadFrame *frame) {
|
|||
#endif
|
||||
} else {
|
||||
/* We were able to get some argument information out the debugging table */
|
||||
wp = frame->args;
|
||||
for (i = 0; i < frame->nargs; i++, wp = wp->next) {
|
||||
wp = frame->debug_args;
|
||||
for (i = 0; i < frame->debug_nargs; i++, wp = wp->next) {
|
||||
strcat(str,wp->name);
|
||||
strcat(str,"=");
|
||||
|
||||
/* Try to figure out where the value is */
|
||||
if ((wp->loc == PARM_STACK) && nf) {
|
||||
/* Parameter is located on the call stack */
|
||||
unsigned long argloc = wp->position; /* Location relative to frame pointer */
|
||||
if ((argloc & 0x3) == 0) {
|
||||
if (argloc >= 0) {
|
||||
/* Is word aligned, make some kind of attempt to print this out */
|
||||
unsigned long *p = (unsigned long *) (((char *) nextstack) + argloc);
|
||||
sprintf(temp,"0x%x", *p);
|
||||
strcat(str,temp);
|
||||
} else {
|
||||
unsigned long *p = (unsigned long *) (((char *) stack) + frame->stack_size + argloc);
|
||||
sprintf(temp,"0x%x", *p);
|
||||
strcat(str,temp);
|
||||
}
|
||||
}
|
||||
} else if (wp->loc == PARM_REGISTER) {
|
||||
#ifdef WAD_SOLARIS
|
||||
if ((wp->position >= 24) && (wp->position < 32)) {
|
||||
/* Value is located in the %in registers */
|
||||
sprintf(temp,"0x%x", stack[wp->position - 16]);
|
||||
strcat(str,temp);
|
||||
} else if ((wp->position >= 8) && (wp->position < 16)) {
|
||||
/* Value is located in the %on registers */
|
||||
/* sprintf(temp,"0x%x", frame->regs[wp->value]);
|
||||
strcat(str,temp); */
|
||||
} else if ((wp->position >= 16) && (wp->position < 24)) {
|
||||
/* Value has been placed in the %ln registers */
|
||||
/*
|
||||
sprintf(temp,"0x%x", frame->regs[wp->value - 16]);
|
||||
strcat(str,temp); */
|
||||
}
|
||||
#endif
|
||||
#ifdef WAD_LINUX
|
||||
strcat(str,"?");
|
||||
#endif
|
||||
}
|
||||
if (i < (frame->nargs-1)) strcat(str,",");
|
||||
strcat(str,wad_format_var(wp));
|
||||
if (i < (frame->debug_nargs-1)) strcat(str,",");
|
||||
}
|
||||
}
|
||||
return str;
|
||||
|
||||
}
|
||||
|
||||
char *wad_strip_dir(char *name) {
|
||||
|
|
@ -168,54 +132,45 @@ void wad_release_source() {
|
|||
* Default callback
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
void wad_default_callback(int signo, WadFrame *framedata, char *ret) {
|
||||
void wad_default_callback(int signo, WadFrame *f, char *ret) {
|
||||
char *fd;
|
||||
WadFrame *f;
|
||||
WadFrame *fline = 0;
|
||||
|
||||
switch(signo) {
|
||||
case SIGSEGV:
|
||||
fprintf(stderr,"Segmentation fault.\n");
|
||||
fprintf(stderr,"WAD: Segmentation fault.\n");
|
||||
break;
|
||||
case SIGBUS:
|
||||
fprintf(stderr,"Bus error.\n");
|
||||
fprintf(stderr,"WAD: Bus error.\n");
|
||||
break;
|
||||
case SIGABRT:
|
||||
fprintf(stderr,"Abort.\n");
|
||||
fprintf(stderr,"WAD: Abort.\n");
|
||||
break;
|
||||
case SIGFPE:
|
||||
fprintf(stderr,"Floating point exception.\n");
|
||||
fprintf(stderr,"WAD: Floating point exception.\n");
|
||||
break;
|
||||
case SIGILL:
|
||||
fprintf(stderr,"Illegal instruction.\n");
|
||||
fprintf(stderr,"WAD: Illegal instruction.\n");
|
||||
break;
|
||||
default:
|
||||
fprintf(stderr,"Signal %d\n", signo);
|
||||
fprintf(stderr,"WAD: Signal %d\n", signo);
|
||||
break;
|
||||
}
|
||||
fd = (char *) framedata;
|
||||
f = (WadFrame *) fd;
|
||||
|
||||
/* Find the last exception frame */
|
||||
|
||||
while (f && !f->last) {
|
||||
while (f && !(f->last)) {
|
||||
f = f->next;
|
||||
}
|
||||
|
||||
/* Now work backwards */
|
||||
if (f) {
|
||||
f = f->prev;
|
||||
}
|
||||
while (f) {
|
||||
fprintf(stderr,"#%-3d 0x%08x in %s(%s)", f->frameno, f->pc, f->symbol ? f->symbol : "?",
|
||||
fprintf(stderr,"#%-3d 0x%08x in %s(%s)", f->frameno, f->pc, f->sym_name ? f->sym_name : "?",
|
||||
wad_arg_string(f));
|
||||
if (f->srcfile && strlen(f->srcfile)) {
|
||||
fprintf(stderr," in '%s'", wad_strip_dir(f->srcfile));
|
||||
if (f->line_number > 0) {
|
||||
fprintf(stderr,", line %d", f->line_number);
|
||||
if (f->loc_srcfile && strlen(f->loc_srcfile)) {
|
||||
fprintf(stderr," in '%s'", wad_strip_dir(f->loc_srcfile));
|
||||
if (f->loc_line > 0) {
|
||||
fprintf(stderr,", line %d", f->loc_line);
|
||||
{
|
||||
int fd;
|
||||
fd = open(f->srcfile, O_RDONLY);
|
||||
fd = open(f->loc_srcfile, O_RDONLY);
|
||||
if (fd > 0) {
|
||||
fline = f;
|
||||
}
|
||||
|
|
@ -223,8 +178,8 @@ void wad_default_callback(int signo, WadFrame *framedata, char *ret) {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if (f->objfile && strlen(f->objfile)) {
|
||||
fprintf(stderr," from '%s'", f->objfile);
|
||||
if (f->loc_objfile && strlen(f->loc_objfile)) {
|
||||
fprintf(stderr," from '%s'", f->loc_objfile);
|
||||
}
|
||||
}
|
||||
fprintf(stderr,"\n");
|
||||
|
|
@ -236,15 +191,15 @@ void wad_default_callback(int signo, WadFrame *framedata, char *ret) {
|
|||
int last;
|
||||
char *line, *c;
|
||||
int i;
|
||||
first = fline->line_number - 2;
|
||||
last = fline->line_number + 2;
|
||||
first = fline->loc_line - 2;
|
||||
last = fline->loc_line + 2;
|
||||
if (first < 1) first = 1;
|
||||
|
||||
line = wad_load_source(fline->srcfile,first);
|
||||
line = wad_load_source(fline->loc_srcfile,first);
|
||||
if (line) {
|
||||
fprintf(stderr,"\n%s, line %d\n\n", fline->srcfile,fline->line_number);
|
||||
fprintf(stderr,"\n%s, line %d\n\n", fline->loc_srcfile,fline->loc_line);
|
||||
for (i = first; i <= last; i++) {
|
||||
if (i == fline->line_number) fprintf(stderr," => ");
|
||||
if (i == fline->loc_line) fprintf(stderr," => ");
|
||||
else fprintf(stderr," ");
|
||||
c = strchr(line,'\n');
|
||||
if (c) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
#include <elf.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* --- What's needed here (high level interface) :
|
||||
|
||||
- Mapping of addresses to symbols
|
||||
|
|
@ -207,30 +206,30 @@ wad_elf_section_byname(WadObjectFile *wo, char *name) {
|
|||
* base address of the object file.
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
char *
|
||||
wad_elf_find_symbol(WadObjectFile *wo, void *ptr, unsigned long base, WadSymbol *ws) {
|
||||
int nsymtab;
|
||||
int nstrtab;
|
||||
int symtab_size;
|
||||
static
|
||||
int elf_search_section_sym(WadFrame *f, char *secname, char *strname) {
|
||||
int nsymtab;
|
||||
int nstrtab;
|
||||
int symtab_size;
|
||||
Elf32_Sym *sym;
|
||||
int nsym;
|
||||
char *str;
|
||||
int i;
|
||||
unsigned long vaddr;
|
||||
char *name;
|
||||
char *localfile = 0;
|
||||
int i;
|
||||
unsigned long vaddr, base;
|
||||
char *name;
|
||||
char *localfile = 0;
|
||||
|
||||
vaddr = (unsigned long) ptr;
|
||||
vaddr = (unsigned long) f->pc;
|
||||
base = (unsigned long) f->segment->base;
|
||||
|
||||
nsymtab = wad_elf_section_byname(wo,".symtab");
|
||||
if (nsymtab < 0) goto dynsym;
|
||||
nstrtab = wad_elf_section_byname(wo,".strtab");
|
||||
if (nstrtab < 0) goto dynsym;
|
||||
nsymtab = wad_elf_section_byname(f->object,secname);
|
||||
if (nsymtab < 0) return 0;
|
||||
nstrtab = wad_elf_section_byname(f->object,strname);
|
||||
if (nstrtab < 0) return 0;
|
||||
|
||||
symtab_size = wad_elf_section_size(wo,nsymtab);
|
||||
sym = (Elf32_Sym *) wad_elf_section_data(wo,nsymtab);
|
||||
str = (char *) wad_elf_section_data(wo,nstrtab);
|
||||
symtab_size = wad_elf_section_size(f->object,nsymtab);
|
||||
sym = (Elf32_Sym *) wad_elf_section_data(f->object,nsymtab);
|
||||
str = (char *) wad_elf_section_data(f->object,nstrtab);
|
||||
|
||||
nsym = (symtab_size/sizeof(Elf32_Sym));
|
||||
for (i = 0; i < nsym; i++) {
|
||||
|
|
@ -242,66 +241,36 @@ wad_elf_find_symbol(WadObjectFile *wo, void *ptr, unsigned long base, WadSymbol
|
|||
if (wad_debug_mode & DEBUG_SYMBOL_SEARCH) {
|
||||
wad_printf("%x(%x): %s %x + %x, %x, %x\n", base, vaddr, name, sym[i].st_value, sym[i].st_size, sym[i].st_info, sym[i].st_shndx);
|
||||
}
|
||||
|
||||
if (((base + sym[i].st_value) <= vaddr) && (vaddr <= (base+sym[i].st_value + sym[i].st_size))) {
|
||||
#ifdef WAD_LINUX
|
||||
/* If the section index is 0, the symbol is undefined */
|
||||
if (sym[i].st_shndx == 0) continue;
|
||||
#endif
|
||||
ws->value = sym[i].st_value;
|
||||
f->sym_name = name;
|
||||
f->sym_base = base + sym[i].st_value;
|
||||
f->sym_size = sym[i].st_size;
|
||||
if (ELF32_ST_BIND(sym[i].st_info) == STB_LOCAL) {
|
||||
ws->file = localfile;
|
||||
ws->bind = WS_LOCAL;
|
||||
f->sym_file = localfile;
|
||||
f->sym_bind = SYM_LOCAL;
|
||||
} else {
|
||||
ws->bind = WS_GLOBAL;
|
||||
f->sym_bind = SYM_GLOBAL;
|
||||
}
|
||||
ws->name = name;
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
dynsym:
|
||||
|
||||
/* If we didn't find it in the .symtab section. Maybe it's in the .dynsym, .dynstr section */
|
||||
|
||||
nsymtab = wad_elf_section_byname(wo,".dynsym");
|
||||
if (nsymtab < 0) return 0;
|
||||
nstrtab = wad_elf_section_byname(wo,".dynstr");
|
||||
if (nstrtab < 0) return 0;
|
||||
|
||||
symtab_size = wad_elf_section_size(wo,nsymtab);
|
||||
sym = (Elf32_Sym *) wad_elf_section_data(wo,nsymtab);
|
||||
str = (char *) wad_elf_section_data(wo,nstrtab);
|
||||
|
||||
nsym = (symtab_size/sizeof(Elf32_Sym));
|
||||
localfile = 0;
|
||||
for (i = 0; i < nsym; i++) {
|
||||
name = str + sym[i].st_name;
|
||||
if (ELF32_ST_TYPE(sym[i].st_info) == STT_FILE) {
|
||||
localfile = name;
|
||||
}
|
||||
if (wad_debug_mode & DEBUG_SYMBOL_SEARCH) {
|
||||
wad_printf("%x(%x): %s %x + %x, %x, %x\n", base, vaddr, name, sym[i].st_value, sym[i].st_size, sym[i].st_info, sym[i].st_shndx);
|
||||
}
|
||||
if (((base + sym[i].st_value) <= vaddr) && (vaddr <= (base+sym[i].st_value + sym[i].st_size))) {
|
||||
#ifdef WAD_LINUX
|
||||
/* If the section index is 0, the symbol is undefined */
|
||||
if (sym[i].st_shndx == 0) continue;
|
||||
#endif
|
||||
ws->value = sym[i].st_value;
|
||||
if (ELF32_ST_BIND(sym[i].st_info) == STB_LOCAL) {
|
||||
ws->file = localfile;
|
||||
ws->bind = WS_LOCAL;
|
||||
} else {
|
||||
ws->bind = WS_GLOBAL;
|
||||
}
|
||||
ws->name = name;
|
||||
return name;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
wad_elf_find_symbol(WadFrame *f) {
|
||||
/* We simply try a few possible sections */
|
||||
if (elf_search_section_sym(f,".symtab",".strtab")) return;
|
||||
if (elf_search_section_sym(f,".dynsym",".dynstr")) return;
|
||||
|
||||
/* Hmmm. No match found. Oh well */
|
||||
return;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_elf_debug_info()
|
||||
*
|
||||
|
|
@ -309,19 +278,19 @@ wad_elf_find_symbol(WadObjectFile *wo, void *ptr, unsigned long base, WadSymbol
|
|||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
int
|
||||
wad_elf_debug_info(WadObjectFile *wo, WadSymbol *wsym, unsigned long offset, WadDebug *wd) {
|
||||
wad_elf_debug_info(WadFrame *f) {
|
||||
int nstab, nstabstr, nstabindex, nstabindexstr, nstabexcl, nstabexclstr;
|
||||
int ret;
|
||||
void *stab;
|
||||
char *stabstr;
|
||||
int stabsize;
|
||||
|
||||
nstab = wad_elf_section_byname(wo,".stab");
|
||||
nstabstr = wad_elf_section_byname(wo,".stabstr");
|
||||
nstabindex = wad_elf_section_byname(wo,".stab.index");
|
||||
nstabindexstr = wad_elf_section_byname(wo,".stab.indexstr");
|
||||
nstabexcl = wad_elf_section_byname(wo,".stab.excl");
|
||||
nstabexclstr = wad_elf_section_byname(wo,".stab.exclstr");
|
||||
nstab = wad_elf_section_byname(f->object,".stab");
|
||||
nstabstr = wad_elf_section_byname(f->object,".stabstr");
|
||||
nstabindex = wad_elf_section_byname(f->object,".stab.index");
|
||||
nstabindexstr = wad_elf_section_byname(f->object,".stab.indexstr");
|
||||
nstabexcl = wad_elf_section_byname(f->object,".stab.excl");
|
||||
nstabexclstr = wad_elf_section_byname(f->object,".stab.exclstr");
|
||||
|
||||
#ifdef DEBUG_DEBUG
|
||||
wad_printf("nstab = %d\n", nstab);
|
||||
|
|
@ -336,39 +305,43 @@ wad_elf_debug_info(WadObjectFile *wo, WadSymbol *wsym, unsigned long offset, Wad
|
|||
|
||||
/* Look in the .stab section */
|
||||
if (nstab > 0) {
|
||||
stab = wad_elf_section_data(wo,nstab);
|
||||
stabsize = wad_elf_section_size(wo,nstab);
|
||||
stabstr = (char *) wad_elf_section_data(wo,nstabstr);
|
||||
stab = wad_elf_section_data(f->object,nstab);
|
||||
stabsize = wad_elf_section_size(f->object,nstab);
|
||||
stabstr = (char *) wad_elf_section_data(f->object,nstabstr);
|
||||
|
||||
if (wad_search_stab(stab,stabsize,stabstr, wsym, offset,wd)) return 1;
|
||||
if (wad_search_stab(stab,stabsize,stabstr, f)) return 1;
|
||||
}
|
||||
|
||||
/* Look in the .stab.excl section. A solaris oddity? */
|
||||
|
||||
if (nstabexcl > 0) {
|
||||
stab = wad_elf_section_data(wo,nstabexcl);
|
||||
stabsize = wad_elf_section_size(wo, nstabexcl);
|
||||
stabstr = (char *) wad_elf_section_data(wo, nstabexclstr);
|
||||
if (wad_search_stab(stab,stabsize,stabstr, wsym, offset,wd)) return 1;
|
||||
stab = wad_elf_section_data(f->object,nstabexcl);
|
||||
stabsize = wad_elf_section_size(f->object, nstabexcl);
|
||||
stabstr = (char *) wad_elf_section_data(f->object, nstabexclstr);
|
||||
if (wad_search_stab(stab,stabsize,stabstr, f)) return 1;
|
||||
}
|
||||
|
||||
/* Look in the .stab.index section. A Solaris oddity? */
|
||||
if (nstabindex > 0) {
|
||||
stab = wad_elf_section_data(wo,nstabindex);
|
||||
stabsize = wad_elf_section_size(wo, nstabindex);
|
||||
stabstr = (char *) wad_elf_section_data(wo, nstabindexstr);
|
||||
if (wad_search_stab(stab,stabsize,stabstr, wsym, offset, wd)) {
|
||||
WadObjectFile *wo1;
|
||||
stab = wad_elf_section_data(f->object,nstabindex);
|
||||
stabsize = wad_elf_section_size(f->object, nstabindex);
|
||||
stabstr = (char *) wad_elf_section_data(f->object, nstabindexstr);
|
||||
if (wad_search_stab(stab,stabsize,stabstr, f)) {
|
||||
WadObjectFile *wo1, *wold;
|
||||
/* Hmmm. Might be in a different file */
|
||||
char objfile[MAX_PATH];
|
||||
strcpy(objfile, wd->objfile);
|
||||
strcpy(objfile, f->loc_objfile);
|
||||
wo1 = wad_object_load(objfile);
|
||||
if (wo1) {
|
||||
ret = wad_debug_info(wo1,wsym,offset,wd);
|
||||
wold = f->object;
|
||||
f->object = wo1;
|
||||
wad_find_debug(f);
|
||||
f->object = wold;
|
||||
return ret;
|
||||
} else {
|
||||
/* wad_printf("couldn't load %s\n", objfile); */
|
||||
}
|
||||
if (!ret) return wad_search_stab(stab,stabsize,stabstr,wsym, offset,wd);
|
||||
/* if (!ret) return wad_search_stab(stab,stabsize,stabstr,f);*/
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
|
@ -402,36 +375,32 @@ wad_elf_debug(WadObjectFile *wo) {
|
|||
/* -----------------------------------------------------------------------------
|
||||
* wad_find_symbol()
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
char *
|
||||
wad_find_symbol(WadObjectFile *wo, void *ptr, unsigned base, WadSymbol *ws) {
|
||||
char *r;
|
||||
ws->name = 0;
|
||||
ws->file = 0;
|
||||
ws->type = 0;
|
||||
ws->bind = 0;
|
||||
ws->value = 0;
|
||||
|
||||
void
|
||||
wad_find_symbol(WadFrame *f) {
|
||||
if (wad_debug_mode & DEBUG_SYMBOL) {
|
||||
wad_printf("wad: Searching for 0x%08x --> ", ptr);
|
||||
wad_printf("wad: Searching for 0x%08x --> ", f->pc);
|
||||
}
|
||||
r = wad_elf_find_symbol(wo,ptr,base,ws);
|
||||
if (r) {
|
||||
if (wad_debug_mode & DEBUG_SYMBOL) {
|
||||
wad_printf("%s", ws->name);
|
||||
if (ws->file)
|
||||
wad_printf(" in '%s'\n", ws->file);
|
||||
if (f->object)
|
||||
wad_elf_find_symbol(f);
|
||||
if (wad_debug_mode & DEBUG_SYMBOL) {
|
||||
if (f->sym_name) {
|
||||
wad_printf("%s", f->sym_name);
|
||||
if (f->sym_file)
|
||||
wad_printf(" in '%s'\n", f->sym_file);
|
||||
else
|
||||
wad_printf("\n");
|
||||
}
|
||||
} else {
|
||||
if (wad_debug_mode & DEBUG_SYMBOL) {
|
||||
} else {
|
||||
wad_printf("?\n");
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
int
|
||||
wad_debug_info(WadObjectFile *wo, WadSymbol *wsym, unsigned long offset, WadDebug *wd) {
|
||||
return wad_elf_debug_info(wo,wsym, offset,wd);
|
||||
void
|
||||
wad_find_debug(WadFrame *f) {
|
||||
if (f->object)
|
||||
wad_elf_debug_info(f);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -246,3 +246,14 @@ wad_arobject_load(const char *arpath, const char *robjname) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_find_object(WadFrame *f)
|
||||
*
|
||||
* Given a stack frame. Try to locate the object file
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
void wad_find_object(WadFrame *f) {
|
||||
if (f->segment) {
|
||||
f->object = wad_object_load(f->segment->mappath);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ void wad_set_returns(WadReturnFunc *rf) {
|
|||
|
||||
WadReturnFunc *wad_check_return(const char *name) {
|
||||
int i;
|
||||
if (!name) return 0;
|
||||
for (i = 0; i < num_return; i++) {
|
||||
if (strcmp(name,return_points[i].name) == 0) {
|
||||
if (wad_debug_mode & DEBUG_RETURN) {
|
||||
|
|
|
|||
|
|
@ -99,7 +99,16 @@ wad_segment_find(void *vaddr) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_segment_valid()
|
||||
*
|
||||
* Checks to see if a memory address is valid or not based on data in the
|
||||
* segment map
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
int wad_segment_valid(void *vaddr) {
|
||||
return wad_segment_find ? 1 : 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -180,7 +180,6 @@ static void nonlocalret() {
|
|||
|
||||
void wad_restore_i386_registers(WadFrame *f, int nlevels) {
|
||||
WadFrame *lastf = f;
|
||||
char *fd = (char *) f;
|
||||
int localsize = 0;
|
||||
unsigned char *pc;
|
||||
unsigned long *saved;
|
||||
|
|
@ -226,8 +225,7 @@ void wad_restore_i386_registers(WadFrame *f, int nlevels) {
|
|||
else break;
|
||||
}
|
||||
}
|
||||
fd += f->size;
|
||||
f = (WadFrame *) fd;
|
||||
f = f->next;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -260,6 +258,12 @@ void wad_signalhandler(int sig, siginfo_t *si, void *vcontext) {
|
|||
wad_nlr_func = 0;
|
||||
|
||||
context = (ucontext_t *) vcontext;
|
||||
|
||||
/* Read the segments */
|
||||
if (wad_segment_read() < 0) {
|
||||
wad_printf("WAD: Unable to read segment map\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (wad_debug_mode & DEBUG_SIGNAL) {
|
||||
printf("WAD: siginfo = %x, context = %x\n", si, vcontext);
|
||||
|
|
@ -302,6 +306,9 @@ void wad_signalhandler(int sig, siginfo_t *si, void *vcontext) {
|
|||
#ifdef WAD_LINUX
|
||||
p_fp = (unsigned long) (*fp);
|
||||
/* printf("fault at address %x, pc = %x, sp = %x, fp = %x\n", addr, p_pc, p_sp, p_fp); */
|
||||
#endif
|
||||
#ifdef WAD_SOLARIS
|
||||
p_fp = (unsigned long) *(((long *) p_sp) + 14);
|
||||
#endif
|
||||
/* printf("fault at address %x, pc = %x, sp = %x, fp = %x\n", addr, p_pc, p_sp, p_fp);*/
|
||||
|
||||
|
|
@ -316,62 +323,50 @@ void wad_signalhandler(int sig, siginfo_t *si, void *vcontext) {
|
|||
}
|
||||
wad_stacked_signal++;
|
||||
frame = wad_stack_trace(p_pc, p_sp, p_fp);
|
||||
origframe =frame;
|
||||
|
||||
if (!frame) {
|
||||
/* We're really hosed here */
|
||||
wad_stacked_signal--;
|
||||
/* We're really hosed. Not possible to generate a stack trace */
|
||||
printf("WAD: Unable to generate stack trace.\n");
|
||||
printf("WAD: Maybe the call stack has been corrupted by buffer overflow.\n");
|
||||
wad_signal_clear();
|
||||
return;
|
||||
/* exit(1); */
|
||||
}
|
||||
|
||||
{
|
||||
WadFrame *f = frame;
|
||||
while (f) {
|
||||
wad_find_object(f);
|
||||
wad_find_symbol(f);
|
||||
wad_find_debug(f);
|
||||
wad_build_vars(f);
|
||||
f = f->next;
|
||||
}
|
||||
}
|
||||
|
||||
wad_heap_overflow = 0;
|
||||
if (sig == SIGSEGV) {
|
||||
if (addr >= current_brk) wad_heap_overflow = 1;
|
||||
}
|
||||
|
||||
|
||||
if (wad_debug_mode & DEBUG_STACK) {
|
||||
/* Walk the exception frames and try to find a return point */
|
||||
while (frame) {
|
||||
int i;
|
||||
WadLocal *p;
|
||||
/* Print out detailed stack trace information */
|
||||
printf("::: Stack frame - 0x%08x :::\n", frame);
|
||||
printf(" sp = %x\n", frame->sp);
|
||||
printf(" fp = %x\n", frame->fp);
|
||||
printf(" size = %x\n", frame->stack_size);
|
||||
printf(" pc = %x (base = %x)\n", frame->pc, frame->sym_base);
|
||||
printf(" symbol = '%s'\n", frame->symbol ? frame->symbol : "?");
|
||||
printf(" srcfile = '%s'\n", frame->srcfile ? frame->srcfile : "");
|
||||
printf(" objfile = '%s'\n", frame->objfile ? frame->objfile : "");
|
||||
printf(" numargs = %d\n", frame->nargs);
|
||||
printf(" arguments [\n");
|
||||
p = frame->args;
|
||||
i = 0;
|
||||
while (p) {
|
||||
printf(" arg[%d] : name = '%s', loc = %d, type = %d, value = %d\n", i, p->name, p->loc, p->type, p->position);
|
||||
p = p->next;
|
||||
i++;
|
||||
}
|
||||
printf(" ]\n");
|
||||
frame = frame->next;
|
||||
}
|
||||
frame = origframe;
|
||||
}
|
||||
wad_stack_debug(frame);
|
||||
|
||||
/* Walk the exception frames and try to find a return point */
|
||||
origframe = frame;
|
||||
while (frame) {
|
||||
WadReturnFunc *wr = wad_check_return(frame->symbol);
|
||||
WadReturnFunc *wr = wad_check_return(frame->sym_name);
|
||||
if (wr) {
|
||||
found = 1;
|
||||
wad_nlr_value = wr->value;
|
||||
retname = wr->name;
|
||||
}
|
||||
frame = frame->next;
|
||||
if (found) {
|
||||
frame->last = 1; /* Cut off top of the stack trace */
|
||||
break;
|
||||
}
|
||||
frame = frame->next;
|
||||
nlevels++;
|
||||
}
|
||||
|
||||
|
||||
if (found) {
|
||||
wad_nlr_levels = nlevels - 1;
|
||||
|
|
@ -382,12 +377,13 @@ void wad_signalhandler(int sig, siginfo_t *si, void *vcontext) {
|
|||
wad_nlr_levels = 0;
|
||||
}
|
||||
|
||||
|
||||
if (sig_callback) {
|
||||
(*sig_callback)(sig,origframe,retname);
|
||||
} else {
|
||||
/* No signal handler defined. Go invoke the default */
|
||||
|
||||
wad_default_callback(sig, origframe,retname);
|
||||
wad_release_trace();
|
||||
}
|
||||
|
||||
if (wad_debug_mode & DEBUG_HOLD) while(1);
|
||||
|
|
@ -464,4 +460,14 @@ void wad_signal_init() {
|
|||
printf("WAD: Couldn't install signal handler!\n");
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* clear signals
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
void wad_signal_clear() {
|
||||
signal(SIGSEGV, SIG_DFL);
|
||||
signal(SIGBUS, SIG_DFL);
|
||||
signal(SIGILL, SIG_DFL);
|
||||
signal(SIGFPE, SIG_DFL);
|
||||
signal(SIGABRT, SIG_DFL);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,8 +55,95 @@ match_stab_symbol(char *symbol, char *stabtext, int slen) {
|
|||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
static void
|
||||
scan_function(Stab *s, int ns, WadDebug *debug) {
|
||||
scan_function(Stab *s, char *stabstr, int ns, WadFrame *f) {
|
||||
int i;
|
||||
unsigned long offset;
|
||||
offset = f->pc - f->sym_base;
|
||||
|
||||
for (i = 0; i < ns; i++,s++) {
|
||||
if (wad_debug_mode & DEBUG_STABS) {
|
||||
wad_printf(" %10d %10x %10d %10d %10d: '%s'\n", s->n_strx, s->n_type, s->n_other, s->n_desc, s->n_value,
|
||||
stabstr+s->n_strx);
|
||||
|
||||
}
|
||||
|
||||
if ((s->n_type == N_UNDF) || (s->n_type == N_SO) || (s->n_type == N_FUN) ||
|
||||
(s->n_type == N_OBJ)) return;
|
||||
|
||||
if (s->n_type == N_SLINE) {
|
||||
if (s->n_value < offset) {
|
||||
f->loc_line = s->n_desc;
|
||||
}
|
||||
} else if ((s->n_type == N_PSYM) || (s->n_type == N_RSYM)) {
|
||||
/* Parameter counting */
|
||||
char *pname;
|
||||
char *c;
|
||||
int len;
|
||||
WadLocal *arg;
|
||||
pname = stabstr+s->n_strx;
|
||||
c = strchr(pname,':');
|
||||
if (c) {
|
||||
len = (c-pname);
|
||||
} else {
|
||||
len = strlen(pname);
|
||||
}
|
||||
|
||||
/* Check if the argument was already used */
|
||||
/* In this case, the first stab simply identifies an argument. The second
|
||||
one identifies its location for the debugger */
|
||||
|
||||
if (f->debug_args) {
|
||||
/* Need to do some fix up for linux here */
|
||||
WadLocal *a = f->debug_args;
|
||||
while (a) {
|
||||
if ((strncmp(a->name,pname,len) == 0) && (strlen(a->name) == len)) {
|
||||
/* We already saw this argument. Given a choice between a register and a stack
|
||||
argument. We will choose the stack version */
|
||||
|
||||
if (a->loc == PARM_STACK) {
|
||||
break;
|
||||
}
|
||||
/* Go ahead and use the new argument */
|
||||
if (s->n_type == N_RSYM) {
|
||||
a->loc = PARM_REGISTER;
|
||||
a->reg = s->n_value;
|
||||
} else {
|
||||
a->loc = PARM_STACK;
|
||||
a->stack = s->n_value;
|
||||
}
|
||||
break;
|
||||
}
|
||||
a = a->next;
|
||||
}
|
||||
if (a) continue; /* We got an argument match. Just skip to the next stab */
|
||||
}
|
||||
|
||||
arg = (WadLocal *) wad_malloc(sizeof(WadLocal));
|
||||
arg->name = (char *) wad_malloc(len+1);
|
||||
strncpy(arg->name, pname, len);
|
||||
arg->name[len] = 0;
|
||||
if (s->n_type == N_RSYM) {
|
||||
arg->loc = PARM_REGISTER;
|
||||
arg->reg = s->n_value;
|
||||
arg->stack = 0;
|
||||
} else {
|
||||
arg->loc = PARM_STACK;
|
||||
arg->line = s->n_desc;
|
||||
arg->stack = s->n_value;
|
||||
}
|
||||
arg->type = 0;
|
||||
arg->next = 0;
|
||||
if (f->debug_args) {
|
||||
f->debug_lastarg->next = arg;
|
||||
f->debug_lastarg = arg;
|
||||
} else {
|
||||
f->debug_args = arg;
|
||||
f->debug_lastarg = arg;
|
||||
f->debug_nargs= 0;
|
||||
}
|
||||
f->debug_nargs++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Given a stabs data segment (obtained somehow), this function tries to
|
||||
|
|
@ -74,43 +161,44 @@ scan_function(Stab *s, int ns, WadDebug *debug) {
|
|||
*/
|
||||
|
||||
int
|
||||
wad_search_stab(void *sp, int size, char *stabstr, WadSymbol *wsym, unsigned long offset, WadDebug *debug) {
|
||||
wad_search_stab(void *sp, int size, char *stabstr, WadFrame *f) {
|
||||
Stab *s;
|
||||
int ns;
|
||||
int infunc;
|
||||
int slen;
|
||||
int i;
|
||||
int found = 0;
|
||||
char *file, *lastfile = 0;
|
||||
int chk = 0;
|
||||
WadLocal *arg;
|
||||
|
||||
char srcfile[MAX_PATH];
|
||||
char objfile[MAX_PATH];
|
||||
|
||||
if (!f->sym_name) return 0;
|
||||
|
||||
s = (Stab *) sp; /* Stabs data */
|
||||
ns = size/sizeof(Stab); /* number of stabs */
|
||||
|
||||
slen = strlen(wsym->name);
|
||||
|
||||
/* Reset the debug information section */
|
||||
debug->found = 0;
|
||||
debug->srcfile[0] = 0;
|
||||
debug->objfile[0] = 0;
|
||||
debug->line_number = -1;
|
||||
debug->nargs = 0;
|
||||
debug->args = 0;
|
||||
debug->lastarg = 0;
|
||||
slen = strlen(f->sym_name);
|
||||
srcfile[0] = 0;
|
||||
objfile[0] = 0;
|
||||
|
||||
for (i = 0; i < ns; i++, s++) {
|
||||
/*
|
||||
if (wad_debug_mode & DEBUG_STABS) {
|
||||
wad_printf(" %10d %10x %10d %10d %10d: '%s'\n", s->n_strx, s->n_type, s->n_other, s->n_desc, s->n_value,
|
||||
stabstr+s->n_strx);
|
||||
|
||||
}
|
||||
*/
|
||||
if ((s->n_type == N_UNDF)) { /* && (s->n_desc >= 0)) { */
|
||||
/* New stabs section. We need to be a little careful here. Do a recursive
|
||||
search of the subsection. */
|
||||
|
||||
if (wad_search_stab(s+1,s->n_desc*sizeof(Stab), stabstr, wsym, offset,debug)) return 1;
|
||||
if (wad_search_stab(s+1,s->n_desc*sizeof(Stab), stabstr, f)) return 1;
|
||||
|
||||
/* On solaris, each stabs section seem to increment the stab string pointer. On Linux,
|
||||
/* On solaris, each stabs section seems to increment the stab string pointer. On Linux,
|
||||
the linker seems to do a certain amount of optimization that results in a single
|
||||
string table. */
|
||||
|
||||
|
|
@ -119,112 +207,48 @@ wad_search_stab(void *sp, int size, char *stabstr, WadSymbol *wsym, unsigned lon
|
|||
#endif
|
||||
i += s->n_desc;
|
||||
s += s->n_desc;
|
||||
debug->objfile[0] = 0;
|
||||
debug->srcfile[0] = 0;
|
||||
debug->line_number = -1;
|
||||
debug->found = 0;
|
||||
objfile[0] = 0;
|
||||
srcfile[0] = 0;
|
||||
continue;
|
||||
} else if (s->n_type == N_SO) {
|
||||
if (debug->found) return 1; /* New file and we already found what we wanted */
|
||||
/* Source file specification */
|
||||
/* Look for directory */
|
||||
file = stabstr+s->n_strx;
|
||||
if (strlen(file) && (file[strlen(file)-1] == '/')) {
|
||||
strcpy(debug->srcfile,file);
|
||||
strcpy(srcfile,file);
|
||||
} else {
|
||||
strcat(debug->srcfile,file);
|
||||
strcat(srcfile,file);
|
||||
}
|
||||
debug->objfile[0] = 0;
|
||||
objfile[0] = 0;
|
||||
/* If we have a file match, we might be looking for a local symbol. If so,
|
||||
we'll go ahead and set the srcfile field of the frame */
|
||||
|
||||
/* We're going to check for a file match. Maybe we're looking for a local symbol */
|
||||
if (wsym->file && strcmp(wsym->file,file) == 0) {
|
||||
debug->found = 1;
|
||||
if (f->sym_file && strcmp(f->sym_file,file) == 0) {
|
||||
found = 1;
|
||||
}
|
||||
lastfile = file;
|
||||
} else if (s->n_type == N_OBJ) {
|
||||
/* Object file specifier */
|
||||
if (debug->objfile[0]) {
|
||||
strcat(debug->objfile,"/");
|
||||
if (objfile[0]) {
|
||||
strcat(objfile,"/");
|
||||
}
|
||||
strcat(debug->objfile,stabstr+s->n_strx);
|
||||
strcat(objfile,stabstr+s->n_strx);
|
||||
} else if (s->n_type == N_FUN) {
|
||||
if (match_stab_symbol(wsym->name, stabstr+s->n_strx, slen)) {
|
||||
if (!wsym->file || (strcmp(wsym->file,lastfile) == 0)) {
|
||||
infunc = 1;
|
||||
debug->found = 1;
|
||||
debug->nargs = 0;
|
||||
} else {
|
||||
infunc = 0;
|
||||
if (match_stab_symbol(f->sym_name, stabstr+s->n_strx, slen)) {
|
||||
if (!f->sym_file || (strcmp(f->sym_file,lastfile) == 0)) {
|
||||
/* Go find debugging information for the function */
|
||||
scan_function(s+1, stabstr, ns -i - 1, f);
|
||||
f->loc_srcfile = wad_strdup(srcfile);
|
||||
f->loc_objfile = wad_strdup(objfile);
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
infunc = 0;
|
||||
}
|
||||
} else if (debug->found && (s->n_type == N_SLINE) && (infunc)) {
|
||||
/* Line number location */
|
||||
if (s->n_value < offset) {
|
||||
debug->line_number = s->n_desc;
|
||||
} else return 1;
|
||||
} else if (debug->found && ((s->n_type == N_PSYM) || (s->n_type == N_RSYM)) && (infunc)) {
|
||||
/* Parameter counting */
|
||||
char *pname;
|
||||
char *c;
|
||||
int len;
|
||||
pname = stabstr+s->n_strx;
|
||||
c = strchr(pname,':');
|
||||
if (c) {
|
||||
len = (c-pname);
|
||||
} else {
|
||||
len = strlen(pname);
|
||||
}
|
||||
|
||||
/* Check if the argument was already used */
|
||||
/* In this case, the first stab simply identifies an argument. The second
|
||||
one identifies its location for the debugger */
|
||||
|
||||
if (debug->args) {
|
||||
/* Need to do some fix up for linux here */
|
||||
WadLocal *a = debug->args;
|
||||
while (a) {
|
||||
if ((strncmp(a->name,pname,len) == 0) && (strlen(a->name) == len)) {
|
||||
/* We already saw this argument. Given a choice between a register and a stack
|
||||
argument. We will choose the stack version */
|
||||
if (a->loc == PARM_STACK) {
|
||||
break;
|
||||
}
|
||||
/* Go ahead and use the new argument */
|
||||
if (s->n_type == 0x40)
|
||||
a->loc = PARM_REGISTER;
|
||||
else
|
||||
a->loc = PARM_STACK;
|
||||
a->position = s->n_value;
|
||||
break;
|
||||
}
|
||||
a = a->next;
|
||||
}
|
||||
if (a) continue; /* We got an argument match. Just skip to the next stab */
|
||||
}
|
||||
|
||||
arg = (WadLocal *) wad_malloc(sizeof(WadLocal));
|
||||
arg->name = (char *) wad_malloc(len+1);
|
||||
strncpy(arg->name, pname, len);
|
||||
arg->name[len] = 0;
|
||||
if (s->n_type == 0x40)
|
||||
arg->loc = PARM_REGISTER;
|
||||
else
|
||||
arg->loc = PARM_STACK;
|
||||
|
||||
arg->position = s->n_value;
|
||||
arg->type = 0;
|
||||
arg->next = 0;
|
||||
if (debug->args) {
|
||||
debug->lastarg->next = arg;
|
||||
debug->lastarg = arg;
|
||||
} else {
|
||||
debug->args = arg;
|
||||
debug->lastarg = arg;
|
||||
}
|
||||
debug->nargs++;
|
||||
}
|
||||
}
|
||||
if (debug->found) return 1;
|
||||
return 0;
|
||||
if (found) {
|
||||
f->loc_srcfile = wad_strdup(srcfile);
|
||||
f->loc_objfile = wad_strdup(objfile);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* -----------------------------------------------------------------------------
|
||||
* stack.c
|
||||
*
|
||||
* This file is used to unwind the C call stack.
|
||||
* This file unwinds the C call stack and creates a list of stack frames.
|
||||
*
|
||||
* Author(s) : David Beazley (beazley@cs.uchicago.edu)
|
||||
*
|
||||
|
|
@ -10,252 +10,211 @@
|
|||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
#include "wad.h"
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
#include <dlfcn.h>
|
||||
|
||||
/* This needs to be changed so that the value is dynamically determined
|
||||
Might also get weird problems with stacks located in different regions. */
|
||||
/* -----------------------------------------------------------------------------
|
||||
* new_frame()
|
||||
*
|
||||
* Create a new stack frame object and initialize all of the fields.
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
#ifdef WAD_SOLARIS
|
||||
#define STACK_BASE 0xffbf0000
|
||||
#endif
|
||||
#ifdef WAD_LINUX
|
||||
#define STACK_BASE 0xc0000000
|
||||
#endif
|
||||
static WadFrame *
|
||||
new_frame() {
|
||||
WadFrame *f;
|
||||
f = (WadFrame *) wad_malloc(sizeof(WadFrame));
|
||||
f->frameno = 0;
|
||||
f->segment = 0;
|
||||
f->object = 0;
|
||||
f->pc = 0;
|
||||
f->sp = 0;
|
||||
f->sp = 0;
|
||||
f->stack = 0;
|
||||
f->stack_size = 0;
|
||||
|
||||
f->sym_name = 0;
|
||||
f->sym_file = 0;
|
||||
f->sym_base = 0;
|
||||
f->sym_size = 0;
|
||||
f->sym_type = 0;
|
||||
f->sym_bind = 0;
|
||||
|
||||
f->loc_objfile = 0;
|
||||
f->loc_srcfile = 0;
|
||||
f->loc_line = 0;
|
||||
|
||||
f->debug_nargs = -1;
|
||||
f->debug_args = 0;
|
||||
f->debug_lastarg = 0;
|
||||
|
||||
f->last = 0;
|
||||
f->next = 0;
|
||||
f->prev = 0;
|
||||
return f;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* stack_unwind()
|
||||
*
|
||||
* Perform a single level of stack unwinding given the stack pointer, frame pointer
|
||||
* and program counter.
|
||||
* This function performs a single level of stack unwinding given the stack pointer
|
||||
* frame pointer and program counter. Validations are made to make sure the stack
|
||||
* and frame pointers are in valid memory. Updates the values of the sp, pc, and fp
|
||||
* in-place. Returns a stack frame object on success, 0 if memory is invalid
|
||||
* or the end of the stack has been reached.
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
static void
|
||||
stack_unwind(unsigned long *sp, unsigned long *pc, unsigned long *fp) {
|
||||
|
||||
static WadFrame *
|
||||
stack_unwind(unsigned long *pc, unsigned long *sp, unsigned long *fp) {
|
||||
WadSegment *sp_seg, *fp_seg;
|
||||
WadFrame *f;
|
||||
if (wad_debug_mode & DEBUG_UNWIND) {
|
||||
wad_printf("::: stack unwind : pc = %x, sp = %x, fp = %x\n", *pc, *sp, *fp);
|
||||
}
|
||||
|
||||
/* Verify that the sp and fp are in mapped memory */
|
||||
sp_seg = wad_segment_find((void *) *sp);
|
||||
fp_seg = wad_segment_find((void *) *fp);
|
||||
|
||||
if (!(sp_seg && fp_seg && (sp_seg == fp_seg))) {
|
||||
/* Either the stack pointer or frame pointer is invalid. Or, the stack pointer
|
||||
and frame pointer are in different memory regions. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Check to see if the PC is valid */
|
||||
if (!wad_segment_valid((void *) *pc)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
f = new_frame();
|
||||
f->pc = *pc;
|
||||
f->sp = *sp;
|
||||
f->fp = *fp;
|
||||
f->segment = wad_segment_find((void *) *pc);
|
||||
f->stack_size = *fp - *sp;
|
||||
|
||||
/* Make a copy of the call stack */
|
||||
f->stack = (char *) wad_malloc(f->stack_size);
|
||||
memcpy(f->stack,(void *) *sp, f->stack_size);
|
||||
|
||||
/* Update the sp, fp, and pc */
|
||||
|
||||
#ifdef WAD_SOLARIS
|
||||
*pc = *((unsigned long *) *sp+15); /* %i7 - Return address */
|
||||
*sp = *((unsigned long *) *sp+14); /* %i6 - frame pointer */
|
||||
if (wad_segment_valid((void *) *sp)) {
|
||||
*fp = *((unsigned long *) *sp+14);
|
||||
} else {
|
||||
*fp = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WAD_LINUX
|
||||
*pc = *((unsigned long *) *fp+1);
|
||||
*sp = *fp;
|
||||
*fp = *((unsigned long *) *fp);
|
||||
|
||||
/* If we get a frame pointer of zero, we've gone off the end of the stack. Set the
|
||||
stack pointer to zero to signal the stack unwinder. */
|
||||
|
||||
if (*fp == 0) {
|
||||
if (wad_segment_valid((void *) ((unsigned long *) *fp+1))) {
|
||||
*pc = *((unsigned long *) *fp+1);
|
||||
*sp = *fp;
|
||||
} else {
|
||||
*sp = 0;
|
||||
}
|
||||
if (wad_segment_valid((void *) ((unsigned long *) *fp))) {
|
||||
*fp = *((unsigned long *) *fp);
|
||||
} else {
|
||||
*fp = 0;
|
||||
}
|
||||
#endif
|
||||
return f;
|
||||
}
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_stack_trace()
|
||||
*
|
||||
* Create a stack trace of the process. Returns a linked list of stack frames
|
||||
* with debugging information and other details.
|
||||
* with a limited about debugging information and other details.
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
WadFrame *
|
||||
wad_stack_trace(unsigned long pc, unsigned long sp, unsigned long fp) {
|
||||
WadSegment *ws;
|
||||
WadObjectFile *wo;
|
||||
WadFrame *firstframe=0, *lastframe=0, *frame=0;
|
||||
WadDebug wd;
|
||||
WadSymbol wsym;
|
||||
|
||||
unsigned long p_pc;
|
||||
unsigned long p_sp;
|
||||
unsigned long p_fp;
|
||||
unsigned long p_lastsp;
|
||||
int n = 0;
|
||||
|
||||
/* Read the segments */
|
||||
if (wad_segment_read() < 0) {
|
||||
wad_printf("WAD: Unable to read segment map\n");
|
||||
return 0;
|
||||
}
|
||||
/* Try to do a stack traceback */
|
||||
|
||||
p_pc = pc;
|
||||
p_sp = sp;
|
||||
p_fp = fp;
|
||||
|
||||
while (p_sp) {
|
||||
/* Add check for stack validity here */
|
||||
ws = wad_segment_find((void *) p_sp);
|
||||
|
||||
if (!ws) {
|
||||
/* If the stack is bad, we are really hosed here */
|
||||
write(1,"Whoa. Stack is corrupted. Bailing out.\n", 39);
|
||||
exit(1);
|
||||
break;
|
||||
}
|
||||
ws = wad_segment_find((void *) p_pc);
|
||||
{
|
||||
int stacksize = 0;
|
||||
char *symname = 0;
|
||||
unsigned long value;
|
||||
|
||||
/* Try to load the object file for this address */
|
||||
if (ws) {
|
||||
wo = wad_object_load(ws->mappath);
|
||||
}
|
||||
else {
|
||||
wo = 0;
|
||||
}
|
||||
|
||||
/* Try to find the symbol corresponding to this PC */
|
||||
if (wo) {
|
||||
symname = wad_find_symbol(wo, (void *) p_pc, (unsigned long) ws->base, &wsym);
|
||||
} else {
|
||||
symname = 0;
|
||||
}
|
||||
value = wsym.value;
|
||||
|
||||
frame = (WadFrame *) wad_malloc(sizeof(WadFrame));
|
||||
frame->frameno = n;
|
||||
frame->pc = p_pc;
|
||||
frame->sp = p_sp;
|
||||
frame->nlocals = -1;
|
||||
frame->nargs = -1;
|
||||
frame->objfile = 0;
|
||||
frame->srcfile = 0;
|
||||
frame->psp = 0;
|
||||
frame->next = 0;
|
||||
while ((frame = stack_unwind(&p_pc, &p_sp, &p_fp))) {
|
||||
/* Got a frame successfully */
|
||||
frame->frameno = n;
|
||||
if (lastframe) {
|
||||
lastframe->next = frame;
|
||||
frame->prev = lastframe;
|
||||
frame->last = 0;
|
||||
if (lastframe) {
|
||||
lastframe->next = frame;
|
||||
lastframe = frame;
|
||||
} else {
|
||||
lastframe = frame;
|
||||
firstframe = frame;
|
||||
}
|
||||
frame->symbol = wad_strdup(symname);
|
||||
frame->sym_base = value + (long) ws->base;
|
||||
n++;
|
||||
if (symname) {
|
||||
/* Try to gather some debugging information about this symbol */
|
||||
if (wad_debug_info(wo,&wsym, p_pc - (unsigned long) ws->base - value, &wd)) {
|
||||
frame->srcfile = wad_strdup(wd.srcfile);
|
||||
frame->objfile = wad_strdup(wd.objfile);
|
||||
frame->args = wd.args;
|
||||
frame->lastarg = wd.lastarg;
|
||||
frame->nargs = wd.nargs;
|
||||
|
||||
/*frame.nargs = wd.nargs;
|
||||
if (wd.nargs > 0) {
|
||||
argsize = sizeof(WadParm)*wd.nargs;
|
||||
}
|
||||
*/
|
||||
frame->line_number = wd.line_number;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef WAD_SOLARIS
|
||||
|
||||
#ifdef OLD /* Might not be necessary. Registers stored on stack already */
|
||||
/* Before unwinding the stack, copy the locals and %o registers from previous frame */
|
||||
if (!firstframe) {
|
||||
int i;
|
||||
long *lsp = (long *) p_lastsp;
|
||||
for (i = 0; i < 16; i++) {
|
||||
/* wad_printf("regs[%d] = 0x%x\n", lsp[i]); */
|
||||
frame.regs[i] = lsp[i];
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
/* Determine stack frame size */
|
||||
p_lastsp = p_sp;
|
||||
stack_unwind(&p_sp, &p_pc, &p_fp);
|
||||
|
||||
if (p_sp) {
|
||||
stacksize = p_sp - p_lastsp;
|
||||
} else {
|
||||
stacksize = STACK_BASE - p_lastsp;
|
||||
}
|
||||
|
||||
/* Sanity check */
|
||||
if ((p_sp + stacksize) > STACK_BASE) {
|
||||
stacksize = STACK_BASE - p_sp;
|
||||
}
|
||||
|
||||
/* Set the frame pointer and stack size */
|
||||
frame->fp = p_sp;
|
||||
frame->stack_size = stacksize;
|
||||
|
||||
/* Copy stack data */
|
||||
frame->psp = (char *) wad_malloc(stacksize);
|
||||
if (frame->psp) {
|
||||
memcpy(frame->psp, (void *) p_lastsp, stacksize);
|
||||
}
|
||||
lastframe = frame;
|
||||
} else {
|
||||
firstframe = frame;
|
||||
lastframe = frame;
|
||||
}
|
||||
n++;
|
||||
}
|
||||
lastframe->last = 1;
|
||||
if (lastframe)
|
||||
lastframe->last = 1;
|
||||
return firstframe;
|
||||
}
|
||||
|
||||
void wad_release_trace() {
|
||||
}
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_stack_debug()
|
||||
*
|
||||
* Make a dump of a stack trace
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
/* This function steals an argument out of a frame further up the call stack :-) */
|
||||
long wad_steal_arg(WadFrame *f, char *symbol, int argno, int *error) {
|
||||
long *regs;
|
||||
WadFrame *lastf = 0;
|
||||
void wad_stack_debug(WadFrame *frame) {
|
||||
if (wad_debug_mode & DEBUG_STACK) {
|
||||
/* Walk the exception frames and try to find a return point */
|
||||
while (frame) {
|
||||
/* Print out detailed stack trace information */
|
||||
printf("::: Stack frame - 0x%08x :::\n", frame);
|
||||
printf(" pc = %x\n", frame->pc);
|
||||
printf(" sp = %x\n", frame->sp);
|
||||
printf(" fp = %x\n", frame->fp);
|
||||
printf(" stack = %x\n", frame->stack);
|
||||
printf(" size = %x\n", frame->stack_size);
|
||||
printf(" segment = %x (%s)\n", frame->segment, frame->segment ? frame->segment->mappath : "?");
|
||||
printf(" object = %x (%s)\n", frame->object, frame->object ? frame->object->path : "?");
|
||||
|
||||
*error = 0;
|
||||
/* Start searching */
|
||||
while (f) {
|
||||
if (f->symbol && (strcmp(f->symbol,symbol) == 0)) {
|
||||
/* Got a match */
|
||||
if (lastf) {
|
||||
regs = (long *) f->psp;
|
||||
return regs[8+argno];
|
||||
if (frame->sym_name) {
|
||||
printf(" sym_name = %s\n", frame->sym_name);
|
||||
printf(" sym_base = %x\n", frame->sym_base);
|
||||
printf(" sym_size = %x\n", frame->sym_size);
|
||||
printf(" sym_bind = %x\n", frame->sym_bind);
|
||||
printf(" sym_file = %s\n", frame->sym_file ? frame->sym_file : "");
|
||||
}
|
||||
}
|
||||
lastf = f;
|
||||
f = f->next;
|
||||
}
|
||||
*error = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
long wad_steal_outarg(WadFrame *f, char *symbol, int argno, int *error) {
|
||||
long *regs;
|
||||
WadFrame *lastf = 0;
|
||||
|
||||
*error = 0;
|
||||
/* Start searching */
|
||||
while (f) {
|
||||
if (f->symbol && (strcmp(f->symbol,symbol) == 0)) {
|
||||
/* Got a match */
|
||||
if (lastf) {
|
||||
#ifdef WAD_SOLARIS
|
||||
regs = (long *) lastf->psp;
|
||||
return regs[8+argno];
|
||||
#endif
|
||||
#ifdef WAD_LINUX
|
||||
regs = (long *) f->psp;
|
||||
return regs[argno+2];
|
||||
#endif
|
||||
if (frame->loc_srcfile) {
|
||||
printf(" loc_srcfile = %s\n", frame->loc_srcfile);
|
||||
}
|
||||
|
||||
if (frame->loc_objfile) {
|
||||
printf(" loc_objfile = %s\n", frame->loc_objfile);
|
||||
}
|
||||
printf(" loc_line = %d\n", frame->loc_line);
|
||||
|
||||
|
||||
printf(" debug_nargs = %d\n", frame->debug_nargs);
|
||||
if (frame->debug_args) {
|
||||
int i = 0;
|
||||
WadLocal *p = frame->debug_args;
|
||||
printf(" debug_args = [ \n");
|
||||
while (p) {
|
||||
printf(" arg[%d] : name = '%s', loc = %d, type = %d, stack = %d, reg = %d, line=%d, ptr=%x(%d)\n", i, p->name, p->loc, p->type, p->stack,p->reg,p->line,p->ptr,p->size);
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
printf(" ]\n");
|
||||
|
||||
frame = frame->next;
|
||||
}
|
||||
lastf = f;
|
||||
f = f->next;
|
||||
}
|
||||
*error = -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
119
SWIG/Tools/WAD/Wad/vars.c
Normal file
119
SWIG/Tools/WAD/Wad/vars.c
Normal file
|
|
@ -0,0 +1,119 @@
|
|||
/* -----------------------------------------------------------------------------
|
||||
* vars.c
|
||||
*
|
||||
* This file examines the stack trace and tries to make some sense out of
|
||||
* collected debugging information. This includes locating the data on
|
||||
* the stack and/or registers.
|
||||
*
|
||||
* This feature is detached from the debugging info collector to make
|
||||
* it independent of debugging formats.
|
||||
*
|
||||
* Author(s) : David Beazley (beazley@cs.uchicago.edu)
|
||||
*
|
||||
* Copyright (C) 2000. The University of Chicago
|
||||
* See the file LICENSE for information on usage and redistribution.
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
#include "wad.h"
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* wad_build_vars()
|
||||
*
|
||||
* Build variable information for a single stack frame
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
void wad_build_vars(WadFrame *f) {
|
||||
char *stack = 0;
|
||||
char *nstack = 0;
|
||||
char *pstack = 0;
|
||||
WadLocal *loc;
|
||||
int laststack = 0;
|
||||
WadLocal *lastloc = 0;
|
||||
|
||||
stack = (char *) f->stack;
|
||||
if (f->next) {
|
||||
nstack = (char *) f->next->stack;
|
||||
}
|
||||
if (f->prev) {
|
||||
pstack = (char *) f->prev->stack;
|
||||
}
|
||||
loc = f->debug_args;
|
||||
|
||||
while (loc) {
|
||||
loc->ptr = 0;
|
||||
if (loc->loc == PARM_STACK) {
|
||||
if ((loc->stack >= 0) && (nstack)) {
|
||||
loc->ptr = (void *) (nstack + loc->stack);
|
||||
} else if (loc->stack < 0) {
|
||||
loc->ptr = (void *) (stack + f->stack_size + loc->stack);
|
||||
}
|
||||
}
|
||||
if (lastloc) {
|
||||
/* Figure out the size */
|
||||
if (!lastloc->size)
|
||||
lastloc->size = abs(loc->stack - lastloc->stack);
|
||||
}
|
||||
lastloc = loc;
|
||||
loc = loc->next;
|
||||
}
|
||||
|
||||
/* If last size is not set. Assume that it is a word */
|
||||
if (lastloc && (!lastloc->size)) {
|
||||
lastloc->size = 4;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* Try to make a formatted version of a local */
|
||||
char *wad_format_var(WadLocal *l) {
|
||||
static char hexdigits[] = "0123456789abcdef";
|
||||
static char buffer[1024];
|
||||
|
||||
buffer[0] = 0;
|
||||
|
||||
switch(l->type) {
|
||||
case TYPE_UNKNOWN:
|
||||
default:
|
||||
/* Hmmm. Unknown data type. We'll just dump out digits */
|
||||
if (l->ptr) {
|
||||
if (l->size <= 8) {
|
||||
int incr,i;
|
||||
int b;
|
||||
int leading = 1;
|
||||
char *c;
|
||||
char *ptr;
|
||||
#ifdef WAD_LITTLE_ENDIAN
|
||||
ptr = ((char *) l->ptr) + l->size - 1;
|
||||
incr = -1;
|
||||
#else
|
||||
ptr = (char *) l->ptr;
|
||||
incr =1 ;
|
||||
#endif
|
||||
strcat(buffer,"0x");
|
||||
c = buffer+2;
|
||||
for (i = 0; i < l->size; i++) {
|
||||
b = (int) *ptr;
|
||||
if (!leading || (b)) {
|
||||
if (!leading || (b & 0xf0))
|
||||
*(c++) = hexdigits[(b & 0xf0) >> 4];
|
||||
*(c++) = hexdigits[(b & 0xf)];
|
||||
leading = 0;
|
||||
}
|
||||
ptr += incr;
|
||||
}
|
||||
if (leading)
|
||||
*(c++) = '0';
|
||||
|
||||
*c = 0;
|
||||
} else {
|
||||
sprintf(buffer,"unknown(%d bytes)", l->size);
|
||||
}
|
||||
}
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -100,10 +100,11 @@ static void handler(int signo, WadFrame *frame, char *ret) {
|
|||
int len = 0;
|
||||
PyObject *type;
|
||||
char *name;
|
||||
char *fd;
|
||||
WadFrame *f;
|
||||
WadFrame *fline = 0;
|
||||
|
||||
|
||||
printf("python handler.\n");
|
||||
if (!ret) {
|
||||
wad_default_callback(signo, frame, ret);
|
||||
return;
|
||||
|
|
@ -130,34 +131,32 @@ static void handler(int signo, WadFrame *frame, char *ret) {
|
|||
type = PyExc_RuntimeError;
|
||||
break;
|
||||
}
|
||||
fd = (char *) frame;
|
||||
f = (WadFrame *) fd;
|
||||
|
||||
f = frame;
|
||||
/* Find the last exception frame */
|
||||
while (!f->last) {
|
||||
fd = fd + f->size;
|
||||
f = (WadFrame *) fd;
|
||||
f= f->next;
|
||||
}
|
||||
printf("f = %x\n", f);
|
||||
/* Now work backwards */
|
||||
fd = fd - f->lastsize;
|
||||
f = (WadFrame *) fd;
|
||||
while (1) {
|
||||
f = f->prev;
|
||||
while (f) {
|
||||
sprintf(temp,"#%-3d 0x%08x in ", f->frameno, f->pc);
|
||||
strcat(message,temp);
|
||||
strcat(message,*(fd + f->sym_off) ? fd+f->sym_off : "?");
|
||||
strcat(message, f->sym_name ? f->sym_name : "?");
|
||||
strcat(message,"(");
|
||||
strcat(message,wad_arg_string(f));
|
||||
strcat(message,")");
|
||||
if (strlen(SRCFILE(f))) {
|
||||
if (f->loc_srcfile && strlen(f->loc_srcfile)) {
|
||||
strcat(message," in '");
|
||||
strcat(message, wad_strip_dir(SRCFILE(f)));
|
||||
strcat(message, wad_strip_dir(f->loc_srcfile));
|
||||
strcat(message,"'");
|
||||
if (f->line_number > 0) {
|
||||
sprintf(temp,", line %d", f->line_number);
|
||||
if (f->loc_line > 0) {
|
||||
sprintf(temp,", line %d", f->loc_line);
|
||||
strcat(message,temp);
|
||||
{
|
||||
int fd;
|
||||
fd = open(SRCFILE(f), O_RDONLY);
|
||||
fd = open(f->loc_srcfile, O_RDONLY);
|
||||
if (fd > 0) {
|
||||
fline = f;
|
||||
}
|
||||
|
|
@ -165,34 +164,32 @@ static void handler(int signo, WadFrame *frame, char *ret) {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
if (strlen(fd+f->obj_off)) {
|
||||
if (f->loc_objfile && strlen(f->loc_objfile)) {
|
||||
strcat(message," from '");
|
||||
strcat(message, wad_strip_dir(OBJFILE(f)));
|
||||
strcat(message, wad_strip_dir(f->loc_objfile));
|
||||
strcat(message,"'");
|
||||
}
|
||||
}
|
||||
strcat(message,"\n");
|
||||
if (!f->lastsize) break;
|
||||
fd = fd - f->lastsize;
|
||||
f = (WadFrame *) fd;
|
||||
f = f->prev;
|
||||
}
|
||||
if (fline) {
|
||||
int first;
|
||||
int last;
|
||||
char *line, *c;
|
||||
int i;
|
||||
first = fline->line_number - 2;
|
||||
last = fline->line_number + 2;
|
||||
first = fline->loc_line - 2;
|
||||
last = fline->loc_line + 2;
|
||||
if (first < 1) first = 1;
|
||||
|
||||
line = wad_load_source(SRCFILE(fline),first);
|
||||
line = wad_load_source(fline->loc_srcfile,first);
|
||||
if (line) {
|
||||
strcat(message,"\n");
|
||||
strcat(message, SRCFILE(fline));
|
||||
sprintf(temp,", line %d\n\n", fline->line_number);
|
||||
strcat(message, fline->loc_srcfile);
|
||||
sprintf(temp,", line %d\n\n", fline->loc_line);
|
||||
strcat(message, temp);
|
||||
for (i = first; i <= last; i++) {
|
||||
if (i == fline->line_number) strcat(message," => ");
|
||||
if (i == fline->loc_line) strcat(message," => ");
|
||||
else strcat(message," ");
|
||||
c = strchr(line,'\n');
|
||||
if (c) {
|
||||
|
|
@ -222,7 +219,6 @@ static void handler(int signo, WadFrame *frame, char *ret) {
|
|||
back. */
|
||||
|
||||
PyErr_SetString(type, message);
|
||||
wad_release_trace();
|
||||
}
|
||||
|
||||
static void pywadinit() {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue