Commit 884aa31d authored by Anton Ertl's avatar Anton Ertl

merge fix

parents 3d9f7a6b faadd276
Bernd Paysan <bernd.paysan@gmx.de> pazsan <pazsan>
Bernd Paysan <bernd.paysan@gmx.de> root <root@net2o.de>
Bernd Paysan <bernd.paysan@gmx.de> U-sunwukong\bernd <bernd@sunwukong.(none)>
Anton Ertl <anton@mips.complang.tuwien.ac.at> anton <anton>
Jens Wilke <jens.wilke@headissues.com> jwilke <jwilke>
David Kühling <dvdkhlng@gmx.de> dvdkhlng <dvdkhlng>
Neal Crook <neal@pinga.free-online.co.uk> crook <crook>
Andreas Kochenburger <minforth@arcor.de> ak042 <ak042>
Lennart Benschop <lennartb@xs4all.nl> benschop <benschop>
Andreas Bolka <a@bolka.at> abolka <abolka>
Darren Bane <unknown> dbane <dbane>
......@@ -12,7 +12,7 @@ before_install: ./install-deps.sh
script:
- ./autogen.sh
- export CC=gcc
- if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-8 -v; export CC=gcc-8; fi
- if [ "${TRAVIS_OS_NAME}" = osx ]; then gcc -v; gcc-9 -v; export CC=gcc-9; fi
- ./configure --enable-lib CC="$CC $M32"
- make
- for i in misc r8c 8086 c165; do ./build-ec $i; done
\ the additional Forth 200x words and their wordsets and other info
\ Author: Bernd Paysan
\ Copyright (C) 2014 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
......@@ -15,23 +15,32 @@ S: D-81477 München
S: Germany
P: rsa4096/3B7FA946 60E7 1A15 9357 5330 99A0 AAF9 CAF0 21DB 3B7F A946
N: David Kühling
E: dvdkhlng@gmx.de
D: Emacs integration
N: Gerald Wodni
E: gerald.wodni@gee.at
D: SWIG module for C libraries
N: David Kühling
E: dvdkhlng@gmx.de
D: Emacs integration
N: Heinz Schnitter
E: heinz.schnitter@muenchen-mail.de
D: R8C assembler
N: Jens Wilke
E: jens.wilke@headissue.com
D: Embedded Control versions (non-gcc), decompiler, cross compiler refinement
N: Klaus Kohl-Schöpe
E: kks@designin.de
D: 8086 Gforth EC
N: Neal Crook
E: neal@pinga.free-online.co.uk
D: manual, glossary entries
-----
Authors: Anton Ertl, Bernd Paysan, Jens Wilke
Copyright (C) 1998,2000,2003,2007,2017,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -80,6 +80,7 @@ gforth etags.fs
16 nov 2005
-----
Authors: Anton Ertl, Bernd Paysan
Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -2,6 +2,7 @@
#use this with parameters and env variables like "configure"
#Authors: Anton Ertl, Bernd Paysan, Jens Wilke, Gerald Wodni
#Copyright (C) 2000,2002,2003,2006,2007,2008,2013,2017 Free Software Foundation, Inc.
#This file is part of Gforth.
......
Authors: Anton Ertl, Bernd Paysan, David Kühling
Copyright (C) 2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
......
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Author: Anton Ertl
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
......
......@@ -9118,6 +9118,7 @@ with possibly additional -u clauses for other authors. Check the authors with
New file.
-----
Authors: Anton Ertl, Bernd Paysan
Copyright (C) 2003,2006,2007,2008,2017 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -227,6 +227,7 @@ INFOPATH=/usr/local/info:/usr/info
manually, or use '/sbin/install-info' (man install-info for details).
Authors: Anton Ertl, Bernd Paysan, Neal Crook
Copyright (C) 2003,2007,2008,2016 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
......
Author: Anton Ertl
Copyright (C) 2003 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
......
Authors: Bernd Paysan, Anton Ertl
Copyright (C) 2003 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
......
......@@ -11,6 +11,7 @@
If you are building from the tarball, please consult [INSTALL](INSTALL).
Authors: Gerald Wodni, Anton Ertl, Bernd Paysan
Copyright (C) 2016,2017 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
......@@ -3,6 +3,7 @@
#make dist targets (workaround for broken makes)
#use GNU make if your make does not grok this.
#Authors: Bernd Paysan, Anton Ertl
#Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2008,2010,2011,2012,2014,2015,2016,2017,2018 Free Software Foundation, Inc.
#This file is part of Gforth.
......
This diff is collapsed.
......@@ -335,6 +335,7 @@ $?) added (SYSTEM) ( c_addr u -- wretval wior ).
' and ['] now give an error for compile-only words.
-----
Authors: Anton Ertl, Bernd Paysan
Copyright (C) 1995,1996,1997,1998,2000,2003,2006,2007,2008 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -47,6 +47,7 @@ gforth-0.5.9-20010501 version until you have completed the changes
same time).
-----
Author: Anton Ertl
Copyright (C) 2001, 2002, 2003,2006,2007,2008 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -131,6 +131,7 @@ https://savannah.gnu.org/bugs/?func=addbug&group=gforth
anton@mips.complang.tuwien.ac.at
http://www.complang.tuwien.ac.at/anton/home.html
-----
Authors: Anton Ertl, Bernd Paysan, Neal Crook
Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2006,2007,2008,2009 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -118,6 +118,7 @@ anton@mips.complang.tuwien.ac.at
---
Authors: Bernd Paysan, Anton Ertl, Gerald Wodni
Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2006,2007,2008,2009,2016,2017,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -50,6 +50,7 @@ programs written for the present version (e.g., requiring a few
additional macro definitions).
-----
Author: Anton Ertl
Copyright (C) 2001, 2002, 2003,2007,2008 Free Software Foundation, Inc.
This file is part of Gforth.
......
-*- RoadMap for gforth 1.0 -*-
ABGO Anton, Bernd, Gerald, Others welcome! * = work in progress, x = done
B [x] Multithreading API
B [ ] Documentation
B [x] Documentation
A [ ] Documentation review
G [ ] Examples
B [x] Save images that contain C bindings
G [ ] Interface files for .h-files; build on install
G [ ]*Interface files for .h-files; build on install Port typical C-Libraries like stdio. Allow for `include c/stdio` Same structure as in C
A [ ] Recognizer Documentation & Examples
A [x] simplify API
B [x] examples
......@@ -14,21 +15,27 @@ ABGO [ ] Documentation for Undocumented features
A [ ]*Search changelogs for features
A [ ]*Sections
A [ ] integrate for: quotations, strings, locals
B [ ] loader for images with sections
A [ ]*saver for images with sections
B [x] loader for images with sections
B [ ]*Header Interface - autodetect duplication, simpler interface, setters have to duplicate if not already
B [ ] Generate header from prototype without duplcation
AB [ ]*locate, view, where & edit
[ ] documented view>*
[x]*help or doc - get documentation of word
[ ]*backtrace os-commandline
[ ]*where: interaction with editors
G [ ] Website manual - doc/crossdoc.fd doc/doc.fd doc/gforth.texi.in|grep doc- doc/gforth.txt
A [ ]*Add tex-section support
A [ ] Add documentation explaining help so that "help help" yields it
A [ ]*backtrace os-commandline
A [ ]*where: interaction with editors - g can be used
A [x]*2012 Implementieren
A [x] update ansreport
A [x] system documentation requirements
B [ ] Configure Scripts
B [x] Configure Scripts
B [x] make -j
G [x] ./BUILD-FROM-SCRATCH mit make -j
B [x] ./BUILD-FROM-SCRATCH for android
B [x] libtool-Fehler when it cannot be found (why is ./libtool not enough?) - better error reporting in configure
B [ ]*sudo make install does not clean up stuff - check if something is still owned by root
B [x]*sudo make install does not clean up stuff - check if something is still owned by root
B [x]*Warnings are added to string variables: present summary at the end
G [x] hash -r show or document
B [x]*version comparison 001.000.000 -> upgrade path: 000.007.009
......@@ -38,16 +45,16 @@ A [x] system documentation requirements
G [ ] better vim support
A [ ] changelog
A [ ] news-file
A [x] update this ToDo file
A [ ] update this ToDo file
BG [x]*implement smart .s "..."
AB [ ]*~~ uses ... and prints floating stack
AB [x]*~~ uses ... and prints floating stack
-*- RoadMap for gforth post 1.0 -*-
B [ ] Multithreading: Use sections to allow compilation in every threading
ABG [ ] fork-marker use fork instead of classic marker
AB [ ] marker für sections
AB [ ] bin-utils disassembler
G [ ] Klaut
-*- outline -*-
......@@ -139,6 +146,7 @@ in all source files.
** Write articles for (general-purpose) magazines
-----
Authors: Anton Ertl, Gerald Wodni, Bernd Paysan, Jens Wilke, Neal Crook
Copyright (C) 1995,1996,1997,1999,2003,2007,2016,2017,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
......@@ -5,6 +5,7 @@ lib.fs does some funny things to the return address (certainly does
The >EXEC trick (users: >STDERR) might work, but I am not sure.
-----
Author: Anton Ertl
Copyright (C) 1995,1996,1997,1998,2000,2003,2007 Free Software Foundation, Inc.
This file is part of Gforth.
......
#!/bin/bash
mark=$BASHPID
for i in `git ls-files|grep -v -x -F -f update-copyright-blacklist`
do
if [ -f $i -a ! -L $i ]
then
AUTHORS=$(git shortlog -n -s $i| cut -c8- | while read author; do git log -w -b --shortstat --author="$author" $i | grep -E "fil(e|es) changed" | awk "{files+=\$1; inserted+=\$4; deleted+=\$6} END {if(!(files==inserted && files==deleted) || !(files==1 && inserted==1 && deleted==0)) {print \"$author\"}}"; done | sed -e 's/$/,/g' | tr '[\n]' '[ ]' | sed -e 's/, $//g')
PLURAL=$(echo $AUTHORS | sed -e 's/[^,]*//g' -e 's/,,*/,/g' | tr [,] [s])
sed -e 's/\(.*\)\(Copyright .* Free Software Foundation, Inc\.\)/\1Author'"$PLURAL"': '"$AUTHORS"'\n\1\2/g' <$i >$i.$mark
mv $i.$mark $i
fi
done
\ ADD.FS Kernal additional things 20may93jaw
\ Author: Anton Ertl
\ Copyright (C) 1995,1996,1997,1998,2000,2003,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ report words used from the various wordsets
\ Authors: Anton Ertl, Bernd Paysan, Jens Wilke
\ Copyright (C) 1996,1998,1999,2003,2005,2006,2007,2009,2012,2013,2014,2015,2017 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ ansi.fs Define terminal attributes 20may93jaw
\ Authors: Bernd Paysan, Anton Ertl, Gerald Wodni, Neal Crook
\ Copyright (C) 1995,1996,1997,1998,2001,2003,2007,2013,2014,2015,2016,2017,2018 Free Software Foundation, Inc.
\ This file is part of Gforth.
......@@ -77,7 +78,7 @@ User Attr 0 Attr !
: (Attr!) ( attr -- )
\G set attribute
dup Attr @ = over 0= or IF drop EXIT THEN
dup Attr @ = IF drop EXIT THEN
dup $6600 = Attr @ 0= and IF drop EXIT THEN
dup Attr !
<<# 'm' hold
......@@ -111,10 +112,10 @@ User Attr 0 Attr !
Variable mark-attr
: m>>> ( -- )
attr @ dup mark-attr !
dup Underline xor attr!
." >>>" Invers xor attr! ;
dup error-hl-ul xor attr!
." >>>" error-hl-inv xor attr! ;
: <<<m ( -- )
mark-attr @ dup Underline xor attr! ." <<<" attr! ;
mark-attr @ dup error-hl-ul xor attr! ." <<<" attr! ;
' m>>> is mark-start
' <<<m is mark-end
......
#!/bin/bash
#Authors: Bernd Paysan, Anton Ertl
#Copyright (C) 2015,2016,2017 Free Software Foundation, Inc.
#This file is part of Gforth.
......
\ *** Assembler for the Intel i486 *** 07nov92py
\ Copyright (C) 1992-2000 by Bernd Paysan
\ Authors: Anton Ertl, Bernd Paysan
\ Copyright (C) 2000,2001,2003,2007 Free Software Foundation, Inc.
......
/*
This is the machine-specific part for Intel 386 compatible processors
Authors: Anton Ertl, Bernd Paysan, Jens Wilke
Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2012,2013,2014,2016,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
\ NCEX simple postfix assembler
\
\ Authors: Anton Ertl, Jens Wilke
\ Copyright (C) 1998 Lars Krueger
\
\ This file is part of FLK.
......
\ NCEX xt cache
\
\ Authors: Anton Ertl, Jens Wilke
\ Copyright (C) 1998 Lars Krueger
\
\ This file is part of FLK.
......
\ NCEX control flow stack
\
\ Authors: Anton Ertl, Jens Wilke
\ Copyright (C) 1998 Lars Krueger
\
\ This file is part of FLK.
......
\ NCEX Optimizer tree construction.
\
\ Authors: Anton Ertl, Jens Wilke
\ Copyright (C) 1998 Lars Krueger
\
\ This file is part of FLK.
......
\ Authors: Anton Ertl, Bernd Paysan
\ Copyright (C) 2000,2003,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ four stack assembler 19jan94py
\ Authors: Bernd Paysan, Anton Ertl
\ Copyright (C) 2000,2003,2007,2008 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ Parameter for target systems 06oct92py
\ Authors: Bernd Paysan, Anton Ertl
\ Copyright (C) 1995,2000,2003,2007,2008 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
#!/bin/sh
# Authors: Anton Ertl, Bernd Paysan, Neal Crook
# Copyright (C) 2001,2003,2004,2007 Free Software Foundation, Inc.
# This file is part of Gforth.
......
\ 4stack primitives
\ Authors: Anton Ertl, Bernd Paysan
\ Copyright (C) 2000,2007,2008 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ 4stack primitives
\ Authors: Bernd Paysan, Anton Ertl
\ Copyright (C) 2000,2003,2007,2008 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ relocate 4stack binary
\ Authors: Anton Ertl, Bernd Paysan
\ Copyright (C) 2000,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ relocate 4stack binary
\ Authors: Bernd Paysan, Anton Ertl
\ Copyright (C) 2000,2003,2007,2008 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ Parameter for target systems 06oct92py
\ Authors: Anton Ertl, Bernd Paysan, Jens Wilke, Neal Crook
\ Copyright (C) 1995,1999,2001,2003,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ Authors: Anton Ertl, Bernd Paysan, Jens Wilke
\ Copyright (C) 1999,2000,2003,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ assembler in forth for alpha
\ Author: Anton Ertl
\ Copyright (C) 1999,2000,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
\ disassembler in forth for alpha
\ Author: Anton Ertl
\ Copyright (C) 1999,2000,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
/* DEC Alpha
Authors: Anton Ertl, Bernd Paysan, Jens Wilke
Copyright (C) 1995,1996,1997,1998,2000,2003,2005,2007,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
\ Author: Anton Ertl
\ Copyright (C) 2000,2003,2007 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
#!/bin/bash
#Authors: Bernd Paysan, Anton Ertl
#Copyright (C) 2015,2016,2017 Free Software Foundation, Inc.
#This file is part of Gforth.
......
\ *** Assembler for the Athlon64 *** 17jul04py
\ Copyright (C) 1992-2000 by Bernd Paysan (486 assemlber)
\ Authors: David Kühling, Bernd Paysan, Anton Ertl
\ Copyright (C) 2000,2001,2003,2004,2007,2010,2017 Free Software Foundation, Inc.
\ This file is part of Gforth.
......
This diff is collapsed.
/*
This is the machine-specific part for the AMD64 (ne x86-64) architecture.
This is the machine-specific part for the AMD64 (née x86-64) architecture.
Authors: Anton Ertl, Bernd Paysan
Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2011,2013,2014,2015,2016,2018 Free Software Foundation, Inc.
This file is part of Gforth.
......
#Authors: Bernd Paysan, Anton Ertl
#Copyright (C) 2015,2014,2016,2018 Free Software Foundation, Inc.
#This file is part of Gforth.
......@@ -19,7 +20,7 @@ cat <<EOF
<?xml version="1.0" encoding="utf-8"?>
<!-- BEGIN_INCLUDE(manifest) -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"