--- gforth/dis-gdb.fs	2011/01/09 20:04:15	1.11
+++ gforth/dis-gdb.fs	2011/01/15 16:20:00	1.12
@@ -22,10 +22,30 @@
     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 -q -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" string-prefix? 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\nset interactive-mode off\ndisas " save-mem ( addr u addr1 u1 )
-    addr 0 <<# ',' hold # #s 'x hold # #> append-extend-string #>>
+    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 <<# 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 `ps -p $$ -o ppid=` -x $file2 2>/dev/null >/dev/null && rm $file2 && grep -v \"of assembler\" $file && rm $file" append-extend-string