From 478c32ae5aceca9fadcd0de357bf5055c610c42d Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 22 Oct 2008 22:08:05 +0000 Subject: * More fpmake fixes. Exampledirs and includefiles mostly fixed for these. gdbint moves two examples from src to exampledir + makefile fix. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@11949 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/gdbint/Makefile | 116 ++++++++++++++++++------------------ packages/gdbint/Makefile.fpc | 2 +- packages/gdbint/examples/symify.pp | 77 ++++++++++++++++++++++++ packages/gdbint/examples/testgdb.pp | 55 +++++++++++++++++ packages/gdbint/fpmake.pp | 2 +- packages/gdbint/src/symify.pp | 77 ------------------------ packages/gdbint/src/testgdb.pp | 55 ----------------- 7 files changed, 192 insertions(+), 192 deletions(-) create mode 100644 packages/gdbint/examples/symify.pp create mode 100644 packages/gdbint/examples/testgdb.pp delete mode 100644 packages/gdbint/src/symify.pp delete mode 100644 packages/gdbint/src/testgdb.pp (limited to 'packages/gdbint') diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 3c744b6f6c..c3bf6ba3f8 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -459,178 +459,178 @@ ifeq ($(FULL_TARGET),armeb-embedded) override TARGET_UNITS+=gdbint gdbcon endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=testgdb symify +override TARGET_EXAMPLES+=examples/testgdb examples/symify endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) diff --git a/packages/gdbint/Makefile.fpc b/packages/gdbint/Makefile.fpc index 604910415b..7b3bd3b488 100644 --- a/packages/gdbint/Makefile.fpc +++ b/packages/gdbint/Makefile.fpc @@ -9,7 +9,7 @@ version=2.2.2 [target] units=gdbint gdbcon -examples=testgdb symify +examples=examples/testgdb examples/symify [compiler] objectdir=$(GDBLIBDIR) diff --git a/packages/gdbint/examples/symify.pp b/packages/gdbint/examples/symify.pp new file mode 100644 index 0000000000..d262bf1b15 --- /dev/null +++ b/packages/gdbint/examples/symify.pp @@ -0,0 +1,77 @@ +{ + Copyright (c) 1998 by Peter Vreman + + Translate backtrace addresses into file and line info + + See the file COPYING.FPC, included in this distribution, + for details about the copyright. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + **********************************************************************} +program symify; +uses GDBInt; + +var + gdb : tgdbinterface; + + +procedure processlog(const fn:string); +var + t : text; + hs,s : string; + code : word; + i, + addr : longint; + sym : tsyminfo; +begin + assign(t,fn); + {$I-} + reset(t); + {$I+} + if ioresult<>0 then + exit; + while not eof(t) do + begin + readln(t,s); + i:=pos('0x',s); + if i=3 then + begin + hs:='$'+Copy(s,5,8); + Val(hs,addr,code); + if code=0 then + begin + gdb.GetAddrSymInfo(addr,sym); + Write(Copy(s,1,12)); + if assigned(sym.funcname) then + write(' in ',sym.funcname,'+',sym.offset); + if assigned(sym.fname) then + writeln(' ',sym.fname,':',sym.line) + else + writeln; + end + else + writeln(s); + end + else + writeln(s); + end; + close(t); +end; + + +begin + if paramcount<2 then + begin + writeln('usage: symify '); + halt(1); + end; + gdb.init; + writeln('loading ',paramstr(2)); + gdb.gdb_command('file '+paramstr(2)); + writeln('parsing ',paramstr(1)); + processlog(paramstr(1)); + gdb.done; +end. diff --git a/packages/gdbint/examples/testgdb.pp b/packages/gdbint/examples/testgdb.pp new file mode 100644 index 0000000000..fe4bbde904 --- /dev/null +++ b/packages/gdbint/examples/testgdb.pp @@ -0,0 +1,55 @@ +{ + Copyright (c) 1998 by Peter Vreman + + Small example program to the GDB + + See the file COPYING.FPC, included in this distribution, + for details about the copyright. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + **********************************************************************} +program testgdb; +uses gdbcon; +var + last,s,parafile : string; + gdb : tgdbcontroller; +begin + gdb.init; + if paramcount=1 then + parafile:=paramstr(1) + else + parafile:='test'; + gdb.loadfile(parafile); + Writeln('Welcome to the pascal GDB...'); + Writeln('Type "q" to exit...'); + last:=''; + repeat + write('>'); + readln(s); + if (s='a') then + gdb.starttrace + else + if (s='s') then + gdb.tracestep + else + if (s='n') then + gdb.tracenext + else + if (s='q') then + break + else + begin + if s='' then + s:=last; + GDB.Command(s); + GDB.WriteErrorBuf; + GDB.WriteOutputBuf; + last:=s; + end; + until false; + gdb.done; + Writeln('End of pascal GDB...'); +end. diff --git a/packages/gdbint/fpmake.pp b/packages/gdbint/fpmake.pp index 07ebea6ef9..5639d140a4 100644 --- a/packages/gdbint/fpmake.pp +++ b/packages/gdbint/fpmake.pp @@ -18,7 +18,7 @@ begin {$endif ALLPACKAGES} P.Version:='2.2.2-0'; P.SourcePath.Add('src'); - + P.IncludePath.Add('src'); T:=P.Targets.AddUnit('gdbcon.pp'); with T.Dependencies do begin diff --git a/packages/gdbint/src/symify.pp b/packages/gdbint/src/symify.pp deleted file mode 100644 index d262bf1b15..0000000000 --- a/packages/gdbint/src/symify.pp +++ /dev/null @@ -1,77 +0,0 @@ -{ - Copyright (c) 1998 by Peter Vreman - - Translate backtrace addresses into file and line info - - See the file COPYING.FPC, included in this distribution, - for details about the copyright. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - **********************************************************************} -program symify; -uses GDBInt; - -var - gdb : tgdbinterface; - - -procedure processlog(const fn:string); -var - t : text; - hs,s : string; - code : word; - i, - addr : longint; - sym : tsyminfo; -begin - assign(t,fn); - {$I-} - reset(t); - {$I+} - if ioresult<>0 then - exit; - while not eof(t) do - begin - readln(t,s); - i:=pos('0x',s); - if i=3 then - begin - hs:='$'+Copy(s,5,8); - Val(hs,addr,code); - if code=0 then - begin - gdb.GetAddrSymInfo(addr,sym); - Write(Copy(s,1,12)); - if assigned(sym.funcname) then - write(' in ',sym.funcname,'+',sym.offset); - if assigned(sym.fname) then - writeln(' ',sym.fname,':',sym.line) - else - writeln; - end - else - writeln(s); - end - else - writeln(s); - end; - close(t); -end; - - -begin - if paramcount<2 then - begin - writeln('usage: symify '); - halt(1); - end; - gdb.init; - writeln('loading ',paramstr(2)); - gdb.gdb_command('file '+paramstr(2)); - writeln('parsing ',paramstr(1)); - processlog(paramstr(1)); - gdb.done; -end. diff --git a/packages/gdbint/src/testgdb.pp b/packages/gdbint/src/testgdb.pp deleted file mode 100644 index fe4bbde904..0000000000 --- a/packages/gdbint/src/testgdb.pp +++ /dev/null @@ -1,55 +0,0 @@ -{ - Copyright (c) 1998 by Peter Vreman - - Small example program to the GDB - - See the file COPYING.FPC, included in this distribution, - for details about the copyright. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - **********************************************************************} -program testgdb; -uses gdbcon; -var - last,s,parafile : string; - gdb : tgdbcontroller; -begin - gdb.init; - if paramcount=1 then - parafile:=paramstr(1) - else - parafile:='test'; - gdb.loadfile(parafile); - Writeln('Welcome to the pascal GDB...'); - Writeln('Type "q" to exit...'); - last:=''; - repeat - write('>'); - readln(s); - if (s='a') then - gdb.starttrace - else - if (s='s') then - gdb.tracestep - else - if (s='n') then - gdb.tracenext - else - if (s='q') then - break - else - begin - if s='' then - s:=last; - GDB.Command(s); - GDB.WriteErrorBuf; - GDB.WriteOutputBuf; - last:=s; - end; - until false; - gdb.done; - Writeln('End of pascal GDB...'); -end. -- cgit v1.2.1