From ea8e12d32a27f9f8357a3c207f40745813d82d24 Mon Sep 17 00:00:00 2001 From: crc Date: Fri, 22 Nov 2019 18:30:02 +0000 Subject: [PATCH] finish reorg of main sources FossilOrigin-Name: 6a7ee82ed6b024ee1d8f7a51a9b91a66a8041cde06b53cce649d6bd383ae9677 --- Makefile | 29 +++++++++---------- RELEASE-NOTES | 1 + interface/{io => }/clock.retro | 0 interface/{io => }/filesystem.retro | 0 interface/{io => }/floatingpoint.retro | 0 interface/{io => }/gopher.retro | 0 interface/{io => }/rng.retro | 0 interface/{io => }/sockets.retro | 0 interface/{io => }/unix.retro | 0 .../native => vm/nga-c-native-x86}/386.ld | 0 .../native => vm/nga-c-native-x86}/386.s | 0 .../native => vm/nga-c-native-x86}/386flat.ld | 0 .../native => vm/nga-c-native-x86}/Makefile | 0 .../native => vm/nga-c-native-x86}/README.md | 0 .../native => vm/nga-c-native-x86}/bin/.keep | 0 .../native => vm/nga-c-native-x86}/image.c | 0 .../native => vm/nga-c-native-x86}/retro.c | 0 .../nga-c-native-x86}/x86/Block-Editor.retro | 0 .../nga-c-native-x86}/x86/ata.retro | 0 .../nga-c-native-x86}/x86/cmos-rtc.retro | 0 .../nga-c-native-x86}/x86/common.retro | 0 .../nga-c-native-x86}/x86/display.retro | 0 .../nga-c-native-x86}/x86/keyboard.retro | 0 .../nga-c-native-x86}/x86/listener.retro | 0 .../nga-c-native-x86}/x86/serial.retro | 0 .../nga-c-no-libc}/Makefile | 0 .../nga-c-no-libc}/README | 0 .../nga-c-no-libc}/fbsd.s | 0 .../nga-c-no-libc}/fbsd64.s | 0 .../nga-c-no-libc}/image.c | 0 .../nga-c-no-libc}/linux.s | 0 .../nga-c-no-libc}/macos.s | 0 .../nga-c-no-libc}/obsd64.s | 0 .../nga-c-no-libc}/retro.c | 0 {interface => vm/nga-c}/barebones.c | 0 {interface => vm/nga-c}/barebones_image.c | 0 {interface => vm/nga-c}/config.h | 0 {interface => vm/nga-c}/image.c | 0 {interface => vm/nga-c}/repl.c | 0 {interface => vm/nga-c}/retro-compiler.c | 0 {interface => vm/nga-c}/retro-image.c | 0 {interface => vm/nga-c}/retro-runtime.c | 0 {interface => vm/nga-c}/retro-unix.c | 0 {interface => vm/nga-c}/retro-windows.c | 0 44 files changed, 15 insertions(+), 15 deletions(-) rename interface/{io => }/clock.retro (100%) rename interface/{io => }/filesystem.retro (100%) rename interface/{io => }/floatingpoint.retro (100%) rename interface/{io => }/gopher.retro (100%) rename interface/{io => }/rng.retro (100%) rename interface/{io => }/sockets.retro (100%) rename interface/{io => }/unix.retro (100%) rename {interface/native => vm/nga-c-native-x86}/386.ld (100%) rename {interface/native => vm/nga-c-native-x86}/386.s (100%) rename {interface/native => vm/nga-c-native-x86}/386flat.ld (100%) rename {interface/native => vm/nga-c-native-x86}/Makefile (100%) rename {interface/native => vm/nga-c-native-x86}/README.md (100%) rename {interface/native => vm/nga-c-native-x86}/bin/.keep (100%) rename {interface/native => vm/nga-c-native-x86}/image.c (100%) rename {interface/native => vm/nga-c-native-x86}/retro.c (100%) rename {interface/native => vm/nga-c-native-x86}/x86/Block-Editor.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/ata.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/cmos-rtc.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/common.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/display.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/keyboard.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/listener.retro (100%) rename {interface/native => vm/nga-c-native-x86}/x86/serial.retro (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/Makefile (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/README (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/fbsd.s (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/fbsd64.s (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/image.c (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/linux.s (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/macos.s (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/obsd64.s (100%) rename {interface/minimal-no-libc => vm/nga-c-no-libc}/retro.c (100%) rename {interface => vm/nga-c}/barebones.c (100%) rename {interface => vm/nga-c}/barebones_image.c (100%) rename {interface => vm/nga-c}/config.h (100%) rename {interface => vm/nga-c}/image.c (100%) rename {interface => vm/nga-c}/repl.c (100%) rename {interface => vm/nga-c}/retro-compiler.c (100%) rename {interface => vm/nga-c}/retro-image.c (100%) rename {interface => vm/nga-c}/retro-runtime.c (100%) rename {interface => vm/nga-c}/retro-unix.c (100%) rename {interface => vm/nga-c}/retro-windows.c (100%) diff --git a/Makefile b/Makefile index 15aab87..46e76c4 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 38d6149..9368894 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -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: diff --git a/interface/io/clock.retro b/interface/clock.retro similarity index 100% rename from interface/io/clock.retro rename to interface/clock.retro diff --git a/interface/io/filesystem.retro b/interface/filesystem.retro similarity index 100% rename from interface/io/filesystem.retro rename to interface/filesystem.retro diff --git a/interface/io/floatingpoint.retro b/interface/floatingpoint.retro similarity index 100% rename from interface/io/floatingpoint.retro rename to interface/floatingpoint.retro diff --git a/interface/io/gopher.retro b/interface/gopher.retro similarity index 100% rename from interface/io/gopher.retro rename to interface/gopher.retro diff --git a/interface/io/rng.retro b/interface/rng.retro similarity index 100% rename from interface/io/rng.retro rename to interface/rng.retro diff --git a/interface/io/sockets.retro b/interface/sockets.retro similarity index 100% rename from interface/io/sockets.retro rename to interface/sockets.retro diff --git a/interface/io/unix.retro b/interface/unix.retro similarity index 100% rename from interface/io/unix.retro rename to interface/unix.retro diff --git a/interface/native/386.ld b/vm/nga-c-native-x86/386.ld similarity index 100% rename from interface/native/386.ld rename to vm/nga-c-native-x86/386.ld diff --git a/interface/native/386.s b/vm/nga-c-native-x86/386.s similarity index 100% rename from interface/native/386.s rename to vm/nga-c-native-x86/386.s diff --git a/interface/native/386flat.ld b/vm/nga-c-native-x86/386flat.ld similarity index 100% rename from interface/native/386flat.ld rename to vm/nga-c-native-x86/386flat.ld diff --git a/interface/native/Makefile b/vm/nga-c-native-x86/Makefile similarity index 100% rename from interface/native/Makefile rename to vm/nga-c-native-x86/Makefile diff --git a/interface/native/README.md b/vm/nga-c-native-x86/README.md similarity index 100% rename from interface/native/README.md rename to vm/nga-c-native-x86/README.md diff --git a/interface/native/bin/.keep b/vm/nga-c-native-x86/bin/.keep similarity index 100% rename from interface/native/bin/.keep rename to vm/nga-c-native-x86/bin/.keep diff --git a/interface/native/image.c b/vm/nga-c-native-x86/image.c similarity index 100% rename from interface/native/image.c rename to vm/nga-c-native-x86/image.c diff --git a/interface/native/retro.c b/vm/nga-c-native-x86/retro.c similarity index 100% rename from interface/native/retro.c rename to vm/nga-c-native-x86/retro.c diff --git a/interface/native/x86/Block-Editor.retro b/vm/nga-c-native-x86/x86/Block-Editor.retro similarity index 100% rename from interface/native/x86/Block-Editor.retro rename to vm/nga-c-native-x86/x86/Block-Editor.retro diff --git a/interface/native/x86/ata.retro b/vm/nga-c-native-x86/x86/ata.retro similarity index 100% rename from interface/native/x86/ata.retro rename to vm/nga-c-native-x86/x86/ata.retro diff --git a/interface/native/x86/cmos-rtc.retro b/vm/nga-c-native-x86/x86/cmos-rtc.retro similarity index 100% rename from interface/native/x86/cmos-rtc.retro rename to vm/nga-c-native-x86/x86/cmos-rtc.retro diff --git a/interface/native/x86/common.retro b/vm/nga-c-native-x86/x86/common.retro similarity index 100% rename from interface/native/x86/common.retro rename to vm/nga-c-native-x86/x86/common.retro diff --git a/interface/native/x86/display.retro b/vm/nga-c-native-x86/x86/display.retro similarity index 100% rename from interface/native/x86/display.retro rename to vm/nga-c-native-x86/x86/display.retro diff --git a/interface/native/x86/keyboard.retro b/vm/nga-c-native-x86/x86/keyboard.retro similarity index 100% rename from interface/native/x86/keyboard.retro rename to vm/nga-c-native-x86/x86/keyboard.retro diff --git a/interface/native/x86/listener.retro b/vm/nga-c-native-x86/x86/listener.retro similarity index 100% rename from interface/native/x86/listener.retro rename to vm/nga-c-native-x86/x86/listener.retro diff --git a/interface/native/x86/serial.retro b/vm/nga-c-native-x86/x86/serial.retro similarity index 100% rename from interface/native/x86/serial.retro rename to vm/nga-c-native-x86/x86/serial.retro diff --git a/interface/minimal-no-libc/Makefile b/vm/nga-c-no-libc/Makefile similarity index 100% rename from interface/minimal-no-libc/Makefile rename to vm/nga-c-no-libc/Makefile diff --git a/interface/minimal-no-libc/README b/vm/nga-c-no-libc/README similarity index 100% rename from interface/minimal-no-libc/README rename to vm/nga-c-no-libc/README diff --git a/interface/minimal-no-libc/fbsd.s b/vm/nga-c-no-libc/fbsd.s similarity index 100% rename from interface/minimal-no-libc/fbsd.s rename to vm/nga-c-no-libc/fbsd.s diff --git a/interface/minimal-no-libc/fbsd64.s b/vm/nga-c-no-libc/fbsd64.s similarity index 100% rename from interface/minimal-no-libc/fbsd64.s rename to vm/nga-c-no-libc/fbsd64.s diff --git a/interface/minimal-no-libc/image.c b/vm/nga-c-no-libc/image.c similarity index 100% rename from interface/minimal-no-libc/image.c rename to vm/nga-c-no-libc/image.c diff --git a/interface/minimal-no-libc/linux.s b/vm/nga-c-no-libc/linux.s similarity index 100% rename from interface/minimal-no-libc/linux.s rename to vm/nga-c-no-libc/linux.s diff --git a/interface/minimal-no-libc/macos.s b/vm/nga-c-no-libc/macos.s similarity index 100% rename from interface/minimal-no-libc/macos.s rename to vm/nga-c-no-libc/macos.s diff --git a/interface/minimal-no-libc/obsd64.s b/vm/nga-c-no-libc/obsd64.s similarity index 100% rename from interface/minimal-no-libc/obsd64.s rename to vm/nga-c-no-libc/obsd64.s diff --git a/interface/minimal-no-libc/retro.c b/vm/nga-c-no-libc/retro.c similarity index 100% rename from interface/minimal-no-libc/retro.c rename to vm/nga-c-no-libc/retro.c diff --git a/interface/barebones.c b/vm/nga-c/barebones.c similarity index 100% rename from interface/barebones.c rename to vm/nga-c/barebones.c diff --git a/interface/barebones_image.c b/vm/nga-c/barebones_image.c similarity index 100% rename from interface/barebones_image.c rename to vm/nga-c/barebones_image.c diff --git a/interface/config.h b/vm/nga-c/config.h similarity index 100% rename from interface/config.h rename to vm/nga-c/config.h diff --git a/interface/image.c b/vm/nga-c/image.c similarity index 100% rename from interface/image.c rename to vm/nga-c/image.c diff --git a/interface/repl.c b/vm/nga-c/repl.c similarity index 100% rename from interface/repl.c rename to vm/nga-c/repl.c diff --git a/interface/retro-compiler.c b/vm/nga-c/retro-compiler.c similarity index 100% rename from interface/retro-compiler.c rename to vm/nga-c/retro-compiler.c diff --git a/interface/retro-image.c b/vm/nga-c/retro-image.c similarity index 100% rename from interface/retro-image.c rename to vm/nga-c/retro-image.c diff --git a/interface/retro-runtime.c b/vm/nga-c/retro-runtime.c similarity index 100% rename from interface/retro-runtime.c rename to vm/nga-c/retro-runtime.c diff --git a/interface/retro-unix.c b/vm/nga-c/retro-unix.c similarity index 100% rename from interface/retro-unix.c rename to vm/nga-c/retro-unix.c diff --git a/interface/retro-windows.c b/vm/nga-c/retro-windows.c similarity index 100% rename from interface/retro-windows.c rename to vm/nga-c/retro-windows.c