*** empty log message ***
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@1017 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
bc2c9de5e0
commit
0b563336fd
4 changed files with 10 additions and 12 deletions
|
|
@ -10,7 +10,7 @@
|
|||
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 = -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,8 +67,7 @@ wad_perl_handler.c:
|
|||
python makehandler.py
|
||||
|
||||
debug::
|
||||
gcc -g debug.c $(INCLUDE) -L. -Xlinker -rpath . -lwad
|
||||
# cc -g debug.c $(INCLUDE) -L. -R. -lwad
|
||||
cc -g debug.c $(INCLUDE) -L. -R. -lwad
|
||||
|
||||
plus::
|
||||
CC -g debug.cxx $(INCLUDE) -L. -R. -lwad
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ wad_segment_find(void *vaddr) {
|
|||
s = segments;
|
||||
ls = segments;
|
||||
while (s) {
|
||||
if (strcmp(s->mapname,ls->mapname)) {
|
||||
if (strcmp(s->mapname,ls->mapname) || (!strlen(ls->mapname))) {
|
||||
ls = s; /* First segment for a given name */
|
||||
}
|
||||
if ((addr >= s->vaddr) && (addr < (s->vaddr + s->size))) {
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ void wad_signalhandler(int sig, siginfo_t *si, void *vcontext) {
|
|||
p_sp = (unsigned long) (*sp);
|
||||
#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); */
|
||||
/* 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);
|
||||
|
|
|
|||
|
|
@ -104,7 +104,6 @@ stack_unwind(unsigned long *pc, unsigned long *sp, unsigned long *fp) {
|
|||
f->fp = fake_fp;
|
||||
f->segment = wad_segment_find((void *) *pc);
|
||||
f->stack_size = fake_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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue