--- gforth/dis-gdb.fs	2004/08/23 14:03:52	1.4
+++ gforth/dis-gdb.fs	2011/12/31 15:29:25	1.14
@@ -1,12 +1,12 @@
 \ dis-gdb.fs	disassembler using gdb
 \
-\ Copyright (C) 2004 Free Software Foundation, Inc.
+\ Copyright (C) 2004,2007,2008,2010,2011 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
 \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License
-\ as published by the Free Software Foundation; either version 2
+\ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.
 
 \ This program is distributed in the hope that it will be useful,
@@ -15,21 +15,40 @@
 \ GNU General Public License for more details.
 
 \ You should have received a copy of the GNU General Public License
-\ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+\ along with this program. If not, see http://www.gnu.org/licenses/.
 
 : append-extend-string ( addr1 u1 addr2 u2 -- addr3 u1+u2 )
     \ append string2 to string1 with dynamic memory reallocation.
     swap >r dup >r extend-mem ( to addr3 u1+u2 r: addr2 u2 )
     rot r> r> rot rot chars move ;
 
+defer gdb-addr-sep-char ( -- c )
+
+',' constant #comma
+
+: check-gdb-syntax ( -- c )
+    \ gdb-7.0 and earlier do what we want with "disassemble addr1 addr2"
+    \ gdb-7.1 and later only work with         "disaesemble addr1,addr2"
+    \ try the old syntax to see if it works
+    s" gdb -ex 'disassemble 0 1' -ex 'quit' 2>/dev/null" r/o open-pipe throw
+    dup slurp-fid rot close-pipe throw drop
+    s" Dump of assembler code from" search nip nip if
+        ['] bl
+    else
+        ['] #comma
+    then
+    dup is gdb-addr-sep-char
+    execute ;
+
+' check-gdb-syntax is gdb-addr-sep-char
+
 : disasm-gdb { addr u -- }
     base @ >r hex
     s\" type mktemp >/dev/null && type gdb >/dev/null && file=`mktemp -t gforthdis.XXXXXXXXXX` && file2=`mktemp -t gforthdis.XXXXXXXXXX` && echo \"set verbose off\nset logging file $file\nset logging on\ndisas " save-mem ( addr u addr1 u1 )
-    addr 0 <<# bl hold # #s 'x hold # #> append-extend-string #>>
+    addr 0 <<# gdb-addr-sep-char hold # #s 'x hold # #> append-extend-string #>>
     addr u + 0 <<# # #s 'x hold # #> append-extend-string #>>
     r> base ! cr
-    s\" \nset logging off\nquit\n\" >$file2 && gdb -nx -q -p $PPID -x $file2 2>/dev/null >/dev/null && rm $file2 && grep -v \"of assembler\" $file && rm $file" append-extend-string
+    s\" \nset logging off\nquit\n\" >$file2 && gdb -nx -q -p `ps -p $$ -o ppid=` -x $file2 2>/dev/null >/dev/null && rm $file2 && grep -v \"of assembler\" $file && rm $file" append-extend-string
     2dup (system) 2swap drop free throw throw if
 	addr u dump
     endif ;