finish reorg of main sources

FossilOrigin-Name: 6a7ee82ed6b024ee1d8f7a51a9b91a66a8041cde06b53cce649d6bd383ae9677
This commit is contained in:
crc 2019-11-22 18:30:02 +00:00
parent 62d551aaf5
commit ea8e12d32a
44 changed files with 15 additions and 15 deletions

View file

@ -79,7 +79,7 @@ test: bin/retro
glossary: doc/Glossary.txt doc/Glossary.html doc/Glossary-Concise.txt doc/Glossary-Names-and-Stack.txt words.tsv
image: interface/image.c
image: vm/nga-c/image.c
js: bin/RETRO12.html
@ -112,19 +112,18 @@ bin/retro-muri: tools/muri.c
bin/RETRO12.html: bin/retro-injectimage-js
./bin/retro-injectimage-js >bin/RETRO12.html
bin/retro-repl: interface/repl.c interface/image.c
bin/retro-repl: vm/nga-c/repl.c vm/nga-c/image.c
cd interface && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro-repl repl.c
bin/retro: ngaImage bin/retro-embedimage bin/retro-extend interface/retro-image.c interface/retro-unix.c interface/io/filesystem.retro interface/io/floatingpoint.retro interface/io/unix.retro interface/io/rng.retro interface/io/sockets.retro interface/retro-unix.retro interface/io/clock.retro
bin/retro: ngaImage bin/retro-embedimage bin/retro-extend vm/nga-c/retro-image.c vm/nga-c/retro-unix.c interface/filesystem.retro interface/floatingpoint.retro interface/unix.retro interface/rng.retro interface/sockets.retro interface/retro-unix.retro interface/clock.retro
cp ngaImage rre.image
./bin/retro-extend rre.image interface/io/filesystem.retro interface/io/floatingpoint.retro interface/io/unix.retro interface/io/rng.retro interface/io/sockets.retro interface/retro-unix.retro interface/io/clock.retro
./bin/retro-embedimage rre.image >interface/retro-image.c
cd interface && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro retro-unix.c $(LIBM)
./bin/retro-extend rre.image interface/filesystem.retro interface/floatingpoint.retro interface/unix.retro interface/rng.retro interface/sockets.retro interface/retro-unix.retro interface/clock.retro
./bin/retro-embedimage rre.image >vm/nga-c/retro-image.c
cd vm/nga-c && $(CC) $(CFLAGS) $(LDFLAGS) -o ../../bin/retro retro-unix.c $(LIBM)
cd package && ../bin/retro -f list.forth
./bin/retro-embedimage rre.image >interface/retro-image.c
./bin/retro-embedimage rre.image >vm/nga-c/retro-image.c
rm rre.image
cd interface && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro retro-unix.c $(LIBM)
cd vm/nga-c && $(CC) $(CFLAGS) $(LDFLAGS) -o ../../bin/retro retro-unix.c $(LIBM)
bin/retro-unu: tools/unu.c
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/retro-unu tools/unu.c
@ -145,16 +144,16 @@ doc/Glossary-Concise.txt: bin/retro sorted
doc/Glossary-Names-and-Stack.txt: bin/retro sorted
./bin/retro glossary.retro export concise-stack >doc/Glossary-Names-and-Stack.txt
interface/image.c: bin/retro-embedimage bin/retro-extend bin/retro-muri image/retro.forth image/rx.muri
vm/nga-c/image.c: bin/retro-embedimage bin/retro-extend bin/retro-muri image/retro.forth image/rx.muri
./bin/retro-muri image/rx.muri
./bin/retro-extend ngaImage image/retro.forth
./bin/retro-embedimage ngaImage > interface/image.c
./bin/retro-embedimage ngaImage > vm/nga-c/image.c
bin/retro-compiler: bin/retro-extend interface/retro-compiler.c interface/retro-runtime.c
bin/retro-compiler: bin/retro-extend vm/nga-c/retro-compiler.c vm/nga-c/retro-runtime.c
cp ngaImage runtime.image
./bin/retro-extend runtime.image interface/io/filesystem.retro interface/io/floatingpoint.retro interface/io/unix.retro interface/io/rng.retro interface/retro-unix.retro interface/io/clock.retro
cd interface && $(CC) $(CFLAGS) $(LDFLAGS) -o ../retro-runtime retro-runtime.c $(LIBM)
cd interface && $(CC) $(CFLAGS) $(LDFLAGS) -o ../bin/retro-compiler retro-compiler.c
./bin/retro-extend runtime.image interface/filesystem.retro interface/floatingpoint.retro interface/unix.retro interface/rng.retro interface/retro-unix.retro interface/clock.retro
cd vm/nga-c && $(CC) $(CFLAGS) $(LDFLAGS) -o ../../retro-runtime retro-runtime.c $(LIBM)
cd vm/nga-c && $(CC) $(CFLAGS) $(LDFLAGS) -o ../../bin/retro-compiler retro-compiler.c
objcopy --add-section .ngaImage=runtime.image --set-section-flags .ngaImage=noload,readonly bin/retro-compiler
objcopy --add-section .runtime=retro-runtime --set-section-flags .runtime=noload,readonly bin/retro-compiler
rm runtime.image retro-runtime

View file

@ -7,6 +7,7 @@
- updated html export for retro sources: averages 7.4% faster conversion, 26% smaller output across my test set
- use a trick from https://getkiss.org/blog/20191004a to disable requests for a favicon in Atua-WWW
- fix a bug in s:WHITESPACE and use it in c:whitespace?
- reorganize source tree
In progress: