kulp · kulp · Aug 31, 2020 · Aug 4, 2020 · Aug 4, 2020 · Aug 4, 2020
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1 @@
 *.tas.cpp linguist-language=tenyr
-hw/lattice/*.sty linguist-language=XML
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,9 @@
-[submodule "3rdparty/tinypp"]
-	path = 3rdparty/tinypp
-	url = https://github.com/kulp/tinypp.git
-[submodule "3rdparty/lcc"]
-	path = 3rdparty/lcc
-	url = https://github.com/drh/lcc.git
 [submodule "wiki"]
 	path = wiki
 	url = https://github.com/kulp/tenyr.wiki.git
 [submodule "3rdparty/wb_intercon"]
 	path = 3rdparty/wb_intercon
 	url = https://github.com/olofk/wb_intercon.git
+[submodule "3rdparty/naive-tsearch"]
+	path = 3rdparty/naive-tsearch
+	url = https://github.com/kulp/naive-tsearch.git
diff --git a/3rdparty/naive-tsearch b/3rdparty/naive-tsearch
diff --git a/3rdparty/tinypp b/3rdparty/tinypp
diff --git a/Changelog.md b/Changelog.md
@@ -29,6 +29,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Stopped using coveralls.io for code coverage reporting
 - Dropped `raw` output format
 - Dropped explicit support for backslashes as path component separators (#43)
+- Removed support for various deprecated and obsolete functionalities (#47)
+    - Dropped support for C-style and C++-style comments in .tas files
+    - Removed broken Forth implementation
+    - Dropped support for deprecated v0 and v1 object formats
+    - Remove unused `@=` syntax sugar
+    - Removed web demo
+    - Removed bitrotten support for Quartus and Lattice builds
+    - Dropped unused submodule for broken lcc port
 
 ## [0.9.7] - 2019-07-25
 ### Added

diff --git a/Makefile b/Makefile
@@ -36,8 +36,11 @@ tsim_OBJECTS   = $(common_OBJECTS) simif.o asm.o obj.o plugin.o \
 tld_OBJECTS    = $(common_OBJECTS) obj.o
 
 ifeq ($(USE_OWN_SEARCH),1)
+vpath %.c $(TOP)/3rdparty/naive-tsearch
 # The interface of lsearch and tsearch is not something we can change.
 lsearch.o tsearch.o: CFLAGS += -W$(PEDANTRY_EXCEPTION)cast-qual
+# tsearch.o from naive-tsearch has feature flags
+tsearch.o: CFLAGS += -Wno-unused-macros
 
 tas_OBJECTS   += lsearch.o tsearch.o
 tld_OBJECTS   += lsearch.o tsearch.o
@@ -54,7 +57,6 @@ distclean:: clobber
 clean clobber::
 	-rmdir $(BUILDDIR)/devices $(BUILDDIR) build # fail, ignore if non-empty
 	-$(MAKE) -C $(TOP)/test $@
-	-$(MAKE) -C $(TOP)/forth $@
 	-$(MAKE) -C $(TOP)/hw/icarus $@
 	-$(MAKE) -C $(TOP)/hw/xilinx $@
 

diff --git a/README.md b/README.md
@@ -6,10 +6,10 @@
 
 **tenyr** is a 32-bit computer architecture and computing environment that
 focuses on simplicity of design and implementation. **tenyr**'s tools run on
-Mac, \*nix, Windows, node.js (via [emscripten](https://github.com/kripken/emscripten)),
-and [in a web browser](http://demo.tenyr.info/). **tenyr**'s highly portable
-Verilog hardware definition has been demonstrated on Xilinx Spartan6 FPGAs and
-should run fine on many FPGAs while using less than 1200 LUT6-equivalents.
+macOS, \*nix, Windows, and node.js (via [emscripten](https://github.com/emscripten-core/emscripten)).
+**tenyr**'s highly portable Verilog hardware definition has been demonstrated
+on Xilinx Spartan6 FPGAs and should run fine on many FPGAs while using less
+than 1200 LUT6-equivalents.
 
 **tenyr** comprises :
 
@@ -27,6 +27,4 @@ should run fine on many FPGAs while using less than 1200 LUT6-equivalents.
   * random snakes "screensaver" ([tenyr source code](https://github.com/kulp/tenyr/blob/develop/ex/bm_snake.tas.cpp) &ndash; [running in the simulator](https://vimeo.com/98338696), [running on the FPGA](https://vimeo.com/103773300))
   * a [recursive Fibonacci number generator](https://github.com/kulp/tenyr/blob/develop/ex/bm_fib.tas.cpp)
 
-Explore a [simple online demo of the **tenyr** toolset](http://demo.tenyr.info/).
-
 **tenyr**'s documentation is [a wiki](https://github.com/kulp/tenyr/wiki), and it keeps a [changelog](Changelog.md) from v0.9.4 onward.
diff --git a/bench/Makefile b/bench/Makefile
diff --git a/bench/bsearch.c b/bench/bsearch.c
diff --git a/bench/qsort.c b/bench/qsort.c
diff --git a/bench/results.txt b/bench/results.txt
diff --git a/ex/Makefile b/ex/Makefile
@@ -2,10 +2,10 @@ TOP := $(abspath ..)
 include $(TOP)/mk/common.mk
 include $(TOP)/mk/rules.mk
 
-vpath %.tas $(TOP)/lib $(TOP)/lib/dword
-vpath %.tas.cpp $(TOP)/lib $(TOP)/lib/dword
+vpath %.tas $(TOP)/lib
+vpath %.tas.cpp $(TOP)/lib
 
-%.tas: INCLUDES += $(TOP)/lib $(TOP)/lib/dword
+%.tas: INCLUDES += $(TOP)/lib
 
 TARGETS = \
     bsearch_demo.texe   \
@@ -27,7 +27,7 @@ TARGETS = \
 
 CPP_FILES := $(wildcard *.tas.cpp)
 
-clean_FILES += $(TARGETS) *.to dword/*.to *.texe
+clean_FILES += $(TARGETS) *.to *.texe
 clean_FILES += $(CPP_FILES:%.tas.cpp=%.tas)
 
 all: $(TARGETS)
@@ -38,7 +38,7 @@ $(patsubst %.tas,%.texe,$(patsubst %.tas.cpp,%.tas,$(wildcard bm_*.tas*))): \
 hello.texe: puts.to
 compare.texe: strcmp.to puts.to
 dynamic.texe: memset.to malloc.to abort.to
-maths.texe: isqrt.to umod.to udiv.to dword/add.to dword/dword_mul.to
+maths.texe: isqrt.to umod.to udiv.to dword_add.to dword_mul.to
 totient.texe: gcd.to
 isprime.texe: umod.to isqrt.to udiv.to
 bsearch_demo.texe: bsearch.to puts.to

diff --git a/lib/dword/add.tas.cpp → ex/dword_add.tas.cpp b/lib/dword/add.tas.cpp → ex/dword_add.tas.cpp
diff --git a/lib/dword/dword_mul.tas.cpp → ex/dword_mul.tas.cpp b/lib/dword/dword_mul.tas.cpp → ex/dword_mul.tas.cpp
diff --git a/lib/fp/fp_mul.tas.cpp → ex/fp_mul.tas.cpp b/lib/fp/fp_mul.tas.cpp → ex/fp_mul.tas.cpp
diff --git a/forth/.gitignore b/forth/.gitignore
diff --git a/forth/Makefile b/forth/Makefile
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		*.tas.cpp linguist-language=tenyr
		hw/lattice/*.sty linguist-language=XML